update to 5.1.1

Anankke · Aug 13, 2018 · 69620c9 · 69620c9
1 parent bc88ce4
commit 69620c9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/shadowsocks-csharp.sln b/shadowsocks-csharp.sln
@@ -6,15 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj", "{45913187-0685-4903-B250-DCEF0479CD86}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637} = {0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835} = {DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp4.0", "shadowsocks-csharp\shadowsocks-csharp4.0.csproj", "{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835} = {DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp-console", "shadowsocks-csharp\shadowsocks-csharp-console.csproj", "{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -30,10 +24,6 @@ Global
 		{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F2A0C8A-6C06-485B-AA13-AEEC19CA9637}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC8929F9-CAC8-4286-8CFE-6A70EF0EF835}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/shadowsocks-csharp/Controller/UpdateChecker.cs b/shadowsocks-csharp/Controller/UpdateChecker.cs
@@ -18,7 +18,7 @@ public class UpdateChecker
 
         public const string Name = "ShadowsocksR";
         public const string Copyright = "Copyright © BreakWa11 2017. Fork from Shadowsocks by clowwindy";
-        public const string Version = "5.0.7";
+        public const string Version = "5.1.1";
 #if !_CONSOLE
         public const string NetVer = "4.0";
 #else
@@ -45,7 +45,7 @@ public void CheckUpdate(Configuration config)
                 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);
+                : config.proxyUserAgent);                
                 if (UseProxy)
                 {
                     WebProxy proxy = new WebProxy(IPAddress.Loopback.ToString(), config.localPort);
@@ -59,7 +59,6 @@ public void CheckUpdate(Configuration config)
                 {
                     http.Proxy = null;
                 }
-                //UseProxy = !UseProxy;
 
                 http.DownloadStringCompleted += http_DownloadStringCompleted;
                 http.DownloadStringAsync(new Uri(UpdateURL + "?rnd=" + Util.Utils.RandUInt32().ToString()));

diff --git a/shadowsocks-csharp/Model/Server.cs b/shadowsocks-csharp/Model/Server.cs
@@ -535,13 +535,21 @@ public void tcpingLatency()
             {
                 stopwatch.Stop();
                 latencies.Add(stopwatch.Elapsed.TotalMilliseconds);
-                sock.EndConnect(result);
             }
             else
             {
                 stopwatch.Stop();
             }
 
+            try
+            {
+                sock.EndConnect(result);
+            }
+            catch (Exception)
+            {
+
+            }
+
             if (latencies.Count != 0)
             {
                 latency = (int)latencies.Average();

diff --git a/shadowsocks-csharp/ssr-win-4.0.xml b/shadowsocks-csharp/ssr-win-4.0.xml
@@ -2,7 +2,7 @@
 <rss xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:files="https://sourceforge.net/api/files.rdf#" xmlns:media="http://video.search.yahoo.com/mrss/" xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:sf="https://sourceforge.net/api/sfelements.rdf#" version="2.0">
   <channel xmlns:files="https://sourceforge.net/api/files.rdf#" xmlns:media="http://video.search.yahoo.com/mrss/" xmlns:doap="http://usefulinc.com/ns/doap#" xmlns:sf="https://sourceforge.net/api/sfelements.rdf#">
     <item>
-      <media:content xmlns:media="http://video.search.yahoo.com/mrss/" type="application/zip; charset=binary" url="https://github.com/SoDa-GitHub/shadowsocksrr-csharp/releases/download/5.0.7/ShadowsocksR-win-5.0.7.7z" filesize="828669"></media:content>
+      <media:content xmlns:media="http://video.search.yahoo.com/mrss/" type="application/zip; charset=binary" url="https://github.com/SoDa-GitHub/shadowsocksrr-csharp/releases/download/5.1.1/ShadowsocksR-win-5.1.1.7z" filesize="828669"></media:content>
     </item>
   </channel>
 </rss>