Merge 9d1aebde66 into f49e6adedf

remove Dockerfile
try to fix linux 6.5 compile
2025-09-16 04:04:27 +08:00 · 2023-11-10 13:07:37 -08:00 · 2023-11-06 03:19:46 -05:00 · 2023-10-07 08:26:10 -04:00 · 2023-09-21 16:35:45 -04:00 · 2023-07-27 21:10:28 +08:00
39 changed files with 8239 additions and 8225 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,4 @@
+SortIncludes: false
+BasedOnStyle: Google
+ColumnLimit: 0
+IndentWidth: 4
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-libev/* linguist-vendored
+lib/aes_acc/asm/* linguist-vendored
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/udp2raw*
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -0,0 +1,35 @@
+#note: experimental
+#      currently only used for generating `compile_commands.json` for clangd.
+#      to build this project, it's suggested to use `makefile` instead
+
+cmake_minimum_required(VERSION 3.7)
+project(udp2raw)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+set(CMAKE_CXX_STANDARD 11)
+
+set(SOURCE_FILES
+        main.cpp 
+        lib/md5.cpp
+        lib/pbkdf2-sha1.cpp
+        lib/pbkdf2-sha256.cpp
+        encrypt.cpp
+        log.cpp
+        network.cpp
+        common.cpp
+        connection.cpp
+        misc.cpp
+        fd_manager.cpp
+        client.cpp
+        server.cpp
+        lib/aes_faster_c/aes.cpp
+        lib/aes_faster_c/wrapper.cpp
+        my_ev.cpp
+)
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers -O2 -g -fsanitize=address,undefined")
+
+add_executable(udp2raw ${SOURCE_FILES})
+target_link_libraries(udp2raw rt)
+target_link_libraries(udp2raw pthread)
+include_directories(SYSTEM "libev")
+include_directories(".")
--- a/13
+++ b/13
@@ -1,13 +0,0 @@
-FROM alpine:3.6 as builder
-
-WORKDIR /
-
-RUN apk add --no-cache git  build-base linux-headers && \
- git clone https://github.com/wangyu-/udp2raw-tunnel.git  && \
- cd udp2raw-tunnel && \
- make dynamic
-
-FROM alpine:3.6
-RUN apk add --no-cache libstdc++ iptables
-COPY --from=builder /udp2raw-tunnel/udp2raw_dynamic /bin/
-ENTRYPOINT [ "/bin/udp2raw_dynamic" ]
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,6 +1 @@
-For English speaking user：
-https://github.com/wangyu-/UDPspeeder/wiki/Issue-Guide
-
-中文用户请看：
-https://github.com/wangyu-/UDPspeeder/wiki/发Issue前请看
-(否则Issue可能被忽略，或被直接关掉)
+English Only.
--- a/README.md
+++ b/README.md
@@ -1,11 +1,227 @@
-# udp2raw-multiplatform
+# Udp2raw-tunnel
+
+
+A Tunnel which turns UDP Traffic into Encrypted FakeTCP/UDP/ICMP Traffic by using Raw Socket, helps you Bypass UDP FireWalls(or Unstable UDP Environment).
+
+When used alone,udp2raw tunnels only UDP traffic. Nevertheless,if you used udp2raw + any UDP-based VPN together,you can tunnel any traffic(include TCP/UDP/ICMP),currently OpenVPN/L2TP/ShadowVPN and [tinyfecVPN](https://github.com/wangyu-/tinyfecVPN) are confirmed to be supported.
+

 ![image0](images/image0.PNG)

-multi-platform(cross-platform) version of [udp2raw](https://github.com/wangyu-/udp2raw-tunnel), which supports Windows/Mac/BSD natively.
+or

-udp2raw的跨平台版，协议兼容[linux版的udpraw](https://github.com/wangyu-/udp2raw-tunnel)，可以直接运行在Windows、Mac、BSD上。
+![image_vpn](images/udp2rawopenvpn.PNG)

-Check [Wiki](https://github.com/wangyu-/udp2raw-multiplatform/wiki) for details.
+[udp2raw wiki](https://github.com/wangyu-/udp2raw-tunnel/wiki)

-更多信息，见 [Wiki](https://github.com/wangyu-/udp2raw-multiplatform/wiki)。
+[简体中文](/doc/README.zh-cn.md)
+
+
+# Support Platforms
+Linux host (including desktop Linux,Android phone/tablet,OpenWRT router,or Raspberry PI) with root account or cap_net_raw capability.
+
+For Windows and MacOS users, use the udp2raw in [this repo](https://github.com/wangyu-/udp2raw-multiplatform).
+
+# Features
+### Send/Receive UDP Packets with ICMP/FakeTCP/UDP headers
+ICMP/FakeTCP headers help you bypass UDP blocking, UDP QOS or improper UDP NAT behavior on some ISPs. In ICMP header mode,udp2raw works like an ICMP tunnel.
+
+UDP headers are also supported. In UDP header mode, it behaves just like a normal UDP tunnel, and you can just make use of the other features (such as encryption, anti-replay, or connection stabilization).
+
+### Simulated TCP with Real-time/Out-of-Order Delivery
+In FakeTCP header mode,udp2raw simulates 3-way handshake while establishing a connection,simulates seq and ack_seq while data transferring. It also simulates a few TCP options such as: `MSS`, `sackOk`, `TS`, `TS_ack`, `wscale`. Firewalls will regard FakeTCP as a TCP connection, but its essentially UDP: it supports real-time/out-of-order delivery(just as normal UDP does), no congestion control or re-transmission. So there wont be any TCP over TCP problem when using OpenVPN.
+
+### Encryption, Anti-Replay
+* Encrypt your traffic with AES-128-CBC.
+* Protect data integrity by HMAC-SHA1 (or weaker MD5/CRC32).
+* Defense replay attack with anti-replay window.
+
+[Notes on encryption](https://github.com/wangyu-/udp2raw-tunnel/wiki/Notes-on-encryption)
+
+### Failure Dectection & Stabilization (Connection Recovery)
+Conection failures are detected by heartbeats. If timed-out, client will automatically change port number and reconnect. If reconnection is successful, the previous connection will be recovered, and all existing UDP conversations will stay vaild.
+
+For example, if you use udp2raw + OpenVPN, OpenVPN won't lose connection after any reconnect, **even if network cable is re-plugged or WiFi access point is changed**.
+
+### Other Features
+* **Multiplexing** One client can handle multiple UDP connections, all of which share the same raw connection.
+
+* **Multiple Clients** One server can have multiple clients.
+
+* **NAT Support** All of the 3 modes work in NAT environments.
+
+* **OpenVZ Support** Tested on BandwagonHost VPS.
+
+* **Easy to Build** No dependencies.To cross-compile udp2raw,all you need to do is just to download a toolchain,modify makefile to point at the toolchain,run `make cross` then everything is done.(Note:Pre-compiled binaries for Desktop,RaspberryPi,Android,some Openwrt Routers are already included in [Releases](https://github.com/wangyu-/udp2raw-tunnel/releases))
+
+### Keywords
+`Bypass UDP QoS` `Bypass UDP Blocking` `Bypass OpenVPN TCP over TCP problem` `OpenVPN over ICMP` `UDP to ICMP tunnel` `UDP to TCP tunnel` `UDP over ICMP` `UDP over TCP`
+
+# Getting Started
+### Installing
+Download binary release from https://github.com/wangyu-/udp2raw-tunnel/releases
+
+### Running
+Assume your UDP is blocked or being QOS-ed or just poorly supported. Assume your server ip is 44.55.66.77, you have a service listening on udp port 7777.
+
+```bash
+# Run at server side:
+./udp2raw_amd64 -s -l0.0.0.0:4096 -r 127.0.0.1:7777    -k "passwd" --raw-mode faketcp -a
+
+# Run at client side
+./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096  -k "passwd" --raw-mode faketcp -a
+```
+(The above commands need to be run as root. For better security, with some extra steps, you can run udp2raw as non-root. Check [this link](https://github.com/wangyu-/udp2raw-tunnel/wiki/run-udp2raw-as-non-root) for more info  )
+
+###### Server Output:
+![](images/output_server.PNG)
+###### Client Output:
+![](images/output_client.PNG)
+
+Now,an encrypted raw tunnel has been established between client and server through TCP port 4096. Connecting to UDP port 3333 at the client side is equivalent to connecting to port 7777 at the server side. No UDP traffic will be exposed.
+
+### Note
+To run on Android, check [Android_Guide](/doc/android_guide.md)
+
+`-a` option automatically adds an iptables rule (or a few iptables rules) for you, udp2raw relies on this iptables rule to work stably. Be aware you dont forget `-a` (its a common mistake). If you dont want udp2raw to add iptables rule automatically, you can add it manually(take a look at `-g` option) and omit `-a`.
+
+
+# Advanced Topic
+### Usage
+```
+udp2raw-tunnel
+git version:6e1df4b39f    build date:Oct 24 2017 09:21:15
+repository: https://github.com/wangyu-/udp2raw-tunnel
+
+usage:
+    run as client : ./this_program -c -l local_listen_ip:local_port -r server_address:server_port  [options]
+    run as server : ./this_program -s -l server_listen_ip:server_port -r remote_address:remote_port  [options]
+
+common options,these options must be same on both side:
+    --raw-mode            <string>        avaliable values:faketcp(default),udp,icmp
+    -k,--key              <string>        password to gen symetric key,default:"secret key"
+    --cipher-mode         <string>        avaliable values:aes128cbc(default),xor,none
+    --auth-mode           <string>        avaliable values:hmac_sha1,md5(default),crc32,simple,none
+    -a,--auto-rule                        auto add (and delete) iptables rule
+    -g,--gen-rule                         generate iptables rule then exit,so that you can copy and
+                                          add it manually.overrides -a
+    --disable-anti-replay                 disable anti-replay,not suggested
+client options:
+    --source-ip           <ip>            force source-ip for raw socket
+    --source-port         <port>          force source-port for raw socket,tcp/udp only
+                                          this option disables port changing while re-connecting
+other options:
+    --conf-file           <string>        read options from a configuration file instead of command line.
+                                          check example.conf in repo for format
+    --fifo                <string>        use a fifo(named pipe) for sending commands to the running program,
+                                          check readme.md in repository for supported commands.
+    --log-level           <number>        0:never    1:fatal   2:error   3:warn
+                                          4:info (default)     5:debug   6:trace
+    --log-position                        enable file name,function name,line number in log
+    --disable-color                       disable log color
+    --disable-bpf                         disable the kernel space filter,most time its not necessary
+                                          unless you suspect there is a bug
+    --sock-buf            <number>        buf size for socket,>=10 and <=10240,unit:kbyte,default:1024
+    --force-sock-buf                      bypass system limitation while setting sock-buf
+    --seq-mode            <number>        seq increase mode for faketcp:
+                                          0:static header,do not increase seq and ack_seq
+                                          1:increase seq for every packet,simply ack last seq
+                                          2:increase seq randomly, about every 3 packets,simply ack last seq
+                                          3:simulate an almost real seq/ack procedure(default)
+                                          4:similiar to 3,but do not consider TCP Option Window_Scale,
+                                          maybe useful when firewall doesnt support TCP Option
+    --lower-level         <string>        send packets at OSI level 2, format:'if_name#dest_mac_adress'
+                                          ie:'eth0#00:23:45:67:89:b9'.or try '--lower-level auto' to obtain
+                                          the parameter automatically,specify it manually if 'auto' failed
+    --gen-add                             generate iptables rule and add it permanently,then exit.overrides -g
+    --keep-rule                           monitor iptables and auto re-add if necessary.implys -a
+    --clear                               clear any iptables rules added by this program.overrides everything
+    -h,--help                             print this help message
+
+```
+
+### Iptables rules,`-a` and `-g`
+This program sends packets via raw socket. In FakeTCP mode, Linux kernel TCP packet processing has to be blocked by a iptables rule on both sides, otherwise the kernel will automatically send RST for an unrecongized TCP packet and you will sustain from stability / peformance problems. You can use `-a` option to let the program automatically add / delete iptables rule on start / exit. You can also use the `-g` option to generate iptables rule and add it manually.
+
+### `--cipher-mode` and `--auth-mode`
+It is suggested to use `aes128cbc` + `hmac_sha1` to obtain maximum security. If you want to run the program on a router, you can try `xor` + `simple`, which can fool packet inspection by firewalls the most of time, but it cannot protect you from serious attacks. Mode none is only for debugging purpose. It is not recommended to set the cipher-mode or auth-mode to none.
+
+### `--seq-mode`
+The FakeTCP mode does not behave 100% like a real tcp connection. ISPs may be able to distinguish the simulated tcp traffic from the real TCP traffic (though it's costly). seq-mode can help you change the seq increase behavior slightly. If you experience connection problems, try to change the value.
+
+### `--lower-level`
+`--lower-level` allows you to send packet at OSI level 2(link level),so that you can bypass any local iptables rules. If you have a complicated iptables rules which conflicts with udp2raw and you cant(or too lazy to) edit the iptables rules,`--lower-level` can be very useful. Try `--lower-level auto` to auto detect the parameters,you can specify it manually if `auto` fails.
+
+Manual format `if_name#dest_mac_adress`,ie:`eth0#00:23:45:67:89:b9`.
+
+### `--keep-rule`
+Monitor iptables and auto re-add iptables rules(for blocking kernel tcp processing) if necessary.Especially useful when iptables rules may be cleared by other programs(for example,if you are using openwrt,everytime you changed and commited a setting,iptables rule may be cleared and re-constructed).
+
+### `--conf-file`
+
+You can also load options from a configuration file in order to keep secrets away from `ps` command.
+
+For example, rewrite the options for the above `server` example (in Getting Started section) into configuration file:
+
+`server.conf`
+
+```
+-s
+# You can add comments like this
+# Comments MUST occupy an entire line
+# Or they will not work as expected
+# Listen address
+-l 0.0.0.0:4096
+# Remote address
+-r 127.0.0.1:7777
+-a
+-k passwd
+--raw-mode faketcp
+```
+
+Pay attention to the `-k` parameter: In command line mode the quotes around the password will be removed by shell. In configuration files we do not remove quotes.
+
+Then start the server with
+
+```bash
+./udp2raw_amd64 --conf-file server.conf
+```
+
+### `--fifo`
+Use a fifo(named pipe) for sending commands to the running program. For example `--fifo fifo.file`.
+
+At client side,you can use `echo reconnect >fifo.file` to force client to reconnect.Currently no command has been implemented for server.
+
+# Peformance Test
+#### Test method:
+iperf3 TCP via OpenVPN + udp2raw
+(iperf3 UDP mode is not used because of a bug mentioned in this issue: https://github.com/esnet/iperf/issues/296 . Instead, we package the TCP traffic into UDP by OpenVPN to test the performance. Read [Application](https://github.com/wangyu-/udp2raw-tunnel#application) for details.
+
+#### iperf3 command:
+```
+iperf3 -c 10.222.2.1 -P40
+iperf3 -c 10.222.2.1 -P40 -R
+```
+#### Environments
+* **Client** Vultr $2.5/monthly plan (single core 2.4GHz cpu, 512MB RAM, Tokyo, Japan)
+* **Server** BandwagonHost $3.99/annually plan (single core 2.0GHz cpu, 128MB RAM, Los Angeles, USA)
+
+### Test1
+raw_mode: faketcp  cipher_mode: xor  auth_mode: simple
+
+![image4](images/image4.PNG)
+
+(reverse speed was simliar and not uploaded)
+
+### Test2
+raw_mode: faketcp  cipher_mode: aes128cbc  auth_mode: md5
+
+![image5](images/image5.PNG)
+
+(reverse speed was simliar and not uploaded)
+
+# wiki
+
+Check wiki for more info:
+
+https://github.com/wangyu-/udp2raw-tunnel/wiki
--- a/client.cpp
+++ b/client.cpp
--- a/common.cpp
+++ b/common.cpp
--- a/common.h
+++ b/common.h
@@ -27,6 +27,12 @@
 #include <assert.h>
 #include <pthread.h>

+#ifndef USE_LIBNET
+#define NO_LIBNET
+#endif
+
+#if defined(UDP2RAW_MP)
+const int is_udp2raw_mp = 1;
 #if !defined(__CYGWIN__) && !defined(__MINGW32__)
 #include <pcap.h>
 #else
@@ -38,6 +44,20 @@
 #include <libnet.h>
 #endif

+#else
+#define UDP2RAW_LINUX
+const int is_udp2raw_mp = 0;
+//#include <linux/if_ether.h>
+#include <linux/filter.h>
+#include <linux/if_packet.h>
+#include <sys/epoll.h>
+//#include <sys/wait.h> //signal
+#include <netinet/if_ether.h>
+#include <net/if.h>
+#include <sys/timerfd.h>
+
+#endif
+
 #if !defined(NO_LIBEV_EMBED)
 #include <my_ev.h>
 #else
@@ -59,7 +79,6 @@ typedef int socklen_t;
 #include <netinet/in.h>
 #endif

-
 #include <unordered_map>
 #include <fstream>
 #include <string>
@@ -79,7 +98,6 @@ using  namespace std;
 #define UDP2RAW_BIG_ENDIAN 1
 #endif

-
 #if defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN ||             \
    defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ || \
    defined(__LITTLE_ENDIAN__) ||                                           \
@@ -94,12 +112,10 @@ using  namespace std;
 #error "endian detection conflicts"
 #endif

-
 #if !defined(UDP2RAW_BIG_ENDIAN) && !defined(UDP2RAW_LITTLE_ENDIAN)
 #error "endian detection failed"
 #endif

-
 #if defined(__MINGW32__)
 int inet_pton(int af, const char *src, void *dst);
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
@@ -111,20 +127,17 @@ int get_sock_errno();

 #if defined(__MINGW32__)
 typedef SOCKET my_fd_t;
-inline int sock_close(my_fd_t fd)
-{
+inline int sock_close(my_fd_t fd) {
    return closesocket(fd);
 }
 #else
 typedef int my_fd_t;
-inline int sock_close(my_fd_t fd)
-{
+inline int sock_close(my_fd_t fd) {
    return close(fd);
 }

 #endif

-
 typedef unsigned long long u64_t;  // this works on most platform,avoid using the PRId64
 typedef long long i64_t;

@@ -149,6 +162,8 @@ const int max_addr_len=100;
 extern int force_socket_buf;

 extern int g_fix_gro;
+
+/*
 struct ip_port_t
 {
        u32_t ip;
@@ -156,8 +171,7 @@ struct ip_port_t
        void from_u64(u64_t u64);
        u64_t to_u64();
        char * to_s();
-};
-
+};*/

 typedef u64_t fd64_t;

@@ -166,10 +180,8 @@ u32_t sdbm(unsigned char *str,int len);

 struct address_t  // TODO scope id
 {
-	struct hash_function
-	{
-	    u32_t operator()(const address_t &key) const
-		{
+    struct hash_function {
+        u32_t operator()(const address_t &key) const {
            return sdbm((unsigned char *)&key.inner, sizeof(key.inner));
        }
    };
@@ -181,16 +193,13 @@ struct address_t  //TODO scope id
    };
    storage_t inner;

-	address_t()
-	{
+    address_t() {
        clear();
    }
-	void clear()
-	{
+    void clear() {
        memset(&inner, 0, sizeof(inner));
    }
-	int from_ip_port(u32_t  ip, int port)
-	{
+    int from_ip_port(u32_t ip, int port) {
        clear();
        inner.ipv4.sin_family = AF_INET;
        inner.ipv4.sin_port = htons(port);
@@ -198,17 +207,13 @@ struct address_t  //TODO scope id
        return 0;
    }

-	int from_ip_port_new(int type, void *  ip, int port)
-	{
+    int from_ip_port_new(int type, void *ip, int port) {
        clear();
-		if(type==AF_INET)
-		{
+        if (type == AF_INET) {
            inner.ipv4.sin_family = AF_INET;
            inner.ipv4.sin_port = htons(port);
            inner.ipv4.sin_addr.s_addr = *((u32_t *)ip);
-		}
-		else if(type==AF_INET6)
-		{
+        } else if (type == AF_INET6) {
            inner.ipv6.sin6_family = AF_INET6;
            inner.ipv6.sin6_port = htons(port);
            inner.ipv6.sin6_addr = *((in6_addr *)ip);
@@ -225,18 +230,15 @@ struct address_t  //TODO scope id
    char *get_str();
    void to_str(char *);

-	inline u32_t get_type()
-	{
+    inline u32_t get_type() {
        u32_t ret = ((sockaddr *)&inner)->sa_family;
        assert(ret == AF_INET || ret == AF_INET6);
        return ret;
    }

-	inline u32_t get_len()
-	{
+    inline u32_t get_len() {
        u32_t type = get_type();
-		switch(type)
-		{
+        switch (type) {
            case AF_INET:
                return sizeof(sockaddr_in);
            case AF_INET6:
@@ -247,11 +249,9 @@ struct address_t  //TODO scope id
        return -1;
    }

-	inline u32_t get_port()
-	{
+    inline u32_t get_port() {
        u32_t type = get_type();
-		switch(type)
-		{
+        switch (type) {
            case AF_INET:
                return ntohs(inner.ipv4.sin_port);
            case AF_INET6:
@@ -262,11 +262,9 @@ struct address_t  //TODO scope id
        return -1;
    }

-	inline void set_port(int port)
-	{
+    inline void set_port(int port) {
        u32_t type = get_type();
-		switch(type)
-		{
+        switch (type) {
            case AF_INET:
                inner.ipv4.sin_port = htons(port);
                break;
@@ -279,8 +277,7 @@ struct address_t  //TODO scope id
        return;
    }

-    bool operator == (const address_t &b) const
-    {
+    bool operator==(const address_t &b) const {
        // return this->data==b.data;
        return memcmp(&this->inner, &b.inner, sizeof(this->inner)) == 0;
    }
@@ -292,16 +289,13 @@ struct address_t  //TODO scope id

 namespace std {
 template <>
- struct hash<address_t>
- {
-   std::size_t operator()(const address_t& key) const
-   {
-
+struct hash<address_t> {
+    std::size_t operator()(const address_t &key) const {
        // return address_t::hash_function(k);
        return sdbm((unsigned char *)&key.inner, sizeof(key.inner));
    }
 };
-}
+}  // namespace std

 union my_ip_t  // just a simple version of address_t,stores ip only
 {
@@ -315,21 +309,15 @@ union my_ip_t //just a simple version of address_t,stores ip only
    char *get_str2() const;

    int from_address_t(address_t a);
-
 };

-struct not_copy_able_t
-{
-	not_copy_able_t()
-	{
-
+struct not_copy_able_t {
+    not_copy_able_t() {
    }
-	not_copy_able_t(const not_copy_able_t &other)
-	{
+    not_copy_able_t(const not_copy_able_t &other) {
        assert(0 == 1);
    }
-	const not_copy_able_t & operator=(const not_copy_able_t &other)
-	{
+    const not_copy_able_t &operator=(const not_copy_able_t &other) {
        assert(0 == 1);
        return other;
    }
@@ -343,51 +331,51 @@ const int buf_len=max_data_len+400;

 // const int max_address_len=512;

+#ifdef UDP2RAW_MP
 const int queue_len = 200;

-struct queue_t
-{
+struct queue_t {
    char data[queue_len][huge_buf_len];
    int data_len[queue_len];

    int head = 0;
    int tail = 0;
-	void clear()
-	{
+    void clear() {
        head = tail = 0;
    }
-	int empty()
-	{
-		if(head==tail) return 1;
-		else return 0;
+    int empty() {
+        if (head == tail)
+            return 1;
+        else
+            return 0;
    }
-	int full()
-	{
-		if( (tail+1)%queue_len==head  ) return 1;
-		else return 0;
+    int full() {
+        if ((tail + 1) % queue_len == head)
+            return 1;
+        else
+            return 0;
    }
-	void peek_front(char * & p,int &len)
-	{
+    void peek_front(char *&p, int &len) {
        assert(!empty());
        p = data[head];
        len = data_len[head];
    }
-	void pop_front()
-	{
+    void pop_front() {
        assert(!empty());
-		head++;head%=queue_len;
+        head++;
+        head %= queue_len;
    }
-	void push_back(char * p,int len)
-	{
+    void push_back(char *p, int len) {
        assert(!full());
        memcpy(data[tail], p, len);
        data_len[tail] = len;
-		tail++;tail%=queue_len;
+        tail++;
+        tail %= queue_len;
    }
 };

 int init_ws();
-
+#endif
 u64_t get_current_time();
 u64_t pack_u64(u32_t a, u32_t b);

@@ -451,12 +439,10 @@ int create_fifo(char * file);
 void print_binary_chars(const char *a, int len);

 template <class key_t>
-struct lru_collector_t:not_copy_able_t
-{
+struct lru_collector_t : not_copy_able_t {
    // typedef void* key_t;
    //#define key_t void*
-	struct lru_pair_t
-	{
+    struct lru_pair_t {
        key_t key;
        my_time_t ts;
    };
@@ -464,65 +450,61 @@ struct lru_collector_t:not_copy_able_t
    unordered_map<key_t, typename list<lru_pair_t>::iterator> mp;

    list<lru_pair_t> q;
-	int update(key_t key)
-	{
+    int update(key_t key) {
        assert(mp.find(key) != mp.end());
        auto it = mp[key];
        q.erase(it);

        my_time_t value = get_current_time();
-		if(!q.empty())
-		{
+        if (!q.empty()) {
            assert(value >= q.front().ts);
        }
-		lru_pair_t tmp; tmp.key=key; tmp.ts=value;
+        lru_pair_t tmp;
+        tmp.key = key;
+        tmp.ts = value;
        q.push_front(tmp);
        mp[key] = q.begin();

        return 0;
    }
-	int new_key(key_t key)
-	{
+    int new_key(key_t key) {
        assert(mp.find(key) == mp.end());

        my_time_t value = get_current_time();
-		if(!q.empty())
-		{
+        if (!q.empty()) {
            assert(value >= q.front().ts);
        }
-		lru_pair_t tmp; tmp.key=key; tmp.ts=value;
+        lru_pair_t tmp;
+        tmp.key = key;
+        tmp.ts = value;
        q.push_front(tmp);
        mp[key] = q.begin();

        return 0;
    }
-	int size()
-	{
+    int size() {
        return q.size();
    }
-	int empty()
-	{
+    int empty() {
        return q.empty();
    }
-	void clear()
-	{
-		mp.clear(); q.clear();
+    void clear() {
+        mp.clear();
+        q.clear();
    }
-	my_time_t ts_of(key_t key)
-	{
+    my_time_t ts_of(key_t key) {
        assert(mp.find(key) != mp.end());
        return mp[key]->ts;
    }

-	my_time_t peek_back(key_t &key)
-	{
+    my_time_t peek_back(key_t &key) {
        assert(!q.empty());
-		auto it=q.end(); it--;
+        auto it = q.end();
+        it--;
        key = it->key;
        return it->ts;
    }
-	void erase(key_t key)
-	{
+    void erase(key_t key) {
        assert(mp.find(key) != mp.end());
        q.erase(mp[key]);
        mp.erase(key);
@@ -537,5 +519,4 @@ struct lru_collector_t:not_copy_able_t
    }*/
 };

-
 #endif /* COMMON_H_ */
--- a/connection.cpp
+++ b/connection.cpp
@@ -15,67 +15,53 @@ const int disable_conn_clear=0;//a raw connection is called conn.

 conn_manager_t conn_manager;

-	anti_replay_seq_t anti_replay_t::get_new_seq_for_send()
-	{
+anti_replay_seq_t anti_replay_t::get_new_seq_for_send() {
    return anti_replay_seq++;
 }
-	anti_replay_t::anti_replay_t()
-	{
+anti_replay_t::anti_replay_t() {
    max_packet_received = 0;
    anti_replay_seq = get_true_random_number_64() / 10;  // random first seq
    // memset(window,0,sizeof(window)); //not necessary
 }
-	void anti_replay_t::re_init()
-	{
+void anti_replay_t::re_init() {
    max_packet_received = 0;
    // memset(window,0,sizeof(window));
 }

-	int anti_replay_t::is_vaild(u64_t seq)
-	{
+int anti_replay_t::is_vaild(u64_t seq) {
    if (disable_anti_replay) return 1;
    // if(disabled) return 0;

-		if(seq==max_packet_received) return 0;
-		else if(seq>max_packet_received)
-		{
-			if(seq-max_packet_received>=anti_replay_window_size)
-			{
+    if (seq == max_packet_received)
+        return 0;
+    else if (seq > max_packet_received) {
+        if (seq - max_packet_received >= anti_replay_window_size) {
            memset(window, 0, sizeof(window));
            window[seq % anti_replay_window_size] = 1;
-			}
-			else
-			{
+        } else {
            for (u64_t i = max_packet_received + 1; i < seq; i++)
                window[i % anti_replay_window_size] = 0;
            window[seq % anti_replay_window_size] = 1;
        }
        max_packet_received = seq;
        return 1;
-		}
-		else if(seq<max_packet_received)
-		{
-			if(max_packet_received-seq>=anti_replay_window_size) return 0;
-			else
-			{
-				if (window[seq%anti_replay_window_size]==1) return 0;
-				else
-				{
+    } else if (seq < max_packet_received) {
+        if (max_packet_received - seq >= anti_replay_window_size)
+            return 0;
+        else {
+            if (window[seq % anti_replay_window_size] == 1)
+                return 0;
+            else {
                window[seq % anti_replay_window_size] = 1;
                return 1;
            }
        }
    }

-
    return 0;  // for complier check
 }

-
-
-
-	 void conn_info_t::recover(const conn_info_t &conn_info)
-	 {
+void conn_info_t::recover(const conn_info_t &conn_info) {
    raw_info = conn_info.raw_info;

    raw_info.rst_received = 0;
@@ -91,11 +77,9 @@ conn_manager_t conn_manager;
    my_roller = 0;       // no need to set,but for easier debug,set it to zero
    oppsite_roller = 0;  // same as above
    last_oppsite_roller_time = 0;
-
 }

-	void conn_info_t::re_init()
-	{
+void conn_info_t::re_init() {
    // send_packet_info.protocol=g_packet_info_send.protocol;
    if (program_mode == server_mode)
        state.server_current_state = server_idle;
@@ -110,49 +94,37 @@ conn_manager_t conn_manager;
    oppsite_roller = 0;
    last_oppsite_roller_time = 0;
 }
-	conn_info_t::conn_info_t()
-	{
+conn_info_t::conn_info_t() {
    blob = 0;
    re_init();
 }
-	void conn_info_t::prepare()
-	{
+void conn_info_t::prepare() {
    assert(blob == 0);
    blob = new blob_t;
-		if(program_mode==server_mode)
-		{
+    if (program_mode == server_mode) {
        blob->conv_manager.s.additional_clear_function = server_clear_function;
-		}
-		else
-		{
+    } else {
        assert(program_mode == client_mode);
    }
 }

-	conn_info_t::conn_info_t(const conn_info_t&b)
-	{
+conn_info_t::conn_info_t(const conn_info_t &b) {
    assert(0 == 1);
    // mylog(log_error,"called!!!!!!!!!!!!!\n");
 }

-	conn_info_t& conn_info_t::operator=(const conn_info_t& b)
-	  {
+conn_info_t &conn_info_t::operator=(const conn_info_t &b) {
    mylog(log_fatal, "not allowed\n");
    myexit(-1);
    return *this;
 }
-	conn_info_t::~conn_info_t()
-	{
-		if(program_mode==server_mode)
-		{
-			if(state.server_current_state==server_ready)
-			{
+conn_info_t::~conn_info_t() {
+    if (program_mode == server_mode) {
+        if (state.server_current_state == server_ready) {
            assert(blob != 0);
            assert(oppsite_const_id != 0);
            // assert(conn_manager.const_id_mp.find(oppsite_const_id)!=conn_manager.const_id_mp.end()); // conn_manager 's deconstuction function  erases it
-			}
-			else
-			{
+        } else {
            assert(blob == 0);
            assert(oppsite_const_id == 0);
        }
@@ -166,9 +138,7 @@ conn_manager_t conn_manager;
    // send_packet_info.protocol=g_packet_info_send.protocol;
 }

-
-	conn_manager_t::conn_manager_t()
- {
+conn_manager_t::conn_manager_t() {
    ready_num = 0;
    mp.reserve(10007);
    // clear_it=mp.begin();
@@ -179,14 +149,12 @@ conn_manager_t conn_manager;
    // current_ready_ip=0;
    // current_ready_port=0;
 }
- int conn_manager_t::exist(address_t addr)
- {
+int conn_manager_t::exist(address_t addr) {
    // u64_t u64=0;
    // u64=ip;
    // u64<<=32u;
    // u64|=port;
-	 if(mp.find(addr)!=mp.end())
-	 {
+    if (mp.find(addr) != mp.end()) {
        return 1;
    }
    return 0;
@@ -208,13 +176,10 @@ conn_manager_t conn_manager;
    // u64<<=32u;
    // u64|=port;
    unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr);
-	 if(it==mp.end())
-	 {
+    if (it == mp.end()) {
        mp[addr] = new conn_info_t;
        // lru.new_key(addr);
-	 }
-	 else
-	 {
+    } else {
        // lru.update(addr);
    }
    return mp[addr];
@@ -226,21 +191,16 @@ conn_manager_t conn_manager;
    // u64<<=32u;
    // u64|=port;
    unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr);
-	 if(it==mp.end())
-	 {
+    if (it == mp.end()) {
        mp[addr] = new conn_info_t;
        // lru.new_key(addr);
-	 }
-	 else
-	 {
+    } else {
        // lru.update(addr);
    }
    return *mp[addr];
 }
- int conn_manager_t::erase(unordered_map<address_t,conn_info_t*>::iterator erase_it)
- {
-		if(erase_it->second->state.server_current_state==server_ready)
-		{
+int conn_manager_t::erase(unordered_map<address_t, conn_info_t *>::iterator erase_it) {
+    if (erase_it->second->state.server_current_state == server_ready) {
        ready_num--;
        assert(i32_t(ready_num) != -1);
        assert(erase_it->second != 0);
@@ -252,7 +212,6 @@ conn_manager_t conn_manager;
        assert(erase_it->second->oppsite_const_id != 0);
        assert(const_id_mp.find(erase_it->second->oppsite_const_id) != const_id_mp.end());

-
        // assert(timer_fd_mp.find(erase_it->second->timer_fd)!=timer_fd_mp.end());

        const_id_mp.erase(erase_it->second->oppsite_const_id);
@@ -264,30 +223,24 @@ conn_manager_t conn_manager;
        // close(erase_it->second->timer_fd);// close will auto delte it from epoll
        delete (erase_it->second);
        mp.erase(erase_it->first);
-		}
-		else
-		{
+    } else {
        assert(erase_it->second->blob == 0);
        assert(erase_it->second->timer_fd64 == 0);

-
        assert(erase_it->second->oppsite_const_id == 0);
        delete (erase_it->second);
        mp.erase(erase_it->first);
    }
    return 0;
 }
-int conn_manager_t::clear_inactive()
-{
-	if(get_current_time()-last_clear_time>conn_clear_interval)
-	{
+int conn_manager_t::clear_inactive() {
+    if (get_current_time() - last_clear_time > conn_clear_interval) {
        last_clear_time = get_current_time();
        return clear_inactive0();
    }
    return 0;
 }
-int conn_manager_t::clear_inactive0()
-{
+int conn_manager_t::clear_inactive0() {
    unordered_map<address_t, conn_info_t *>::iterator it;
    unordered_map<address_t, conn_info_t *>::iterator old_it;

@@ -304,31 +257,22 @@ int conn_manager_t::clear_inactive0()
    num_to_clean = min(num_to_clean, (int)mp.size());
    u64_t current_time = get_current_time();

-	for(;;)
-	{
+    for (;;) {
        if (cnt >= num_to_clean) break;
        if (mp.begin() == mp.end()) break;

-		if(it==mp.end())
-		{
+        if (it == mp.end()) {
            it = mp.begin();
        }

-		if(it->second->state.server_current_state==server_ready &&current_time - it->second->last_hb_recv_time  <=server_conn_timeout)
-		{
+        if (it->second->state.server_current_state == server_ready && current_time - it->second->last_hb_recv_time <= server_conn_timeout) {
            it++;
-		}
-		else if(it->second->state.server_current_state!=server_ready&& current_time - it->second->last_state_time  <=server_handshake_timeout )
-		{
+        } else if (it->second->state.server_current_state != server_ready && current_time - it->second->last_state_time <= server_handshake_timeout) {
            it++;
-		}
-		else if(it->second->blob!=0&&it->second->blob->conv_manager.s.get_size() >0)
-		{
+        } else if (it->second->blob != 0 && it->second->blob->conv_manager.s.get_size() > 0) {
            assert(it->second->state.server_current_state == server_ready);
            it++;
-		}
-		else
-		{
+        } else {
            mylog(log_info, "[%s:%d]inactive conn cleared \n", it->second->raw_info.recv_info.new_src_ip.get_str1(), it->second->raw_info.recv_info.src_port);
            old_it = it;
            it++;
@@ -341,13 +285,10 @@ int conn_manager_t::clear_inactive0()
    return 0;
 }

-
-
 int send_bare(raw_info_t &raw_info, const char *data, int len)  // send function with encryption but no anti replay,this is used when client and server verifys each other
 // you have to design the protocol carefully, so that you wont be affect by relay attack
 {
-	if(len<0)
-	{
+    if (len < 0) {
        mylog(log_debug, "input_len <0\n");
        return -1;
    }
@@ -357,7 +298,6 @@ int send_bare(raw_info_t &raw_info,const char* data,int len)//send function with
    char send_data_buf[buf_len];  // buf for send data and send hb
    char send_data_buf2[buf_len];

-
    // static send_bare[buf_len];
    iv_t iv = get_true_random_number_64();
    padding_t padding = get_true_random_number_64();
@@ -369,8 +309,7 @@ int send_bare(raw_info_t &raw_info,const char* data,int len)//send function with
    memcpy(send_data_buf + sizeof(iv) + sizeof(padding) + 1, data, len);
    int new_len = len + sizeof(iv) + sizeof(padding) + 1;

-	if(my_encrypt(send_data_buf,send_data_buf2,new_len)!=0)
-	{
+    if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0) {
        return -1;
    }
    send_raw0(raw_info, send_data_buf2, new_len);
@@ -380,26 +319,22 @@ int reserved_parse_bare(const char *input,int input_len,char* & data,int & len)
 {
    static char recv_data_buf[buf_len];

-	if(input_len<0)
-	{
+    if (input_len < 0) {
        mylog(log_debug, "input_len <0\n");
        return -1;
    }
-	if(my_decrypt(input,recv_data_buf,input_len)!=0)
-	{
+    if (my_decrypt(input, recv_data_buf, input_len) != 0) {
        mylog(log_debug, "decrypt_fail in recv bare\n");
        return -1;
    }
-	if(recv_data_buf[sizeof(iv_t)+sizeof(padding_t)]!='b')
-	{
+    if (recv_data_buf[sizeof(iv_t) + sizeof(padding_t)] != 'b') {
        mylog(log_debug, "not a bare packet\n");
        return -1;
    }
    len = input_len;
    data = recv_data_buf + sizeof(iv_t) + sizeof(padding_t) + 1;
    len -= sizeof(iv_t) + sizeof(padding_t) + 1;
-	if(len<0)
-	{
+    if (len < 0) {
        mylog(log_debug, "len <0\n");
        return -1;
    }
@@ -411,14 +346,18 @@ int recv_bare(raw_info_t &raw_info,char* & data,int & len)//recv function with e
    packet_info_t &send_info = raw_info.send_info;
    packet_info_t &recv_info = raw_info.recv_info;

-	if(recv_raw0(raw_info,data,len)<0)
-	{
+    if (recv_raw0(raw_info, data, len) < 0) {
        // printf("recv_raw_fail in recv bare\n");
        return -1;
    }
+
+    if (len >= max_data_len + 1) {
+        mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", len);
+        return -1;
+    }
+
    mylog(log_trace, "data len=%d\n", len);
-	if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1)))
-	{
+    if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1))) {
        mylog(log_debug, "unexpect packet type recv_info.syn=%d recv_info.ack=%d \n", recv_info.syn, recv_info.ack);
        return -1;
    }
@@ -430,10 +369,14 @@ int send_handshake(raw_info_t &raw_info,my_id_t id1,my_id_t id2,my_id_t id3)// a
    packet_info_t &send_info = raw_info.send_info;
    packet_info_t &recv_info = raw_info.recv_info;

-	char * data;int len;
+    char *data;
+    int len;
    // len=sizeof(id_t)*3;
    if (numbers_to_char(id1, id2, id3, data, len) != 0) return -1;
-	if(send_bare(raw_info,data,len)!=0) {mylog(log_warn,"send bare fail\n");return -1;}
+    if (send_bare(raw_info, data, len) != 0) {
+        mylog(log_warn, "send bare fail\n");
+        return -1;
+    }
    return 0;
 }
 /*
@@ -449,17 +392,14 @@ int recv_handshake(packet_info_t &info,id_t &id1,id_t &id2,id_t &id3)

 int send_safer(conn_info_t &conn_info, char type, const char *data, int len)  // safer transfer function with anti-replay,when mutually verification is done.
 {
-
    packet_info_t &send_info = conn_info.raw_info.send_info;
    packet_info_t &recv_info = conn_info.raw_info.recv_info;

-	if(type!='h'&&type!='d')
-	{
+    if (type != 'h' && type != 'd') {
        mylog(log_warn, "first byte is not h or d  ,%x\n", type);
        return -1;
    }

-
    char send_data_buf[buf_len];  // buf for send data and send hb
    char send_data_buf2[buf_len];

@@ -475,7 +415,6 @@ int send_safer(conn_info_t &conn_info,char type,const char* data,int len)  //saf

    memcpy(send_data_buf + sizeof(n_tmp_id) * 2, &n_seq, sizeof(n_seq));

-
    send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq)] = type;
    send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq) + 1] = conn_info.my_roller;

@@ -483,33 +422,24 @@ int send_safer(conn_info_t &conn_info,char type,const char* data,int len)  //saf

    int new_len = len + sizeof(n_seq) + sizeof(n_tmp_id) * 2 + 2;

-	if(g_fix_gro==0)
-    {
-        if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0)
-        {
+    if (g_fix_gro == 0) {
+        if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0) {
            return -1;
        }
-    }
-	else
-    {
-        if (my_encrypt(send_data_buf, send_data_buf2+2, new_len) != 0)
-        {
+    } else {
+        if (my_encrypt(send_data_buf, send_data_buf2 + 2, new_len) != 0) {
            return -1;
        }
        write_u16(send_data_buf2, new_len);
        new_len += 2;
-	if(cipher_mode==cipher_xor)
-	{
+        if (cipher_mode == cipher_xor) {
            send_data_buf2[0] ^= gro_xor[0];
            send_data_buf2[1] ^= gro_xor[1];
-	}
-	else if(cipher_mode==cipher_aes128cbc||cipher_mode==cipher_aes128cbc)
-	{
+        } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
            aes_ecb_encrypt1(send_data_buf2);
        }
    }

-
    if (send_raw0(conn_info.raw_info, send_data_buf2, new_len) != 0) return -1;

    if (after_send_raw0(conn_info.raw_info) != 0) return -1;
@@ -530,21 +460,17 @@ int send_data_safer(conn_info_t &conn_info,const char* data,int len,u32_t conv_n
    int new_len = len + sizeof(n_conv_num);
    send_safer(conn_info, 'd', send_data_buf, new_len);
    return 0;
-
 }
 int reserved_parse_safer(conn_info_t &conn_info, const char *input, int input_len, char &type, char *&data, int &len)  // subfunction for recv_safer,allow overlap
 {
    static char recv_data_buf[buf_len];

    // char *recv_data_buf=recv_data_buf0; //fix strict alias warning
-	if(my_decrypt(input,recv_data_buf,input_len)!=0)
-	{
+    if (my_decrypt(input, recv_data_buf, input_len) != 0) {
        // printf("decrypt fail\n");
        return -1;
    }

-
-
    // char *a=recv_data_buf;
    // id_t h_oppiste_id= ntohl (  *((id_t * )(recv_data_buf)) );
    my_id_t h_oppsite_id;
@@ -561,8 +487,7 @@ int reserved_parse_safer(conn_info_t &conn_info,const char * input,int input_len
    memcpy(&h_seq, recv_data_buf + sizeof(my_id_t) * 2, sizeof(h_seq));
    h_seq = ntoh64(h_seq);

-	if(h_oppsite_id!=conn_info.oppsite_id||h_my_id!=conn_info.my_id)
-	{
+    if (h_oppsite_id != conn_info.oppsite_id || h_my_id != conn_info.my_id) {
        mylog(log_debug, "id and oppsite_id verification failed %x %x %x %x \n", h_oppsite_id, conn_info.oppsite_id, h_my_id, conn_info.my_id);
        return -1;
    }
@@ -576,46 +501,37 @@ int reserved_parse_safer(conn_info_t &conn_info,const char * input,int input_len
    data = recv_data_buf + sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2;
    len = input_len - (sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2);

-
-	if(data[0]!='h'&&data[0]!='d')
-	{
+    if (data[0] != 'h' && data[0] != 'd') {
        mylog(log_debug, "first byte is not h or d  ,%x\n", data[0]);
        return -1;
    }

    uint8_t roller = data[1];

-
    type = data[0];
    data += 2;
    len -= 2;

-	if(len<0)
-	{
+    if (len < 0) {
        mylog(log_debug, "len <0 ,%d\n", len);
        return -1;
    }

-	if(roller!=conn_info.oppsite_roller)
-	{
+    if (roller != conn_info.oppsite_roller) {
        conn_info.oppsite_roller = roller;
        conn_info.last_oppsite_roller_time = get_current_time();
    }
    if (hb_mode == 0)
        conn_info.my_roller++;  // increase on a successful recv
-	else if(hb_mode==1)
-	{
+    else if (hb_mode == 1) {
        if (type == 'h')
            conn_info.my_roller++;
-	}
-	else
-	{
+    } else {
        mylog(log_fatal, "unknow hb_mode\n");
        myexit(-1);
    }

-
-	if(after_recv_raw0(conn_info.raw_info)!=0) return -1;
+    if (after_recv_raw0(conn_info.raw_info) != 0) return -1;  // TODO might need to move this function to somewhere else after --fix-gro is introduced

    return 0;
 }
@@ -624,7 +540,8 @@ int recv_safer_notused(conn_info_t &conn_info,char &type,char* &data,int &len)//
    packet_info_t &send_info = conn_info.raw_info.send_info;
    packet_info_t &recv_info = conn_info.raw_info.recv_info;

-	char * recv_data;int recv_len;
+    char *recv_data;
+    int recv_len;
    // static char recv_data_buf[buf_len];

    if (recv_raw0(conn_info.raw_info, recv_data, recv_len) != 0) return -1;
@@ -637,7 +554,8 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
    packet_info_t &send_info = conn_info.raw_info.send_info;
    packet_info_t &recv_info = conn_info.raw_info.recv_info;

-    char * recv_data;int recv_len;
+    char *recv_data;
+    int recv_len;
    assert(type_arr.empty());
    assert(data_arr.empty());

@@ -647,55 +565,45 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
    char *data;
    int len;

-    if(g_fix_gro==0)
-    {
+    if (g_fix_gro == 0) {
        int ret = reserved_parse_safer(conn_info, recv_data, recv_len, type, data, len);
-        if(ret==0)
-        {
+        if (ret == 0) {
            type_arr.push_back(type);
            data_arr.emplace_back(data, data + len);
            // std::copy(data,data+len,data_arr[0]);
        }
        return 0;
-    } else
-    {
+    } else {
        char *ori_recv_data = recv_data;
        int ori_recv_len = recv_len;
        // mylog(log_debug,"recv_len:%d\n",recv_len);
        int cnt = 0;
-        while(recv_len>=16)
-        {
+        while (recv_len >= 16) {
            cnt++;
            int single_len_no_xor;
            single_len_no_xor = read_u16(recv_data);
            int single_len;
-	    if(cipher_mode==cipher_xor)
-	    {
+            if (cipher_mode == cipher_xor) {
                recv_data[0] ^= gro_xor[0];
                recv_data[1] ^= gro_xor[1];
-	    }
-	    else if(cipher_mode==cipher_aes128cbc||cipher_mode==cipher_aes128cbc)
-	    {
+            } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
                aes_ecb_decrypt1(recv_data);
            }
            single_len = read_u16(recv_data);
            recv_len -= 2;
            recv_data += 2;
-            if(single_len > recv_len)
-            {
+            if (single_len > recv_len) {
                mylog(log_debug, "illegal single_len %d(%d), recv_len %d left,dropped\n", single_len, single_len_no_xor, recv_len);
                break;
            }
-            if(single_len> max_data_len )
-            {
+            if (single_len > max_data_len) {
                mylog(log_warn, "single_len %d(%d) > %d, maybe you need to turn down mtu at upper level\n", single_len, single_len_no_xor, max_data_len);
                break;
            }

            int ret = reserved_parse_safer(conn_info, recv_data, single_len, type, data, len);

-            if(ret!=0)
-            {
+            if (ret != 0) {
                mylog(log_debug, "parse failed, offset= %d,single_len=%d(%d)\n", (int)(recv_data - ori_recv_data), single_len, single_len_no_xor);
            } else {
                type_arr.push_back(type);
@@ -705,15 +613,13 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
            recv_data += single_len;
            recv_len -= single_len;
        }
-        if(cnt>1)
-        {
+        if (cnt > 1) {
            mylog(log_debug, "got a suspected gro packet, %d packets recovered, recv_len=%d, loop_cnt=%d\n", (int)data_arr.size(), ori_recv_len, cnt);
        }
        return 0;
    }
 }

-
 void server_clear_function(u64_t u64)  // used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection),
 // so we have to close the fd when conv expires
 {
@@ -731,7 +637,8 @@ void server_clear_function(u64_t u64)//used in conv_manager in server mode.for s
    {
            mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd);
            myexit(-1);   //this shouldnt happen
-	}*/                //no need
+    }*/
+    // no need

    /*ret= close(fd);  //closed fd should be auto removed from epoll

--- a/connection.h
+++ b/connection.h
@@ -18,7 +18,6 @@ extern int disable_anti_replay;

 const int disable_conv_clear = 0;  // a udp connection in the multiplexer is called conversation in this program,conv for short.

-
 struct anti_replay_t  // its for anti replay attack,similar to openvpn/ipsec 's anti replay window
 {
    u64_t max_packet_received;
@@ -51,36 +50,29 @@ struct conv_manager_t  // manage the udp connections

    long long last_clear_time;

-	conv_manager_t()
-		{
+    conv_manager_t() {
        // clear_it=conv_last_active_time.begin();
        long long last_clear_time = 0;
        additional_clear_function = 0;
    }
-	~conv_manager_t()
-		{
+    ~conv_manager_t() {
        clear();
    }
-		int get_size()
-		{
+    int get_size() {
        return conv_to_data.size();
    }
-		void reserve()
-		{
+    void reserve() {
        data_to_conv.reserve(10007);
        conv_to_data.reserve(10007);
        // conv_last_active_time.reserve(10007);

        lru.mp.reserve(10007);
    }
-		void clear()
-		{
+    void clear() {
        if (disable_conv_clear) return;

-			if(additional_clear_function!=0)
-			{
-				for(auto it=conv_to_data.begin();it!=conv_to_data.end();it++)
-				{
+        if (additional_clear_function != 0) {
+            for (auto it = conv_to_data.begin(); it != conv_to_data.end(); it++) {
                // int fd=int((it->second<<32u)>>32u);
                additional_clear_function(it->second);
            }
@@ -92,53 +84,42 @@ struct conv_manager_t  // manage the udp connections
        // conv_last_active_time.clear();

        // clear_it=conv_last_active_time.begin();
-
    }
-		u32_t get_new_conv()
-		{
+    u32_t get_new_conv() {
        u32_t conv = get_true_random_number_nz();
-			while(conv_to_data.find(conv)!=conv_to_data.end())
-			{
+        while (conv_to_data.find(conv) != conv_to_data.end()) {
            conv = get_true_random_number_nz();
        }
        return conv;
    }
-		int is_conv_used(u32_t conv)
-		{
+    int is_conv_used(u32_t conv) {
        return conv_to_data.find(conv) != conv_to_data.end();
    }
-		int is_data_used(T data)
-		{
+    int is_data_used(T data) {
        return data_to_conv.find(data) != data_to_conv.end();
    }
-		u32_t find_conv_by_data(T data)
-		{
+    u32_t find_conv_by_data(T data) {
        return data_to_conv[data];
    }
-		T find_data_by_conv(u32_t conv)
-		{
+    T find_data_by_conv(u32_t conv) {
        return conv_to_data[conv];
    }
-		int update_active_time(u32_t conv)
-		{
+    int update_active_time(u32_t conv) {
        // return conv_last_active_time[conv]=get_current_time();
        lru.update(conv);
        return 0;
    }
-		int insert_conv(u32_t conv,T data)
-		{
+    int insert_conv(u32_t conv, T data) {
        data_to_conv[data] = conv;
        conv_to_data[conv] = data;
        // conv_last_active_time[conv]=get_current_time();
        lru.new_key(conv);
        return 0;
    }
-		int erase_conv(u32_t conv)
-		{
+    int erase_conv(u32_t conv) {
        if (disable_conv_clear) return 0;
        T data = conv_to_data[conv];
-			if(additional_clear_function!=0)
-			{
+        if (additional_clear_function != 0) {
            additional_clear_function(data);
        }
        conv_to_data.erase(conv);
@@ -147,20 +128,16 @@ struct conv_manager_t  // manage the udp connections
        lru.erase(conv);
        return 0;
    }
-		int clear_inactive(char * info=0)
-		{
-			if(get_current_time()-last_clear_time>conv_clear_interval)
-			{
+    int clear_inactive(char *info = 0) {
+        if (get_current_time() - last_clear_time > conv_clear_interval) {
            last_clear_time = get_current_time();
            return clear_inactive0(info);
        }
        return 0;
    }
-		int clear_inactive0(char * info)
-		{
+    int clear_inactive0(char *info) {
        if (disable_conv_clear) return 0;

-
        unordered_map<u32_t, u64_t>::iterator it;
        unordered_map<u32_t, u64_t>::iterator old_it;

@@ -173,8 +150,7 @@ struct conv_manager_t  // manage the udp connections
        num_to_clean = min(num_to_clean, size);

        my_time_t current_time = get_current_time();
-			for(;;)
-			{
+        for (;;) {
            if (cnt >= num_to_clean) break;
            if (lru.empty()) break;

@@ -184,12 +160,9 @@ struct conv_manager_t  // manage the udp connections
            if (current_time - ts < conv_timeout) break;

            erase_conv(conv);
-				if(info==0)
-				{
+            if (info == 0) {
                mylog(log_info, "conv %x cleared\n", conv);
-				}
-				else
-				{
+            } else {
                mylog(log_info, "[%s]conv %x cleared\n", info, conv);
            }
            cnt++;
@@ -197,7 +170,6 @@ struct conv_manager_t  // manage the udp connections
        return 0;
    }

-
    /*
 conv_manager_t();
 ~conv_manager_t();
@@ -223,26 +195,18 @@ struct blob_t:not_copy_able_t //used in conn_info_t.
        conv_manager_t<address_t> c;
        conv_manager_t<u64_t> s;
        // avoid templates here and there, avoid pointer and type cast
-		tmp_union_t()
-		{
-			if(program_mode==client_mode)
-			{
+        tmp_union_t() {
+            if (program_mode == client_mode) {
                new (&c) conv_manager_t<address_t>();
-			}
-			else
-			{
+            } else {
                assert(program_mode == server_mode);
                new (&s) conv_manager_t<u64_t>();
            }
        }
-		~tmp_union_t()
-		{
-			if(program_mode==client_mode)
-			{
+        ~tmp_union_t() {
+            if (program_mode == client_mode) {
                c.~conv_manager_t<address_t>();
-			}
-			else
-			{
+            } else {
                assert(program_mode == server_mode);
                s.~conv_manager_t<u64_t>();
            }
@@ -265,7 +229,6 @@ struct conn_info_t     //stores info for a raw connection.for client ,there is o
    my_id_t my_id;
    my_id_t oppsite_id;

-
    fd64_t timer_fd64;
    fd64_t udp_fd64;

@@ -282,6 +245,7 @@ struct conn_info_t     //stores info for a raw connection.for client ,there is o
    /*
            const uint32_t &ip=raw_info.recv_info.src_ip;
            const uint16_t &port=raw_info.recv_info.src_port;
+
    */
    void recover(const conn_info_t &conn_info);
    void re_init();
@@ -294,7 +258,6 @@ struct conn_info_t     //stores info for a raw connection.for client ,there is o

 struct conn_manager_t  // manager for connections. for client,we dont need conn_manager since there is only one connection.for server we use one conn_manager for all connections
 {
-
    u32_t ready_num;

    // unordered_map<int,conn_info_t *> udp_fd_mp;  //a bit dirty to used pointer,but can void unordered_map search
@@ -328,7 +291,6 @@ struct conn_manager_t  //manager for connections. for client,we dont need conn_m
    int erase(unordered_map<address_t, conn_info_t *>::iterator erase_it);
    int clear_inactive();
    int clear_inactive0();
-
 };

 extern conn_manager_t conn_manager;
--- a/doc/README.zh-cn.md
+++ b/doc/README.zh-cn.md
@@ -14,23 +14,19 @@ udp2raw tunnel，通过raw socket给UDP包加上TCP或ICMP header，进而绕过

 **提示：**

-udp2raw不是加速器，只是一个帮助你绕过UDP限制的工具。如果你需要UDP加速器，请看UDPspeeder。
+udp2raw不是加速器，只是一个帮助你绕过UDP限制的工具。如果你需要UDP“加速器” (改善UDP丢包)，请看UDPspeeder。

 UDPspeeder的repo:

 https://github.com/wangyu-/UDPspeeder
 # 支持的平台
-Linux主机，有root权限。可以是PC、android手机/平板、openwrt路由器、树莓派。主机上最好安装了iptables命令(apt/yum很容易安装)。
+Linux主机，有root权限或cap_net_raw capability.。可以是PC、android手机/平板、openwrt路由器、树莓派。主机上最好安装了iptables命令(apt/yum很容易安装)。

 Release中提供了`amd64`、`x86`、`arm`、`mips_be`、`mips_le`的预编译binary.

 ##### 对于windows和mac用户：

-可以把udp2raw运行在虚拟机上(网络必须是桥接模式)。
-
-另外可以参考：
-
-https://github.com/wangyu-/udp2raw-tunnel/wiki/在windows-mac上运行udp2raw客户端，带图形界面
+可以用[这个repo](https://github.com/wangyu-/udp2raw-multiplatform)里的udp2raw。

 ##### 对于ios和游戏主机用户：

@@ -43,17 +39,13 @@ https://github.com/wangyu-/udp2raw-tunnel/wiki/在windows-mac上运行udp2raw客
 ### 模拟TCP3次握手
 模拟TCP3次握手，模拟seq ack过程。另外还模拟了一些tcp option：MSS,sackOk,TS,TS_ack,wscale，用来使流量看起来更像是由普通的linux tcp协议栈发送的。

-### 心跳保活、自动重连，连接快速恢复，单向链路失效检测
+### 心跳保活、自动重连，连接恢复
 心跳保活、自动重连，udp2raw重连可以恢复上次的连接，重连后上层连接继续有效，底层掉线上层不掉线。有效解决上层连接断开的问题。 （功能借鉴自[kcptun-raw](https://github.com/Chion82/kcptun-raw)）（**就算你拔掉网线重插，或者重新拨号获得新ip，上层应用也不会断线**）

-Client能用单倍的超时时间检测到单向链路的失效，不管是上行还是下行，只要有一个方向失效就能被client检测到。重连只需要client发起，就可以立即被server处理，不需要等到server端的连接超时后。
+### 加密、防重放攻击
+用aes128cbc加密(或更弱的xor)，hmac-sha1(或更弱的md5/crc32/simple)做数据完整校验。用类似ipsec/openvpn的replay window机制来防止重放攻击。

-对于有大量client的情况，对于不同client,server发送的心跳是错开时间发送的，不会因为短时间发送大量的心跳而造成拥塞和延迟抖动。
-
-### 加密 防重放攻击
-用aes128cbc加密，md5/crc32做数据完整校验。用类似ipsec/openvpn的 replay window机制来防止重放攻击。
-
-设计目标是，即使攻击者可以监听到tunnel的所有包，可以选择性丢弃tunnel的任意包，可以重放任意包；攻击者也没办法获得tunnel承载的任何数据，也没办法向tunnel的数据流中通过包构造/包重放插入任何数据。
+[Notes on encryption](https://github.com/wangyu-/udp2raw-tunnel/wiki/Notes-on-encryption)

 ### 其他特性
 信道复用，client的udp端支持多个连接。
@@ -62,12 +54,10 @@ server支持多个client，也能正确处理多个连接的重连和连接恢

 NAT 穿透 ，tcp icmp udp模式都支持nat穿透。

-支持Openvz，配合finalspeed使用，可以在openvz上用tcp模式的finalspeed
+支持Openvz，配合finalspeed使用，可以在openvz上用tcp模式的finalspeed.

 支持Openwrt，没有编译依赖，容易编译到任何平台上。

-epoll实现，高并发，除了回收过期连接外，所有操作的时间复杂度都跟连接数无关。回收过期连接的操做也是柔和进行的，不会因为消耗太多cpu时间造成延迟抖动。
-
 ### 关键词
 突破udp qos,突破udp屏蔽，openvpn tcp over tcp problem,openvpn over icmp,udp to icmp tunnel,udp to tcp tunnel,udp via icmp,udp via tcp

@@ -83,10 +73,10 @@ https://github.com/wangyu-/udp2raw-tunnel/releases

 ```
 在server端运行:
-./udp2raw_amd64 -s -l0.0.0.0:4096  -r127.0.0.1:7777   -a -k "passwd" --raw-mode faketcp   --cipher-mode xor
+./udp2raw_amd64 -s -l0.0.0.0:4096  -r127.0.0.1:7777   -k "passwd" --raw-mode faketcp   --cipher-mode xor  -a

 在client端运行:
-./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096 -a -k "passwd" --raw-mode faketcp   --cipher-mode xor
+./udp2raw_amd64 -c -l0.0.0.0:3333  -r44.55.66.77:4096 -k "passwd" --raw-mode faketcp   --cipher-mode xor  -a
 ```
 (以上例子需要用root账号运行。 用非root运行udp2raw需要一些额外的步骤，具体方法请看 [这个](https://github.com/wangyu-/udp2raw-tunnel/wiki/run-udp2raw-as-non-root) 链接。用非root运行更安全)

@@ -106,9 +96,7 @@ https://github.com/wangyu-/udp2raw-tunnel/releases

 如果要在anroid上运行，请看[Android简明教程](/doc/android_guide.md)

-如果要在梅林固件的路由器上使用，添加`--lower-level auto` `--keep-rule`
-
-如果client和server无法连接，或者连接经常断开，请看一下`--seq-mode`的用法，尝试不同的seq-mode。
+`-a`选项会自动添加一条/几条iptables规则，udp2raw必须和相应的iptables规则配合才能稳定工作，一定要注意不要忘了`-a`(这是个常见错误)。 如果你不想让udp2raw自动添加iptables规则，可以自己手动添加相应的iptables规则(看一下`-g`选项)，然后以不带`-a`的方式运行udp2raw。

 # 进阶操作说明

@@ -123,10 +111,10 @@ usage:
    run as server : ./this_program -s -l server_listen_ip:server_port -r remote_address:remote_port  [options]

 common options,these options must be same on both side:
-    --raw-mode            <string>        avaliable values:faketcp(default),udp,icmp
+    --raw-mode            <string>        available values:faketcp(default),udp,icmp
    -k,--key              <string>        password to gen symetric key,default:"secret key"
-    --cipher-mode         <string>        avaliable values:aes128cbc(default),xor,none
-    --auth-mode           <string>        avaliable values:md5(default),crc32,simple,none
+    --cipher-mode         <string>        available values:aes128cbc(default),xor,none
+    --auth-mode           <string>        available values:hmac_sha1,md5(default),crc32,simple,none
    -a,--auto-rule                        auto add (and delete) iptables rule
    -g,--gen-rule                         generate iptables rule then exit,so that you can copy and
                                          add it manually.overrides -a
@@ -170,10 +158,10 @@ other options:

 用raw收发udp包也类似，只是内核回复的是icmp unreachable。而用raw 收发icmp，内核会自动回复icmp echo。都需要相应的iptables规则。
 ### `--cipher-mode` 和 `--auth-mode` 
-如果要最大的安全性建议用aes128cbc+md5。如果要运行在路由器上，建议用xor+simple，可以节省CPU。但是注意xor+simple只能骗过防火墙的包检测，不能防止真正的攻击者。
+如果要最大的安全性建议用aes128cbc+hmac_sha1。如果要运行在路由器上，建议用xor+simple，可以节省CPU。但是注意xor+simple只能骗过防火墙的包检测，不能防止真正的攻击者。

 ### `--seq-mode`
-facktcp模式并没有模拟tcp的全部。所以理论上有办法把faketcp和真正的tcp流量区分开来（虽然大部分ISP不太可能做这种程度的包检测）。seq-mode可以改变一些seq ack的行为。如果遇到了连接问题，可以尝试更改。在我这边的移动线路用3种模式都没问题。
+faketcp模式并没有模拟tcp的全部。所以理论上有办法把faketcp和真正的tcp流量区分开来（虽然大部分ISP不太可能做这种程度的包检测）。seq-mode可以改变一些seq ack的行为。如果遇到了连接问题，可以尝试更改。在我这边的移动线路用3种模式都没问题。

 ### `--keep-rule`
 定期主动检查iptables，如果udp2raw添加的iptables规则丢了，就重新添加。在一些iptables可能会被其他程序清空的情况下(比如梅林固件和openwrt的路由器)格外有用。
@@ -274,25 +262,6 @@ raw_mode: faketcp  cipher_mode: aes128cbc  auth_mode: md5
 [udp2raw+kcptun step_by_step教程](kcptun_step_by_step.md)
 ### 中转 finalspeed
 [udp2raw+finalspeed step_by_step教程](finalspeed_step_by_step.md)
-# 如何自己编译
-[编译教程](build_guide.zh-cn.md)
-# 相关repo
-### kcptun-raw
-udp2raw was inspired by kcptun-raw,which modified kcptun to support tcp mode.
-
-https://github.com/Chion82/kcptun-raw
-### relayRawSocket
-kcptun-raw was inspired by relayRawSocket. A simple  udp to raw tunnel,wrote in python
-
-https://github.com/linhua55/some_kcptun_tools/tree/master/relayRawSocket
-### kcpraw
-another project of kcptun with tcp mode
-
-https://github.com/ccsexyz/kcpraw
-### icmptunnel
-Transparently tunnel your IP traffic through ICMP echo and reply packets.
-
-https://github.com/DhavalKapil/icmptunnel

 # wiki

--- a/encrypt.cpp
+++ b/encrypt.cpp
@@ -28,9 +28,20 @@ unsigned char cipher_key_decrypt[cipher_key_len + 100];  //key for aes etc.

 char gro_xor[256 + 100];  // dirty fix for gro

-unordered_map<int, const char *> auth_mode_tostring = {{auth_none, "none"}, {auth_md5, "md5"}, {auth_crc32, "crc32"},{auth_simple,"simple"},{auth_hmac_sha1,"hmac_sha1"},};
+unordered_map<int, const char *> auth_mode_tostring = {
+    {auth_none, "none"},
+    {auth_md5, "md5"},
+    {auth_crc32, "crc32"},
+    {auth_simple, "simple"},
+    {auth_hmac_sha1, "hmac_sha1"},
+};

-unordered_map<int, const char *> cipher_mode_tostring={{cipher_none,"none"},{cipher_aes128cfb,"aes128cfb"},{cipher_aes128cbc,"aes128cbc"},{cipher_xor,"xor"},};
+unordered_map<int, const char *> cipher_mode_tostring = {
+    {cipher_none, "none"},
+    {cipher_aes128cfb, "aes128cfb"},
+    {cipher_aes128cbc, "aes128cbc"},
+    {cipher_xor, "xor"},
+};
 // TODO aes-gcm

 auth_mode_t auth_mode = auth_md5;
@@ -41,8 +52,7 @@ int aes128cfb_old=0;

 // TODO key negotiation and forward secrecy

-int my_init_keys(const char * user_passwd,int is_client)
-{
+int my_init_keys(const char *user_passwd, int is_client) {
    char tmp[1000] = "";
    int len = strlen(user_passwd);

@@ -52,11 +62,9 @@ int my_init_keys(const char * user_passwd,int is_client)

    md5((uint8_t *)tmp, strlen(tmp), (uint8_t *)normal_key);

-
    if (auth_mode == auth_hmac_sha1)
        is_hmac_used = 1;
-	if(is_hmac_used||g_fix_gro||1)
-	{
+    if (is_hmac_used || g_fix_gro || 1) {
        unsigned char salt[400] = "";
        char salt_text[400] = "udp2raw_salt1";
        md5((uint8_t *)(salt_text), strlen(salt_text), salt);  // TODO different salt per session
@@ -72,14 +80,15 @@ int my_init_keys(const char * user_passwd,int is_client)
        const char *info_cipher_encrypt = "cipher_key server-->client";
        const char *info_cipher_decrypt = "cipher_key client-->server";

-		if(is_client)
-		{
+        if (is_client) {
            const char *tmp;
-			tmp=info_hmac_encrypt; info_hmac_encrypt=info_hmac_decrypt;info_hmac_decrypt=tmp;
-			tmp=info_cipher_encrypt; info_cipher_encrypt=info_cipher_decrypt;info_cipher_decrypt=tmp;
-		}
-		else
-		{
+            tmp = info_hmac_encrypt;
+            info_hmac_encrypt = info_hmac_decrypt;
+            info_hmac_decrypt = tmp;
+            tmp = info_cipher_encrypt;
+            info_cipher_encrypt = info_cipher_decrypt;
+            info_cipher_decrypt = tmp;
+        } else {
            // nop
        }

@@ -143,8 +152,7 @@ void simple_hash(unsigned char *str,int len,unsigned char res[8])   //djb2+ sdbm
    u32_t hash2 = 0;
    int c;
    int i = 0;
-    while(c = *str++,i++!=len)
-    {
+    while (c = *str++, i++ != len) {
        // hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
        hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */
        hash2 = c + (hash2 << 6) + (hash2 << 16) - hash2;
@@ -156,16 +164,14 @@ void simple_hash(unsigned char *str,int len,unsigned char res[8])   //djb2+ sdbm
    memcpy(res + sizeof(hash), &hash2, sizeof(hash2));
 }

-int auth_md5_cal(const char *data,char * output,int &len)
-{
+int auth_md5_cal(const char *data, char *output, int &len) {
    memcpy(output, data, len);  // TODO inefficient code
    md5((unsigned char *)output, len, (unsigned char *)(output + len));
    len += 16;
    return 0;
 }

-int auth_hmac_sha1_cal(const char *data,char * output,int &len)
-{
+int auth_hmac_sha1_cal(const char *data, char *output, int &len) {
    mylog(log_trace, "auth_hmac_sha1_cal() is called\n");
    memcpy(output, data, len);  // TODO inefficient code
    sha1_hmac(hmac_key_encrypt, 20, (const unsigned char *)data, len, (unsigned char *)(output + len));
@@ -174,11 +180,9 @@ int auth_hmac_sha1_cal(const char *data,char * output,int &len)
    return 0;
 }

-int auth_hmac_sha1_verify(const char *data,int &len)
-{
+int auth_hmac_sha1_verify(const char *data, int &len) {
    mylog(log_trace, "auth_hmac_sha1_verify() is called\n");
-	if(len<20)
-	{
+    if (len < 20) {
        mylog(log_trace, "auth_hmac_sha1_verify len<20\n");
        return -1;
    }
@@ -186,8 +190,7 @@ int auth_hmac_sha1_verify(const char *data,int &len)

    sha1_hmac(hmac_key_decrypt, 20, (const unsigned char *)data, len - 20, (unsigned char *)(res));

-	if(memcmp(res,data+len-20,20)!=0)
-	{
+    if (memcmp(res, data + len - 20, 20) != 0) {
        mylog(log_trace, "auth_hmac_sha1 check failed\n");
        return -2;
    }
@@ -195,8 +198,7 @@ int auth_hmac_sha1_verify(const char *data,int &len)
    return 0;
 }

-int auth_crc32_cal(const char *data,char * output,int &len)
-{
+int auth_crc32_cal(const char *data, char *output, int &len) {
    memcpy(output, data, len);  // TODO inefficient code
    unsigned int ret = crc32h((unsigned char *)output, len);
    unsigned int ret_n = htonl(ret);
@@ -205,16 +207,14 @@ int auth_crc32_cal(const char *data,char * output,int &len)
    return 0;
 }

-int auth_simple_cal(const char *data,char * output,int &len)
-{
+int auth_simple_cal(const char *data, char *output, int &len) {
    // char res[4];
    memcpy(output, data, len);  // TODO inefficient code
    simple_hash((unsigned char *)output, len, (unsigned char *)(output + len));
    len += 8;
    return 0;
 }
-int auth_simple_verify(const char *data,int &len)
-{
+int auth_simple_verify(const char *data, int &len) {
    if (len < 8) return -1;
    unsigned char res[8];
    len -= 8;
@@ -224,16 +224,12 @@ int auth_simple_verify(const char *data,int &len)
    return 0;
 }

-
-int auth_none_cal(const char *data,char * output,int &len)
-{
+int auth_none_cal(const char *data, char *output, int &len) {
    memcpy(output, data, len);
    return 0;
 }
-int auth_md5_verify(const char *data,int &len)
-{
-	if(len<16)
-	{
+int auth_md5_verify(const char *data, int &len) {
+    if (len < 16) {
        mylog(log_trace, "auth_md5_verify len<16\n");
        return -1;
    }
@@ -241,16 +237,14 @@ int auth_md5_verify(const char *data,int &len)

    md5((unsigned char *)data, len - 16, (unsigned char *)md5_res);

-	if(memcmp(md5_res,data+len-16,16)!=0)
-	{
+    if (memcmp(md5_res, data + len - 16, 16) != 0) {
        mylog(log_trace, "auth_md5_verify md5 check failed\n");
        return -2;
    }
    len -= 16;
    return 0;
 }
-int auth_none_verify(const char *data,int &len)
-{
+int auth_none_verify(const char *data, int &len) {
    return 0;
 }

@@ -276,12 +270,10 @@ int cipher_xor_decrypt(const char * data, char *output,int &len, char *key) {
    return 0;
 }

-int padding(char *data ,int &data_len,int padding_num)
-{
+int padding(char *data, int &data_len, int padding_num) {
    int old_len = data_len;
    data_len += 1;
-	if(data_len%padding_num!=0)
-	{
+    if (data_len % padding_num != 0) {
        data_len = (data_len / padding_num) * padding_num + padding_num;
    }
    unsigned char *p = (unsigned char *)&data[data_len - 1];
@@ -289,52 +281,48 @@ int padding(char *data ,int &data_len,int padding_num)
    return 0;
 }

-int de_padding(const char *data ,int &data_len,int padding_num)
-{
+int de_padding(const char *data, int &data_len, int padding_num) {
+    if (data_len == 0) return -1;
    if ((uint8_t)data[data_len - 1] > padding_num) return -1;
    data_len -= (uint8_t)data[data_len - 1];
-	if(data_len<0)
-	{
+    if (data_len < 0) {
        return -1;
    }
    return 0;
 }
-void aes_ecb_encrypt(const char *data,char *output)
-{
+void aes_ecb_encrypt(const char *data, char *output) {
    static int first_time = 1;
    char *key = (char *)cipher_key_encrypt;
-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }
    AES_ECB_encrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output);
 }
-void aes_ecb_encrypt1(char *data)
-{
+void aes_ecb_encrypt1(char *data) {
    char buf[16];
    memcpy(buf, data, 16);
    aes_ecb_encrypt(buf, data);
 }
-void aes_ecb_decrypt(const char *data,char *output)
-{
+void aes_ecb_decrypt(const char *data, char *output) {
    static int first_time = 1;
    char *key = (char *)cipher_key_decrypt;
-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }
    AES_ECB_decrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output);
 }
-void aes_ecb_decrypt1(char *data)
-{
+void aes_ecb_decrypt1(char *data) {
    char buf[16];
    memcpy(buf, data, 16);
    aes_ecb_decrypt(buf, data);
 }
-int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_aes128cbc_encrypt(const char *data, char *output, int &len, char *key) {
    static int first_time = 1;

    char buf[buf_len];
@@ -342,83 +330,81 @@ int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)

    if (padding(buf, len, 16) < 0) return -1;

-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }

    AES_CBC_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv);
    return 0;
 }
-int cipher_aes128cfb_encrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_aes128cfb_encrypt(const char *data, char *output, int &len, char *key) {
    static int first_time = 1;
    assert(len >= 16);

    char buf[buf_len];
    memcpy(buf, data, len);  // TODO inefficient code
-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }
-	if(!aes128cfb_old)
-	{
+    if (!aes128cfb_old) {
        aes_ecb_encrypt(data, buf);  // encrypt the first block
    }

    AES_CFB_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv);
    return 0;
 }
-int auth_crc32_verify(const char *data,int &len)
-{
-	if(len<int(sizeof(unsigned int)))
-	{
+int auth_crc32_verify(const char *data, int &len) {
+    if (len < int(sizeof(unsigned int))) {
        mylog(log_debug, "auth_crc32_verify len<%d\n", int(sizeof(unsigned int)));
        return -1;
    }
    unsigned int ret = crc32h((unsigned char *)data, len - sizeof(unsigned int));
    unsigned int ret_n = htonl(ret);

-	if(memcmp(data+len-sizeof(unsigned int),&ret_n,sizeof(unsigned int))!=0)
-	{
+    if (memcmp(data + len - sizeof(unsigned int), &ret_n, sizeof(unsigned int)) != 0) {
        mylog(log_debug, "auth_crc32_verify memcmp fail\n");
        return -1;
    }
    len -= sizeof(unsigned int);
    return 0;
 }
-int cipher_none_encrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_none_encrypt(const char *data, char *output, int &len, char *key) {
    memcpy(output, data, len);
    return 0;
 }
-int cipher_aes128cbc_decrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_aes128cbc_decrypt(const char *data, char *output, int &len, char *key) {
    static int first_time = 1;
-	if(len%16 !=0) {mylog(log_debug,"len%%16!=0\n");return -1;}
-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (len % 16 != 0) {
+        mylog(log_debug, "len%%16!=0\n");
+        return -1;
+    }
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }
    AES_CBC_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv);
    if (de_padding(output, len, 16) < 0) return -1;
    return 0;
 }
-int cipher_aes128cfb_decrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_aes128cfb_decrypt(const char *data, char *output, int &len, char *key) {
    static int first_time = 1;
    if (len < 16) return -1;

-	if(aes_key_optimize)
-	{
-		if(first_time==0) key=0;
-		else first_time=0;
+    if (aes_key_optimize) {
+        if (first_time == 0)
+            key = 0;
+        else
+            first_time = 0;
    }

-	
    AES_CFB_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv);

    if (!aes128cfb_old)
@@ -427,81 +413,97 @@ int cipher_aes128cfb_decrypt(const char *data,char *output,int &len,char * key)
    return 0;
 }

-int cipher_none_decrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_none_decrypt(const char *data, char *output, int &len, char *key) {
    memcpy(output, data, len);
    return 0;
 }

-int auth_cal(const char *data,char * output,int &len)
-{
+int auth_cal(const char *data, char *output, int &len) {
    mylog(log_trace, "auth:%d\n", auth_mode);
-	switch(auth_mode)
-	{
-	case auth_crc32:return auth_crc32_cal(data, output, len);
-	case auth_md5:return auth_md5_cal(data, output, len);
-	case auth_simple:return auth_simple_cal(data, output, len);
-	case auth_none:return auth_none_cal(data, output, len);
-	case auth_hmac_sha1:return auth_hmac_sha1_cal(data,output,len);
+    switch (auth_mode) {
+        case auth_crc32:
+            return auth_crc32_cal(data, output, len);
+        case auth_md5:
+            return auth_md5_cal(data, output, len);
+        case auth_simple:
+            return auth_simple_cal(data, output, len);
+        case auth_none:
+            return auth_none_cal(data, output, len);
+        case auth_hmac_sha1:
+            return auth_hmac_sha1_cal(data, output, len);
        // default:	return auth_md5_cal(data,output,len);//default;
-	default: assert(0==1);
+        default:
+            assert(0 == 1);
    }
    return -1;
-
 }
-int auth_verify(const char *data,int &len)
-{
+int auth_verify(const char *data, int &len) {
    mylog(log_trace, "auth:%d\n", auth_mode);
-	switch(auth_mode)
-	{
-	case auth_crc32:return auth_crc32_verify(data, len);
-	case auth_md5:return auth_md5_verify(data, len);
-	case auth_simple:return auth_simple_verify(data, len);
-	case auth_none:return auth_none_verify(data, len);
-	case auth_hmac_sha1:return auth_hmac_sha1_verify(data,len);
+    switch (auth_mode) {
+        case auth_crc32:
+            return auth_crc32_verify(data, len);
+        case auth_md5:
+            return auth_md5_verify(data, len);
+        case auth_simple:
+            return auth_simple_verify(data, len);
+        case auth_none:
+            return auth_none_verify(data, len);
+        case auth_hmac_sha1:
+            return auth_hmac_sha1_verify(data, len);
        // default:	return auth_md5_verify(data,len);//default
-	default: assert(0==1);
+        default:
+            assert(0 == 1);
    }
    return -1;
-
 }
-int cipher_encrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_encrypt(const char *data, char *output, int &len, char *key) {
    mylog(log_trace, "cipher:%d\n", cipher_mode);
-	switch(cipher_mode)
-	{
-	case cipher_aes128cbc:return cipher_aes128cbc_encrypt(data,output,len, key);
-	case cipher_aes128cfb:return cipher_aes128cfb_encrypt(data,output,len, key);
-	case cipher_xor:return cipher_xor_encrypt(data,output,len, key);
-	case cipher_none:return cipher_none_encrypt(data,output,len, key);
+    switch (cipher_mode) {
+        case cipher_aes128cbc:
+            return cipher_aes128cbc_encrypt(data, output, len, key);
+        case cipher_aes128cfb:
+            return cipher_aes128cfb_encrypt(data, output, len, key);
+        case cipher_xor:
+            return cipher_xor_encrypt(data, output, len, key);
+        case cipher_none:
+            return cipher_none_encrypt(data, output, len, key);
        // default:return cipher_aes128cbc_encrypt(data,output,len, key);
-	default: assert(0==1);
+        default:
+            assert(0 == 1);
    }
    return -1;
 }
-int cipher_decrypt(const char *data,char *output,int &len,char * key)
-{
+int cipher_decrypt(const char *data, char *output, int &len, char *key) {
    mylog(log_trace, "cipher:%d\n", cipher_mode);
-	switch(cipher_mode)
-	{
-		case cipher_aes128cbc:return cipher_aes128cbc_decrypt(data,output,len, key);
-		case cipher_aes128cfb:return cipher_aes128cfb_decrypt(data,output,len, key);
-		case cipher_xor:return cipher_xor_decrypt(data,output,len, key);
-		case cipher_none:return cipher_none_decrypt(data,output,len, key);
+    switch (cipher_mode) {
+        case cipher_aes128cbc:
+            return cipher_aes128cbc_decrypt(data, output, len, key);
+        case cipher_aes128cfb:
+            return cipher_aes128cfb_decrypt(data, output, len, key);
+        case cipher_xor:
+            return cipher_xor_decrypt(data, output, len, key);
+        case cipher_none:
+            return cipher_none_decrypt(data, output, len, key);
        //	default:	return cipher_aes128cbc_decrypt(data,output,len,key);
-	default: assert(0==1);
+        default:
+            assert(0 == 1);
    }
    return -1;
 }

-int encrypt_AE(const char *data,char *output,int &len /*,char * key*/)
-{
+int encrypt_AE(const char *data, char *output, int &len /*,char * key*/) {
    mylog(log_trace, "encrypt_AE is called\n");
    char buf[buf_len];
    char buf2[buf_len];
    memcpy(buf, data, len);
-	if(cipher_encrypt(buf,buf2,len,(char *)cipher_key_encrypt) !=0) {mylog(log_debug,"cipher_encrypt failed ");return -1;}
-	if(auth_cal(buf2,output,len)!=0) {mylog(log_debug,"auth_cal failed ");return -1;}
+    if (cipher_encrypt(buf, buf2, len, (char *)cipher_key_encrypt) != 0) {
+        mylog(log_debug, "cipher_encrypt failed ");
+        return -1;
+    }
+    if (auth_cal(buf2, output, len) != 0) {
+        mylog(log_debug, "auth_cal failed ");
+        return -1;
+    }

    // printf("%d %x %x\n",len,(int)(output[0]),(int)(output[1]));
    // print_binary_chars(output,len);
@@ -510,59 +512,77 @@ int encrypt_AE(const char *data,char *output,int &len /*,char * key*/)
    return 0;
 }

-int decrypt_AE(const char *data,char *output,int &len /*,char * key*/)
-{
+int decrypt_AE(const char *data, char *output, int &len /*,char * key*/) {
    mylog(log_trace, "decrypt_AE is called\n");
    // printf("%d %x %x\n",len,(int)(data[0]),(int)(data[1]));
    // print_binary_chars(data,len);

-	if(auth_verify(data,len)!=0) {mylog(log_debug,"auth_verify failed\n");return -1;}
-	if(cipher_decrypt(data,output,len,(char *)cipher_key_decrypt) !=0) {mylog(log_debug,"cipher_decrypt failed \n"); return -1;}
+    if (auth_verify(data, len) != 0) {
+        mylog(log_debug, "auth_verify failed\n");
+        return -1;
+    }
+    if (cipher_decrypt(data, output, len, (char *)cipher_key_decrypt) != 0) {
+        mylog(log_debug, "cipher_decrypt failed \n");
+        return -1;
+    }
    return 0;
 }

-int my_encrypt(const char *data,char *output,int &len /*,char * key*/)
-{
-	if(len<0) {mylog(log_trace,"len<0");return -1;}
-	if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;}
+int my_encrypt(const char *data, char *output, int &len /*,char * key*/) {
+    if (len < 0) {
+        mylog(log_trace, "len<0");
+        return -1;
+    }
+    if (len > max_data_len) {
+        mylog(log_warn, "len>max_data_len");
+        return -1;
+    }

    if (is_hmac_used)
        return encrypt_AE(data, output, len);

-
    char buf[buf_len];
    char buf2[buf_len];
    memcpy(buf, data, len);
-	if(auth_cal(buf,buf2,len)!=0) {mylog(log_debug,"auth_cal failed ");return -1;}
-	if(cipher_encrypt(buf2,output,len,normal_key) !=0) {mylog(log_debug,"cipher_encrypt failed ");return -1;}
+    if (auth_cal(buf, buf2, len) != 0) {
+        mylog(log_debug, "auth_cal failed ");
+        return -1;
+    }
+    if (cipher_encrypt(buf2, output, len, normal_key) != 0) {
+        mylog(log_debug, "cipher_encrypt failed ");
+        return -1;
+    }
    return 0;
-
 }

-int my_decrypt(const char *data,char *output,int &len /*,char * key*/)
-{
+int my_decrypt(const char *data, char *output, int &len /*,char * key*/) {
    if (len < 0) return -1;
-	if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;}
+    if (len > max_data_len) {
+        mylog(log_warn, "len>max_data_len");
+        return -1;
+    }

    if (is_hmac_used)
        return decrypt_AE(data, output, len);

-	if(cipher_decrypt(data,output,len,normal_key) !=0) {mylog(log_debug,"cipher_decrypt failed \n"); return -1;}
-	if(auth_verify(output,len)!=0) {mylog(log_debug,"auth_verify failed\n");return -1;}
+    if (cipher_decrypt(data, output, len, normal_key) != 0) {
+        mylog(log_debug, "cipher_decrypt failed \n");
+        return -1;
+    }
+    if (auth_verify(output, len) != 0) {
+        mylog(log_debug, "auth_verify failed\n");
+        return -1;
+    }

    return 0;
 }

-
-int encrypt_AEAD(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen)
-{
+int encrypt_AEAD(uint8_t *data, uint8_t *output, int &len, uint8_t *key, uint8_t *header, int hlen) {
    // TODO
    return -1;
 }

-int decrypt_AEAD(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen)
-{
+int decrypt_AEAD(uint8_t *data, uint8_t *output, int &len, uint8_t *key, uint8_t *header, int hlen) {
    // TODO
    return -1;
 }
-
--- a/encrypt.h
+++ b/encrypt.h
@@ -1,13 +1,10 @@
 #ifndef UDP2RAW_ENCRYPTION_H_
 #define UDP2RAW_ENCRYPTION_H_

-
-
 //#include "aes.h"
 //#include "md5.h"
 #include "common.h"

-
 // using namespace std;
 // extern char key[16];

@@ -19,15 +16,20 @@ int my_init_keys(const char *,int);
 int my_encrypt(const char *data, char *output, int &len);
 int my_decrypt(const char *data, char *output, int &len);

-
 unsigned short csum(const unsigned short *ptr, int nbytes);

+enum auth_mode_t { auth_none = 0,
+                   auth_md5,
+                   auth_crc32,
+                   auth_simple,
+                   auth_hmac_sha1,
+                   auth_end };

-enum auth_mode_t {auth_none=0,auth_md5,auth_crc32,auth_simple,auth_hmac_sha1,auth_end};
-
-
-enum cipher_mode_t {cipher_none=0,cipher_aes128cbc,cipher_xor,cipher_aes128cfb,cipher_end};
-
+enum cipher_mode_t { cipher_none = 0,
+                     cipher_aes128cbc,
+                     cipher_xor,
+                     cipher_aes128cfb,
+                     cipher_end };

 extern auth_mode_t auth_mode;
 extern cipher_mode_t cipher_mode;
--- a/fd_manager.cpp
+++ b/fd_manager.cpp
@@ -5,60 +5,49 @@
 *      Author: root
 */

-
 #include "fd_manager.h"
-int fd_manager_t::fd_exist(int fd)
-{
+int fd_manager_t::fd_exist(int fd) {
    return fd_to_fd64_mp.find(fd) != fd_to_fd64_mp.end();
 }
-int fd_manager_t::exist(fd64_t fd64)
-{
+int fd_manager_t::exist(fd64_t fd64) {
    return fd64_to_fd_mp.find(fd64) != fd64_to_fd_mp.end();
 }
-int fd_manager_t::to_fd(fd64_t fd64)
-{
+int fd_manager_t::to_fd(fd64_t fd64) {
    assert(exist(fd64));
    return fd64_to_fd_mp[fd64];
 }
-void fd_manager_t::fd64_close(fd64_t fd64)
-{
+void fd_manager_t::fd64_close(fd64_t fd64) {
    assert(exist(fd64));
    int fd = fd64_to_fd_mp[fd64];
    fd64_to_fd_mp.erase(fd64);
    fd_to_fd64_mp.erase(fd);
-	if(exist_info(fd64))
-	{
+    if (exist_info(fd64)) {
        fd_info_mp.erase(fd64);
    }
    // assert(close(fd)==0);
    sock_close(fd);
 }
-void fd_manager_t::reserve(int n)
-{
+void fd_manager_t::reserve(int n) {
    fd_to_fd64_mp.reserve(n);
    fd64_to_fd_mp.reserve(n);
    fd_info_mp.reserve(n);
 }
-u64_t fd_manager_t::create(int fd)
-{
+u64_t fd_manager_t::create(int fd) {
    assert(!fd_exist(fd));
    fd64_t fd64 = counter++;
    fd_to_fd64_mp[fd] = fd64;
    fd64_to_fd_mp[fd64] = fd;
    return fd64;
 }
-fd_manager_t::fd_manager_t()
-{
+fd_manager_t::fd_manager_t() {
    counter = u32_t(-1);
    counter += 100;
    reserve(10007);
 }
-fd_info_t & fd_manager_t::get_info(fd64_t fd64)
-{
+fd_info_t& fd_manager_t::get_info(fd64_t fd64) {
    assert(exist(fd64));
    return fd_info_mp[fd64];
 }
-int fd_manager_t::exist_info(fd64_t fd64)
-{
+int fd_manager_t::exist_info(fd64_t fd64) {
    return fd_info_mp.find(fd64) != fd_info_mp.end();
 }
--- a/fd_manager.h
+++ b/fd_manager.h
@@ -12,8 +12,7 @@
 //#include "packet.h"
 #include "connection.h"

-struct fd_info_t
-{
+struct fd_info_t {
    // ip_port_t ip_port;
    conn_info_t *p_conn_info;
 };
@@ -29,6 +28,7 @@ struct fd_manager_t   //conver fd to a uniq 64bit number,avoid fd value conflict
    void reserve(int n);
    u64_t create(int fd);
    fd_manager_t();
+
   private:
    u64_t counter;
    unordered_map<int, fd64_t> fd_to_fd64_mp;
--- a/images/multiplatform/init
+++ b/images/multiplatform/init
@@ -1 +0,0 @@
-
--- a/images/multiplatform/mp1.PNG
+++ b/images/multiplatform/mp1.PNG
--- a/images/multiplatform/mp2.PNG
+++ b/images/multiplatform/mp2.PNG
--- a/images/multiplatform/mp3.PNG
+++ b/images/multiplatform/mp3.PNG
--- a/images/multiplatform/mp4.5.PNG
+++ b/images/multiplatform/mp4.5.PNG
--- a/images/multiplatform/mp4.PNG
+++ b/images/multiplatform/mp4.PNG
--- a/images/multiplatform/mp5.PNG
+++ b/images/multiplatform/mp5.PNG
--- a/images/multiplatform/mp6.PNG
+++ b/images/multiplatform/mp6.PNG
--- a/images/multiplatform/mp7.PNG
+++ b/images/multiplatform/mp7.PNG
--- a/log.cpp
+++ b/log.cpp
@@ -7,11 +7,9 @@ int enable_log_position=0;
 int enable_log_color = 1;

 void log0(const char* file, const char* function, int line, int level, const char* str, ...) {
-
    if (level > log_level) return;
    if (level > log_trace || level < 0) return;

-
    time_t timer;
    char buffer[100];
    struct tm* tm_info;
@@ -39,14 +37,12 @@ void log0(const char * file,const char * function,int line,int level,const char*
    // printf(log_color[level]);
    fflush(stdout);

-	if(log_level==log_fatal)
-	{
+    if (log_level == log_fatal) {
        about_to_exit = 1;
    }
 }

-void log_bare(int level,const char* str, ...)
-{
+void log_bare(int level, const char* str, ...) {
    if (level > log_level) return;
    if (level > log_trace || level < 0) return;
    if (enable_log_color)
@@ -58,5 +54,4 @@ void log_bare(int level,const char* str, ...)
    if (enable_log_color)
        printf("%s", RESET);
    fflush(stdout);
-
 }
--- a/log.h
+++ b/log.h
@@ -2,13 +2,10 @@
 #ifndef UDP2RAW_LOG_MYLOG_H_
 #define UDP2RAW_LOG_MYLOG_H_

-
 #include "common.h"

-
 using namespace std;

-
 #define RED "\x1B[31m"
 #define GRN "\x1B[32m"
 #define YEL "\x1B[33m"
@@ -18,7 +15,6 @@ using namespace std;
 #define WHT "\x1B[37m"
 #define RESET "\x1B[0m"

-
 const int log_never = 0;
 const int log_fatal = 1;
 const int log_error = 2;
@@ -35,7 +31,6 @@ extern int log_level;
 extern int enable_log_position;
 extern int enable_log_color;

-
 #ifdef MY_DEBUG
 #define mylog(__first_argu__dummy_abcde__, ...) printf(__VA_ARGS__)

@@ -43,12 +38,10 @@ extern int enable_log_color;
 #define mylog(...) log0(__FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
 #endif

-
 //#define mylog(__first_argu__dummy_abcde__,...) {;}

 void log0(const char* file, const char* function, int line, int level, const char* str, ...);

 void log_bare(int level, const char* str, ...);

-
 #endif
--- a/main.cpp
+++ b/main.cpp
@@ -7,32 +7,31 @@
 #include "encrypt.h"
 #include "fd_manager.h"

-void sigpipe_cb(struct ev_loop *l, ev_signal *w, int revents)
-{
+void sigpipe_cb(struct ev_loop *l, ev_signal *w, int revents) {
    mylog(log_info, "got sigpipe, ignored");
 }

-void sigterm_cb(struct ev_loop *l, ev_signal *w, int revents)
-{
+void sigterm_cb(struct ev_loop *l, ev_signal *w, int revents) {
    mylog(log_info, "got sigterm, exit");
    myexit(0);
 }

-void sigint_cb(struct ev_loop *l, ev_signal *w, int revents)
-{
+void sigint_cb(struct ev_loop *l, ev_signal *w, int revents) {
    mylog(log_info, "got sigint, exit");
    myexit(0);
 }

 int client_event_loop();
+int server_event_loop();

-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
    assert(sizeof(unsigned short) == 2);
    assert(sizeof(unsigned int) == 4);
    assert(sizeof(unsigned long long) == 8);

+#ifdef UDP2RAW_MP
    init_ws();
+#endif

    dup2(1, 2);  // redirect stderr to stdout
 #if defined(__MINGW32__)
@@ -41,41 +40,37 @@ int main(int argc, char *argv[])

    pre_process_arg(argc, argv);

-	if(program_mode==client_mode)
-	{
+    ev_signal signal_watcher_sigpipe;
+    ev_signal signal_watcher_sigterm;
+    ev_signal signal_watcher_sigint;
+
+    if (program_mode == client_mode) {
        struct ev_loop *loop = ev_default_loop(0);
 #if !defined(__MINGW32__)
-		ev_signal signal_watcher_sigpipe;
        ev_signal_init(&signal_watcher_sigpipe, sigpipe_cb, SIGPIPE);
        ev_signal_start(loop, &signal_watcher_sigpipe);
 #endif
-		ev_signal signal_watcher_sigterm;
        ev_signal_init(&signal_watcher_sigterm, sigterm_cb, SIGTERM);
        ev_signal_start(loop, &signal_watcher_sigterm);

-		ev_signal signal_watcher_sigint;
        ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT);
        ev_signal_start(loop, &signal_watcher_sigint);
-	}
-	else
-	{
-		mylog(log_fatal,"server mode not supported in multi-platform version\n");
-		myexit(-1);
-		/*
+    } else {
+#ifdef UDP2RAW_LINUX
        signal(SIGINT, signal_handler);
        signal(SIGHUP, signal_handler);
        signal(SIGKILL, signal_handler);
        signal(SIGTERM, signal_handler);
        signal(SIGQUIT, signal_handler);
-		 */
+#else
+        mylog(log_fatal, "server mode not supported in multi-platform version\n");
+        myexit(-1);
+#endif
    }
 #if !defined(__MINGW32__)
-	if(geteuid() != 0)
-	{
+    if (geteuid() != 0) {
        mylog(log_warn, "root check failed, it seems like you are using a non-root account. we can try to continue, but it may fail. If you want to run udp2raw as non-root, you have to add iptables rule manually, and grant udp2raw CAP_NET_RAW capability, check README.md in repo for more info.\n");
-	}
-	else
-	{
+    } else {
        mylog(log_warn, "you can run udp2raw with non-root account for better security. check README.md in repo for more info.\n");
    }
 #endif
@@ -91,20 +86,20 @@ int main(int argc, char *argv[])
    my_init_keys(key_string, program_mode == client_mode ? 1 : 0);

    iptables_rule();
-	//init_raw_socket();
-	//init_raw_socket() has to be done after dev dectection in mp version

-	if(program_mode==client_mode)
-	{
+#ifdef UDP2RAW_LINUX
+    init_raw_socket();
+#endif
+
+    if (program_mode == client_mode) {
        client_event_loop();
-	}
-	else
-	{
+    } else {
+#ifdef UDP2RAW_LINUX
+        server_event_loop();
+#else
        mylog(log_fatal, "server mode not supported in multi-platform version\n");
        myexit(-1);
-		/*
-		server_event_loop();
-		*/
+#endif
    }

    return 0;
--- a/166
+++ b/166
@@ -1,97 +1,133 @@
 cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 cc_local=g++
-#cc_local=/opt/cross/x86_64-linux-musl/bin/x86_64-linux-musl-g++
-#cc_mips34kc=/toolchains/OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-g++
-cc_mips24kc_be=/toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++
-cc_mips24kc_le=/toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++
-#cc_arm= /toolchains/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabi/bin/arm-linux-gnueabi-g++ -march=armv6 -marm 
-cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++
-#cc_arm=/toolchains/lede-sdk-17.01.2-brcm2708-bcm2708_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_arm1176jzf-s+vfp_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-muslgnueabi-g++
-#cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ 
-cc_tmp= /home/wangyu/OpenWrt-SDK-15.05-x86-64_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-4.8-linaro_uClibc-0.9.33.2/bin/x86_64-openwrt-linux-uclibc-g++
+cc_mips24kc_be=$(shell which g++ || /toolchains/lede-sdk-17.01.2-ar71xx-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mips_24kc_gcc-5.4.0_musl-1.1.16/bin/mips-openwrt-linux-musl-g++)
+cc_mips24kc_le=$(shell which g++ || /toolchains/lede-sdk-17.01.2-ramips-mt7621_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-mipsel_24kc_gcc-5.4.0_musl-1.1.16/bin/mipsel-openwrt-linux-musl-g++)
+cc_arm= $(shell which c++ || /toolchains/lede-sdk-17.01.2-bcm53xx_gcc-5.4.0_musl-1.1.16_eabi.Linux-x86_64/staging_dir/toolchain-arm_cortex-a9_gcc-5.4.0_musl-1.1.16_eabi/bin/arm-openwrt-linux-c++)
 cc_mingw_cross=i686-w64-mingw32-g++-posix
+cc_mac_cross=o64-clang++ -stdlib=libc++
+cc_x86=$(shell which c++ || /toolchains/lede-sdk-17.01.2-x86-generic_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-i386_pentium4_gcc-5.4.0_musl-1.1.16/bin/i486-openwrt-linux-c++)
+cc_amd64=$(shell which c++ || /toolchains/lede-sdk-17.01.2-x86-64_gcc-5.4.0_musl-1.1.16.Linux-x86_64/staging_dir/toolchain-x86_64_gcc-5.4.0_musl-1.1.16/bin/x86_64-openwrt-linux-c++)
+#cc_bcm2708=$(shell which g++ || /home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++)
+

 FLAGS= -std=c++11   -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers ${OPT}

-COMMON=main.cpp lib/md5.cpp encrypt.cpp log.cpp network.cpp common.cpp  connection.cpp misc.cpp fd_manager.cpp client.cpp -lpthread
+COMMON=main.cpp lib/md5.cpp lib/pbkdf2-sha1.cpp lib/pbkdf2-sha256.cpp encrypt.cpp log.cpp network.cpp common.cpp  connection.cpp misc.cpp fd_manager.cpp client.cpp server.cpp -lpthread

-PCAP="-lpcap"
-
-LIBNET=-D_DEFAULT_SOURCE `libnet-config --defines` `libnet-config --libs`
-
-
-SOURCES0= $(COMMON) lib/aes_faster_c/aes.cpp lib/aes_faster_c/wrapper.cpp lib/pbkdf2-sha1.cpp lib/pbkdf2-sha256.cpp
+SOURCES0= $(COMMON) lib/aes_faster_c/aes.cpp lib/aes_faster_c/wrapper.cpp
 SOURCES= ${SOURCES0} my_ev.cpp -isystem libev
-SOURCES_TINY_AES= $(COMMON) lib/aes.cpp
-SOURCES_AES_ACC=$(COMMON) $(wildcard lib/aes_acc/aes*.c)
+SOURCES_AES_ACC= $(COMMON) $(wildcard lib/aes_acc/aes*.c) my_ev.cpp -isystem libev
+PCAP="-lpcap"
+MP="-DUDP2RAW_MP"

-NAME=udp2raw_mp
-OUTPUTS=${NAME} ${NAME}_nolibnet ${NAME}.exe ${NAME}_nolibnet.exe
+
+NAME=udp2raw

 TARGETS=amd64 arm amd64_hw_aes arm_asm_aes mips24kc_be mips24kc_be_asm_aes x86 x86_asm_aes mips24kc_le mips24kc_le_asm_aes
-TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/udp2raw_\1/g'` version.txt

+TAR=${NAME}_binaries.tar.gz `echo ${TARGETS}|sed -r 's/([^ ]+)/${NAME}_\1/g'` version.txt
+
+TARGETS_MP= mingw_cross mingw_cross_wepoll mac_cross
+
+export STAGING_DIR=/tmp/    #just for supress warning of staging_dir not define
+
+# targets for nativei (non-cross) compile 
 all:git_version
-	echo "\ndo not use 'make all', instead, use 'make linux' 'make mac' 'make freebsd' 'make cygwin' \nyou can also try 'make linux_nolibnet' 'make mac_nolibnet'  'make freebsd_nolibnet'  "
+	rm -f ${NAME}
+	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${FLAGS} -lrt -ggdb -static -O2

-cygwin:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}_nolibnet          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -lrt -ggdb -static -O2 -D_GNU_SOURCE
+#dynamic link
+dynamic: git_version
+	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${FLAGS} -lrt -O2

-mingw:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}_nolibnet          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32
+#targes for general cross compile

-mingw_cross:git_version
-	${cc_mingw_cross}   -o ${NAME}_nolibnet.exe          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32
+cross:git_version
+	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -O2

-mingw_cross_wepoll:git_version
-	${cc_mingw_cross}   -o ${NAME}_nolibnet_wepoll.exe          -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32
+cross2:git_version
+	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -static -lgcc_eh -O2

-linux:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${PCAP} ${LIBNET} ${FLAGS} -lrt -ggdb -static -O2
-
-linux_nolibnet:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}_nolibnet          -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 -DNO_LIBNET
-
-freebsd:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${PCAP} ${LIBNET} ${FLAGS} -lrt -ggdb -static -O2
-
-freebsd_nolibnet:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}_nolibnet         -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 -DNO_LIBNET
-
-mac:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${PCAP} ${LIBNET} ${FLAGS} -ggdb -O2
-
-mac_nolibnet:git_version
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}_nolibnet          -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 -DNO_LIBNET
-
-mac_nolibnet_static:git_version  #it doesnt work
-	rm -f ${OUTPUTS}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} -static-libstdc++  /usr/local/Cellar/libpcap/1.8.1/lib/libpcap.a  ${FLAGS} -ggdb -O2 -DNO_LIBNET
+cross3:git_version
+	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -static -O2

+#targets only for debug purpose
 fast: git_version
 	rm -f ${NAME}
 	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${FLAGS} -lrt -ggdb
 debug: git_version
 	rm -f ${NAME}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${PCAP} ${LIBNET} ${FLAGS} -lrt -ggdb -static -O2 -Wformat-nonliteral -D MY_DEBUG 
+	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -D MY_DEBUG  -ggdb
 debug2: git_version
 	rm -f ${NAME}
-	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb
+	${cc_local}   -o ${NAME}          -I. ${SOURCES} ${FLAGS} -lrt -Wformat-nonliteral -ggdb -fsanitize=address
+
+#targets only for 'make release'
+
+mips24kc_be: git_version
+	${cc_mips24kc_be}  -o ${NAME}_$@   -I. ${SOURCES} ${FLAGS} -lrt -lgcc_eh -static -O2
+mips24kc_be_asm_aes: git_version
+	${cc_mips24kc_be}  -o ${NAME}_$@   -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -lgcc_eh -static -O2 lib/aes_acc/asm/mips_be.S
+mips24kc_le: git_version
+	${cc_mips24kc_le}  -o ${NAME}_$@   -I. ${SOURCES} ${FLAGS} -lrt -lgcc_eh -static -O2
+mips24kc_le_asm_aes: git_version
+	${cc_mips24kc_le}  -o ${NAME}_$@   -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -lgcc_eh -static -O2 lib/aes_acc/asm/mips.S
+amd64:git_version
+	${cc_amd64}   -o ${NAME}_$@    -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb
+amd64_hw_aes:git_version
+	${cc_amd64}   -o ${NAME}_$@   -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -static -O2 lib/aes_acc/asm/x64.S -lgcc_eh -ggdb
+x86:git_version
+	${cc_x86}   -o ${NAME}_$@      -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh -ggdb
+x86_asm_aes:git_version
+	${cc_x86}   -o ${NAME}_$@    -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -static -O2 lib/aes_acc/asm/x86.S -lgcc_eh -ggdb
+arm:git_version
+	${cc_arm}   -o ${NAME}_$@      -I. ${SOURCES} ${FLAGS} -lrt -static -O2 -lgcc_eh
+arm_asm_aes:git_version
+	${cc_arm}   -o ${NAME}_$@    -I. ${SOURCES_AES_ACC} ${FLAGS} -lrt -static -O2 lib/aes_acc/asm/arm.S -lgcc_eh
+
+release: ${TARGETS}
+	cp git_version.h version.txt
+	tar -zcvf ${TAR}
+
+#targets for multi-platform version (native compile)
+cygwin:git_version
+	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -lrt -ggdb -static -O2 -D_GNU_SOURCE ${MP}
+
+mingw:git_version
+	${cc_local}   -o ${NAME}_$@         -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32 ${MP}
+
+mingw_wepoll:git_version
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32 ${MP}
+
+linux:git_version
+	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -O2 ${MP}
+
+freebsd:git_version
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -lrt -ggdb -static -libverbs -O2 ${MP}
+
+mac:git_version
+	${cc_local}   -o ${NAME}_$@        -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 ${MP}
+
+#targets for multi-platform version (cross compile)
+
+mingw_cross:git_version
+	${cc_mingw_cross}   -o ${NAME}_mp.exe          -I. ${SOURCES} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -lws2_32 ${MP}
+
+mingw_cross_wepoll:git_version
+	${cc_mingw_cross}   -o ${NAME}_mp_wepoll.exe   -I. ${SOURCES0} pcap_wrapper.cpp ${FLAGS} -ggdb -static -O2 -DNO_LIBEV_EMBED -D_WIN32 -lev -lws2_32 ${MP}
+
+mac_cross:git_version
+	${cc_mac_cross}   -o ${NAME}_mp_mac            -I. ${SOURCES} ${PCAP} ${FLAGS} -ggdb -O2 ${MP}
+
+release_mp:${TARGETS_MP}
+	cp git_version.h version.txt
+	tar -zcvf ${NAME}_mp_binaries.tar.gz ${NAME}_mp.exe ${NAME}_mp_wepoll.exe ${NAME}_mp_mac version.txt

-#dynamic: git_version
-#	${cc_local}   -o ${NAME}_$@          -I. ${SOURCES} ${FLAGS} -lrt -O3

 clean:	
-	rm -f udp2raw.exe ${OUTPUTS}
-	rm -f udp2raw udp2raw_cross udp2raw_cmake udp2raw_dynamic
+	rm -f ${TAR}
+	rm -f ${NAME} ${NAME}_cross ${NAME}.exe ${NAME}_wepoll.exe ${NAME}_mac
+	rm -f ${NAME}_mp_binaries.tar.gz ${NAME}_mp.exe ${NAME}_mp_wepoll.exe ${NAME}_mp_mac
 	rm -f git_version.h

 git_version:
--- a/misc.cpp
+++ b/misc.cpp
--- a/misc.h
+++ b/misc.h
@@ -8,7 +8,6 @@
 #ifndef MISC_H_
 #define MISC_H_

-
 #include "common.h"
 #include "log.h"
 #include "network.h"
@@ -26,7 +25,6 @@ extern int enable_dns_resolve;

 extern int ttl_value;

-
 const u32_t max_handshake_conn_num = 10000;
 const u32_t max_ready_conn_num = 1000;
 const u32_t anti_replay_window_size = 4000;
@@ -45,7 +43,6 @@ const int conn_clear_min=1;
 const u32_t conv_clear_interval = 1000;  // ms
 const u32_t conn_clear_interval = 1000;  // ms

-
 const i32_t max_fail_time = 0;  // disable

 const u32_t heartbeat_interval = 600;  // ms
@@ -63,24 +60,33 @@ const uint32_t server_conn_timeout=conv_timeout+60000;//ms. this should be 60s+

 const u32_t iptables_rule_keep_interval = 20;  // unit: second;

-enum server_current_state_t {server_idle=0,server_handshake1,server_ready};  //server state machine
-enum client_current_state_t {client_idle=0,client_tcp_handshake,client_handshake1,client_handshake2,client_ready,client_tcp_handshake_dummy};//client state machine
+enum server_current_state_t { server_idle = 0,
+                              server_handshake1,
+                              server_ready };  // server state machine
+enum client_current_state_t { client_idle = 0,
+                              client_tcp_handshake,
+                              client_handshake1,
+                              client_handshake2,
+                              client_ready,
+                              client_tcp_handshake_dummy };  // client state machine

-enum raw_mode_t{mode_faketcp=0,mode_udp,mode_icmp,mode_end};
-enum program_mode_t {unset_mode=0,client_mode,server_mode};
+enum raw_mode_t { mode_faketcp = 0,
+                  mode_udp,
+                  mode_icmp,
+                  mode_end };
+enum program_mode_t { unset_mode = 0,
+                      client_mode,
+                      server_mode };

-union current_state_t
-{
+union current_state_t {
    server_current_state_t server_current_state;
    client_current_state_t client_current_state;
 };

-extern char remote_address[max_addr_len];
 // extern char remote_address[max_address_len];
-extern char local_ip[100], remote_ip[100],source_ip[100];//local_ip is for -l option,remote_ip for -r option,source for --source-ip
-extern u32_t local_ip_uint32,remote_ip_uint32,source_ip_uint32;//convert from last line.
-extern int local_port , remote_port,source_port;//similiar to local_ip  remote_ip,buf for port.source_port=0 indicates --source-port is not enabled
-
+// extern char local_ip[100], remote_ip[100],source_ip[100];//local_ip is for -l option,remote_ip for -r option,source for --source-ip
+// extern u32_t local_ip_uint32,remote_ip_uint32,source_ip_uint32;//convert from last line.
+// extern int local_port , remote_port,source_port;//similiar to local_ip  remote_ip,buf for port.source_port=0 indicates --source-port is not enabled

 extern address_t local_addr, remote_addr, source_addr;

@@ -95,13 +101,12 @@ extern my_id_t const_id;//an id used for connection recovery,its generated rando

 extern int udp_fd;                 // for client only. client use this fd to listen and handle udp connection
 extern int bind_fd;                // bind only,never send or recv.  its just a dummy fd for bind,so that other program wont occupy the same port
-//extern int epollfd; //fd for epoll
-//extern int timer_fd;   //the general timer fd for client and server.for server this is not the only timer find,every connection has a timer fd.
+extern int epollfd;                // fd for epoll
+extern int timer_fd;               // the general timer fd for client and server.for server this is not the only timer find,every connection has a timer fd.
 extern int fail_time_counter;      // determine if the max_fail_time is reached
 extern int epoll_trigger_counter;  // for debug only
 extern int debug_flag;             // for debug only

-
 extern int simple_rule;                 // deprecated.
 extern int keep_rule;                   // whether to monitor the iptables rule periodly,re-add if losted
 extern int auto_add_iptables_rule;      // if -a is set
@@ -115,7 +120,6 @@ extern int debug_resend; // debug only
 extern char key_string[1000];  // -k option
 extern char fifo_file[1000];

-
 extern raw_mode_t raw_mode;
 extern u32_t raw_ip_version;

@@ -129,9 +133,6 @@ extern int socket_buf_size;
 extern pthread_t keep_thread;
 extern int keep_thread_running;

-
-
-
 int process_lower_level_arg();
 void print_help();
 void iptables_rule();
@@ -149,8 +150,6 @@ int iptables_gen_add(const char * s,u32_t const_id);
 int iptables_rule_init(const char *s, u32_t const_id, int keep);
 int keep_iptables_rule();

-
-
 void signal_handler(int sig);

 #endif /* MISC_H_ */
--- a/my_ev.h
+++ b/my_ev.h
@@ -2,4 +2,3 @@

 #include "my_ev_common.h"
 #include "ev.h"
-
--- a/my_ev_common.h
+++ b/my_ev_common.h
@@ -1,6 +1,8 @@

 #define EV_STANDALONE 1
-#define EV_COMMON  void *data; unsigned long long u64;
+#define EV_COMMON \
+    void *data;   \
+    unsigned long long u64;
 #define EV_COMPAT3 0

 //#include <wepoll.h>
@@ -15,4 +17,3 @@

 #endif
 //#define EV_VERIFY 2
-
--- a/network.cpp
+++ b/network.cpp
--- a/network.h
+++ b/network.h
@@ -14,11 +14,11 @@ extern int use_tcp_dummy_socket;
 extern int seq_mode;
 extern int max_seq_mode;
 extern int filter_port;
-extern u32_t bind_address_uint32;
+// extern u32_t bind_address_uint32;
 extern int disable_bpf_filter;

-//extern int lower_level;
-//extern int lower_level_manual;
+extern int lower_level;
+extern int lower_level_manual;
 extern char if_name[100];
 extern char dev[100];
 extern unsigned char dest_hw_addr[];
@@ -30,7 +30,7 @@ extern int ifindex;
 extern char g_packet_buf[huge_buf_len];
 extern int g_packet_buf_len;
 extern int g_packet_buf_cnt;
-
+#ifdef UDP2RAW_MP
 extern queue_t my_queue;

 extern ev_async async_watcher;
@@ -47,17 +47,16 @@ extern int send_with_pcap;
 extern int pcap_header_captured;
 extern int pcap_header_buf[buf_len];

-struct icmphdr
-{
+struct icmphdr {
    uint8_t type;
    uint8_t code;
    uint16_t check_sum;
    uint16_t id;
    uint16_t seq;
 };
+#endif

-struct my_iphdr
-  {
+struct my_iphdr {
 #ifdef UDP2RAW_LITTLE_ENDIAN
    unsigned char ihl : 4;
    unsigned char version : 4;
@@ -77,11 +76,8 @@ struct my_iphdr
    /*The options start here. */
 };

-
-struct my_udphdr
-{
-  /*__extension__*/ union
-  {
+struct my_udphdr {
+    /*__extension__*/ union {
        struct
        {
            u_int16_t uh_sport; /* source port */
@@ -99,11 +95,8 @@ struct my_udphdr
    };
 };

-
-struct my_tcphdr
-  {
-    /*__extension__*/ union
-    {
+struct my_tcphdr {
+    /*__extension__*/ union {
        struct
        {
            u_int16_t th_sport; /* source port */
@@ -162,9 +155,7 @@ struct my_tcphdr
    };
 };

-
-struct my_ip6hdr
-  {
+struct my_ip6hdr {
 #ifdef UDP2RAW_LITTLE_ENDIAN
    uint8_t traffic_class_high : 4;
    uint8_t version : 4;
@@ -185,8 +176,7 @@ struct my_ip6hdr
    struct in6_addr dst;
 };

-struct my_icmphdr
-{
+struct my_icmphdr {
    uint8_t type;
    uint8_t code;
    uint16_t check_sum;
@@ -217,9 +207,6 @@ struct packet_info_t  //todo change this to union

    // u32_t src_ip;
    // u32_t dst_ip;
-	u32_t src_ip;
-	u32_t dst_ip;
-
    my_ip_t new_src_ip;
    my_ip_t new_dst_ip;

@@ -235,28 +222,26 @@ struct packet_info_t  //todo change this to union

    u32_t ts, ts_ack;

-
    uint16_t my_icmp_seq;

    bool has_ts;

-	//sockaddr_ll addr_ll;
-
    i32_t data_len;

+#ifdef UDP2RAW_LINUX
+    sockaddr_ll addr_ll;
+#endif
+
    packet_info_t();
 };

-struct raw_info_t
-{
+struct raw_info_t {
    packet_info_t send_info;
    packet_info_t recv_info;
    // int last_send_len;
    // int last_recv_len;
-
    bool peek = 0;
    // bool csum=1;
-
    u32_t reserved_send_seq;
    // uint32_t first_seq,first_ack_seq;
    int rst_received = 0;
@@ -264,16 +249,19 @@ struct raw_info_t

 };  // g_raw_info;

-
-
 int init_raw_socket();

 void init_filter(int port);

 void remove_filter();

-//int init_ifindex(const char * if_name,int fd,int &index);
+#ifdef UDP2RAW_LINUX
+int init_ifindex(const char *if_name, int fd, int &index);
+#endif
+
+#ifdef UDP2RAW_MP
 int init_ifindex(const char *if_name, int &index);
+#endif

 int find_lower_level_info(u32_t ip, u32_t &dest_ip, string &if_name, string &hw);

@@ -287,6 +275,7 @@ int client_bind_to_a_new_port(int & bind_fd,u32_t local_ip_uint32);//find a free
 int client_bind_to_a_new_port2(int &fd, const address_t &address);

 int discard_raw_packet();
+int pre_recv_raw_packet();

 int send_raw_ip(raw_info_t &raw_info, const char *payload, int payloadlen);

@@ -318,5 +307,4 @@ int after_send_raw0(raw_info_t &raw_info);

 int after_recv_raw0(raw_info_t &raw_info);

-
 #endif /* NETWORK_H_ */
--- a/pcap_wrapper.cpp
+++ b/pcap_wrapper.cpp
@@ -32,26 +32,23 @@ char* (*pcap_lookupdev)(char *)=0;

 int (*pcap_findalldevs)(pcap_if_t **, char *) = 0;

-struct init_pcap_t
-{
-	init_pcap_t()
-	{
+struct init_pcap_t {
+    init_pcap_t() {
        init_pcap();
    }

 } do_it;

-static void init_npcap_dll_path()
-{
-	BOOL(WINAPI *SetDllDirectory)(LPCTSTR);
+static void init_npcap_dll_path() {
+    BOOL(WINAPI * SetDllDirectory)
+    (LPCTSTR);
    char sysdir_name[512];
    int len;

    SetDllDirectory = (BOOL(WINAPI *)(LPCTSTR))GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA");
    if (SetDllDirectory == NULL) {
        printf("Error in SetDllDirectory\n");
-	}
-	else {
+    } else {
        len = GetSystemDirectory(sysdir_name, 480);  //	be safe
        if (!len)
            printf("Error in GetSystemDirectory (%d)\n", (int)GetLastError());
@@ -61,24 +58,22 @@ static void init_npcap_dll_path()
    }
 }

-#define EXPORT_FUN(XXX) do{ XXX= (__typeof__(XXX)) GetProcAddress(wpcap, #XXX); }while(0)
-int init_pcap()
-{
+#define EXPORT_FUN(XXX)                                     \
+    do {                                                    \
+        XXX = (__typeof__(XXX))GetProcAddress(wpcap, #XXX); \
+    } while (0)
+int init_pcap() {
    HMODULE wpcap = LoadLibrary("wpcap.dll");
-	if(wpcap!=0)
-	{
+    if (wpcap != 0) {
        printf("using system32/wpcap.dll\n");
-	}
-	else
-	{
+    } else {
        init_npcap_dll_path();
        // SetDllDirectory("C:\\Windows\\System32\\Npcap\\");
        wpcap = LoadLibrary("wpcap.dll");
        if (wpcap != 0)
            printf("using system32/npcap/wpcap.dll\n");
    }
-	if(wpcap==0)
-	{
+    if (wpcap == 0) {
        printf("cant not open wpcap.dll, make sure winpcap/npcap is installed\n");
        exit(-1);
    }
@@ -121,5 +116,4 @@ int init_pcap()
    //pcap_loop = (__typeof__(pcap_loop))GetProcAddress(wpcap, "pcap_loop");
    */
    return 0;
-
 }
--- a/pcap_wrapper.h
+++ b/pcap_wrapper.h
@@ -7,14 +7,12 @@
 //#include <sys/time.h>
 //#include <stdint.h>

-struct bpf_program
-{
- char a[2000];
+struct bpf_program {
+    char a[4096];
 };

-struct pcap_t
-{
- char a[2000];
+struct pcap_t {
+    char a[4096];
 };

 typedef unsigned int bpf_u_int32;
@@ -36,7 +34,6 @@ typedef enum {
    PCAP_D_OUT
 } pcap_direction_t;

-
 struct pcap_addr {
    struct pcap_addr *next;
    struct sockaddr *addr;      /* address */
@@ -56,11 +53,8 @@ struct pcap_if {
 typedef struct pcap_if pcap_if_t;
 typedef struct pcap_addr pcap_addr_t;

-
-
 typedef unsigned char u_char;

-
 #define PCAP_ERRBUF_SIZE 256

 #define DLT_NULL 0    /* BSD loopback encapsulation */
@@ -112,16 +106,12 @@ extern char* (*pcap_lookupdev)(char *);

 extern int (*pcap_findalldevs)(pcap_if_t **, char *);

-inline int pcap_set_immediate_mode(pcap_t *,int)
-{
+inline int pcap_set_immediate_mode(pcap_t *, int) {
    return 0;
 }

-
-
 //#ifdef __cplusplus
 //}
 //#endif

 int init_pcap();
-
--- a/server.cpp
+++ b/server.cpp
@@ -0,0 +1,800 @@
+/*
+ * server.cpp
+ *
+ *  Created on: Aug 29, 2018
+ *      Author: root
+ */
+
+#ifndef UDP2RAW_MP
+
+#include "common.h"
+#include "network.h"
+#include "connection.h"
+#include "misc.h"
+#include "log.h"
+#include "lib/md5.h"
+#include "encrypt.h"
+#include "fd_manager.h"
+
+int server_on_timer_multi(conn_info_t &conn_info)  // for server. called when a timer is ready in epoll.for server,there will be one timer for every connection
+// there is also a global timer for server,but its not handled here
+{
+    char ip_port[max_addr_len];
+    // u32_t ip=conn_info.raw_info.send_info.dst_ip;
+    // u32_t port=conn_info.raw_info.send_info.dst_port;
+
+    address_t tmp_addr;
+    tmp_addr.from_ip_port_new(raw_ip_version, &conn_info.raw_info.send_info.new_dst_ip, conn_info.raw_info.send_info.dst_port);
+    // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
+    tmp_addr.to_str(ip_port);
+
+    // keep_iptables_rule();
+    mylog(log_trace, "server timer!\n");
+    raw_info_t &raw_info = conn_info.raw_info;
+
+    assert(conn_info.state.server_current_state == server_ready);
+
+    if (conn_info.state.server_current_state == server_ready) {
+        conn_info.blob->conv_manager.s.clear_inactive(ip_port);
+        /*
+        if( get_current_time()-conn_info.last_hb_recv_time>heartbeat_timeout )
+        {
+                mylog(log_trace,"%lld %lld\n",get_current_time(),conn_info.last_state_time);
+                conn_info.server_current_state=server_nothing;
+
+                //conn_manager.current_ready_ip=0;
+                //conn_manager.current_ready_port=0;
+
+                mylog(log_info,"changed state to server_nothing\n");
+                return 0;
+        }*/
+        // dont need to do this at server,conn_manger will clear expired connections
+
+        if (get_current_time() - conn_info.last_hb_sent_time < heartbeat_interval) {
+            return 0;
+        }
+
+        if (hb_mode == 0)
+            send_safer(conn_info, 'h', hb_buf, 0);  /////////////send
+        else
+            send_safer(conn_info, 'h', hb_buf, hb_len);
+        conn_info.last_hb_sent_time = get_current_time();
+
+        mylog(log_debug, "heart beat sent<%x,%x>\n", conn_info.my_id, conn_info.oppsite_id);
+    } else {
+        mylog(log_fatal, "this shouldnt happen!\n");
+        myexit(-1);
+    }
+    return 0;
+}
+int server_on_raw_recv_ready(conn_info_t &conn_info, char *ip_port, char type, char *data, int data_len)  // called while the state for a connection is server_ready
+// receives data and heart beat by recv_safer.
+{
+    raw_info_t &raw_info = conn_info.raw_info;
+    packet_info_t &send_info = conn_info.raw_info.send_info;
+    packet_info_t &recv_info = conn_info.raw_info.recv_info;
+    // char ip_port[40];
+
+    // sprintf(ip_port,"%s:%d",my_ntoa(recv_info.src_ip),recv_info.src_port);
+
+    /*
+            if (recv_info.src_ip != send_info.dst_ip
+                            || recv_info.src_port != send_info.dst_port) {
+                    mylog(log_debug, "unexpected adress\n");
+                    return 0;
+            }*/
+
+    if (type == 'h' && data_len >= 0) {
+        // u32_t tmp = ntohl(*((u32_t *) &data[sizeof(u32_t)]));
+        mylog(log_debug, "[%s][hb]received hb \n", ip_port);
+        conn_info.last_hb_recv_time = get_current_time();
+        return 0;
+    } else if (type == 'd' && data_len >= int(sizeof(u32_t))) {
+        // u32_t tmp_conv_id = ntohl(*((u32_t *) &data[0]));
+        my_id_t tmp_conv_id;
+        memcpy(&tmp_conv_id, &data[0], sizeof(tmp_conv_id));
+        tmp_conv_id = ntohl(tmp_conv_id);
+
+        if (hb_mode == 0)
+            conn_info.last_hb_recv_time = get_current_time();
+
+        mylog(log_trace, "conv:%u\n", tmp_conv_id);
+        if (!conn_info.blob->conv_manager.s.is_conv_used(tmp_conv_id)) {
+            if (conn_info.blob->conv_manager.s.get_size() >= max_conv_num) {
+                mylog(log_warn,
+                      "[%s]ignored new conv %x connect bc max_conv_num exceed\n", ip_port,
+                      tmp_conv_id);
+                return 0;
+            }
+
+            /*
+            struct sockaddr_in remote_addr_in={0};
+
+            socklen_t slen = sizeof(sockaddr_in);
+            //memset(&remote_addr_in, 0, sizeof(remote_addr_in));
+            remote_addr_in.sin_family = AF_INET;
+            remote_addr_in.sin_port = htons(remote_port);
+            remote_addr_in.sin_addr.s_addr = remote_ip_uint32;
+
+
+
+            int new_udp_fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
+
+            if (new_udp_fd < 0) {
+                    mylog(log_warn, "[%s]create udp_fd error\n",ip_port);
+                    return -1;
+            }
+            setnonblocking(new_udp_fd);
+            set_buf_size(new_udp_fd,socket_buf_size);
+
+            mylog(log_debug, "[%s]created new udp_fd %d\n",ip_port, new_udp_fd);
+            int ret = connect(new_udp_fd, (struct sockaddr *) &remote_addr_in,
+                            slen);
+            if (ret != 0) {
+                    mylog(log_warn, "udp fd connect fail\n");
+                    close(new_udp_fd);
+                    return -1;
+            }*/
+
+            int new_udp_fd = remote_addr.new_connected_udp_fd();
+            if (new_udp_fd < 0) {
+                mylog(log_warn, "[%s]new_connected_udp_fd() failed\n", ip_port);
+                return -1;
+            }
+
+            struct epoll_event ev;
+
+            fd64_t new_udp_fd64 = fd_manager.create(new_udp_fd);
+            fd_manager.get_info(new_udp_fd64).p_conn_info = &conn_info;
+
+            mylog(log_trace, "[%s]u64: %lld\n", ip_port, new_udp_fd64);
+            ev.events = EPOLLIN;
+
+            ev.data.u64 = new_udp_fd64;
+
+            int ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, new_udp_fd, &ev);
+
+            if (ret != 0) {
+                mylog(log_warn, "[%s]add udp_fd error\n", ip_port);
+                close(new_udp_fd);
+                return -1;
+            }
+
+            conn_info.blob->conv_manager.s.insert_conv(tmp_conv_id, new_udp_fd64);
+
+            // assert(conn_manager.udp_fd_mp.find(new_udp_fd)==conn_manager.udp_fd_mp.end());
+
+            // conn_manager.udp_fd_mp[new_udp_fd] = &conn_info;
+
+            // pack_u64(conn_info.raw_info.recv_info.src_ip,conn_info.raw_info.recv_info.src_port);
+
+            mylog(log_info, "[%s]new conv conv_id=%x, assigned fd=%d\n", ip_port,
+                  tmp_conv_id, new_udp_fd);
+        }
+
+        fd64_t fd64 = conn_info.blob->conv_manager.s.find_data_by_conv(tmp_conv_id);
+
+        conn_info.blob->conv_manager.s.update_active_time(tmp_conv_id);
+
+        int fd = fd_manager.to_fd(fd64);
+
+        mylog(log_trace, "[%s]received a data from fake tcp,len:%d\n", ip_port, data_len);
+        int ret = send(fd, data + sizeof(u32_t),
+                       data_len - (sizeof(u32_t)), 0);
+
+        mylog(log_trace, "[%s]%d byte sent  ,fd :%d\n ", ip_port, ret, fd);
+        if (ret < 0) {
+            mylog(log_warn, "send returned %d\n", ret);
+            // perror("what happened????");
+        }
+        return 0;
+    }
+    return 0;
+}
+
+int server_on_raw_recv_pre_ready(conn_info_t &conn_info, char *ip_port, u32_t tmp_oppsite_const_id)  // do prepare work before state change to server ready for a specifc connection
+// connection recovery is also handle here
+{
+    // u32_t ip;uint16_t port;
+    // ip=conn_info.raw_info.recv_info.src_ip;
+    // port=conn_info.raw_info.recv_info.src_port;
+    // char ip_port[40];
+    // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
+
+    mylog(log_info, "[%s]received handshake oppsite_id:%x  my_id:%x\n", ip_port, conn_info.oppsite_id, conn_info.my_id);
+
+    mylog(log_info, "[%s]oppsite const_id:%x \n", ip_port, tmp_oppsite_const_id);
+    if (conn_manager.const_id_mp.find(tmp_oppsite_const_id) == conn_manager.const_id_mp.end()) {
+        // conn_manager.const_id_mp=
+
+        if (conn_manager.ready_num >= max_ready_conn_num) {
+            mylog(log_info, "[%s]max_ready_conn_num,cant turn to ready\n", ip_port);
+            conn_info.state.server_current_state = server_idle;
+            return 0;
+        }
+
+        conn_info.prepare();
+        conn_info.state.server_current_state = server_ready;
+        conn_info.oppsite_const_id = tmp_oppsite_const_id;
+        conn_manager.ready_num++;
+        conn_manager.const_id_mp[tmp_oppsite_const_id] = &conn_info;
+
+        // conn_info.last_state_time=get_current_time(); //dont change this!!!!!!!!!!!!!!!!!!!!!!!!!
+
+        // conn_manager.current_ready_ip=ip;
+        // conn_manager.current_ready_port=port;
+
+        // my_id=conn_info.my_id;
+        // oppsite_id=conn_info.oppsite_id;
+        conn_info.last_hb_recv_time = get_current_time();
+
+        conn_info.last_hb_sent_time = conn_info.last_hb_recv_time;  //=get_current_time()
+
+        if (hb_mode == 0)
+            send_safer(conn_info, 'h', hb_buf, 0);  /////////////send
+        else
+            send_safer(conn_info, 'h', hb_buf, hb_len);
+
+        mylog(log_info, "[%s]changed state to server_ready\n", ip_port);
+        conn_info.blob->anti_replay.re_init();
+
+        // g_conn_info=conn_info;
+        int new_timer_fd;
+        set_timer_server(epollfd, new_timer_fd, conn_info.timer_fd64);
+
+        fd_manager.get_info(conn_info.timer_fd64).p_conn_info = &conn_info;
+        // assert(conn_manager.timer_fd_mp.find(new_timer_fd)==conn_manager.timer_fd_mp.end());
+        // conn_manager.timer_fd_mp[new_timer_fd] = &conn_info;//pack_u64(ip,port);
+
+        // timer_fd_mp[new_timer_fd]
+        /*
+         if(oppsite_const_id!=0&&tmp_oppsite_const_id!=oppsite_const_id)  //TODO MOVE TO READY
+         {
+         mylog(log_info,"cleared all conv bc of const id doesnt match\n");
+         conv_manager.clear();
+         }*/
+        // oppsite_const_id=tmp_oppsite_const_id;
+    } else {
+        conn_info_t &ori_conn_info = *conn_manager.const_id_mp[tmp_oppsite_const_id];
+
+        if (ori_conn_info.state.server_current_state == server_ready) {
+            if (conn_info.last_state_time < ori_conn_info.last_state_time) {
+                mylog(log_info, "[%s]conn_info.last_state_time<ori_conn_info.last_state_time. ignored new handshake\n", ip_port);
+                conn_info.state.server_current_state = server_idle;
+                conn_info.oppsite_const_id = 0;
+                return 0;
+            }
+            address_t addr1;
+            addr1.from_ip_port_new(raw_ip_version, &ori_conn_info.raw_info.recv_info.new_src_ip, ori_conn_info.raw_info.recv_info.src_port);
+            if (!conn_manager.exist(addr1))  // TODO remove this
+            {
+                mylog(log_fatal, "[%s]this shouldnt happen\n", ip_port);
+                myexit(-1);
+            }
+            address_t addr2;
+            addr2.from_ip_port_new(raw_ip_version, &conn_info.raw_info.recv_info.new_src_ip, conn_info.raw_info.recv_info.src_port);
+            if (!conn_manager.exist(addr2))  // TODO remove this
+            {
+                mylog(log_fatal, "[%s]this shouldnt happen2\n", ip_port);
+                myexit(-1);
+            }
+            conn_info_t *&p_ori = conn_manager.find_insert_p(addr1);
+            conn_info_t *&p = conn_manager.find_insert_p(addr2);
+            conn_info_t *tmp = p;
+            p = p_ori;
+            p_ori = tmp;
+
+            mylog(log_info, "[%s]grabbed a connection\n", ip_port);
+
+            // ori_conn_info.state.server_current_state=server_ready;
+            ori_conn_info.recover(conn_info);
+
+            // send_safer(ori_conn_info, 'h',hb_buf, hb_len);
+            // ori_conn_info.blob->anti_replay.re_init();
+            if (hb_mode == 0)
+                send_safer(ori_conn_info, 'h', hb_buf, 0);  /////////////send
+            else
+                send_safer(ori_conn_info, 'h', hb_buf, hb_len);
+
+            ori_conn_info.last_hb_recv_time = get_current_time();
+
+            conn_info.state.server_current_state = server_idle;
+            conn_info.oppsite_const_id = 0;
+
+        } else {
+            mylog(log_fatal, "[%s]this should never happen\n", ip_port);
+            myexit(-1);
+        }
+        return 0;
+    }
+    return 0;
+}
+int server_on_raw_recv_handshake1(conn_info_t &conn_info, char *ip_port, char *data, int data_len)  // called when server received a handshake1 packet from client
+{
+    packet_info_t &send_info = conn_info.raw_info.send_info;
+    packet_info_t &recv_info = conn_info.raw_info.recv_info;
+    raw_info_t &raw_info = conn_info.raw_info;
+
+    // u32_t ip=conn_info.raw_info.recv_info.src_ip;
+    // uint16_t port=conn_info.raw_info.recv_info.src_port;
+
+    // char ip_port[40];
+    // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
+
+    if (data_len < int(3 * sizeof(my_id_t))) {
+        mylog(log_debug, "[%s] data_len=%d too short to be a handshake\n", ip_port, data_len);
+        return -1;
+    }
+    // id_t tmp_oppsite_id=  ntohl(* ((u32_t *)&data[0]));
+    my_id_t tmp_oppsite_id;
+    memcpy(&tmp_oppsite_id, (u32_t *)&data[0], sizeof(tmp_oppsite_id));
+    tmp_oppsite_id = ntohl(tmp_oppsite_id);
+
+    // id_t tmp_my_id=ntohl(* ((u32_t *)&data[sizeof(id_t)]));
+    my_id_t tmp_my_id;
+    memcpy(&tmp_my_id, &data[sizeof(my_id_t)], sizeof(tmp_my_id));
+    tmp_my_id = ntohl(tmp_my_id);
+
+    if (tmp_my_id == 0)  // received  init handshake again
+    {
+        if (raw_mode == mode_faketcp) {
+            send_info.seq = recv_info.ack_seq;
+            send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len;
+            send_info.ts_ack = recv_info.ts;
+        }
+        if (raw_mode == mode_icmp) {
+            send_info.my_icmp_seq = recv_info.my_icmp_seq;
+        }
+        send_handshake(raw_info, conn_info.my_id, tmp_oppsite_id, const_id);  //////////////send
+
+        mylog(log_info, "[%s]changed state to server_handshake1,my_id is %x\n", ip_port, conn_info.my_id);
+    } else if (tmp_my_id == conn_info.my_id) {
+        conn_info.oppsite_id = tmp_oppsite_id;
+        // id_t tmp_oppsite_const_id=ntohl(* ((u32_t *)&data[sizeof(id_t)*2]));
+
+        my_id_t tmp_oppsite_const_id;
+        memcpy(&tmp_oppsite_const_id, &data[sizeof(my_id_t) * 2], sizeof(tmp_oppsite_const_id));
+        tmp_oppsite_const_id = ntohl(tmp_oppsite_const_id);
+
+        if (raw_mode == mode_faketcp) {
+            send_info.seq = recv_info.ack_seq;
+            send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len;
+            send_info.ts_ack = recv_info.ts;
+        }
+
+        if (raw_mode == mode_icmp) {
+            send_info.my_icmp_seq = recv_info.my_icmp_seq;
+        }
+
+        server_on_raw_recv_pre_ready(conn_info, ip_port, tmp_oppsite_const_id);
+
+    } else {
+        mylog(log_debug, "[%s]invalid my_id %x,my_id is %x\n", ip_port, tmp_my_id, conn_info.my_id);
+    }
+    return 0;
+}
+int server_on_recv_safer_multi(conn_info_t &conn_info, char type, char *data, int data_len) {
+    return 0;
+}
+int server_on_raw_recv_multi()  // called when server received an raw packet
+{
+    char dummy_buf[buf_len];
+    raw_info_t peek_raw_info;
+    peek_raw_info.peek = 1;
+    packet_info_t &peek_info = peek_raw_info.recv_info;
+    mylog(log_trace, "got a packet\n");
+    if (pre_recv_raw_packet() < 0) return -1;
+    if (peek_raw(peek_raw_info) < 0) {
+        discard_raw_packet();
+        // recv(raw_recv_fd, 0,0, 0  );//
+        // struct sockaddr saddr;
+        // socklen_t saddr_size=sizeof(saddr);
+        /// recvfrom(raw_recv_fd, 0,0, 0 ,&saddr , &saddr_size);//
+        mylog(log_trace, "peek_raw failed\n");
+        return -1;
+    } else {
+        mylog(log_trace, "peek_raw success\n");
+    }
+    // u32_t ip=peek_info.src_ip;uint16_t port=peek_info.src_port;
+
+    int data_len;
+    char *data;
+
+    address_t addr;
+    addr.from_ip_port_new(raw_ip_version, &peek_info.new_src_ip, peek_info.src_port);
+
+    char ip_port[max_addr_len];
+    addr.to_str(ip_port);
+    // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
+    mylog(log_trace, "[%s]peek_raw\n", ip_port);
+
+    if (raw_mode == mode_faketcp && peek_info.syn == 1) {
+        if (!conn_manager.exist(addr) || conn_manager.find_insert(addr).state.server_current_state != server_ready) {  // reply any syn ,before state become ready
+
+            raw_info_t tmp_raw_info;
+            if (recv_raw0(tmp_raw_info, data, data_len) < 0) {
+                return 0;
+            }
+            if (data_len >= max_data_len + 1) {
+                mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", data_len);
+                return -1;
+            }
+            if (use_tcp_dummy_socket != 0)
+                return 0;
+            raw_info_t &raw_info = tmp_raw_info;
+            packet_info_t &send_info = raw_info.send_info;
+            packet_info_t &recv_info = raw_info.recv_info;
+
+            send_info.new_src_ip = recv_info.new_dst_ip;
+            send_info.src_port = recv_info.dst_port;
+
+            send_info.dst_port = recv_info.src_port;
+            send_info.new_dst_ip = recv_info.new_src_ip;
+
+            if (lower_level) {
+                handle_lower_level(raw_info);
+            }
+
+            if (data_len == 0 && raw_info.recv_info.syn == 1 && raw_info.recv_info.ack == 0) {
+                send_info.ack_seq = recv_info.seq + 1;
+
+                send_info.psh = 0;
+                send_info.syn = 1;
+                send_info.ack = 1;
+                send_info.ts_ack = recv_info.ts;
+
+                mylog(log_info, "[%s]received syn,sent syn ack back\n", ip_port);
+                send_raw0(raw_info, 0, 0);
+                return 0;
+            }
+        } else {
+            discard_raw_packet();
+            // recv(raw_recv_fd, 0,0,0);
+        }
+        return 0;
+    }
+    if (!conn_manager.exist(addr)) {
+        if (conn_manager.mp.size() >= max_handshake_conn_num) {
+            mylog(log_info, "[%s]reached max_handshake_conn_num,ignored new handshake\n", ip_port);
+            discard_raw_packet();
+            // recv(raw_recv_fd, 0,0, 0  );//
+            return 0;
+        }
+
+        raw_info_t tmp_raw_info;
+
+        if (raw_mode == mode_icmp) {
+            tmp_raw_info.send_info.dst_port = tmp_raw_info.send_info.src_port = addr.get_port();
+        }
+        if (recv_bare(tmp_raw_info, data, data_len) < 0) {
+            return 0;
+        }
+        if (data_len < int(3 * sizeof(my_id_t))) {
+            mylog(log_debug, "[%s]too short to be a handshake\n", ip_port);
+            return -1;
+        }
+
+        // id_t zero=ntohl(* ((u32_t *)&data[sizeof(id_t)]));
+        my_id_t zero;
+        memcpy(&zero, &data[sizeof(my_id_t)], sizeof(zero));
+        zero = ntohl(zero);
+
+        if (zero != 0) {
+            mylog(log_debug, "[%s]not a invalid initial handshake\n", ip_port);
+            return -1;
+        }
+
+        mylog(log_info, "[%s]got packet from a new ip\n", ip_port);
+
+        conn_info_t &conn_info = conn_manager.find_insert(addr);
+        conn_info.raw_info = tmp_raw_info;
+        raw_info_t &raw_info = conn_info.raw_info;
+
+        packet_info_t &send_info = conn_info.raw_info.send_info;
+        packet_info_t &recv_info = conn_info.raw_info.recv_info;
+
+        // conn_info.ip_port.ip=ip;
+        // conn_info.ip_port.port=port;
+
+        send_info.new_src_ip = recv_info.new_dst_ip;
+        send_info.src_port = recv_info.dst_port;
+
+        send_info.dst_port = recv_info.src_port;
+        send_info.new_dst_ip = recv_info.new_src_ip;
+
+        if (lower_level) {
+            handle_lower_level(raw_info);
+        }
+
+        // id_t tmp_oppsite_id=  ntohl(* ((u32_t *)&data[0]));
+        // mylog(log_info,"[%s]handshake1 received %x\n",ip_port,tmp_oppsite_id);
+
+        conn_info.my_id = get_true_random_number_nz();
+
+        mylog(log_info, "[%s]created new conn,state: server_handshake1,my_id is %x\n", ip_port, conn_info.my_id);
+
+        conn_info.state.server_current_state = server_handshake1;
+        conn_info.last_state_time = get_current_time();
+
+        server_on_raw_recv_handshake1(conn_info, ip_port, data, data_len);
+        return 0;
+    }
+
+    conn_info_t &conn_info = conn_manager.find_insert(addr);  // insert if not exist
+    packet_info_t &send_info = conn_info.raw_info.send_info;
+    packet_info_t &recv_info = conn_info.raw_info.recv_info;
+    raw_info_t &raw_info = conn_info.raw_info;
+
+    if (conn_info.state.server_current_state == server_handshake1) {
+        if (recv_bare(raw_info, data, data_len) != 0) {
+            return -1;
+        }
+        return server_on_raw_recv_handshake1(conn_info, ip_port, data, data_len);
+    }
+    if (conn_info.state.server_current_state == server_ready) {
+        vector<char> type_vec;
+        vector<string> data_vec;
+        recv_safer_multi(conn_info, type_vec, data_vec);
+        if (data_vec.empty()) {
+            mylog(log_debug, "recv_safer failed!\n");
+            return -1;
+        }
+
+        for (int i = 0; i < (int)type_vec.size(); i++) {
+            char type = type_vec[i];
+            char *data = (char *)data_vec[i].c_str();  // be careful, do not append data to it
+            int data_len = data_vec[i].length();
+            server_on_raw_recv_ready(conn_info, ip_port, type, data, data_len);
+        }
+        return 0;
+    }
+
+    if (conn_info.state.server_current_state == server_idle) {
+        discard_raw_packet();
+        // recv(raw_recv_fd, 0,0, 0  );//
+        return 0;
+    }
+    mylog(log_fatal, "we should never run to here\n");
+    myexit(-1);
+    return -1;
+}
+
+int server_on_udp_recv(conn_info_t &conn_info, fd64_t fd64) {
+    char buf[buf_len];
+
+    if (conn_info.state.server_current_state != server_ready)  // TODO remove this for peformance
+    {
+        mylog(log_fatal, "p_conn_info->state.server_current_state!=server_ready!!!this shouldnt happen\n");
+        myexit(-1);
+    }
+
+    // conn_info_t &conn_info=*p_conn_info;
+
+    assert(conn_info.blob->conv_manager.s.is_data_used(fd64));
+
+    u32_t conv_id = conn_info.blob->conv_manager.s.find_conv_by_data(fd64);
+
+    int fd = fd_manager.to_fd(fd64);
+
+    int recv_len = recv(fd, buf, max_data_len + 1, 0);
+
+    mylog(log_trace, "received a packet from udp_fd,len:%d\n", recv_len);
+
+    if (recv_len == max_data_len + 1) {
+        mylog(log_warn, "huge packet, data_len > %d,dropped\n", max_data_len);
+        return -1;
+    }
+
+    if (recv_len < 0) {
+        mylog(log_debug, "udp fd,recv_len<0 continue,%s\n", strerror(errno));
+        return -1;
+    }
+
+    if (recv_len >= mtu_warn) {
+        mylog(log_warn, "huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ", recv_len, mtu_warn);
+    }
+
+    // conn_info.conv_manager->update_active_time(conv_id);  server dosnt update from upd side,only update from raw side.  (client updates at both side)
+
+    if (conn_info.state.server_current_state == server_ready) {
+        send_data_safer(conn_info, buf, recv_len, conv_id);
+        // send_data(g_packet_info_send,buf,recv_len,my_id,oppsite_id,conv_id);
+        mylog(log_trace, "send_data_safer ,sent !!\n");
+    }
+
+    return 0;
+}
+
+int server_event_loop() {
+    char buf[buf_len];
+
+    int i, j, k;
+    int ret;
+
+    if (raw_ip_version == AF_INET) {
+        if (local_addr.inner.ipv4.sin_addr.s_addr != 0) {
+            bind_addr_used = 1;
+            bind_addr.v4 = local_addr.inner.ipv4.sin_addr.s_addr;
+        }
+    } else {
+        assert(raw_ip_version == AF_INET6);
+        char zero_arr[16] = {0};
+        if (memcmp(&local_addr.inner.ipv6.sin6_addr, zero_arr, 16) != 0) {
+            bind_addr_used = 1;
+            bind_addr.v6 = local_addr.inner.ipv6.sin6_addr;
+        }
+    }
+    // bind_address_uint32=local_ip_uint32;//only server has bind adress,client sets it to zero
+
+    if (lower_level) {
+        if (lower_level_manual) {
+            init_ifindex(if_name, raw_send_fd, ifindex);
+            mylog(log_info, "we are running at lower-level (manual) mode\n");
+        } else {
+            mylog(log_info, "we are running at lower-level (auto) mode\n");
+        }
+    }
+
+    if (raw_mode == mode_faketcp) {
+        bind_fd = socket(local_addr.get_type(), SOCK_STREAM, 0);
+    } else if (raw_mode == mode_udp || raw_mode == mode_icmp)  // bind an adress to avoid collision,for icmp,there is no port,just bind a udp port
+    {
+        bind_fd = socket(local_addr.get_type(), SOCK_DGRAM, 0);
+    }
+
+    // struct sockaddr_in temp_bind_addr={0};
+    // bzero(&temp_bind_addr, sizeof(temp_bind_addr));
+
+    // temp_bind_addr.sin_family = AF_INET;
+    // temp_bind_addr.sin_port = local_addr.get_port();
+    // temp_bind_addr.sin_addr.s_addr = local_addr.inner.ipv4.sin_addr.s_addr;
+
+    if (bind(bind_fd, (struct sockaddr *)&local_addr.inner, local_addr.get_len()) != 0) {
+        mylog(log_fatal, "bind fail\n");
+        myexit(-1);
+    }
+
+    if (raw_mode == mode_faketcp) {
+        if (listen(bind_fd, SOMAXCONN) != 0) {
+            mylog(log_fatal, "listen fail\n");
+            myexit(-1);
+        }
+    }
+
+    // init_raw_socket();
+    init_filter(local_addr.get_port());  // bpf filter
+
+    epollfd = epoll_create1(0);
+    const int max_events = 4096;
+
+    struct epoll_event ev, events[max_events];
+    if (epollfd < 0) {
+        mylog(log_fatal, "epoll return %d\n", epollfd);
+        myexit(-1);
+    }
+
+    ev.events = EPOLLIN;
+    ev.data.u64 = raw_recv_fd;
+
+    ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, raw_recv_fd, &ev);
+    if (ret != 0) {
+        mylog(log_fatal, "add raw_fd error\n");
+        myexit(-1);
+    }
+    int timer_fd;
+
+    set_timer(epollfd, timer_fd);
+
+    u64_t begin_time = 0;
+    u64_t end_time = 0;
+
+    mylog(log_info, "now listening at %s\n", local_addr.get_str());
+
+    int fifo_fd = -1;
+
+    if (fifo_file[0] != 0) {
+        fifo_fd = create_fifo(fifo_file);
+        ev.events = EPOLLIN;
+        ev.data.u64 = fifo_fd;
+
+        ret = epoll_ctl(epollfd, EPOLL_CTL_ADD, fifo_fd, &ev);
+        if (ret != 0) {
+            mylog(log_fatal, "add fifo_fd to epoll error %s\n", strerror(errno));
+            myexit(-1);
+        }
+        mylog(log_info, "fifo_file=%s\n", fifo_file);
+    }
+
+    while (1)  ////////////////////////
+    {
+        if (about_to_exit) myexit(0);
+
+        int nfds = epoll_wait(epollfd, events, max_events, 180 * 1000);
+        if (nfds < 0) {  // allow zero
+            if (errno == EINTR) {
+                mylog(log_info, "epoll interrupted by signal,continue\n");
+                // myexit(0);
+            } else {
+                mylog(log_fatal, "epoll_wait return %d,%s\n", nfds, strerror(errno));
+                myexit(-1);
+            }
+        }
+        int idx;
+        for (idx = 0; idx < nfds; ++idx) {
+            // mylog(log_debug,"ndfs:  %d \n",nfds);
+            epoll_trigger_counter++;
+            // printf("%d %d %d %d\n",timer_fd,raw_recv_fd,raw_send_fd,n);
+            if ((events[idx].data.u64) == (u64_t)timer_fd) {
+                if (debug_flag) begin_time = get_current_time();
+                conn_manager.clear_inactive();
+                u64_t dummy;
+                int unused = read(timer_fd, &dummy, 8);
+                // current_time_rough=get_current_time();
+                if (debug_flag) {
+                    end_time = get_current_time();
+                    mylog(log_debug, "timer_fd,%llu,%llu,%llu\n", begin_time, end_time, end_time - begin_time);
+                }
+
+                mylog(log_trace, "epoll_trigger_counter:  %d \n", epoll_trigger_counter);
+                epoll_trigger_counter = 0;
+
+            } else if (events[idx].data.u64 == (u64_t)raw_recv_fd) {
+                if (debug_flag) begin_time = get_current_time();
+                server_on_raw_recv_multi();
+                if (debug_flag) {
+                    end_time = get_current_time();
+                    mylog(log_debug, "raw_recv_fd,%llu,%llu,%llu  \n", begin_time, end_time, end_time - begin_time);
+                }
+            } else if (events[idx].data.u64 == (u64_t)fifo_fd) {
+                int len = read(fifo_fd, buf, sizeof(buf));
+                if (len < 0) {
+                    mylog(log_warn, "fifo read failed len=%d,errno=%s\n", len, strerror(errno));
+                    continue;
+                }
+                // assert(len>=0);
+                buf[len] = 0;
+                while (len >= 1 && buf[len - 1] == '\n')
+                    buf[len - 1] = 0;
+                mylog(log_info, "got data from fifo,len=%d,s=[%s]\n", len, buf);
+                mylog(log_info, "unknown command\n");
+            } else if (events[idx].data.u64 > u32_t(-1)) {
+                fd64_t fd64 = events[idx].data.u64;
+                if (!fd_manager.exist(fd64)) {
+                    mylog(log_trace, "fd64 no longer exist\n");
+                    return -1;
+                }
+                assert(fd_manager.exist_info(fd64));
+                conn_info_t *p_conn_info = fd_manager.get_info(fd64).p_conn_info;
+                conn_info_t &conn_info = *p_conn_info;
+                if (fd64 == conn_info.timer_fd64)  //////////timer_fd64
+                {
+                    if (debug_flag) begin_time = get_current_time();
+                    int fd = fd_manager.to_fd(fd64);
+                    u64_t dummy;
+                    int unused = read(fd, &dummy, 8);
+                    assert(conn_info.state.server_current_state == server_ready);  // TODO remove this for peformance
+                    server_on_timer_multi(conn_info);
+                    if (debug_flag) {
+                        end_time = get_current_time();
+                        mylog(log_debug, "(events[idx].data.u64 >>32u) == 2u ,%llu,%llu,%llu  \n", begin_time, end_time, end_time - begin_time);
+                    }
+                } else  // udp_fd64
+                {
+                    if (debug_flag) begin_time = get_current_time();
+                    server_on_udp_recv(conn_info, fd64);
+                    if (debug_flag) {
+                        end_time = get_current_time();
+                        mylog(log_debug, "(events[idx].data.u64 >>32u) == 1u,%lld,%lld,%lld  \n", begin_time, end_time, end_time - begin_time);
+                    }
+                }
+            } else {
+                mylog(log_fatal, "unknown fd,this should never happen\n");
+                myexit(-1);
+            }
+        }
+    }
+    return 0;
+}
+
+#endif
Author	SHA1	Message	Date
degfw	df4c9f1b3f	Merge `9d1aebde66` into `f49e6adedf`	2023-11-10 13:07:37 -08:00
yancey	f49e6adedf	remove Dockerfile	2023-11-06 03:19:46 -05:00
yancey	d1a9bcc4fb	try to fix linux 6.5 compile	2023-10-07 08:26:10 -04:00
Yancey Wang	bc8bd8c2f8	Merge pull request #475 from gek64/unified Fix compile errors on FreeBSD/pfSense/OPNsense	2023-09-21 16:35:45 -04:00
gek64	ca16c3a5e6	Merge branch 'wangyu-:unified' into unified	2023-07-27 21:10:28 +08:00
Yancey Wang	7abe19c7d9	Merge pull request #482 from wangyu-/revert-455-unified Revert "fix CMakeLists.txt"	2023-07-22 17:31:10 -04:00
Yancey Wang	f3f528e866	Revert "fix CMakeLists.txt"	2023-07-22 17:30:56 -04:00
Yancey Wang	ec6fad552b	Merge pull request #455 from HiGarfield/unified fix CMakeLists.txt	2023-07-22 17:09:53 -04:00
yancey	87b878a09e	fix stack-use-after-scope reported by sanitizer	2023-07-22 14:31:17 -04:00
yancey	e66eddd1d5	fix mem access problem reported by sanitizer	2023-07-22 14:00:03 -04:00
gek64	ec416515f3	Fix compile errors on freebsd	2023-06-14 16:26:10 +08:00
Yancey Wang	d12e540830	Update CMakeLists.txt	2023-06-04 21:44:44 -04:00
Yancey Wang	e7eecc8ef2	Update ISSUE_TEMPLATE.md	2023-05-10 00:08:00 -04:00
degfw	9d1aebde66	Create .gitignore	2023-03-25 06:14:34 +00:00
degfw	dc311f3b92	make graceful to use cc preferably use the compiler(s) pre-installed on the system, then use those from `/toolchains/` if they do not exist, for the convenience of users who have not downloaded toolchains.	2023-03-25 06:13:09 +00:00
HiGarfield	82ba4f7d1b	fix CMakeLists.txt	2023-02-09 01:23:51 +08:00
yancey	e5ecd33ec4	add .clang-format	2023-02-07 07:12:02 -05:00
yancey	9217e0e9e6	fix indent with clang-format	2023-02-07 07:11:49 -05:00
yancey	87b0db8862	add cmake	2023-02-07 07:02:13 -05:00
Yancey Wang	8ceaf27eda	Merge pull request #409 from brlin-tw/patch-2 fix typo (stabilization)	2022-01-26 00:59:47 -05:00
Yancey Wang	9f9e8caff6	Merge pull request #408 from brlin-tw/patch-1 fix typo (facktcp -> faketcp)	2022-01-26 00:59:25 -05:00
Yancey Wang	74f3eb90a7	Update README.md	2021-12-09 09:26:32 -05:00
林博仁(Buo-ren, Lin)	38286d5c5b	fix typo (stabilization) Signed-off-by: 林博仁(Buo-ren, Lin) <Buo.Ren.Lin@gmail.com>	2021-09-14 00:54:21 +08:00
林博仁(Buo-ren, Lin)	ec849322d7	fix typo (facktcp -> faketcp) Signed-off-by: 林博仁(Buo-ren, Lin) <Buo.Ren.Lin@gmail.com>	2021-09-14 00:34:07 +08:00
wangyu	b98a467eed	fix source argument is the same as destination	2021-03-11 00:45:26 -05:00
wangyu	25d3323427	fix mp compile; fix tcp option bug	2021-02-17 16:58:32 -05:00
wangyu	b8e9095135	add --fix-gro reminder	2021-01-11 05:58:31 -05:00
wangyu	026f97687a	fix packet_header->caplen <= max_data_len in network.cpp	2021-01-09 05:10:12 -05:00
wangyu-	f2f90a9a15	Update ISSUE_TEMPLATE.md	2020-09-20 05:16:05 -04:00
wangyu-	cf23f4d656	Update ISSUE_TEMPLATE.md	2020-09-20 05:12:33 -04:00
wangyu	59819db2dd	do not quit when got pcap error	2020-08-27 00:32:07 -04:00
wangyu	cc6ea766c4	update makefile	2020-08-18 03:19:18 -04:00
wangyu	509156fc14	change toochain for arm x86 x64	2020-08-17 19:48:23 -04:00
wangyu	cb9059bf3b	update readme.md	2020-08-17 18:26:20 -04:00
wangyu	07e2e695a6	put version.txt into release_mp	2020-07-27 11:33:26 -04:00
root	e8daf7c263	more fix of memory access	2020-07-26 19:07:17 +00:00
root	5f907e32d7	fix bad memorry access	2020-07-26 18:15:27 +00:00
wangyu	0e37c1fea4	fix macro in `5a51248cb0`	2020-07-15 19:32:14 -04:00
wangyu	606bbec351	add missed file	2020-07-15 17:23:17 -04:00
Kevin Darbyshire-Bryant	3fc23f5cf6	Fix devices and available typos Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>	2020-07-15 17:06:36 -04:00
Kevin Darbyshire-Bryant	f3c8f70f47	fix missing braces warning Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>	2020-07-15 17:02:21 -04:00
wangyu	6c27502757	unified makefile	2020-07-15 16:46:45 -04:00
wangyu	5a51248cb0	unify udpraw linux and mp branch	2020-07-15 15:29:32 -04:00
wangyu	79bb28fd12	introduce huge_buf_len and huge_data_len	2020-07-15 03:59:58 -04:00
wangyu	b3e06de4cb	do not drop truncated packet if fix_gro enabled	2020-07-15 02:59:42 -04:00
wangyu	b03ae53df6	update	2020-07-15 01:58:26 -04:00
wangyu	15c15d5bcb	aes128cfb_0	2020-07-15 01:37:47 -04:00
wangyu	2f0328a41a	update	2020-07-14 14:48:29 -04:00
wangyu	779ebdd37a	change gro scheme	2020-07-14 14:30:26 -04:00
wangyu	5340f0726e	fix last commit	2020-07-14 12:30:57 -04:00
wangyu	e95ee70351	sync `ca4a5d3`	2020-07-14 11:46:02 -04:00
root	5cc304a261	partically revert last change	2019-07-16 06:18:44 +00:00
wangyu	7636225414	update cfb	2019-07-16 00:47:36 -04:00
wangyu	f68c6e211d	update help page	2019-07-15 13:12:17 -04:00
wangyu	8c81f7673b	update --fix-gro	2019-07-15 13:00:16 -04:00
root	c1dfd4e928	--fix-gro works	2019-07-15 15:33:16 +00:00
wangyu	7e55b1e132	--fix-gro update	2019-07-15 10:49:54 -04:00
wangyu	ee787e0d4a	added --fix-gro	2019-07-15 08:36:06 -04:00
$U-DESKTOP-T772REH\wangyu$ U-DESKTOP-T772REH\wangyu	7d481d26b9	get_current_time_us() never goes back now	2019-05-02 05:39:39 +00:00
wangyu-	168ae1e2ae	Merge pull request #231 from king6cong/master fix typo	2018-12-06 23:33:00 +08:00
king6cong	6230569bbb	fix typo	2018-12-06 16:13:47 +08:00
$U-DESKTOP-T772REH\wangyu$ U-DESKTOP-T772REH\wangyu	238e85a5e4	fixed get_sock_error() format on windows	2018-11-13 06:40:58 -06:00
wangyu-	0137dba1fd	fix bug in random port bind	2018-11-13 02:37:45 -06:00
wangyu-	b6f76827b0	Merge pull request #221 from felixonmars/patch-1 Fix a typo in README	2018-11-13 16:31:03 +08:00
Felix Yan	66eb002528	Fix a typo in README	2018-11-10 17:13:38 +08:00
wangyu-	b1f0498472	fix typo	2018-09-30 09:52:45 +08:00
$U-DESKTOP-T772REH\wangyu$ U-DESKTOP-T772REH\wangyu	e5584c73be	turn down log level	2018-09-06 10:35:23 -05:00
$U-DESKTOP-T772REH\wangyu$ U-DESKTOP-T772REH\wangyu	c855a14ae8	bug fix	2018-09-06 10:35:23 -05:00
wangyu-	d77271540f	trival	2018-08-31 12:51:27 -05:00
wangyu-	6b8852f269	add warning	2018-08-31 12:45:30 -05:00
root	f0e36d7d7c	fixed a core	2018-08-31 17:10:46 +00:00
wangyu-	6153aca5d8	fix last commit	2018-08-29 20:02:42 -05:00
wangyu-	92fcdbb31a	reduce diff	2018-08-29 20:00:37 -05:00
wangyu-	c72480110f	reduce diff	2018-08-29 17:09:48 -05:00
wangyu-	8331610e7a	reduce diff	2018-08-29 16:48:45 -05:00
wangyu-	4a1e01c5a5	remove register var	2018-08-29 14:32:45 -05:00
wangyu-	6ccf6ce3dc	delete unused codes, reduce diff with non-mp version	2018-08-29 14:26:34 -05:00
wangyu-	a3535364fa	fixed fifo at client side	2018-08-29 12:29:41 -05:00
wangyu-	4e9000c6b5	sync easyfaketcp,fixed a bug in try_to_list_and_bind2	2018-08-29 12:19:09 -05:00
wangyu-	a4aba62656	sync easy-tcp and other options from mp version	2018-08-29 05:25:44 -05:00
wangyu-	7de2f800f9	server works again	2018-08-29 05:01:30 -05:00
wangyu-	233fab4fac	change client to libev, server doesnt work yet	2018-08-29 04:01:37 -05:00
wangyu-	6718627e9d	added libev files	2018-08-29 02:03:10 -05:00
wangyu-	b9d4264225	split main.cpp into client.cpp and server.cpp	2018-08-29 01:45:57 -05:00
wangyu-	0095f1da5c	fixed print of ip address	2018-08-18 12:55:02 -05:00
wangyu-	44fef508a1	supress warning	2018-08-09 02:40:59 -05:00
wangyu-	d6c0df17f5	fixed bug of server_clear_function called at client side	2018-08-03 16:16:53 -05:00
wangyu-	8ade602be1	use unrestricted union instead of struct	2018-07-28 03:42:00 -05:00
wangyu-	0980d89072	sync more updates from mp	2018-07-27 02:26:24 -05:00
wangyu-	278ade5d36	sync a few mp version update	2018-07-26 12:41:55 -05:00
wangyu-	10869eb197	changed to custom header definitons	2018-07-26 11:25:36 -05:00
wangyu-	1bc20c1cdb	changed a log level	2018-07-25 05:22:07 -05:00
wangyu-	4bb7367cfa	fix from_ip_port_new()	2018-07-25 05:16:15 -05:00
wangyu-	c0c9cc0411	Merge branch 'master' of https://github.com/wangyu-/udp2raw-tunnel	2018-07-25 02:23:27 -05:00
wangyu-	b78dc6673f	fixed flowid and traffic class in ipv6 header	2018-07-25 02:23:04 -05:00
wangyu-	f52385ccd5	fix ipv6 header struct	2018-07-25 02:06:20 -05:00
wangyu-	7ad9a6987c	trival	2018-07-25 01:52:18 -05:00
wangyu-	184b198470	icmpv6 works	2018-07-24 08:33:42 -05:00
wangyu-	2dc0670266	added function from_addres_t()	2018-07-24 05:55:59 -05:00
wangyu-	6ccd056d41	ipv6 faketcp and udp works	2018-07-24 05:36:56 -05:00
wangyu-	73daa12db1	implement raw ipv6 recv, refactor peek_raw	2018-07-23 13:52:36 -05:00
wangyu-	80d21e56c7	added send_raw_packet() and recv_raw_packet()	2018-07-23 09:50:21 -05:00
wangyu-	b0d96a3c47	Merge branch 'master' of https://github.com/wangyu-/udp2raw-tunnel	2018-07-22 08:59:26 -05:00
wangyu-	0682757631	changed src_ip and dst_ip in conn_info to new data structure	2018-07-22 08:59:09 -05:00
wangyu-	52d540df90	use csum_with_header in recv_raw_udp	2018-07-22 03:23:53 -05:00
wangyu-	256d1eee69	change IPPROTO_TCP to IPPROTO_RAW for raw socket,deleted IP_HDRINCL code	2018-07-21 14:26:07 -05:00
wangyu-	9e9ad56890	avoid MSG_PEEK	2018-07-21 14:23:13 -05:00
wangyu-	1e98ae10c2	trival	2018-07-21 07:45:10 -05:00
wangyu-	fabe2b3558	changed hmac_sha1 keylen to 20, implemented cfb for aesacc	2018-07-21 03:19:59 -05:00
wangyu-	565034dbae	add aes128cfb, delete unused files	2018-07-21 02:06:15 -05:00
wangyu-	a7849b3634	revert lru of conn_manager	2018-07-20 12:44:41 -05:00
wangyu-	3a372b9eee	fix a dead loop, moved some code blocks	2018-07-20 11:54:57 -05:00
wangyu-	2e8294ab88	simplify csum, added tcp option parser	2018-07-20 09:29:10 -05:00
wangyu-	30eb96608d	ipv6 for non-raw end works	2018-07-20 04:35:25 -05:00
wangyu-	822a807e58	moved some code blocks	2018-07-20 03:46:14 -05:00
wangyu-	f90d1abe05	change ip_port to address_t in conn_manager	2018-07-20 03:44:53 -05:00
wangyu-	2f59ce490e	Update README.md	2018-07-20 14:45:53 +08:00
wangyu-	4cb60d5997	Update README.zh-cn.md	2018-07-20 14:43:28 +08:00
wangyu-	1155f0547f	Update README.zh-cn.md	2018-07-20 14:42:03 +08:00
wangyu-	cac9c56afb	Update README.md	2018-07-20 14:35:22 +08:00
wangyu-	f050946ac5	conv_manager_t<address_t> works	2018-07-19 05:32:25 -05:00
wangyu-	2f0c02def2	fix port number bug	2018-07-19 04:16:57 -05:00
wangyu-	c71d256006	added lru collector	2018-07-19 03:18:07 -05:00
wangyu-	946b615acf	conv_manager_t changed to template	2018-07-19 01:23:25 -05:00
wangyu-	fef76af3a5	add option --dev to bind to a specific interface	2018-07-18 02:02:30 -05:00
wangyu-	736c3f46b6	address_t now works	2018-07-17 11:33:02 -05:00
wangyu-	bec9c95999	ipv6 prepare	2018-07-17 02:31:14 -05:00
wangyu-	16de522196	trival	2018-06-24 08:29:12 -05:00
wangyu-	232ec4f339	trival	2018-06-24 08:22:26 -05:00
wangyu-	d3cbbe8085	implement hkdf	2018-06-24 07:58:19 -05:00
wangyu-	e51c236c20	update TODOs	2018-06-23 20:29:27 -05:00
wangyu-	876649fd74	Merge branch 'master' of https://github.com/wangyu-/udp2raw-tunnel	2018-06-23 20:00:20 -05:00
wangyu-	8a6f89be88	add missing files	2018-06-23 20:00:03 -05:00
wangyu-	45fca0bbfe	Update README.zh-cn.md	2018-06-24 06:37:02 +08:00
wangyu-	cd92410cfe	supress compile warning	2018-06-23 17:21:39 -05:00
wangyu-	04eec19ab2	derive 32bytes key for future use	2018-06-23 16:56:20 -05:00
wangyu-	423157dbba	derive different key for different directions	2018-06-23 16:19:15 -05:00
wangyu-	94e12e6cf5	change print_binary_chars to log_debug	2018-06-22 22:28:19 -05:00
wangyu-	61512a15ec	changed kdf	2018-06-22 22:20:48 -05:00
wangyu-	65943053ff	update readme and --help	2018-06-22 13:36:09 -05:00
wangyu-	52a911b109	add hmac-sha1	2018-06-22 13:22:26 -05:00
wangyu-	3ab2543715	Update README.zh-cn.md	2018-06-21 01:51:53 +08:00
wangyu-	b9d0375a72	Update README.zh-cn.md	2018-06-21 01:50:29 +08:00
wangyu-	0fc24b6233	Update README.md	2018-06-21 01:48:32 +08:00
root	4463e21d9e	fixed a log	2018-06-20 15:13:03 +00:00