chore: remove libn2t [broken]

Author: oasiscifr

.gitmodules

@@ -4,6 +4,3 @@
 [submodule "app/src/main/cpp/libs"]
 	path = app/src/main/cpp/libs
 	url = https://github.com/trojan-gfw/igniter-libs.git
-[submodule "app/src/main/cpp/libn2t"]
-	path = app/src/main/cpp/libn2t
-	url = https://github.com/trojan-gfw/libn2t.git

app/src/main/cpp/CMakeLists.txt

@@ -34,62 +34,10 @@ target_link_libraries(trojan
     ${CMAKE_SOURCE_DIR}/libs/lib/${ANDROID_ABI}/libssl.a
     ${CMAKE_SOURCE_DIR}/libs/lib/${ANDROID_ABI}/libcrypto.a
     ${androidLogLib})
-add_library(n2t
-    libn2t/src/n2t/n2s.cpp
-    libn2t/src/n2t/n2t.cpp
-    libn2t/src/n2t/socket.cpp
-    libn2t/src/n2t/tcpsession.cpp
-    libn2t/src/n2t/udpsession.cpp
-    libn2t/src/n2t/utils.cpp
-    libn2t/src/custom/sys_arch.c
-    libn2t/src/lwip/src/core/init.c
-    libn2t/src/lwip/src/core/def.c
-    libn2t/src/lwip/src/core/dns.c
-    libn2t/src/lwip/src/core/inet_chksum.c
-    libn2t/src/lwip/src/core/ip.c
-    libn2t/src/lwip/src/core/mem.c
-    libn2t/src/lwip/src/core/memp.c
-    libn2t/src/lwip/src/core/netif.c
-    libn2t/src/lwip/src/core/pbuf.c
-    libn2t/src/lwip/src/core/raw.c
-    libn2t/src/lwip/src/core/stats.c
-    libn2t/src/lwip/src/core/sys.c
-    libn2t/src/lwip/src/core/altcp.c
-    libn2t/src/lwip/src/core/altcp_alloc.c
-    libn2t/src/lwip/src/core/altcp_tcp.c
-    libn2t/src/lwip/src/core/tcp.c
-    libn2t/src/lwip/src/core/tcp_in.c
-    libn2t/src/lwip/src/core/tcp_out.c
-    libn2t/src/lwip/src/core/timeouts.c
-    libn2t/src/lwip/src/core/udp.c
-    libn2t/src/lwip/src/core/ipv4/autoip.c
-    libn2t/src/lwip/src/core/ipv4/dhcp.c
-    libn2t/src/lwip/src/core/ipv4/etharp.c
-    libn2t/src/lwip/src/core/ipv4/icmp.c
-    libn2t/src/lwip/src/core/ipv4/igmp.c
-    libn2t/src/lwip/src/core/ipv4/ip4_frag.c
-    libn2t/src/lwip/src/core/ipv4/ip4.c
-    libn2t/src/lwip/src/core/ipv4/ip4_addr.c
-    libn2t/src/lwip/src/core/ipv6/dhcp6.c
-    libn2t/src/lwip/src/core/ipv6/ethip6.c
-    libn2t/src/lwip/src/core/ipv6/icmp6.c
-    libn2t/src/lwip/src/core/ipv6/inet6.c
-    libn2t/src/lwip/src/core/ipv6/ip6.c
-    libn2t/src/lwip/src/core/ipv6/ip6_addr.c
-    libn2t/src/lwip/src/core/ipv6/ip6_frag.c
-    libn2t/src/lwip/src/core/ipv6/mld6.c
-    libn2t/src/lwip/src/core/ipv6/nd6.c)
-target_include_directories(n2t PRIVATE
-    ${CMAKE_SOURCE_DIR}/libn2t/src/custom
-    ${CMAKE_SOURCE_DIR}/libn2t/src/lwip/src/include
-    ${CMAKE_SOURCE_DIR}/libs/include)
-target_link_libraries(n2t
-    ${CMAKE_SOURCE_DIR}/libs/lib/${ANDROID_ABI}/libboost_system.a
-    ${androidLogLib})
 add_library(jni-helper SHARED jni-helper.cpp)
 target_include_directories(jni-helper PRIVATE
     ${CMAKE_SOURCE_DIR}/trojan/src
     ${CMAKE_SOURCE_DIR}/libn2t/src
     ${CMAKE_SOURCE_DIR}/libs/include
     ${CMAKE_SOURCE_DIR}/libs/include/${ANDROID_ABI})
-target_link_libraries(jni-helper trojan n2t)
+target_link_libraries(jni-helper trojan)

app/src/main/cpp/jni-helper.cpp

@@ -4,17 +4,13 @@
 #include <thread>
 #include <core/config.h>
 #include <core/service.h>
-#include <n2t/n2t.h>
-#include <n2t/n2s.h>
 using namespace std;
-using namespace Net2Tr;
+
 
 static thread *trojanThread = nullptr;
-static thread *n2sThread = nullptr;
 static Config *trojanConfig = nullptr;
 static Service *trojanService = nullptr;
-static N2T *n2tService = nullptr;
-static N2S *n2sService = nullptr;
+
 
 static void startTrojan(const string &config)
 {
@@ -24,12 +20,7 @@ static void startTrojan(const string &config)
     trojanService->run();
 }
 
-static void startN2S(int tun_fd, const string &ip_addr, const string &netmask, const string &ip6_addr, uint16_t mtu, const string &socks5_addr, uint16_t socks5_port)
-{
-    n2tService = new N2T(ip_addr, netmask, ip6_addr, mtu);
-    n2sService = new N2S(tun_fd, *n2tService, socks5_addr, socks5_port);
-    n2sService->start();
-}
+
 
 extern "C" {
     JNIEXPORT void JNICALL Java_io_github_trojan_1gfw_igniter_JNIHelper_trojan(JNIEnv *env, jclass, jstring config) {
@@ -41,33 +32,9 @@ extern "C" {
         trojanThread = new thread(startTrojan, a);
     }
 
-    JNIEXPORT void JNICALL Java_io_github_trojan_1gfw_igniter_JNIHelper_n2s(JNIEnv *env, jclass, jint tun_fd, jstring ip_addr, jstring netmask, jstring ip6_addr, jint mtu, jstring socks5_addr, jint socks5_port) {
-        if (n2sThread != nullptr)
-            return;
-        const char *s1 = env->GetStringUTFChars(ip_addr, 0);
-        const char *s2 = env->GetStringUTFChars(netmask, 0);
-        const char *s3 = env->GetStringUTFChars(ip6_addr, 0);
-        const char *s4 = env->GetStringUTFChars(socks5_addr, 0);
-        string a(s1);
-        string b(s2);
-        string c(s3);
-        string d(s4);
-        env->ReleaseStringUTFChars(socks5_addr, s4);
-        env->ReleaseStringUTFChars(ip6_addr, s3);
-        env->ReleaseStringUTFChars(netmask, s2);
-        env->ReleaseStringUTFChars(ip_addr, s1);
-        n2sThread = new thread(startN2S, tun_fd, a, b, c, uint16_t(mtu), d, uint16_t(socks5_port));
-    }
 
     JNIEXPORT void JNICALL Java_io_github_trojan_1gfw_igniter_JNIHelper_stop(JNIEnv *env, jclass) {
-        if (n2sThread != nullptr) {
-            n2sService->stop();
-            n2sThread->join();
-            delete n2sService;
-            delete n2tService;
-            delete n2sThread;
-            n2sThread = nullptr;
-        }
+
         if (trojanThread != nullptr) {
             trojanService->stop();
             trojanThread->join();

app/src/main/cpp/libn2t

@@ -5,6 +5,5 @@ public class JNIHelper {
         System.loadLibrary("jni-helper");
     }
     public static native void trojan(String config);
-    public static native void n2s(int tun_fd, String ip_addr, String netmask, String ip6_addr, int mtu, String socks5_addr, int socks5_port);
     public static native void stop();
 }