Fixed an issue with TLS SNI extraction, thanks @jedy

raise-isayan/TunProxy#6

Author: krlvm

app/src/main/cpp/tcp.c

@@ -749,7 +749,7 @@ jboolean handle_tcp(const struct arguments *args,
                 }
             }
             if (cur->tcp.connect_sent == TCP_CONNECT_NOT_SENT) {
-                if (len > 0) {
+                if (len > 0 && datalen > 0) {
                     char buffer[512];
                     sprintf(buffer, "CONNECT %s:443 HTTP/1.1\r\n\r\n", cur->tcp.hostname);
 

app/src/main/cpp/tls.c

@@ -144,7 +144,7 @@ void parse_tls_header(const char *data, size_t data_len, char *hostname)
     data_len = MIN(data_len, len);
 
     /* Check we received entire TLS record length */
-    if (data_len < len)
+    if (data_len < len && data_len < 512)
         return;
 
     /* Handshake */
@@ -196,5 +196,5 @@ void parse_tls_header(const char *data, size_t data_len, char *hostname)
     if (pos + len > data_len)
         return;
 
-    parse_extensions(data + pos, len, hostname);
+    parse_extensions(data + pos, MIN(data_len - pos, len), hostname);
 }

app/src/main/java/io/github/krlvm/powertunnel/android/services/TunnelingVpnService.java

@@ -114,8 +114,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                         );
                     }
             );
-            vpnResolveHosts = PreferenceManager.getDefaultSharedPreferences(this)
-                    .getBoolean("vpn_resolve_hosts", false);
+            vpnResolveHosts = false;
+            //vpnResolveHosts = PreferenceManager.getDefaultSharedPreferences(this)
+            //        .getBoolean("vpn_resolve_hosts", false);
             proxy.setHostnamesAvailability(!vpnResolveHosts);
             proxy.start();
             return START_STICKY;