Merge pull request #2728 from celeron533/config_gfwlist

Support custom GFWListUrl defined in config file

shadowsocks-csharp/Controller/Service/GfwListUpdater.cs

@@ -90,7 +90,13 @@ var __RULES__ = {JsonConvert.SerializeObject(gfwLines, Formatting.Indented)};
 
         public void UpdatePACFromGFWList(Configuration config)
         {
-            Logging.Info($"Checking GFWList from {GFWLIST_URL}");
+            string gfwListUrl = GFWLIST_URL;
+            if (!string.IsNullOrWhiteSpace(config.gfwListUrl))
+            {
+                Logging.Info("Found custom GFWListURL in config file");
+                gfwListUrl = config.gfwListUrl;
+            }
+            Logging.Info($"Checking GFWList from {gfwListUrl}");
             WebClient http = new WebClient();
             if (config.enabled)
             {
@@ -101,7 +107,7 @@ var __RULES__ = {JsonConvert.SerializeObject(gfwLines, Formatting.Indented)};
                     config.localPort);
             }
             http.DownloadStringCompleted += http_DownloadStringCompleted;
-            http.DownloadStringAsync(new Uri(GFWLIST_URL));
+            http.DownloadStringAsync(new Uri(gfwListUrl));
         }
 
         public static List<string> ParseBase64ToValidList(string response)

shadowsocks-csharp/Model/Configuration.cs

@@ -25,6 +25,7 @@ namespace Shadowsocks.Model
         public bool portableMode = true;
         public bool showPluginOutput;
         public string pacUrl;
+        public string gfwListUrl;
         public bool useOnlinePac;
         public bool secureLocalPac = true;
         public bool availabilityStatistics;