Skip to content

Commit 0621308

Browse files
dawei101dawei101
committed
rename namespace, add global mode
1 parent 12f15e9 commit 0621308

45 files changed

Lines changed: 107 additions & 89 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ android {
1515
buildToolsVersion "23.0.1"
1616

1717
defaultConfig {
18-
applicationId "com.vpnmore.shadowsocks"
18+
applicationId "com.vm.shadowsocks"
1919
minSdkVersion 14
2020
targetSdkVersion 19
2121
versionCode 1
22-
versionName "1.0"
22+
versionName "1.1"
2323
}
2424
buildTypes {
2525
release {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="com.vpnmore.shadowsocks">
4+
package="com.vm.shadowsocks">
55

66
<uses-permission android:name="android.permission.INTERNET"/>
77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
@@ -13,7 +13,7 @@
1313
android:persistent="true">
1414

1515
<activity
16-
android:name="com.vpnmore.shadowsocks.ui.MainActivity"
16+
android:name="com.vm.shadowsocks.ui.MainActivity"
1717
android:label="@string/app_name"
1818
android:launchMode="singleTask">
1919
<intent-filter>
@@ -23,7 +23,7 @@
2323
</activity>
2424

2525
<service
26-
android:name="com.vpnmore.shadowsocks.core.LocalVpnService"
26+
android:name="com.vm.shadowsocks.core.LocalVpnService"
2727
android:permission="android.permission.BIND_VPN_SERVICE">
2828
<intent-filter>
2929
<action android:name="android.net.VpnService"/>

app/src/main/java/com/vpnmore/shadowsocks/core/ChinaIpMaskManager.java renamed to app/src/main/java/com/vm/shadowsocks/core/ChinaIpMaskManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
import android.util.SparseIntArray;
44

5-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
5+
import com.vm.shadowsocks.tcpip.CommonMethods;
66

77
import java.io.IOException;
88
import java.io.InputStream;

app/src/main/java/com/vpnmore/shadowsocks/core/DnsProxy.java renamed to app/src/main/java/com/vm/shadowsocks/core/DnsProxy.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
import android.util.SparseArray;
44

5-
import com.vpnmore.shadowsocks.dns.DnsPacket;
6-
import com.vpnmore.shadowsocks.dns.Question;
7-
import com.vpnmore.shadowsocks.dns.Resource;
8-
import com.vpnmore.shadowsocks.dns.ResourcePointer;
9-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
10-
import com.vpnmore.shadowsocks.tcpip.IPHeader;
11-
import com.vpnmore.shadowsocks.tcpip.UDPHeader;
5+
import com.vm.shadowsocks.dns.DnsPacket;
6+
import com.vm.shadowsocks.dns.Question;
7+
import com.vm.shadowsocks.dns.Resource;
8+
import com.vm.shadowsocks.dns.ResourcePointer;
9+
import com.vm.shadowsocks.tcpip.CommonMethods;
10+
import com.vm.shadowsocks.tcpip.IPHeader;
11+
import com.vm.shadowsocks.tcpip.UDPHeader;
1212

1313
import java.io.IOException;
1414
import java.net.DatagramPacket;

app/src/main/java/com/vpnmore/shadowsocks/core/HttpHostHeaderParser.java renamed to app/src/main/java/com/vm/shadowsocks/core/HttpHostHeaderParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

3-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
3+
import com.vm.shadowsocks.tcpip.CommonMethods;
44

55
import java.util.Locale;
66

app/src/main/java/com/vpnmore/shadowsocks/core/LocalVpnService.java renamed to app/src/main/java/com/vm/shadowsocks/core/LocalVpnService.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
import android.app.PendingIntent;
44
import android.content.Intent;
@@ -11,14 +11,14 @@
1111
import android.os.Handler;
1212
import android.os.ParcelFileDescriptor;
1313

14-
import com.vpnmore.shadowsocks.core.ProxyConfig.IPAddress;
15-
import com.vpnmore.shadowsocks.dns.DnsPacket;
16-
import com.vpnmore.shadowsocks.R;
17-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
18-
import com.vpnmore.shadowsocks.tcpip.IPHeader;
19-
import com.vpnmore.shadowsocks.tcpip.TCPHeader;
20-
import com.vpnmore.shadowsocks.tcpip.UDPHeader;
21-
import com.vpnmore.shadowsocks.ui.MainActivity;
14+
import com.vm.shadowsocks.core.ProxyConfig.IPAddress;
15+
import com.vm.shadowsocks.dns.DnsPacket;
16+
import com.vm.shadowsocks.R;
17+
import com.vm.shadowsocks.tcpip.CommonMethods;
18+
import com.vm.shadowsocks.tcpip.IPHeader;
19+
import com.vm.shadowsocks.tcpip.TCPHeader;
20+
import com.vm.shadowsocks.tcpip.UDPHeader;
21+
import com.vm.shadowsocks.ui.MainActivity;
2222

2323
import java.io.FileInputStream;
2424
import java.io.FileOutputStream;
@@ -213,6 +213,7 @@ public synchronized void run() {
213213
if(welcomeInfoString!=null&&!welcomeInfoString.isEmpty()){
214214
writeLog("%s", ProxyConfig.Instance.getWelcomeInfo());
215215
}
216+
writeLog("Global mode is " + (ProxyConfig.Instance.globalMode?"on":"off"));
216217

217218
runVPN();
218219
} else {

app/src/main/java/com/vpnmore/shadowsocks/core/NatSession.java renamed to app/src/main/java/com/vm/shadowsocks/core/NatSession.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
public class NatSession{
44
public int RemoteIP;

app/src/main/java/com/vpnmore/shadowsocks/core/NatSessionManager.java renamed to app/src/main/java/com/vm/shadowsocks/core/NatSessionManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
import android.util.SparseArray;
44

5-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
5+
import com.vm.shadowsocks.tcpip.CommonMethods;
66

77
public class NatSessionManager {
88

app/src/main/java/com/vpnmore/shadowsocks/core/ProxyConfig.java renamed to app/src/main/java/com/vm/shadowsocks/core/ProxyConfig.java

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

33
import android.annotation.SuppressLint;
44
import android.os.Build;
55

6-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
7-
import com.vpnmore.shadowsocks.tunnel.Config;
8-
import com.vpnmore.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
9-
import com.vpnmore.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
6+
import com.vm.shadowsocks.tcpip.CommonMethods;
7+
import com.vm.shadowsocks.tunnel.Config;
8+
import com.vm.shadowsocks.tunnel.httpconnect.HttpConnectConfig;
9+
import com.vm.shadowsocks.tunnel.shadowsocks.ShadowsocksConfig;
1010

1111
import org.apache.http.HttpResponse;
1212
import org.apache.http.client.HttpClient;
@@ -40,15 +40,17 @@ public class ProxyConfig {
4040
ArrayList<IPAddress> m_RouteList;
4141
public ArrayList<Config> m_ProxyList;
4242
HashMap<String, Boolean> m_DomainMap;
43-
44-
int m_dns_ttl;
43+
44+
public boolean globalMode = false;
45+
46+
int m_dns_ttl;
4547
String m_welcome_info;
4648
String m_session_name;
4749
String m_user_agent;
4850
boolean m_outside_china_use_proxy=true;
4951
boolean m_isolate_http_host_header=true;
5052
int m_mtu;
51-
53+
5254
Timer m_Timer;
5355

5456
public class IPAddress{
@@ -207,6 +209,9 @@ private Boolean getDomainState(String domain){
207209
}
208210

209211
public boolean needProxy(String host, int ip){
212+
if (globalMode) {
213+
return true;
214+
}
210215
if(host!=null){
211216
Boolean stateBoolean=getDomainState(host);
212217
if(stateBoolean!=null){

app/src/main/java/com/vpnmore/shadowsocks/core/TcpProxyServer.java renamed to app/src/main/java/com/vm/shadowsocks/core/TcpProxyServer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.vpnmore.shadowsocks.core;
1+
package com.vm.shadowsocks.core;
22

3-
import com.vpnmore.shadowsocks.tcpip.CommonMethods;
4-
import com.vpnmore.shadowsocks.tunnel.Tunnel;
3+
import com.vm.shadowsocks.tcpip.CommonMethods;
4+
import com.vm.shadowsocks.tunnel.Tunnel;
55

66
import java.io.IOException;
77
import java.net.InetSocketAddress;

0 commit comments

Comments
 (0)