添加排除服务器功能。

Author: godoorsun

shadowsocks-csharp/Controller/UpdateChecker.cs

@@ -21,7 +21,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 = "4.7.0";
+        public const string Version = "4.7.3";
 #if !_DOTNET_4_0
         public const string NetVer = "2.0";
 #elif !_CONSOLE

shadowsocks-csharp/Data/cn.txt

@@ -28,7 +28,7 @@ Allow Clients from LAN=允许来自局域网的连接
 Load balance=服务器负载均衡
 Same host for same address=优先相同节点连接同一地址
 Enable domain white list(http proxy only)=使用域名白名单(仅http代理)
-Update local PAC from User Defined List=更新PAC为用户自定义的列表
+Update local PAC from User Defined List=更新PAC为用户自定义的列表(同目录下pac-url.ini)
 Update local PAC from Lan IP list=更新PAC为绕过局域网IP
 Update local PAC from Chn White list=更新PAC为绕过大陆常见域名列表
 Update local PAC from Chn IP list=更新PAC为绕过大陆IP(慎用)

shadowsocks-csharp/View/MenuViewController.cs

@@ -298,10 +298,14 @@ private void LoadMenu()
             // HotKeys ab = new HotKeys(); 
             GlobalKeyForm gkf = new GlobalKeyForm(controller);
             //gkf.Show();
-            
+
+
+          //  System.Timers.Timer autoUpdate = new System.Timers.Timer();
+
+
 
         }
-         
+
 
         private void controller_ConfigChanged(object sender, EventArgs e)
         {
@@ -467,6 +471,25 @@ void updateFreeNodeChecker_NewFreeNodeFound(object sender, EventArgs e)
                         }
                     }
 
+
+
+                    //load servers that should be excluded from file excluded-servers.ini
+
+                    
+                    string[] excluded_parts = { "alsjflawjglajwelfjawlfjlawjfajwefljlgawefaefuoioio" }; // magic string: in case no server will match to this exlcuded string .
+                    String excludedFilePath = "excluded-servers.ini";
+                    if (System.IO.File.Exists(excludedFilePath))
+                    {
+                        string text = System.IO.File.ReadAllText(excludedFilePath);
+                        excluded_parts = text.Split(new string[] { "\r\n" }, StringSplitOptions.None);
+                        foreach (string ep in excluded_parts)
+                        {
+                            Debug.WriteLine(ep);
+                        }
+                    }
+
+                    
+                    
                     // import all, find difference
                     {
                         Dictionary<string, Server> old_servers = new Dictionary<string, Server>();
@@ -484,7 +507,23 @@ void updateFreeNodeChecker_NewFreeNodeFound(object sender, EventArgs e)
                         {
                             try
                             {
-                                Server server = new Server(url, curGroup);
+                                Server server = new Server(url, curGroup);  //url is ssurl or ssrurl
+
+                                //Debug.WriteLine(server.server);
+                                //Debug.WriteLine(server.remarks);
+
+                                bool isExcluded = false;
+                                foreach (string ep in excluded_parts)
+                                {
+                                    if (server.remarks.Contains(ep) || server.server.Contains(ep))
+                                        isExcluded = true;
+                                }
+                                if (isExcluded) {
+                                    Debug.WriteLine("Exclude: " + server.remarks + "\t " + server.server);
+                                    continue;
+                                }
+
+
                                 bool match = false;
                                 foreach (KeyValuePair<string, Server> pair in old_servers)
                                 {
@@ -499,6 +538,7 @@ void updateFreeNodeChecker_NewFreeNodeFound(object sender, EventArgs e)
                                 }
                                 if (!match)
                                 {
+                                    
                                     config.configs.Add(server);
                                     ++count;
                                 }

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -61,6 +61,18 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>ADF40F5C0FC659D3DEC8DB025320979894A9F736</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>shadowsocks-csharp_1_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System" />
@@ -295,6 +307,8 @@
     <None Include="Data\libsscrypto64.dll.gz" />
     <None Include="Data\mgwz.dll.gz" />
     <None Include="Data\privoxy.exe.gz" />
+    <None Include="shadowsocks-csharp_1_TemporaryKey.pfx" />
+    <None Include="shadowsocks-csharp_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Data\proxy.pac.txt.gz" />

shadowsocks-csharp/shadowsocks-csharp4.0.csproj

@@ -64,10 +64,10 @@
     <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>4A922898E7E518837AD2D181625224F999227BDC</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>70133AC87B2082C04CF2B3117DA40BA13E5D4588</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>shadowsocks-csharp4.0_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>shadowsocks-csharp4.0_1_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -308,6 +308,7 @@
     <None Include="Data\libsscrypto.dll.gz" />
     <None Include="Data\mgwz.dll.gz" />
     <None Include="Data\privoxy.exe.gz" />
+    <None Include="shadowsocks-csharp4.0_1_TemporaryKey.pfx" />
     <None Include="shadowsocks-csharp4.0_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>