Fixes bug in proxy_conf_helper.

SweetAsprin · Sep 15, 2019 · 6742b03 · 6742b03
1 parent 331fede
commit 6742b03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ShadowsocksX-NG/proxy_conf_helper_version.h b/ShadowsocksX-NG/proxy_conf_helper_version.h
@@ -9,6 +9,6 @@
 #ifndef proxy_conf_helper_version_h
 #define proxy_conf_helper_version_h
 
-#define kProxyConfHelperVersion @"1.8.0"
+#define kProxyConfHelperVersion @"1.8.2"
 
 #endif /* proxy_conf_helper_version_h */
diff --git a/proxy_conf_helper/main.m b/proxy_conf_helper/main.m
@@ -188,15 +188,15 @@ int main(int argc, const char * argv[])
                     SCPreferencesPathSetValue(prefRef, (__bridge CFStringRef)prefPath
                                               , (__bridge CFDictionaryRef)proxies);
                 } else if ([mode isEqualToString:@"off"]) {
-                    if (pacURL != nil && portString != nil) {
+                    if (pacURL != nil && portString != nil && socks5ListenAddress != nil) {
                         // 取原来的配置，判断是否为shadowsocksX-NG设置的
                         NSDictionary* oldProxies
                             = (__bridge NSDictionary*)SCPreferencesPathGetValue(prefRef
                                                                                 , (__bridge CFStringRef)prefPath);
 
                         if (([oldProxies[(NSString *)kCFNetworkProxiesProxyAutoConfigURLString] isEqualToString:pacURL]
                              &&[oldProxies[(NSString *)kCFNetworkProxiesProxyAutoConfigEnable] isEqual:[NSNumber numberWithInt:1]])
-                            ||([oldProxies[(NSString*)kCFNetworkProxiesSOCKSProxy] isEqualToString:@"127.0.0.1"]
+                            ||([oldProxies[(NSString*)kCFNetworkProxiesSOCKSProxy] isEqualToString:socks5ListenAddress]
                                &&[oldProxies[(NSString*)kCFNetworkProxiesSOCKSPort] isEqualTo:[NSNumber numberWithInteger:port]]
                                &&[oldProxies[(NSString*)kCFNetworkProxiesSOCKSEnable] isEqual:[NSNumber numberWithInt:1]])
                             ) {