From 5aa28229048d83c51dd83b33a9d94a3cc3f2784c Mon Sep 17 00:00:00 2001 From: clowwindy Date: Sun, 18 Jan 2015 17:12:59 +0800 Subject: [PATCH] use local port in pac --- shadowsocks-csharp/Controller/PACServer.cs | 8 +++++++- shadowsocks-csharp/Controller/ShadowsocksController.cs | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/shadowsocks-csharp/Controller/PACServer.cs b/shadowsocks-csharp/Controller/PACServer.cs index a4589e92..3f84f933 100755 --- a/shadowsocks-csharp/Controller/PACServer.cs +++ b/shadowsocks-csharp/Controller/PACServer.cs @@ -17,6 +17,7 @@ namespace Shadowsocks.Controller public static string PAC_FILE = "pac.txt"; FileSystemWatcher watcher; + private Configuration _config; public event EventHandler PACFileChanged; @@ -25,6 +26,11 @@ namespace Shadowsocks.Controller this.WatchPacFile(); } + public void UpdateConfiguration(Configuration config) + { + this._config = config; + } + public bool Handle(byte[] firstPacket, int length, Socket socket) { try @@ -159,7 +165,7 @@ Connection: Close private string GetPACAddress(byte[] requestBuf, int length, IPEndPoint localEndPoint) { - return "PROXY " + localEndPoint.Address + ":8123;"; + return "PROXY " + localEndPoint.Address + ":" + this._config.localPort + ";"; } } } diff --git a/shadowsocks-csharp/Controller/ShadowsocksController.cs b/shadowsocks-csharp/Controller/ShadowsocksController.cs index 4ec92381..16231025 100755 --- a/shadowsocks-csharp/Controller/ShadowsocksController.cs +++ b/shadowsocks-csharp/Controller/ShadowsocksController.cs @@ -196,6 +196,7 @@ namespace Shadowsocks.Controller _pacServer = new PACServer(); _pacServer.PACFileChanged += pacServer_PACFileChanged; } + _pacServer.UpdateConfiguration(_config); if (gfwListUpdater == null) { gfwListUpdater = new GFWListUpdater();