shadowsocksr-rm · Jul 31, 2017 · Jul 31, 2017 · Aug 2, 2017 · Aug 2, 2017 · Aug 3, 2017
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ TestResults
 *.exe
 
 /templates
+.vs/
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ShadowsocksR for Windows
 =======================
 
-[![Build Status]][Appveyor]
+[![Build Status]][Appveyor]    <b> <=== \[click this to download nightly version\] </b>
 
 #### Download
 
@@ -21,7 +21,7 @@ _Optionally_, download and install [Gpg4win](https://www.gpg4win.org/).
 From the Windows start menu, launch program **Kleopatra**. 
 Do **File** > **New Certificate** to create a personal OpenPGP key pair. 
 Save the signing key from
-[breakwa11/pubkey](https://github.com/breakwa11/pubkey) as a text file. 
+[Akkariiin/pubkey](https://github.com/Akkariiin/pubkey) as a text file. 
 Then do **File** > **Import Certificates** to import the signing key text file.
 After import, select the signing key and do 
 **Certificates** > **Certify Certificates**. 
@@ -37,31 +37,31 @@ For <= Windows 7 or with .Net 2.0, using ShadowsocksR-dotnet2.0.exe.
 
 #### Usage
 
-1. Find ShadowsocksR icon in the notification tray
-2. You can add multiple servers in servers menu
+1. Find ShadowsocksR icon in the system tray.
+2. You can add multiple servers in servers menu.
 3. Select Enable System Proxy menu to enable system proxy. Please disable other
-proxy addons in your browser, or set them to use system proxy
+proxy addons in your browser, or set them to use system proxy.
 4. You can also configure your browser proxy manually if you don't want to enable
 system proxy. Set Socks5 or HTTP proxy to 127.0.0.1:1080. You can change this
-port in Global settings
+port in Global settings.
 5. You can change PAC rules by editing the PAC file. When you save the PAC file
-with any editor, ShadowsocksR will notify browsers about the change automatically
+with any editor, ShadowsocksR will notify browsers about the change automatically.
 6. You can also update the PAC file from GFWList. Note your modifications to the PAC
 file will be lost. However you can put your rules in the user rule file for GFWList.
-Don't forget to update from GFWList again after you've edited the user rule
+Don't forget to update from GFWList again after you've edited the user rule.
 7. For UDP, you need to use SocksCap or ProxyCap to force programs you want
-to proxy to tunnel over ShadowsocksR
+to proxy to tunnel over ShadowsocksR.
 
 ### Develop
 
-Visual Studio Express 2012 is recommended.
+Visual Studio Community 2017 is recommended.
 
 #### License
 
 GPLv3
 
-Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy
+Copyright © Akkariiin 2019. Forked from ShadowsocksR by BreakWa11
 
-[Appveyor]:       https://ci.appveyor.com/project/breakwa11/shadowsocksr-csharp
-[Build Status]:   https://ci.appveyor.com/api/projects/status/itcxnad1y95gf2x5/branch/master?svg=true
-[latest release]: https://github.com/shadowsocksr/shadowsocksr-csharp/releases
+[Appveyor]:       https://ci.appveyor.com/project/Akkariiin/shadowsocksr-csharp
+[Build Status]:   https://ci.appveyor.com/api/projects/status/ey901turnakim5nv/branch/master?svg=true
+[latest release]: https://github.com/shadowsocksrr/shadowsocksr-csharp/releases
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,19 @@
+version: 1.0.{build}
+image: Visual Studio 2015
+environment:
+  matrix:
+    - platform: Any CPU
+      configuration: Debug
+    - platform: Any CPU
+      configuration: Release
+matrix:
+  fast_finish: false
+build:
+  parallel: true
+  verbosity: normal
+artifacts:
+- path: shadowsocks-csharp\bin\2.0\Release\ShadowsocksR.exe
+  name: ShadowsocksR-dotnet2.0.exe
+- path: shadowsocks-csharp\bin\4.0\Release\ShadowsocksR.exe
+  name: ShadowsocksR-dotnet4.0.exe
+
diff --git a/shadowsocks-csharp/Controller/GfwListUpdater.cs b/shadowsocks-csharp/Controller/GfwListUpdater.cs
@@ -14,9 +14,9 @@ public class GFWListUpdater
     {
         private const string GFWLIST_URL = "https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt";
 
-        private const string GFWLIST_BACKUP_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/ssr/gfwlist.txt";
+        private const string GFWLIST_BACKUP_URL = "https://raw.githubusercontent.com/shadowsocksrr/breakwa11.github.io/master/ssr/gfwlist.txt";
 
-        private const string GFWLIST_TEMPLATE_URL = "https://raw.githubusercontent.com/breakwa11/breakwa11.github.io/master/ssr/ss_gfw.pac";
+        private const string GFWLIST_TEMPLATE_URL = "https://raw.githubusercontent.com/shadowsocksrr/breakwa11.github.io/master/ssr/ss_gfw.pac";
 
         private static string PAC_FILE = PACServer.PAC_FILE;
 
@@ -182,6 +182,10 @@ public void UpdatePACFromGFWList(Configuration config)
             {
                 lastConfig = config;
                 WebClient http = new WebClient();
+                http.Headers.Add("User-Agent",
+                    String.IsNullOrEmpty(config.proxyUserAgent) ?
+                    "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.3319.102 Safari/537.36"
+                    : config.proxyUserAgent);
                 WebProxy proxy = new WebProxy(IPAddress.Loopback.ToString(), config.localPort);
                 if (!string.IsNullOrEmpty(config.authPass))
                 {
@@ -194,6 +198,10 @@ public void UpdatePACFromGFWList(Configuration config)
             else
             {
                 WebClient http = new WebClient();
+                http.Headers.Add("User-Agent",
+                    String.IsNullOrEmpty(config.proxyUserAgent) ?
+                    "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.3319.102 Safari/537.36"
+                    : config.proxyUserAgent);
                 WebProxy proxy = new WebProxy(IPAddress.Loopback.ToString(), config.localPort);
                 if (!string.IsNullOrEmpty(config.authPass))
                 {
@@ -209,6 +217,10 @@ public void UpdatePACFromGFWList(Configuration config)
         public void UpdatePACFromGFWList(Configuration config, string url)
         {
             WebClient http = new WebClient();
+            http.Headers.Add("User-Agent",
+                String.IsNullOrEmpty(config.proxyUserAgent) ?
+                "Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.3319.102 Safari/537.36"
+                : config.proxyUserAgent);
             WebProxy proxy = new WebProxy(IPAddress.Loopback.ToString(), config.localPort);
             if (!string.IsNullOrEmpty(config.authPass))
             {

diff --git a/shadowsocks-csharp/Controller/Listener.cs b/shadowsocks-csharp/Controller/Listener.cs
@@ -260,7 +260,11 @@ public void AcceptCallback(IAsyncResult ar)
                     conn.Close();
                 }
 
-                if ((_authUser ?? "").Length == 0 && !Util.Utils.isLAN(conn))
+                int local_port = ((IPEndPoint)conn.LocalEndPoint).Port;
+
+                if ((_authUser ?? "").Length == 0 && !Util.Utils.isLAN(conn)
+                    && !(_config.GetPortMapCache().ContainsKey(local_port)
+                    || _config.GetPortMapCache()[local_port].type == PortMapType.Forward))
                 {
                     conn.Shutdown(SocketShutdown.Both);
                     conn.Close();
@@ -273,7 +277,6 @@ public void AcceptCallback(IAsyncResult ar)
                         buf
                     };
 
-                    int local_port = ((IPEndPoint)conn.LocalEndPoint).Port;
                     if (!_config.GetPortMapCache().ContainsKey(local_port) || _config.GetPortMapCache()[local_port].type != PortMapType.Forward)
                     {
                         conn.BeginReceive(buf, 0, buf.Length, 0,

diff --git a/shadowsocks-csharp/Controller/Local.cs b/shadowsocks-csharp/Controller/Local.cs
@@ -103,14 +103,15 @@ public bool Handle(byte[] firstPacket, int length, Socket socket)
         }
     }
 
-    class HandlerConfig
+    class HandlerConfig : ICloneable
     {
         public string targetHost;
         public int targetPort;
 
         public Double TTL = 0; // Second
         public Double connect_timeout = 0;
         public int try_keep_alive = 0;
+        public string local_dns_servers;
         public string dns_servers;
         public bool fouce_local_dns_query = false;
         // Server proxy
@@ -127,6 +128,31 @@ class HandlerConfig
         public int reconnectTimes = 0;
         public bool random = false;
         public bool forceRandom = false;
+
+        public object Clone()
+        {
+            HandlerConfig obj = new HandlerConfig();
+            obj.targetHost = targetHost;
+            obj.targetPort = targetPort;
+            obj.TTL = TTL;
+            obj.connect_timeout = connect_timeout;
+            obj.try_keep_alive = try_keep_alive;
+            obj.local_dns_servers = local_dns_servers;
+            obj.dns_servers = dns_servers;
+            obj.fouce_local_dns_query = fouce_local_dns_query;
+            obj.proxyType = proxyType;
+            obj.socks5RemoteHost = socks5RemoteHost;
+            obj.socks5RemotePort = socks5RemotePort;
+            obj.socks5RemoteUsername = socks5RemoteUsername;
+            obj.socks5RemotePassword = socks5RemotePassword;
+            obj.proxyUserAgent = proxyUserAgent;
+            obj.autoSwitchOff = autoSwitchOff;
+            obj.reconnectTimesRemain = reconnectTimesRemain;
+            obj.reconnectTimes = reconnectTimes;
+            obj.random = random;
+            obj.forceRandom = forceRandom;
+            return obj;
+        }
     }
 
     class Handler
@@ -230,7 +256,7 @@ private void ResetTimeout(double time, bool reset_keep_alive = true)
                     }
                 }
             }
-            else
+            else if (!closed)
             {
                 if (lastTimerSetTime != null && (DateTime.Now - lastTimerSetTime).TotalMilliseconds > 500)
                 {
@@ -459,7 +485,7 @@ public bool ReConnect()
                 handler.select_server = select_server;
                 handler.connection = connection;
                 handler.connectionUDP = connectionUDP;
-                handler.cfg = cfg;
+                handler.cfg = cfg.Clone() as HandlerConfig;
                 handler.cfg.reconnectTimesRemain = cfg.reconnectTimesRemain - 1;
                 handler.cfg.reconnectTimes = cfg.reconnectTimes + 1;
 
@@ -505,7 +531,15 @@ public void Start(byte[] firstPacket, int length, string rsp_protocol)
                 connectionSendBufferList.Add(data);
                 remoteHeaderSendBuffer = data;
 
-                Connect();
+                if (cfg.reconnectTimes > 0)
+                {
+                    InvokeHandler handler = () => Connect();
+                    handler.BeginInvoke(null, null);
+                }
+                else
+                {
+                    Connect();
+                }
             }
             else
             {
@@ -704,7 +738,7 @@ public void Close()
             Thread.Sleep(200);
             CloseSocket(ref remote);
             CloseSocket(ref remoteUDP);
-            if (connection != null && cfg != null)
+            if (connection != null && cfg != null && connection.GetSocket() != null)
             {
                 Logging.Debug("Close   " + cfg.targetHost + ":" + cfg.targetPort.ToString() + " " + connection.GetSocket().Handle.ToString());
             }
@@ -745,8 +779,6 @@ public void Close()
                         }
                         this.State = ConnectState.END;
                     }
-                    getCurrentServer = null;
-                    keepCurrentServer = null;
                 }
 
                 if (!reconnect)
@@ -761,19 +793,24 @@ public void Close()
                     connection = null;
                     connectionUDP = null;
                 }
-
-                detector = null;
-                speedTester = null;
-                random = null;
-                remoteUDPRecvBuffer = null;
-
-                server = null;
-                select_server = null;
             }
             catch (Exception e)
             {
                 Logging.LogUsefulException(e);
             }
+
+            getCurrentServer = null;
+            keepCurrentServer = null;
+
+            detector = null;
+            speedTester = null;
+            random = null;
+            remoteUDPRecvBuffer = null;
+
+            server = null;
+            select_server = null;
+
+            cfg = null;
         }
 
         private bool ConnectProxyServer(string strRemoteHost, int iRemotePort)
@@ -835,10 +872,10 @@ private void Connect()
                 }
             }
             speedTester.server = server.server;
-            Logging.Info($"Connect {cfg.targetHost}:{cfg.targetPort.ToString()}");
+            Logging.Info($"Connect {cfg.targetHost}:{cfg.targetPort.ToString()} via {server.server}:{server.server_port}");
 
             ResetTimeout(cfg.TTL);
-            if (cfg.fouce_local_dns_query && cfg.targetHost != null)
+            if (cfg.targetHost != null)
             {
                 IPAddress ipAddress;
 
@@ -858,6 +895,7 @@ private void Connect()
                             ipAddress = Utils.QueryDns(host, null);
                         }
                     }
+                    Logging.Info($"DNS nolock query {host} answer {ipAddress.ToString()}");
                     if (ipAddress != null)
                     {
                         Utils.DnsBuffer.Set(host, new IPAddress(ipAddress.GetAddressBytes()));
@@ -899,18 +937,20 @@ private void Connect()
                 bool parsed = IPAddress.TryParse(serverHost, out ipAddress);
                 if (!parsed)
                 {
+                    if (server.ServerSpeedLog().ErrorContinurousTimes > 10)
+                        server.DnsBuffer().force_expired = true;
                     if (server.DnsBuffer().isExpired(serverHost))
                     {
                         bool dns_ok = false;
                         {
                             DnsBuffer buf = server.DnsBuffer();
-                            lock (buf)
+                            if (Monitor.TryEnter(buf, buf.ip != null ? 100 : 1000000))
                             {
                                 if (buf.isExpired(serverHost))
                                 {
                                     if (serverHost.IndexOf('.') >= 0)
                                     {
-                                        ipAddress = Util.Utils.QueryDns(serverHost, cfg.dns_servers);
+                                        ipAddress = Util.Utils.QueryDns(serverHost, cfg.local_dns_servers);
                                     }
                                     else
                                     {
@@ -927,6 +967,15 @@ private void Connect()
                                     ipAddress = buf.ip;
                                     dns_ok = true;
                                 }
+                                Monitor.Exit(buf);
+                            }
+                            else
+                            {
+                                if (buf.ip != null)
+                                {
+                                    ipAddress = buf.ip;
+                                    dns_ok = true;
+                                }
                             }
                         }
                         if (!dns_ok)
@@ -997,8 +1046,8 @@ private void doConnectionTCPRecv()
             if (connection != null && connectionTCPIdle)
             {
                 connectionTCPIdle = false;
-                byte[] buffer = new byte[BufferSize];
                 int recv_size = remote == null ? RecvSize : remote.TcpMSS - remote.OverHead;
+                byte[] buffer = new byte[recv_size];
                 connection.BeginReceive(buffer, recv_size, 0,
                     new AsyncCallback(PipeConnectionReceiveCallback), null);
             }