Merge pull request #682 from efryntov/remove-vpn-tun2socks

Remove VPN and tun2socks code from Android library
Psiphon-Labs · Oct 16, 2024 · dbacf60 · dbacf60
2 parents d16a328 + 2b264b8
commit dbacf60
Show file tree

Hide file tree

Showing 12 changed files with 165 additions and 627 deletions.
diff --git a/MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java b/MobileLibrary/Android/PsiphonTunnel/PsiphonTunnel.java
diff --git a/MobileLibrary/Android/PsiphonTunnel/libs/.gitignore b/MobileLibrary/Android/PsiphonTunnel/libs/.gitignore
diff --git a/MobileLibrary/Android/PsiphonTunnel/libs/arm64-v8a/libtun2socks.so b/MobileLibrary/Android/PsiphonTunnel/libs/arm64-v8a/libtun2socks.so
diff --git a/MobileLibrary/Android/PsiphonTunnel/libs/armeabi-v7a/libtun2socks.so b/MobileLibrary/Android/PsiphonTunnel/libs/armeabi-v7a/libtun2socks.so
diff --git a/MobileLibrary/Android/PsiphonTunnel/libs/x86/libtun2socks.so b/MobileLibrary/Android/PsiphonTunnel/libs/x86/libtun2socks.so
diff --git a/MobileLibrary/Android/PsiphonTunnel/libs/x86_64/libtun2socks.so b/MobileLibrary/Android/PsiphonTunnel/libs/x86_64/libtun2socks.so
diff --git a/MobileLibrary/Android/SampleApps/TunneledWebView/.idea/runConfigurations.xml b/MobileLibrary/Android/SampleApps/TunneledWebView/.idea/runConfigurations.xml
diff --git a/...SampleApps/TunneledWebView/app/src/main/java/ca/psiphon/tunneledwebview/MainActivity.java b/...SampleApps/TunneledWebView/app/src/main/java/ca/psiphon/tunneledwebview/MainActivity.java
@@ -166,26 +166,11 @@ public void run() {
     // NOTE: these are callbacks from the Psiphon Library
     //----------------------------------------------------------------------------------------------
 
-    @Override
-    public String getAppName() {
-        return "TunneledWebView Sample";
-    }
-
     @Override
     public Context getContext() {
         return this;
     }
 
-    @Override
-    public Object getVpnService() {
-        return null;
-    }
-
-    @Override
-    public Object newVpnServiceBuilder() {
-        return null;
-    }
-
     @Override
     public String getPsiphonConfig() {
         try {

diff --git a/MobileLibrary/Android/make.bash b/MobileLibrary/Android/make.bash
@@ -48,10 +48,6 @@ fi
 mkdir -p build-tmp/psi
 unzip -o psi.aar -d build-tmp/psi
 yes | cp -f PsiphonTunnel/AndroidManifest.xml build-tmp/psi/AndroidManifest.xml
-yes | cp -f PsiphonTunnel/libs/armeabi-v7a/libtun2socks.so build-tmp/psi/jni/armeabi-v7a/libtun2socks.so
-yes | cp -f PsiphonTunnel/libs/arm64-v8a/libtun2socks.so build-tmp/psi/jni/arm64-v8a/libtun2socks.so
-yes | cp -f PsiphonTunnel/libs/x86/libtun2socks.so build-tmp/psi/jni/x86/libtun2socks.so
-yes | cp -f PsiphonTunnel/libs/x86_64/libtun2socks.so build-tmp/psi/jni/x86_64/libtun2socks.so
 mkdir -p build-tmp/psi/res/xml
 yes | cp -f PsiphonTunnel/ca_psiphon_psiphontunnel_backup_rules.xml build-tmp/psi/res/xml/ca_psiphon_psiphontunnel_backup_rules.xml
 

diff --git a/MobileLibrary/iOS/PsiphonTunnel/PsiphonTunnel/PsiphonTunnel.m b/MobileLibrary/iOS/PsiphonTunnel/PsiphonTunnel/PsiphonTunnel.m
@@ -1199,7 +1199,7 @@ - (void)handlePsiphonNotice:(NSString * _Nonnull)noticeJSON {
     else if ([noticeType isEqualToString:@"ConnectedServerRegion"]) {
         id region = [notice valueForKeyPath:@"data.serverRegion"];
         if (![region isKindOfClass:[NSString class]]) {
-            [self logMessage:[NSString stringWithFormat: @"ActiveTunnel notice missing data.serverRegion: %@", noticeJSON]];
+            [self logMessage:[NSString stringWithFormat: @"ConnectedServerRegion notice missing data.serverRegion: %@", noticeJSON]];
             return;
         }
         if ([self.tunneledAppDelegate respondsToSelector:@selector(onConnectedServerRegion:)]) {

diff --git a/psiphon/controller.go b/psiphon/controller.go
@@ -1039,8 +1039,7 @@ loop:
 
 			NoticeActiveTunnel(
 				connectedTunnel.dialParams.ServerEntry.GetDiagnosticID(),
-				connectedTunnel.dialParams.TunnelProtocol,
-				connectedTunnel.dialParams.ServerEntry.SupportsSSHAPIRequests())
+				connectedTunnel.dialParams.TunnelProtocol)
 
 			NoticeConnectedServerRegion(connectedTunnel.dialParams.ServerEntry.Region)
 

diff --git a/psiphon/notice.go b/psiphon/notice.go
@@ -699,12 +699,11 @@ func NoticeRequestedTactics(dialParams *DialParameters) {
 }
 
 // NoticeActiveTunnel is a successful connection that is used as an active tunnel for port forwarding
-func NoticeActiveTunnel(diagnosticID, protocol string, isTCS bool) {
+func NoticeActiveTunnel(diagnosticID, protocol string) {
 	singletonNoticeLogger.outputNotice(
 		"ActiveTunnel", noticeIsDiagnostic,
 		"diagnosticID", diagnosticID,
-		"protocol", protocol,
-		"isTCS", isTCS)
+		"protocol", protocol)
 }
 
 // NoticeConnectedServerRegion reports the region of the connected server