From 6742b03005a30bf32025d0912c39546e64bfdf06 Mon Sep 17 00:00:00 2001 From: Qiu Yuzhou Date: Sun, 15 Sep 2019 19:26:07 +0800 Subject: [PATCH] Fixes bug in proxy_conf_helper. --- ShadowsocksX-NG/proxy_conf_helper_version.h | 2 +- proxy_conf_helper/main.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ShadowsocksX-NG/proxy_conf_helper_version.h b/ShadowsocksX-NG/proxy_conf_helper_version.h index 21482201..d6111106 100644 --- 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 index c208ddcb..1abffe51 100644 --- a/proxy_conf_helper/main.m +++ b/proxy_conf_helper/main.m @@ -188,7 +188,7 @@ 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 @@ -196,7 +196,7 @@ int main(int argc, const char * argv[]) 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]]) ) {