Merge branch 'development-SDXPINN' into development-SDXPINN

This commit is contained in:
Russel Yasol
2025-08-25 12:58:28 +08:00
committed by GitHub
14 changed files with 36 additions and 24 deletions

View File

@@ -1,5 +1,5 @@
Package: sdxpinn-console-menu
Version: 0.0.2
Version: 0.0.3
Architecture: aarch64_cortex-a53
Maintainer: Cameron Thompson iamromulan@github.com
Source: github.com/iamromulan

View File

@@ -7,7 +7,7 @@ menu() {
echo -e "\e[92m1) Enable/Disable Single IP DMZ Passthrough Mode\e[0m" # Green
echo -e "\e[94m2) Set Gateway Address\e[0m" # Blue
echo -e "\e[93m3) Set DHCP Start/Limit Range\e[0m" # Yellow
echo -e "\e[96m4) Set Custom DNS\e[0m" # Cyan
echo -e "\e[96m4) Set Custom DNS (Recommended to be connected through ADB over USB)(Network restart required)\e[0m" # Cyan
echo -e "\e[95m5) Use Provider's DNS (IPv4 only)\e[0m" # Magenta
echo -e "\e[92m6) Enable/Disable IP Passthrough with NAT (Access to modem's LAN locally)\e[0m" # Green
echo -e "\e[91m7) Exit\e[0m" # Red
@@ -26,11 +26,12 @@ apply_changes() {
# Function to check if IPPT is enabled by inspecting the MPDN rules
is_ippt_enabled() {
local mpdn_output=$(atcmd 'AT+QMAP="mpdn_rule"')
local mpdn_output=$(sms_tool at -t 3 'AT+QMAP="mpdn_rule"')
echo "$mpdn_output"
# Check if any MPDN rule has IPPT enabled (non-zero second-to-last value)
if echo "$mpdn_output" | grep -q "+QMAP: \"MPDN_rule\",.*,.*,.*,[1-9],.*"; then
# The expected format is: +QMAP: "MPDN_rule",<rule_id>,<pdp_id>,<vlan>,<ippt>,<auto-connect>
if echo "$mpdn_output" | grep -q "+QMAP: \"MPDN_rule\",.*,[1-9].*,.*,[1-9],[1-9]"; then
return 0 # IPPT is enabled
else
return 1 # IPPT is not enabled
@@ -41,7 +42,7 @@ is_ippt_enabled() {
are_mpdn_rules_clear() {
local mpdn_output=$(atcmd 'AT+QMAP="mpdn_rule"')
echo "$mpdn_output"
# Check if all MPDN rules are clear (all values are 0)
if echo "$mpdn_output" | grep -q "+QMAP: \"MPDN_rule\",0,0,0,0,0"; then
return 0 # MPDN rules are clear
@@ -208,6 +209,14 @@ toggle_custom_dns() {
get_current_settings "$interface"
local dns=$(prompt "Enter DNS servers (comma-separated)" "$CURRENT_DNS")
if uci show dhcp.$interface &>/dev/null; then
echo -e "\e[93mSetting DNS to: $dns\e[0m" # Yellow
else
uci add dhcp.$interface
echo -e "\e[91m$interface section not found with UCI. Created and set dhcp_option to 6,$dns. \e[0m" # Red
fi
uci set dhcp.$interface.dhcp_option="6,$dns"
apply_changes
}

File diff suppressed because one or more lines are too long

View File

@@ -1,5 +1,5 @@
Package: tailscaled
Version: 1.86.2
Version: 1.86.2-1
Depends: libc, ca-bundle, kmod-tun
Source: feeds/packages/net/tailscale
SourceName: tailscaled

View File

@@ -200,6 +200,8 @@ start_instance() {
procd_set_param command $PROGD $ARGS
procd_set_param env TS_DEBUG_FIREWALL_MODE="$fw_mode"
procd_set_param env GOGC=50
procd_set_param env GOMEMLIMIT=110MiB
procd_set_param respawn
procd_set_param stdout "$std_out"