handle socks port properly on linux and mac

Author: rivethorn

scripts/proxy_set_linux_sh

@@ -24,19 +24,21 @@ set_gnome_proxy() {
     local MODE=$1
     local PROXY_IP=$2
     local PROXY_PORT=$3
-    local IGNORE_HOSTS=$4
+    local SOCKS_PORT=$4
+    local IGNORE_HOSTS=$5
 
     # Set the proxy mode
     gsettings set org.gnome.system.proxy mode "$MODE"
 
     if [ "$MODE" == "manual" ]; then
         # List of protocols
-        local PROTOCOLS=("http" "https" "ftp" "socks")
+        local PROTOCOLS=("http" "https" "ftp")
 
         # Loop through protocols to set the proxy
         for PROTOCOL in "${PROTOCOLS[@]}"; do
             gsettings set org.gnome.system.proxy.$PROTOCOL host "$PROXY_IP"
             gsettings set org.gnome.system.proxy.$PROTOCOL port "$PROXY_PORT"
+            gsettings set org.gnome.system.proxy.socks port "$SOCKS_PORT"
         done
 
         # Set ignored hosts
@@ -56,7 +58,8 @@ set_kde_proxy() {
     local MODE=$1
     local PROXY_IP=$2
     local PROXY_PORT=$3
-    local IGNORE_HOSTS=$4
+    local SOCKS_PORT=$4
+    local IGNORE_HOSTS=$5
 
     # Determine the correct kwriteconfig command based on KDE_SESSION_VERSION
     if [ "$KDE_SESSION_VERSION" == "6" ]; then
@@ -72,7 +75,7 @@ set_kde_proxy() {
         $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key httpProxy "http://$PROXY_IP:$PROXY_PORT"
         $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key httpsProxy "http://$PROXY_IP:$PROXY_PORT"
         $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key ftpProxy "http://$PROXY_IP:$PROXY_PORT"
-        $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key socksProxy "http://$PROXY_IP:$PROXY_PORT"
+        $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key socksProxy "http://$PROXY_IP:$SOCKS_PORT"
 
         # Set ignored hosts
         $KWRITECONFIG --file kioslaverc --group "Proxy Settings" --key NoProxyFor "$IGNORE_HOSTS"

scripts/proxy_set_osx_sh

@@ -4,6 +4,7 @@
 set_proxy() {
     PROXY_IP=$1
     PROXY_PORT=$2
+    SOCKS_PORT=$3
 
     shift 2
     BYPASS_DOMAINS=("$@")
@@ -25,7 +26,7 @@ set_proxy() {
         networksetup -setsecurewebproxy "$SERVICE" "$PROXY_IP" "$PROXY_PORT"
 
         # Set SOCKS proxy
-        networksetup -setsocksfirewallproxy "$SERVICE" "$PROXY_IP" "$PROXY_PORT"
+        networksetup -setsocksfirewallproxy "$SERVICE" "$PROXY_IP" "$SOCKS_PORT"
 
         # Set bypass domains
         networksetup -setproxybypassdomains "$SERVICE" "${BYPASS_DOMAINS[@]}"

src/system_proxy.rs

@@ -30,9 +30,15 @@ pub fn enable_system_proxy(cfg: &Config) -> Result<(), Error> {
 
     #[cfg(target_os = "macos")]
     {
+        let socks = cfg.socks5_port.unwrap_or(cfg.listen_port);
         run_script(
             MACOS_SCRIPT,
-            &["set", &cfg.listen_host, &cfg.listen_port.to_string()],
+            &[
+                "set",
+                &cfg.listen_host,
+                &cfg.listen_port.to_string(),
+                &socks.to_string(),
+            ],
         )
         .map_err(|e| {
             Error::new(
@@ -44,9 +50,15 @@ pub fn enable_system_proxy(cfg: &Config) -> Result<(), Error> {
 
     #[cfg(all(unix, not(target_os = "macos")))]
     {
+        let socks = cfg.socks5_port.unwrap_or(cfg.listen_port);
         run_script(
             LINUX_SCRIPT,
-            &["manual", &cfg.listen_host, &cfg.lister_port.to_string()],
+            &[
+                "manual",
+                &cfg.listen_host,
+                &cfg.listen_port.to_string(),
+                &socks.to_string(),
+            ],
         )
         .map_err(|e| {
             Error::new(