v1.0.0-rc1:

- Change min SDK to 21
- Refactor code
- Fix crushes
- Add proxy mode
- Add listening ip setting
- Update main screen
- Update settings screen
- Move logs saving to main screen

Author: dovecoteescapee

.idea/render.experimental.xml

@@ -11,19 +11,28 @@ android {
 
     defaultConfig {
         applicationId = "io.github.dovecoteescapee.byedpi"
-        minSdk = 24
+        minSdk = 21
         targetSdk = 34
-        versionCode = 2
-        versionName = "0.1.1-alpha"
+        versionCode = 3
+        versionName = "1.0.0-rc1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     buildTypes {
         release {
+            buildConfigField("String", "VERSION_NAME",  "\"${defaultConfig.versionName}\"")
+
             isMinifyEnabled = false
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
+        debug {
+            buildConfigField("String", "VERSION_NAME",  "\"${defaultConfig.versionName}-debug\"")
+        }
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -72,7 +81,7 @@ abstract class BuildTun2Socks : DefaultTask() {
         }
         project.exec {
             workingDir = tun2socksDir
-            commandLine("gomobile", "bind", "-o", tun2socksOutput, "./engine")
+            commandLine("gomobile", "bind", "-o", tun2socksOutput, "-trimpath", "./engine")
         }
     }
 }

app/build.gradle.kts

@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:allowBackup="true"
@@ -16,10 +16,11 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.ByeDPI"
-        tools:targetApi="31">
+        tools:targetApi="34">
         <activity
-            android:name=".MainActivity"
-            android:exported="true">
+            android:name=".activities.MainActivity"
+            android:exported="true"
+            android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -28,16 +29,31 @@
         </activity>
 
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:label="@string/title_settings"
-            android:exported="false"/>
+            android:exported="true"/>
 
-        <service android:name=".ByeDpiVpnService"
+        <service android:name=".services.ByeDpiVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE"
-            android:exported="true">
+            android:foregroundServiceType="specialUse"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.net.VpnService"/>
             </intent-filter>
+            <meta-data
+                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+                android:value="false" />
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="vpn" />
+        </service>
+
+        <service android:name=".services.ByeDpiProxyService"
+            android:foregroundServiceType="specialUse"
+            android:exported="false">
+            <property
+                android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                android:value="proxy" />
         </service>
     </application>
 

app/src/main/AndroidManifest.xml

@@ -30,13 +30,16 @@ add_library(${CMAKE_PROJECT_NAME} SHARED
         byedpi/desync.c
         byedpi/packets.c
         byedpi/proxy.c
+        byedpi/main.c
         native-lib.c
         )
 
 include_directories("byedpi")
 
 set(CMAKE_C_FLAGS "-std=c99 -O2 -D_XOPEN_SOURCE=500")
 
+add_compile_definitions(ANDROID_APP)
+
 # Specifies libraries CMake should link to your target library. You
 # can link libraries from various origins, such as libraries defined in this
 # build script, prebuilt third-party libraries, or Android system libraries.

app/src/main/cpp/CMakeLists.txt

@@ -2,74 +2,40 @@
 #include <proxy.h>
 #include <params.h>
 #include <packets.h>
-#include <jni.h>
-#include <android/log.h>
 #include <unistd.h>
-#include <pthread.h>
 #include <string.h>
+#include <netdb.h>
+#include <sys/eventfd.h>
 
-extern int NOT_EXIT;
-
-struct packet fake_tls = {
-        sizeof(tls_data), tls_data
-},
-        fake_http = {
-        sizeof(http_data), http_data
-};
-
-struct params params = {
-        .ttl = 8,
-        .split = 3,
-        .sfdelay = 3000,
-        .attack = DESYNC_NONE,
-        .split_host = 0,
-        .def_ttl = 0,
-        .custom_ttl = 0,
-        .mod_http = 0,
-        .tlsrec = 0,
-        .tlsrec_pos = 0,
-        .tlsrec_sni = 0,
-        .de_known = 0,
+#include <jni.h>
+#include <android/log.h>
 
-        .ipv6 = 1,
-        .resolve = 1,
-        .max_open = 512,
-        .bfsize = 16384,
-        .baddr = {
-                .sin6_family = AF_INET
-        },
-        .debug = 2
+const enum demode DESYNC_METHODS[] = {
+        DESYNC_NONE,
+        DESYNC_SPLIT,
+        DESYNC_DISORDER,
+        DESYNC_FAKE
 };
 
-int get_default_ttl()
-{
-    int orig_ttl = -1, fd;
-    socklen_t tsize = sizeof(orig_ttl);
+extern struct packet fake_tls, fake_http;
+extern int get_default_ttl();
+extern int get_addr(const char *str, struct sockaddr_ina *addr);
 
-    if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-        uniperror("socket");
+JNIEXPORT jint JNICALL
+Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniEventFd(JNIEnv *env, jobject thiz) {
+    int fd = eventfd(0, EFD_NONBLOCK);
+    if (fd < 0) {
         return -1;
     }
-    if (getsockopt(fd, IPPROTO_IP, IP_TTL,
-                   (char *)&orig_ttl, &tsize) < 0) {
-        uniperror("getsockopt IP_TTL");
-    }
-    close(fd);
-    return orig_ttl;
-}
-
-void *run(void *srv) {
-    LOG(LOG_S, "Start proxy thread");
-    listener(*((struct sockaddr_ina *) srv));
-    free(srv);
-    LOG(LOG_S, "Stop proxy thread");
-    return NULL;
+    return fd;
 }
 
-JNIEXPORT jlong JNICALL
-Java_io_github_dovecoteescapee_byedpi_ByeDpiVpnService_jniStartProxy(
+JNIEXPORT jint JNICALL
+Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniStartProxy(
         JNIEnv *env,
         jobject thiz,
+        jint event_fd,
+        jstring ip,
         jint port,
         jint max_connections,
         jint buffer_size,
@@ -82,24 +48,35 @@ Java_io_github_dovecoteescapee_byedpi_ByeDpiVpnService_jniStartProxy(
         jint fake_ttl,
         jboolean host_mixed_case,
         jboolean domain_mixed_case,
-        jboolean host_remove_space,
+        jboolean host_remove_spaces,
         jboolean tls_record_split,
         jint tls_record_split_position,
         jboolean tls_record_split_at_sni) {
-    enum demode desync_methods[] = {DESYNC_NONE, DESYNC_SPLIT, DESYNC_DISORDER, DESYNC_FAKE};
+
+    struct sockaddr_ina s = {
+            .in.sin_family = AF_INET,
+            .in.sin_addr.s_addr = inet_addr("0.0.0.0"),
+    };
+
+    const char *address = (*env)->GetStringUTFChars(env, ip, 0);
+    if (get_addr(address, &s) < 0) {
+        return -1;
+    }
+    s.in.sin_port = htons(port);
 
     params.max_open = max_connections;
     params.bfsize = buffer_size;
     params.def_ttl = default_ttl;
     params.resolve = !no_domain;
     params.de_known = desync_known;
-    params.attack = desync_methods[desync_method];
+    params.attack = DESYNC_METHODS[desync_method];
     params.split = split_position;
     params.split_host = split_at_host;
     params.ttl = fake_ttl;
-    params.mod_http |= host_mixed_case ? MH_HMIX : 0;
-    params.mod_http |= domain_mixed_case ? MH_DMIX : 0;
-    params.mod_http |= host_remove_space ? MH_SPACE : 0;
+    params.mod_http =
+            MH_HMIX * host_mixed_case |
+            MH_DMIX * domain_mixed_case |
+            MH_SPACE * host_remove_spaces;
     params.tlsrec = tls_record_split;
     params.tlsrec_pos = tls_record_split_position;
     params.tlsrec_sni = tls_record_split_at_sni;
@@ -110,23 +87,22 @@ Java_io_github_dovecoteescapee_byedpi_ByeDpiVpnService_jniStartProxy(
         }
     }
 
-    struct sockaddr_ina *srv = malloc(sizeof(struct sockaddr_ina));
-    srv->in.sin_family = AF_INET;
-    srv->in.sin_addr.s_addr = inet_addr("0.0.0.0");
-    srv->in.sin_port = htons(port);
-
-    NOT_EXIT = 1;
+    int res = listener(event_fd, s);
 
-    pthread_t proxy_thread;
-    if (pthread_create(&proxy_thread, NULL, run, srv) != 0) {
-        LOG(LOG_S, "Failed to start proxy thread");
-        return -1;
+    if (close(event_fd) < 0) {
+        uniperror("close");
     }
 
-    return proxy_thread;
+    return res < 0 ? get_e() : 0;
 }
 
-JNIEXPORT void JNICALL
-Java_io_github_dovecoteescapee_byedpi_ByeDpiVpnService_jniStopProxy(JNIEnv *env, jobject thiz, jlong proxy_thread) {
-    NOT_EXIT = 0;
-}
+JNIEXPORT jint JNICALL
+Java_io_github_dovecoteescapee_byedpi_core_ByeDpiProxy_jniStopProxy(JNIEnv *env, jobject thiz,
+                                                                      jint event_fd) {
+    if (eventfd_write(event_fd, 1) < 0) {
+        uniperror("eventfd_write");
+        LOG(LOG_S, "event_fd: %d", event_fd);
+    }
+
+    return 0;
+}