[opt]udp

.vscode/launch.json

@@ -6,7 +6,7 @@
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/proxyServer",
-            "args": ["0", "8080"],
+            "args": ["1", "8082"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],

include/tcp_client_map.h

@@ -5,7 +5,6 @@
 #include <map>
 #include <shared_mutex>
 #include <mutex>
-#include <memory>
 
 template <typename Key, typename Value>
 class TcpClientMap {

include/timer_thread.h

@@ -0,0 +1,43 @@
+#ifndef PROXYSERVER_TIMER_THREAD_H
+#define PROXYSERVER_TIMER_THREAD_H
+
+#include "hv/EventLoopThread.h"
+
+class TimerThread : public hv::EventLoopThread {
+public:
+    std::atomic<hv::TimerID> nextTimerID;
+    TimerThread() : EventLoopThread() {
+        nextTimerID = 0;
+        start();
+    }
+
+    virtual ~TimerThread() {
+        stop();
+        join();
+    }
+
+public:
+    // setTimer, setTimeout, killTimer, resetTimer thread-safe
+    hv::TimerID setTimer(int timeout_ms, hv::TimerCallback cb, uint32_t repeat = INFINITE) {
+        hv::TimerID timerID = ++nextTimerID;
+        loop()->setTimerInLoop(timeout_ms, cb, repeat, timerID);
+        return timerID;
+    }
+    // alias javascript setTimeout, setInterval
+    hv::TimerID setTimeout(int timeout_ms, hv::TimerCallback cb) {
+        return setTimer(timeout_ms, cb, 1);
+    }
+    hv::TimerID setInterval(int interval_ms, hv::TimerCallback cb) {
+        return setTimer(interval_ms, cb, INFINITE);
+    }
+
+    void killTimer(hv::TimerID timerID) {
+        loop()->killTimer(timerID);
+    }
+
+    void resetTimer(hv::TimerID timerID, int timeout_ms = 0) {
+        loop()->resetTimer(timerID, timeout_ms);
+    }
+};
+
+#endif // PROXYSERVER_TIMER_THREAD_H

include/udp_client.h

@@ -3,6 +3,7 @@
 
 #include "hv/hloop.h"
 #include "hv/UdpClient.h"
+#include "timer_thread.h"
 #include "bolt/crypt.h"
 #include "udp_client_map.h"
 #include <string>
@@ -19,6 +20,8 @@ public:
     char ept_key;
 };
 
+#define TIMEOUT_TIMEUNIT 10 * 1000
+#define DNS_TIMEOUT 5 * 1000
 class UdpClientProxy
 {
 public:
@@ -26,6 +29,9 @@ public:
     hv::UdpClient *getClient() { return &cli; }
     bool init();
     void close();
+    bool isDns() {
+        return ntohs(t_addr.sin_port) == 53;
+    };
 
 private:
     void onRecv(const hv::SocketChannelPtr &channel, hv::Buffer *buf);
@@ -36,7 +42,9 @@ public:
 
 private:
     hv::UdpClient cli;
+    TimerThread timer;
     uint32_t session_id;
+    long long ts;
 };
 
 class UdpServerBoltProxy
@@ -50,6 +58,8 @@ public:
     
     int sendData(struct sockaddr_in t_addr, struct sockaddr_in u_addr, void *data, int data_len);
 
+    void closeClient(struct sockaddr_in &t_addr, struct sockaddr_in &u_addr);
+
     void recycle();
 
 private:

include/{hv_utils.h → utils.h}

@@ -10,5 +10,6 @@ hloop_t* get_next_loop();
 
 char generateRandomKey();
 
+long long currentTimeMillis();
 
 #endif //PROXYSERVER_HV_UTILS_H

src/main.cpp

@@ -129,7 +129,7 @@
 
 #include "hv/hloop.h"
 #include "hv/hthread.h"
-#include "hv_utils.h"
+#include "utils.h"
 #include "tcp_inbound.h"
 #include "udp_inbound.h"
 
@@ -174,7 +174,9 @@ static HTHREAD_RETTYPE tcpaccept_thread(void* userdata) {
     if (listenio == NULL) {
         exit(1);
     }
+    int listeniofd = hio_fd(listenio);
     hloop_run(loop);
+    close(listeniofd);
     return 0;
 }
 
@@ -184,12 +186,14 @@ static HTHREAD_RETTYPE udpbind_thread(void* userdata) {
     if (bindio == NULL) {
         exit(1);
     }
+    int bindfd = hio_fd(bindio);
     spdlog::info("ProxyServer start: udp->{}", port);
     hio_setcb_read(bindio, udp_on_recvfrom);
     hio_setcb_write(bindio, udp_on_writed);
     hio_setcb_close(bindio, udp_on_close);
     hio_read(bindio);
     hloop_run(loop);
+    close(bindfd);
     return 0;
 }
 

src/tcp_client.cpp

@@ -1,7 +1,7 @@
 #include "tcp_client.h"
 #include "bolt/datagram.h"
 #include "tcp_client_map.h"
-#include "hv_utils.h"
+#include "utils.h"
 #include "spdlog/spdlog.h"
 #include <string>
 #include <time.h>

src/udp_client.cpp

@@ -1,5 +1,6 @@
 #include "udp_client.h"
 #include "conn_map.h"
+#include "utils.h"
 #include "hv/UdpClient.h"
 #include "bolt/datagram.h"
 #include "spdlog/spdlog.h"
@@ -41,10 +42,27 @@ bool UdpServerBoltProxy::analyzeData(struct sockaddr_in t_addr, struct sockaddr_
 
 int UdpServerBoltProxy::sendData(struct sockaddr_in t_addr, struct sockaddr_in u_addr, void *data, int data_len)
 {
+
+    if (getConfig().ept_type == CRYPT_TYPE::XOR)
+    {
+        xor_::crypt((char *)data, data_len, getConfig().ept_key);
+    }
     PACK_TUNNEL_DATA(boltdata, boltdata_len, BOLT_VERSION, BOLT_RESERVE, BOLT_PAYLOAD_TYPE_UDP, t_addr.sin_addr.s_addr, t_addr.sin_port, u_addr.sin_addr.s_addr, u_addr.sin_port, config.session_id, 0, 0, data, data_len)
     hio_write(io, boltdata, boltdata_len);
 }
 
+void UdpServerBoltProxy::closeClient(struct sockaddr_in &t_addr, struct sockaddr_in &u_addr)
+{
+    auto key = get_key(t_addr, u_addr);
+    auto client = _map.get(key);
+    if (client)
+    {
+        client->close();
+        _map.remove(key);
+    }
+    
+}
+
 void UdpServerBoltProxy::recycle()
 {
     for (auto it = _map.begin(); it != _map.end(); ++it)
@@ -73,14 +91,36 @@ bool UdpClientProxy::init()
     hio_setcb_close(cli.channel.get()->io(), [](hio_t *io) {
 
     });
-
     cli.start();
+
+    timer.setInterval(TIMEOUT_TIMEUNIT, [this](hv::TimerID timerID) {
+        long timeout = isDns() ? DNS_TIMEOUT : TIMEOUT_TIMEUNIT;
+        long time = currentTimeMillis() - ts;
+        if (time > 0 && time < timeout) 
+        {
+            long remaining = (timeout-time);
+            if(remaining < TIMEOUT_TIMEUNIT) {
+            } else {
+
+            }
+        } else {
+            auto serverProxy = UdpConnMap<uint32_t, UdpServerBoltProxy>::getInstance().get(session_id);
+            if (!serverProxy)
+            {
+                close();
+                return;
+            }
+            serverProxy->closeClient(t_addr, u_addr);
+        }
+        
+    });
     return true;
 }
 
 void UdpClientProxy::close()
 {
     cli.closesocket();
+    timer.stop();
 }
 
 void UdpClientProxy::onRecv(const hv::SocketChannelPtr &channel, hv::Buffer *buf)
@@ -91,6 +131,7 @@ void UdpClientProxy::onRecv(const hv::SocketChannelPtr &channel, hv::Buffer *buf
     {
         return;
     }
+    ts = currentTimeMillis();
     serverProxy->sendData(t_addr, u_addr, buf->data(), buf->size());
 }
 

src/udp_inbound.cpp

@@ -1,7 +1,7 @@
 #include "udp_inbound.h"
 #include "udp_client.h"
 #include "conn_map.h"
-#include "hv_utils.h"
+#include "utils.h"
 #include "bolt/datagram.h"
 #include "bolt/crypt.h"
 

src/{hv_utils.cpp → utils.cpp}

@@ -1,4 +1,5 @@
-#include "hv_utils.h"
+#include "utils.h"
+#include <sys/time.h>
 
 int thread_num = 4;
 hloop_t** worker_loops = NULL;
@@ -28,4 +29,15 @@ char generateRandomKey()
 
     // 生成 'A' 到 'Z' 之间的随机字符
     return (char)('A' + rand() % 26);
+}
+
+long long currentTimeMillis() {
+    struct timeval now;
+    gettimeofday(&now, NULL);
+
+//    return time(NULL);
+
+//    struct timespec now;
+//    clock_gettime(CLOCK_MONOTONIC, &now);
+    return now.tv_sec * 1000 + now.tv_usec / 1000;
 }