From e67f7d27cb13cd40286455ea79dce9fb1a86b901 Mon Sep 17 00:00:00 2001 From: Charlie Qiu Date: Sun, 12 Jun 2016 02:06:25 +0800 Subject: [PATCH] Exclude 127.0.01 and localhost in global mode. --- ShadowsocksX-NG.xcodeproj/project.pbxproj | 12 ++++++++---- ShadowsocksX-NG/proxy_conf_helper_version.h | 2 +- proxy_conf_helper/main.m | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ShadowsocksX-NG.xcodeproj/project.pbxproj b/ShadowsocksX-NG.xcodeproj/project.pbxproj index 4d55507..f937317 100644 --- a/ShadowsocksX-NG.xcodeproj/project.pbxproj +++ b/ShadowsocksX-NG.xcodeproj/project.pbxproj @@ -802,7 +802,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -821,7 +821,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -847,7 +847,7 @@ CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_IDENTITY = "Mac Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; @@ -860,7 +860,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; }; @@ -872,6 +872,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/libcork/include/", @@ -898,6 +899,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/libcork/include/", @@ -975,6 +977,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = B4E6A97CA843F3943524B686 /* Pods-proxy_conf_helper.debug.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -983,6 +986,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 297AF069022A197FD8E9D226 /* Pods-proxy_conf_helper.release.xcconfig */; buildSettings = { + CODE_SIGN_IDENTITY = ""; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/ShadowsocksX-NG/proxy_conf_helper_version.h b/ShadowsocksX-NG/proxy_conf_helper_version.h index b6b94aa..fc73b0f 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.0.0" +#define kProxyConfHelperVersion @"1.1.0" #endif /* proxy_conf_helper_version_h */ diff --git a/proxy_conf_helper/main.m b/proxy_conf_helper/main.m index 67e0cc1..9765c38 100644 --- a/proxy_conf_helper/main.m +++ b/proxy_conf_helper/main.m @@ -101,6 +101,7 @@ int main(int argc, const char * argv[]) [proxies setObject:[NSNumber numberWithInt:0] forKey:(NSString *)kCFNetworkProxiesHTTPSEnable]; [proxies setObject:[NSNumber numberWithInt:0] forKey:(NSString *)kCFNetworkProxiesProxyAutoConfigEnable]; [proxies setObject:[NSNumber numberWithInt:0] forKey:(NSString *)kCFNetworkProxiesSOCKSEnable]; + [proxies setObject:@[] forKey:(NSString *)kCFNetworkProxiesExceptionsList]; // 遍历系统中的网络设备列表，设置 AirPort 和 Ethernet 的代理 for (NSString *key in [sets allKeys]) { @@ -123,6 +124,7 @@ int main(int argc, const char * argv[]) kCFNetworkProxiesSOCKSPort]; [proxies setObject:[NSNumber numberWithInt:1] forKey:(NSString*) kCFNetworkProxiesSOCKSEnable]; + [proxies setObject:@[@"127.0.0.1", @"localhost"] forKey:(NSString *)kCFNetworkProxiesExceptionsList]; }