Change default port from 1080 to 8089 to solve conflict on iOS8

zhigang1992 · Oct 6, 2014 · a0de458 · a0de458
1 parent d289389
commit a0de458
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/ShadowWeb/SWBAppDelegate.m b/ShadowWeb/SWBAppDelegate.m
@@ -31,7 +31,7 @@ - (void)updateProxyMode {
     if (proxyMode == nil || [proxyMode isEqualToString:@"pac"]) {
         [AppProxyCap setPACURL:@"http://127.0.0.1:8090/proxy.pac"];
     } else if ([proxyMode isEqualToString:@"global"]) {
-        [AppProxyCap setProxy:AppProxy_SOCKS Host:@"127.0.0.1" Port:1080];
+        [AppProxyCap setProxy:AppProxy_SOCKS Host:@"127.0.0.1" Port:8089];
     } else{
         [AppProxyCap setNoProxy];
     }

diff --git a/ShadowWeb/local.m b/ShadowWeb/local.m
@@ -564,7 +564,7 @@ void set_config(const char *server, const char *remote_port, const char* passwor
 int local_main ()
 {
     int listenfd;
-    listenfd = create_and_bind("1080");
+    listenfd = create_and_bind("8089");
     if (listenfd < 0) {
 #ifdef DEBUG
         NSLog(@"bind() error..");
@@ -576,7 +576,7 @@ int local_main ()
         return 1;
     }
 #ifdef DEBUG
-    NSLog(@"server listening at port %s\n", "1080");
+    NSLog(@"server listening at port %s\n", "8089");
 #endif
 
     setnonblocking(listenfd);

diff --git a/ShadowWeb/polipo.config b/ShadowWeb/polipo.config
@@ -11,7 +11,7 @@ disableLocalInterface = true
 disableConfiguration = true
 disableIndexing = true
 dnsUseGethostbyname = yes
-socksParentProxy = 127.0.0.1:1080
+socksParentProxy = 127.0.0.1:8089
 socksProxyType = socks5
 
 # allowUnalignedRangeRequests boolean false Allow unaligned range requests (unreliable).

diff --git a/ShadowWeb/polipo_disable.config b/ShadowWeb/polipo_disable.config
@@ -11,7 +11,7 @@ disableLocalInterface = true
 disableConfiguration = true
 disableIndexing = true
 dnsUseGethostbyname = yes
-# socksParentProxy = 127.0.0.1:1080
+# socksParentProxy = 127.0.0.1:8089
 # socksProxyType = socks5
 
 # allowUnalignedRangeRequests boolean false Allow unaligned range requests (unreliable).

diff --git a/proxy.pac.gz b/proxy.pac.gz
diff --git a/shadowsocks_sysconf/main.m b/shadowsocks_sysconf/main.m
@@ -73,7 +73,7 @@ int main(int argc, const char * argv[])
 
                         [proxies setObject:@"127.0.0.1" forKey:(NSString *)
                          kCFNetworkProxiesSOCKSProxy];
-                        [proxies setObject:[NSNumber numberWithInteger:1080] forKey:(NSString*)
+                        [proxies setObject:[NSNumber numberWithInteger:8089] forKey:(NSString*)
                          kCFNetworkProxiesSOCKSPort];
                         [proxies setObject:[NSNumber numberWithInt:1] forKey:(NSString*)
                          kCFNetworkProxiesSOCKSEnable];