update byedpi to v0.15

romanvht · Dec 6, 2024 · 5b81aac · 5b81aac
1 parent 085d25a
commit 5b81aac
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ android {
         minSdk = 21
         targetSdk = 34
         versionCode = 10
-        versionName = "1.3.8"
+        versionName = "1.3.9"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/assets/proxytest_cmds.txt b/app/src/main/assets/proxytest_cmds.txt
@@ -33,11 +33,13 @@
 --split 2 --disorder 3+sni --fake -1 --ttl 5
 -s0 -o1 -d1 -r1+s -Ar -o1 -At -f-1 -r1+s -As
 --disoob 3+sni --split -1+host --tlsrec 1+sni
---split 2 --fake 0+e --ttl 5 --tls-sni=www.google.com
+--split 2 --fake 1 --ttl 5 --tls-sni=www.google.com
 -s1 -q1 -Y -Ar -s5 -o1+s -At -f-1 -r1+s -As -s1 -o1+s -s-1 -An
 --split 1 --disorder 3+s --mod-http=h,d --auto=torst --tlsrec 1+s
 -s1 -q1 -Y -Ar -s5 -o25000+s -At -f-1 -r1+s -As -s1 -o1+s -s-1 -An -b+500
 --split 1 --disorder 3+s --mod-http=h,d --auto=torst --tlsrec 1+s --tlsrec 3+sni
 -s1 -o1 -Atr -f16 -l':\x16\x03\x01\x02\x87\x01\x00\x02\x83\x03\x03\x5f\x15\x63\xcb\x06' -As
+-Kt,h -d1 -s0+s -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -An -Ku -a1 -An
+-Kt,h -d1 -s0+s -d3+s -s6+s -d9+s -s12+s -d15+s -s20+s -d25+s -s30+s -d35+s -An -Ku -a5 -s443+s -d80+s -d443+s -s80+s -s443+s -d53+s -s53+s -d443+s
 -s1 -o1 -Ar -o1 -At -f32 -r1+s -l':\x16\x03\x01\x02\x87\x01\x00\x02\x83\x03\x03\x5f\x15\x63\xcb\x06\xea\x1c\xdd\x40\x76\xf5\x8c\x44\x50\x6e\x01\xf3\xa3\x83\xac\xc2' -As
 --proto=udp --pf=443 --fake-data=':\xC2\x00\x00\x00\x01\x14\x2E\xE3\xE3\x5F\x6B\xBB\x23\xA8\xE6\x5D\xA9\x78\x21\xCF\xC2\x72\x4C\x8F\xC4\x5E\x14\x00\x00\x00\x00\xC5\x00\x00\x00\x00\x4C\x00\xA7\x00\x00\x00\x00\x00\x00\x44\x00\x00\x80\x00\x00\x00\x0D\xFC\xFA\x1D\xCD\x73\xBA\x2A\x90\x93\xB3\xEE\xF7\x43\xC5\x85\xDA\xFF\x45\x3C\x00\x00\x00\x00\x00\x00\x7C\x00\x9B\x00\xF6\x00\x00\xDD\x00\x00\x00\x00\x00\x00\x00\x00\x00\x59\xA8\xE4\x00\x00\x00\x00\x00\x00\x00\x00\x7B\x00\x0F\x00\x00\x00\x48\x4E\x00\x00\x00\x06\xF3\x00\x00\x00\x00\xD9\x5A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00' --udp-fake=10 --auto=none -s1 -o1
diff --git a/app/src/main/cpp/byedpi b/app/src/main/cpp/byedpi
diff --git a/app/src/main/cpp/utils.c b/app/src/main/cpp/utils.c
@@ -15,7 +15,7 @@ void reset_params(void) {
     params = default_params;
 }
 
-extern const struct option options[38];
+extern const struct option options[41];
 
 int parse_args(int argc, char **argv)
 {
@@ -35,12 +35,16 @@ int parse_args(int argc, char **argv)
     }
 
     params.laddr.sin6_port = htons(1080);
+    if (!ipv6_support()) {
+        params.baddr.sin6_family = AF_INET;
+    }
 
     int rez;
     int invalid = 0;
 
-    long val;
+    long val = 0;
     char *end = 0;
+    bool all_limited = 1;
 
     struct desync_params *dp = add((void *)&params.dp,
                                    &params.dp_count, sizeof(struct desync_params));
@@ -65,6 +69,11 @@ int parse_args(int argc, char **argv)
             case 'U':
                 params.udp = 0;
                 break;
+#ifdef __linux__
+                case 'E':
+            params.transparent = 1;
+            break;
+#endif
 
 //            case 'h':
 //                printf(help_text);
@@ -117,13 +126,24 @@ int parse_args(int argc, char **argv)
                     invalid = 1;
                 break;
 
-            // desync options
+                // desync options
 
             case 'F':
                 params.tfo = 1;
                 break;
 
+            case 'L':
+                val = strtol(optarg, &end, 0);
+                if (val < 0 || val > 1 || *end)
+                    invalid = 1;
+                else
+                    params.auto_level = val;
+                break;
+
             case 'A':
+                if (!(dp->hosts || dp->proto || dp->pf[0] || dp->detect)) {
+                    all_limited = 0;
+                }
                 dp = add((void *)&params.dp, &params.dp_count,
                          sizeof(struct desync_params));
                 if (!dp) {
@@ -152,6 +172,9 @@ int parse_args(int argc, char **argv)
                     end = strchr(end, ',');
                     if (end) end++;
                 }
+                if (dp->detect && params.auto_level == AUTO_NOBUFF) {
+                    params.auto_level = AUTO_NOSAVE;
+                }
                 break;
 
             case 'u':
@@ -165,7 +188,7 @@ int parse_args(int argc, char **argv)
             case 'T':;
 #ifdef __linux__
                 float f = strtof(optarg, &end);
-                val = (long)(f * 1000);
+            val = (long)(f * 1000);
 #else
                 val = strtol(optarg, &end, 0);
 #endif
@@ -370,6 +393,24 @@ int parse_args(int argc, char **argv)
                 }
                 break;
 
+            case 'R':
+                val = strtol(optarg, &end, 0);
+                if (val <= 0 || val > INT_MAX)
+                    invalid = 1;
+                else {
+                    dp->rounds[0] = val;
+                    if (*end == '-') {
+                        val = strtol(end + 1, &end, 0);
+                        if (val <= 0 || val > INT_MAX)
+                            invalid = 1;
+                    }
+                    if (*end)
+                        invalid = 1;
+                    else
+                        dp->rounds[1] = val;
+                }
+                break;
+
             case 'g':
                 val = strtol(optarg, &end, 0);
                 if (val <= 0 || val > 255 || *end)
@@ -395,9 +436,9 @@ int parse_args(int argc, char **argv)
                 params.wait_send = 0;
                 break;
 #ifdef __linux__
-            case 'P':
-                params.protect_path = optarg;
-                break;
+                case 'P':
+            params.protect_path = optarg;
+            break;
 #endif
             case 0:
                 break;
@@ -417,7 +458,7 @@ int parse_args(int argc, char **argv)
         reset_params();
         return -1;
     }
-    if (dp->hosts || dp->proto || dp->pf[0]) {
+    if (all_limited) {
         dp = add((void *)&params.dp,
                  &params.dp_count, sizeof(struct desync_params));
         if (!dp) {

diff --git a/app/src/main/java/io/github/dovecoteescapee/byedpi/activities/TestActivity.kt b/app/src/main/java/io/github/dovecoteescapee/byedpi/activities/TestActivity.kt
@@ -355,7 +355,6 @@ class TestActivity : AppCompatActivity() {
         }.awaitAll()
     }
 
-
     private suspend fun checkSiteAccessibility(site: String, requestsCount: Int): Int = withContext(Dispatchers.IO) {
         var responseCount = 0
         val formattedUrl =
@@ -395,7 +394,6 @@ class TestActivity : AppCompatActivity() {
         responseCount
     }
 
-
     private fun loadSites(): List<String> {
         val userDomains = getPreferences().getBoolean("byedpi_proxytest_userdomains", false)
         return if (userDomains) {

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -21,6 +21,7 @@
     <string name="theme_settings">Theme</string>
     <string name="mode_setting">Mode</string>
     <string name="dbs_ip_setting">DNS</string>
+    <string name="byedpi_version">ByeDPI</string>
     <string name="bye_dpi_proxy_ip_setting">Address</string>
     <string name="byedpi_proxy_port_setting">Port</string>
     <string name="byedpi_max_connections_setting">Max connections</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="theme_settings">Тема</string>
     <string name="mode_setting">Режим</string>
     <string name="dbs_ip_setting">DNS</string>
+    <string name="byedpi_version">ByeDPI</string>
     <string name="bye_dpi_proxy_ip_setting">Адрес</string>
     <string name="byedpi_proxy_port_setting">Порт</string>
     <string name="byedpi_max_connections_setting">Максимальное к-во подключений</string>

diff --git a/app/src/main/res/xml/main_settings.xml b/app/src/main/res/xml/main_settings.xml
@@ -143,6 +143,11 @@
             app:useSimpleSummaryProvider="true"
             tools:summary="1.0.0" />
 
+        <Preference
+            android:key="version"
+            android:title="@string/byedpi_version"
+            android:summary="0.15" />
+
     </androidx.preference.PreferenceCategory>
 
 </PreferenceScreen>
+7 −0		Makefile
+30 −11		README.md
+10 −11		conev.c
+11 −9		conev.h
+127 −130		desync.c
+1 −3		desync.h
+38 −0		dist/linux/README.md
+8 −0		dist/linux/byedpi.conf
+19 −0		dist/linux/byedpi.service
+1 −1		dist/windows/byedpi.bat
+1 −1		dist/windows/service_install.bat
+2 −0		error.h
+298 −185		extend.c
+9 −6		extend.h
+116 −24		main.c
+1 −1		packets.c
+23 −12		params.h
+141 −93		proxy.c