no hard code 8123

clowwindy · clowwindy · commit 5463b2859a24 · 2015-01-18T17:30:42.000+08:00
diff --git a/shadowsocks-csharp/Controller/PolipoRunner.cs b/shadowsocks-csharp/Controller/PolipoRunner.cs
@@ -6,6 +6,8 @@
 using System.IO;
 using System.IO.Compression;
 using System.Text;
+using System.Net.NetworkInformation;
+using System.Net;
 
 namespace Shadowsocks.Controller
 {
@@ -47,6 +49,7 @@ public void Start(Configuration configuration)
                 }
                 string polipoConfig = Resources.polipo_config;
                 polipoConfig = polipoConfig.Replace("__SOCKS_PORT__", configuration.localPort.ToString());
+                polipoConfig = polipoConfig.Replace("__POLIPO_BIND_PORT__", this.GetFreePort().ToString());
                 polipoConfig = polipoConfig.Replace("__POLIPO_BIND_IP__", configuration.shareOverLan ? "0.0.0.0" : "127.0.0.1");
                 FileManager.ByteArrayToFile(temppath + "/polipo.conf", System.Text.Encoding.UTF8.GetBytes(polipoConfig));
 
@@ -79,5 +82,25 @@ public void Stop()
                 _process = null;
             }
         }
+
+        private int GetFreePort()
+        {
+            IPGlobalProperties properties = IPGlobalProperties.GetIPGlobalProperties();
+            IPEndPoint[] tcpEndPoints = properties.GetActiveTcpListeners();
+
+            List<int> usedPorts = new List<int>();
+            foreach (IPEndPoint endPoint in IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners())
+            {
+                usedPorts.Add(endPoint.Port);
+            }
+            for (int port = 8123; port < 65535; port++)
+            {
+                if (!usedPorts.Contains(port))
+                {
+                    return port;
+                }
+            }
+            throw new Exception("No free port found.");
+        }
     }
 }
diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs
@@ -222,7 +222,7 @@ protected void Reload()
                 List<Listener.Service> services = new List<Listener.Service>();
                 services.Add(local);
                 services.Add(_pacServer);
-                services.Add(new PortForwarder(8123));
+                services.Add(new PortForwarder(_config.localPort));
                 _listener = new Listener(services);
                 _listener.Start(_config);
             }
diff --git a/shadowsocks-csharp/Data/polipo_config.txt b/shadowsocks-csharp/Data/polipo_config.txt
@@ -1,4 +1,5 @@
-proxyAddress = "__POLIPO_BIND_IP__"
+proxyAddress = "__POLIPO_BIND_IP__"
+proxyPort = 8123
 
 socksParentProxy = "127.0.0.1:__SOCKS_PORT__"
 socksProxyType = socks5

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ protected void Reload()`
`222`	`222`	`List<Listener.Service> services = new List<Listener.Service>();`
`223`	`223`	`services.Add(local);`
`224`	`224`	`services.Add(_pacServer);`
`225`		`- services.Add(new PortForwarder(8123));`
	`225`	`+ services.Add(new PortForwarder(_config.localPort));`
`226`	`226`	`_listener = new Listener(services);`
`227`	`227`	`_listener.Start(_config);`
`228`	`228`	`}`