feature: redirect all tcp

Author: Nethius

android_app/app/src/main/cpp/tcp.c

@@ -634,10 +634,7 @@ jboolean handle_tcp(const struct arguments *args,
             s->tcp.sent = 0;
             s->tcp.received = 0;
             s->tcp.connect_sent = TCP_CONNECT_NOT_SENT;
-            if (rport == 80) {
-                s->tcp.connect_sent = TCP_CONNECT_ESTABLISHED;
-            }
-
+            
             if (version == 4) {
                 s->tcp.saddr.ip4 = (__be32) ip4->saddr;
                 s->tcp.daddr.ip4 = (__be32) ip4->daddr;
@@ -649,7 +646,6 @@ jboolean handle_tcp(const struct arguments *args,
             s->tcp.source = tcphdr->source;
             s->tcp.dest = tcphdr->dest;
             s->tcp.state = TCP_LISTEN;
-            //  s->tcp.socks5 = SOCKS5_NONE;
             s->tcp.forward = NULL;
             s->next = NULL;
 
@@ -713,36 +709,41 @@ jboolean handle_tcp(const struct arguments *args,
             goto free;
         }
     } else {
-        if (rport == 443) {
+        if (len > 0) {
+            strcpy(cur->tcp.hostname, hostname);
+        } else {
+            struct sockaddr_in addr4;
+            addr4.sin_family = AF_INET;
+            addr4.sin_addr.s_addr = (__be32) cur->tcp.daddr.ip4;
+            addr4.sin_port = cur->tcp.dest;
+            lookup_hostname(&addr4, hostname, 512, 1);
+            len = strlen(hostname);
             if (len > 0) {
                 strcpy(cur->tcp.hostname, hostname);
             } else {
-                struct sockaddr_in addr4;
-                addr4.sin_family = AF_INET;
-                addr4.sin_addr.s_addr = (__be32) cur->tcp.daddr.ip4;
-                addr4.sin_port = cur->tcp.dest;
-                lookup_hostname(&addr4, hostname, 512, 1);
-                len = strlen(hostname);
-                if (len > 0) {
-                    strcpy(cur->tcp.hostname, hostname);
-                }
+                inet_ntop(cur->version == 4 ? AF_INET : AF_INET6,
+                          cur->version == 4 ? &cur->tcp.daddr.ip4 : &cur->tcp.daddr.ip6,
+                          cur->tcp.hostname, sizeof(cur->tcp.hostname));
+                len = strlen(cur->tcp.hostname);
             }
-            if (cur->tcp.connect_sent == TCP_CONNECT_NOT_SENT) {
-                if (len > 0) {
-                    char buffer[512];
-                    sprintf(buffer, "CONNECT %s:%d HTTP/1.0\r\n\r\n", cur->tcp.hostname, rport);
+        }
+        
+        if (cur->tcp.connect_sent == TCP_CONNECT_NOT_SENT) {
+            if (len > 0) {
+                char buffer[512];
+                sprintf(buffer, "CONNECT %s:%d HTTP/1.0\r\n\r\n", cur->tcp.hostname, rport);
 
-                    ssize_t sent = send(cur->socket, buffer, strlen(buffer), MSG_NOSIGNAL);
-                    if (sent < 0) {
-                        write_rst(args, &cur->tcp);
-                    } else {
-                        cur->tcp.connect_sent = TCP_CONNECT_SENT;
-                        cur->tcp.state = TCP_LISTEN;
-                    }
+                ssize_t sent = send(cur->socket, buffer, strlen(buffer), MSG_NOSIGNAL);
+                if (sent < 0) {
+                    write_rst(args, &cur->tcp);
+                } else {
+                    cur->tcp.connect_sent = TCP_CONNECT_SENT;
+                    cur->tcp.state = TCP_LISTEN;
                 }
             }
         }
-        if (rport == 443 && cur->tcp.connect_sent != TCP_CONNECT_ESTABLISHED) {
+        
+        if (cur->tcp.connect_sent != TCP_CONNECT_ESTABLISHED) {
             char session[250];
             sprintf(session,
                     "%s %s loc %u rem %u acked %u",
@@ -755,7 +756,6 @@ jboolean handle_tcp(const struct arguments *args,
             goto free;
         }
 
-
         char session[250];
         sprintf(session,
                 "%s %s loc %u rem %u acked %u",
@@ -970,9 +970,6 @@ int open_tcp_socket(const struct arguments *args,
     int version;
 
     int rport = htons(cur->dest);
-    if (rport != 80 && rport != 443) {
-        redirect = NULL;
-    }
 
     if (redirect == NULL) {
         version = cur->version;