diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt deleted file mode 100644 index de95a48e8a67527c9483bfab23d2f9ae29522b0f..0000000000000000000000000000000000000000 --- a/app/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# For more information about using CMake with Android Studio, read the -# documentation: https://d.android.com/studio/projects/add-native-code.html - -# Sets the minimum version of CMake required to build the native library. - -cmake_minimum_required(VERSION 3.18.1) - -project(ANONguard) - - -# Creates and names a library, sets it as either STATIC -# or SHARED, and provides the relative paths to its source code. -# You can define multiple libraries, and CMake builds them for you. -# Gradle automatically packages shared libraries with your APK. - -add_library( # Sets the name of the library. - FileDescriptorHandler - - # Sets the library as a shared library. - SHARED - - # Provides a relative path to your source file(s). - src/main/cpp/FileDescriptorHandler.cpp ) - # FileDescriptorHandler.cpp ) - diff --git a/app/build.gradle b/app/build.gradle index 69308f53da565b20a1972d0b64fc53b44d744568..bdb8a9b0d843cbbd9b03e37dd28b84de48b3115a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,12 +74,6 @@ android { } - externalNativeBuild { - cmake { - path 'CMakeLists.txt' - } - } - ndkVersion '24.0.8215888' diff --git a/app/src/main/cpp/FileDescriptorHandler.cpp b/app/src/main/cpp/FileDescriptorHandler.cpp deleted file mode 100644 index c40eef97b2f3c516e6abb08846bc64265d14699e..0000000000000000000000000000000000000000 --- a/app/src/main/cpp/FileDescriptorHandler.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include <jni.h> - -#include <sys/select.h> -#include <sys/time.h> -#include <sys/types.h> -#include <unistd.h> -#include <fcntl.h> -#include <errno.h> - -extern "C" { - - -// http://man7.org/linux/man-pages/man2/select.2.html -/* -JNIEXPORT jint JNICALL -Java_anonvpn_anon_1next_android_service_networking_Tunneling_waitForPackets(JNIEnv *env, - jobject obj, - jint fd_id) - { - fd_set rfds; - struct timeval tv; - int retval = -1; - - // Clear current set - FD_ZERO(&rfds); - // Add our FD to the set - FD_SET(fd_id, &rfds); - // FD_SET(0, &rfds); // Watch stdin (fd 0) to see when it has input. - - // Set timeout - tv.tv_sec = 10; - tv.tv_usec = 0; - - // blocking select - while (true) - { - retval = select(1, &rfds, NULL, NULL, &tv); - - if (retval < 0) - { //Error - return -1; - } - else if (retval == 1) - { //socket is ready - return 1; - } - } - } - */ -JNIEXPORT jint JNICALL -Java_anonvpn_anon_1next_android_AndroidVpnService_setBlocking(JNIEnv *env, jobject obj, jint fd_id) - { - int flags = fcntl(fd_id, F_GETFL, 0); - - if (flags < 0) - { - return -1; - } - - flags = flags & (~O_NONBLOCK); - - int ret= fcntl(fd_id, F_SETFL, flags); - if(ret==-1) - int err=errno; - return ret; - } -} \ No newline at end of file diff --git a/app/src/noRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java b/app/src/noRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java index 0f540fcc4d5ee9fa8a44f78b94b781897dbc88e2..6b5f1b9505cb2fc1d518512c0fb35e325d6e0556 100644 --- a/app/src/noRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java +++ b/app/src/noRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java @@ -29,10 +29,7 @@ import anonvpn.anon_next.core.persistence.IConfig; public class AndroidVpnService extends VpnService { - static - { - System.loadLibrary("FileDescriptorHandler"); - } + ANONVPNService anonvpnService = null; diff --git a/app/src/withRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java b/app/src/withRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java index c0bdcddbf0442d67f705749b9cc90801de4a5dc3..0250e042e5ccf91b63d57f761c1a09f6981beb85 100644 --- a/app/src/withRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java +++ b/app/src/withRemotePCAP/java/anonvpn/anon_next/android/AndroidVpnService.java @@ -30,10 +30,7 @@ import wiresharksshdumpserver.WiresharkSSHdumpServer; public class AndroidVpnService extends VpnService { - static - { - System.loadLibrary("FileDescriptorHandler"); - } + ANONVPNService anonvpnService = null;