rename namespace, add global mode

dawei101 · Aug 22, 2016 · 0621308 · 0621308
1 parent 12f15e9
commit 0621308
Show file tree

Hide file tree

Showing 45 changed files with 107 additions and 89 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,11 +15,11 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.vpnmore.shadowsocks"
+        applicationId "com.vm.shadowsocks"
         minSdkVersion 14
         targetSdkVersion 19
         versionCode 1
-        versionName "1.0"
+        versionName "1.1"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.vpnmore.shadowsocks">
+    package="com.vm.shadowsocks">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -13,7 +13,7 @@
         android:persistent="true">
 
         <activity
-            android:name="com.vpnmore.shadowsocks.ui.MainActivity"
+            android:name="com.vm.shadowsocks.ui.MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask">
             <intent-filter>
@@ -23,7 +23,7 @@
         </activity>
 
         <service
-            android:name="com.vpnmore.shadowsocks.core.LocalVpnService"
+            android:name="com.vm.shadowsocks.core.LocalVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService"/>

diff --git a/.../shadowsocks/core/ChinaIpMaskManager.java → .../shadowsocks/core/ChinaIpMaskManager.java b/.../shadowsocks/core/ChinaIpMaskManager.java → .../shadowsocks/core/ChinaIpMaskManager.java
@@ -1,8 +1,8 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 import android.util.SparseIntArray;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.CommonMethods;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...om/vpnmore/shadowsocks/core/DnsProxy.java → ...ava/com/vm/shadowsocks/core/DnsProxy.java b/...om/vpnmore/shadowsocks/core/DnsProxy.java → ...ava/com/vm/shadowsocks/core/DnsProxy.java
@@ -1,14 +1,14 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 import android.util.SparseArray;
 
-import com.vpnmore.shadowsocks.dns.DnsPacket;
-import com.vpnmore.shadowsocks.dns.Question;
-import com.vpnmore.shadowsocks.dns.Resource;
-import com.vpnmore.shadowsocks.dns.ResourcePointer;
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
-import com.vpnmore.shadowsocks.tcpip.IPHeader;
-import com.vpnmore.shadowsocks.tcpip.UDPHeader;
+import com.vm.shadowsocks.dns.DnsPacket;
+import com.vm.shadowsocks.dns.Question;
+import com.vm.shadowsocks.dns.Resource;
+import com.vm.shadowsocks.dns.ResourcePointer;
+import com.vm.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.IPHeader;
+import com.vm.shadowsocks.tcpip.UDPHeader;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

diff --git a/...hadowsocks/core/HttpHostHeaderParser.java → ...hadowsocks/core/HttpHostHeaderParser.java b/...hadowsocks/core/HttpHostHeaderParser.java → ...hadowsocks/core/HttpHostHeaderParser.java
@@ -1,6 +1,6 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.CommonMethods;
 
 import java.util.Locale;
 

diff --git a/...ore/shadowsocks/core/LocalVpnService.java → .../vm/shadowsocks/core/LocalVpnService.java b/...ore/shadowsocks/core/LocalVpnService.java → .../vm/shadowsocks/core/LocalVpnService.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 import android.app.PendingIntent;
 import android.content.Intent;
@@ -11,14 +11,14 @@
 import android.os.Handler;
 import android.os.ParcelFileDescriptor;
 
-import com.vpnmore.shadowsocks.core.ProxyConfig.IPAddress;
-import com.vpnmore.shadowsocks.dns.DnsPacket;
-import com.vpnmore.shadowsocks.R;
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
-import com.vpnmore.shadowsocks.tcpip.IPHeader;
-import com.vpnmore.shadowsocks.tcpip.TCPHeader;
-import com.vpnmore.shadowsocks.tcpip.UDPHeader;
-import com.vpnmore.shadowsocks.ui.MainActivity;
+import com.vm.shadowsocks.core.ProxyConfig.IPAddress;
+import com.vm.shadowsocks.dns.DnsPacket;
+import com.vm.shadowsocks.R;
+import com.vm.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.IPHeader;
+import com.vm.shadowsocks.tcpip.TCPHeader;
+import com.vm.shadowsocks.tcpip.UDPHeader;
+import com.vm.shadowsocks.ui.MainActivity;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -213,6 +213,7 @@ public synchronized void run() {
 					if(welcomeInfoString!=null&&!welcomeInfoString.isEmpty()){
 						writeLog("%s", ProxyConfig.Instance.getWelcomeInfo());
 					}
+					writeLog("Global mode is " + (ProxyConfig.Instance.globalMode?"on":"off"));
 
 					runVPN();
 				} else {

diff --git a/.../vpnmore/shadowsocks/core/NatSession.java → ...a/com/vm/shadowsocks/core/NatSession.java b/.../vpnmore/shadowsocks/core/NatSession.java → ...a/com/vm/shadowsocks/core/NatSession.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 public class NatSession{
 	public int RemoteIP;

diff --git a/...e/shadowsocks/core/NatSessionManager.java → ...m/shadowsocks/core/NatSessionManager.java b/...e/shadowsocks/core/NatSessionManager.java → ...m/shadowsocks/core/NatSessionManager.java
@@ -1,8 +1,8 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 import android.util.SparseArray;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.CommonMethods;
 
 public class NatSessionManager {
 

diff --git a/...vpnmore/shadowsocks/core/ProxyConfig.java → .../com/vm/shadowsocks/core/ProxyConfig.java b/...vpnmore/shadowsocks/core/ProxyConfig.java → .../com/vm/shadowsocks/core/ProxyConfig.java
@@ -1,12 +1,12 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
 import android.annotation.SuppressLint;
 import android.os.Build;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
-import com.vpnmore.shadowsocks.tunnel.Config;
-import com.vpnmore.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
-import com.vpnmore.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
+import com.vm.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tunnel.Config;
+import com.vm.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
+import com.vm.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -40,15 +40,17 @@ public class ProxyConfig {
     ArrayList<IPAddress> m_RouteList;
     public ArrayList<Config> m_ProxyList;
     HashMap<String, Boolean> m_DomainMap;
-
-    int m_dns_ttl;
+
+	public boolean globalMode = false;
+
+	int m_dns_ttl;
     String m_welcome_info;
     String m_session_name;
     String m_user_agent;
     boolean m_outside_china_use_proxy=true;
     boolean m_isolate_http_host_header=true;
     int m_mtu;
-    
+
     Timer m_Timer;
 
     public class IPAddress{
@@ -207,6 +209,9 @@ private Boolean getDomainState(String domain){
 	}
 
     public boolean needProxy(String host, int ip){
+		if (globalMode) {
+			return true;
+		}
     	if(host!=null){
     		Boolean stateBoolean=getDomainState(host);
     		if(stateBoolean!=null){

diff --git a/...more/shadowsocks/core/TcpProxyServer.java → ...m/vm/shadowsocks/core/TcpProxyServer.java b/...more/shadowsocks/core/TcpProxyServer.java → ...m/vm/shadowsocks/core/TcpProxyServer.java
@@ -1,7 +1,7 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
-import com.vpnmore.shadowsocks.tunnel.Tunnel;
+import com.vm.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tunnel.Tunnel;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...nmore/shadowsocks/core/TunnelFactory.java → ...om/vm/shadowsocks/core/TunnelFactory.java b/...nmore/shadowsocks/core/TunnelFactory.java → ...om/vm/shadowsocks/core/TunnelFactory.java
@@ -1,12 +1,12 @@
-package com.vpnmore.shadowsocks.core;
+package com.vm.shadowsocks.core;
 
-import com.vpnmore.shadowsocks.tunnel.Config;
-import com.vpnmore.shadowsocks.tunnel.RawTunnel;
-import com.vpnmore.shadowsocks.tunnel.Tunnel;
-import com.vpnmore.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
-import com.vpnmore.shadowsocks.tunnel.httpconnect.HttpConnectTunnel;
-import com.vpnmore.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
-import com.vpnmore.shadowsocks.tunnel.shadowsocks.ShadowsocksTunnel;
+import com.vm.shadowsocks.tunnel.Config;
+import com.vm.shadowsocks.tunnel.RawTunnel;
+import com.vm.shadowsocks.tunnel.Tunnel;
+import com.vm.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
+import com.vm.shadowsocks.tunnel.httpconnect.HttpConnectTunnel;
+import com.vm.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
+import com.vm.shadowsocks.tunnel.shadowsocks.ShadowsocksTunnel;
 
 import java.net.InetSocketAddress;
 import java.nio.channels.Selector;

diff --git a/...com/vpnmore/shadowsocks/dns/DnsFlags.java → ...java/com/vm/shadowsocks/dns/DnsFlags.java b/...com/vpnmore/shadowsocks/dns/DnsFlags.java → ...java/com/vm/shadowsocks/dns/DnsFlags.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
 public class DnsFlags {
 	 public boolean QR;//1 bits

diff --git a/...om/vpnmore/shadowsocks/dns/DnsHeader.java → ...ava/com/vm/shadowsocks/dns/DnsHeader.java b/...om/vpnmore/shadowsocks/dns/DnsHeader.java → ...ava/com/vm/shadowsocks/dns/DnsHeader.java
@@ -1,6 +1,6 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.CommonMethods;
 
 import java.nio.ByteBuffer;
 

diff --git a/...om/vpnmore/shadowsocks/dns/DnsPacket.java → ...ava/com/vm/shadowsocks/dns/DnsPacket.java b/...om/vpnmore/shadowsocks/dns/DnsPacket.java → ...ava/com/vm/shadowsocks/dns/DnsPacket.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
 import java.nio.ByteBuffer;
 

diff --git a/...com/vpnmore/shadowsocks/dns/Question.java → ...java/com/vm/shadowsocks/dns/Question.java b/...com/vpnmore/shadowsocks/dns/Question.java → ...java/com/vm/shadowsocks/dns/Question.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
 import java.nio.ByteBuffer;
 

diff --git a/...com/vpnmore/shadowsocks/dns/Resource.java → ...java/com/vm/shadowsocks/dns/Resource.java b/...com/vpnmore/shadowsocks/dns/Resource.java → ...java/com/vm/shadowsocks/dns/Resource.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
 import java.nio.ByteBuffer;
 

diff --git a/...more/shadowsocks/dns/ResourcePointer.java → ...m/vm/shadowsocks/dns/ResourcePointer.java b/...more/shadowsocks/dns/ResourcePointer.java → ...m/vm/shadowsocks/dns/ResourcePointer.java
@@ -1,6 +1,6 @@
-package com.vpnmore.shadowsocks.dns;
+package com.vm.shadowsocks.dns;
 
-import com.vpnmore.shadowsocks.tcpip.CommonMethods;
+import com.vm.shadowsocks.tcpip.CommonMethods;
 
 public class ResourcePointer {
 	static final short offset_Domain = 0;

diff --git a/...more/shadowsocks/tcpip/CommonMethods.java → ...m/vm/shadowsocks/tcpip/CommonMethods.java b/...more/shadowsocks/tcpip/CommonMethods.java → ...m/vm/shadowsocks/tcpip/CommonMethods.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tcpip;
+package com.vm.shadowsocks.tcpip;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;

diff --git a/...m/vpnmore/shadowsocks/tcpip/IPHeader.java → ...va/com/vm/shadowsocks/tcpip/IPHeader.java b/...m/vpnmore/shadowsocks/tcpip/IPHeader.java → ...va/com/vm/shadowsocks/tcpip/IPHeader.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tcpip;
+package com.vm.shadowsocks.tcpip;
 
 public class IPHeader {
 

diff --git a/.../vpnmore/shadowsocks/tcpip/TCPHeader.java → ...a/com/vm/shadowsocks/tcpip/TCPHeader.java b/.../vpnmore/shadowsocks/tcpip/TCPHeader.java → ...a/com/vm/shadowsocks/tcpip/TCPHeader.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tcpip;
+package com.vm.shadowsocks.tcpip;
 
 
 public class TCPHeader {

diff --git a/.../vpnmore/shadowsocks/tcpip/UDPHeader.java → ...a/com/vm/shadowsocks/tcpip/UDPHeader.java b/.../vpnmore/shadowsocks/tcpip/UDPHeader.java → ...a/com/vm/shadowsocks/tcpip/UDPHeader.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tcpip;
+package com.vm.shadowsocks.tcpip;
 
 public class UDPHeader {
 	static final short offset_src_port = 0; // Source port

diff --git a/...om/vpnmore/shadowsocks/tunnel/Config.java → ...ava/com/vm/shadowsocks/tunnel/Config.java b/...om/vpnmore/shadowsocks/tunnel/Config.java → ...ava/com/vm/shadowsocks/tunnel/Config.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tunnel;
+package com.vm.shadowsocks.tunnel;
 
 import java.net.InetSocketAddress;
 

diff --git a/...vpnmore/shadowsocks/tunnel/RawTunnel.java → .../com/vm/shadowsocks/tunnel/RawTunnel.java b/...vpnmore/shadowsocks/tunnel/RawTunnel.java → .../com/vm/shadowsocks/tunnel/RawTunnel.java
@@ -1,4 +1,4 @@
-package com.vpnmore.shadowsocks.tunnel;
+package com.vm.shadowsocks.tunnel;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;

diff --git a/...om/vpnmore/shadowsocks/tunnel/Tunnel.java → ...ava/com/vm/shadowsocks/tunnel/Tunnel.java b/...om/vpnmore/shadowsocks/tunnel/Tunnel.java → ...ava/com/vm/shadowsocks/tunnel/Tunnel.java
@@ -1,9 +1,9 @@
-package com.vpnmore.shadowsocks.tunnel;
+package com.vm.shadowsocks.tunnel;
 
 import android.annotation.SuppressLint;
 
-import com.vpnmore.shadowsocks.core.LocalVpnService;
-import com.vpnmore.shadowsocks.core.ProxyConfig;
+import com.vm.shadowsocks.core.LocalVpnService;
+import com.vm.shadowsocks.core.ProxyConfig;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

diff --git a/...tunnel/httpconnect/HttpConnectConfig.java → ...tunnel/httpconnect/HttpConnectConfig.java b/...tunnel/httpconnect/HttpConnectConfig.java → ...tunnel/httpconnect/HttpConnectConfig.java
@@ -1,8 +1,8 @@
-package com.vpnmore.shadowsocks.tunnel.httpconnect;
+package com.vm.shadowsocks.tunnel.httpconnect;
 
 import android.net.Uri;
 
-import com.vpnmore.shadowsocks.tunnel.Config;
+import com.vm.shadowsocks.tunnel.Config;
 
 import java.net.InetSocketAddress;
 

diff --git a/...tunnel/httpconnect/HttpConnectTunnel.java → ...tunnel/httpconnect/HttpConnectTunnel.java b/...tunnel/httpconnect/HttpConnectTunnel.java → ...tunnel/httpconnect/HttpConnectTunnel.java
@@ -1,7 +1,7 @@
-package com.vpnmore.shadowsocks.tunnel.httpconnect;
+package com.vm.shadowsocks.tunnel.httpconnect;
 
-import com.vpnmore.shadowsocks.core.ProxyConfig;
-import com.vpnmore.shadowsocks.tunnel.Tunnel;
+import com.vm.shadowsocks.core.ProxyConfig;
+import com.vm.shadowsocks.tunnel.Tunnel;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

diff --git a/...dowsocks/tunnel/shadowsocks/AesCrypt.java → ...dowsocks/tunnel/shadowsocks/AesCrypt.java b/...dowsocks/tunnel/shadowsocks/AesCrypt.java → ...dowsocks/tunnel/shadowsocks/AesCrypt.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import org.bouncycastle.crypto.StreamBlockCipher;
 import org.bouncycastle.crypto.engines.AESFastEngine;

diff --git a/...cks/tunnel/shadowsocks/BlowFishCrypt.java → ...cks/tunnel/shadowsocks/BlowFishCrypt.java b/...cks/tunnel/shadowsocks/BlowFishCrypt.java → ...cks/tunnel/shadowsocks/BlowFishCrypt.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import org.bouncycastle.crypto.StreamBlockCipher;
 import org.bouncycastle.crypto.engines.BlowfishEngine;

diff --git a/...cks/tunnel/shadowsocks/CamelliaCrypt.java → ...cks/tunnel/shadowsocks/CamelliaCrypt.java b/...cks/tunnel/shadowsocks/CamelliaCrypt.java → ...cks/tunnel/shadowsocks/CamelliaCrypt.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import org.bouncycastle.crypto.StreamBlockCipher;
 import org.bouncycastle.crypto.engines.CamelliaEngine;

diff --git a/...owsocks/tunnel/shadowsocks/CryptBase.java → ...owsocks/tunnel/shadowsocks/CryptBase.java b/...owsocks/tunnel/shadowsocks/CryptBase.java → ...owsocks/tunnel/shadowsocks/CryptBase.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import org.bouncycastle.crypto.StreamBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;

diff --git a/...ocks/tunnel/shadowsocks/CryptFactory.java → ...ocks/tunnel/shadowsocks/CryptFactory.java b/...ocks/tunnel/shadowsocks/CryptFactory.java → ...ocks/tunnel/shadowsocks/CryptFactory.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;

diff --git a/...hadowsocks/tunnel/shadowsocks/ICrypt.java → ...hadowsocks/tunnel/shadowsocks/ICrypt.java b/...hadowsocks/tunnel/shadowsocks/ICrypt.java → ...hadowsocks/tunnel/shadowsocks/ICrypt.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import java.io.ByteArrayOutputStream;
 

diff --git a/...owsocks/tunnel/shadowsocks/SeedCrypt.java → ...owsocks/tunnel/shadowsocks/SeedCrypt.java b/...owsocks/tunnel/shadowsocks/SeedCrypt.java → ...owsocks/tunnel/shadowsocks/SeedCrypt.java
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.vpnmore.shadowsocks.tunnel.shadowsocks;
+package com.vm.shadowsocks.tunnel.shadowsocks;
 
 import org.bouncycastle.crypto.StreamBlockCipher;
 import org.bouncycastle.crypto.engines.SEEDEngine;