Update README.md

README.md

@@ -10,11 +10,22 @@ or
 
 ![image_vpn](/images/en/udpspeeder+openvpn3.PNG)
 
+Assume your local network to your server is lossy. Just establish a VPN connection to your server with UDPspeeder + any UDP-based VPN, access your server via this VPN connection, then your connection quality will be significantly improved. With well-tuned parameters , you can easily reduce IP or UDP/ICMP packet-loss-rate to less than 0.01% . Besides reducing packet-loss-rate, UDPspeeder can also significantly improve your TCP latency and TCP single-thread download speed.
+
 [简体中文](/doc/README.zh-cn.md)(内容更丰富)
 
 ###### Note
-You can use udp2raw with UDPspeeder together to bypass UDP firewalls.
-udp2raw：https://github.com/wangyu-/udp2raw-tunnel
+You can use udp2raw with UDPspeeder together to get better speed on some ISP with UDP QoS(UDP throttling).
+
+udp2raw's repo：
+
+https://github.com/wangyu-/udp2raw-tunnel
+
+You can also try tinyFecVPN, a lightweight high-performance VPN with build-in FEC support:
+
+tinyFecVPN's repo:
+
+https://github.com/wangyu-/tinyFecVPN
 
 
 # Efficacy
@@ -73,7 +84,7 @@ Now connecting to UDP port 3333 at the client side is equivalent to connecting t
 
 `-f20:10` means sending 10 redundant packets for every 20 original packets.
 
-`-k` enables simple XOR encryption to confuse DPI(Deep Packet Inspection)
+`-k` enables simple XOR encryption
 
 To run stably, pay attention to MTU.
 

common.cpp

@@ -260,6 +260,39 @@ unsigned short csum(const unsigned short *ptr,int nbytes) {
 
     return(answer);
 }
+
+
+unsigned short tcp_csum(const pseudo_header & ph,const unsigned short *ptr,int nbytes) {//works both for big and little endian
+
+	register long sum;
+    unsigned short oddbyte;
+    register short answer;
+
+    sum=0;
+	unsigned short * tmp= (unsigned short *)&ph;
+	for(int i=0;i<6;i++)
+	{
+		sum+=*tmp++;
+	}
+
+
+    while(nbytes>1) {
+        sum+=*ptr++;
+        nbytes-=2;
+    }
+    if(nbytes==1) {
+        oddbyte=0;
+        *((u_char*)&oddbyte)=*(u_char*)ptr;
+        sum+=oddbyte;
+    }
+
+    sum = (sum>>16)+(sum & 0xffff);
+    sum = sum + (sum>>16);
+    answer=(short)~sum;
+
+    return(answer);
+}
+
 int set_buf_size(int fd,int socket_buf_size,int force_socket_buf)
 {
 	if(force_socket_buf)

common.h

@@ -67,7 +67,7 @@ typedef u64_t my_time_t;
 const int max_data_len=2200;
 const int buf_len=max_data_len+200;
 
-const u32_t conv_clear_interval=200;
+
 //const u32_t timer_interval=400;
 ////const u32_t conv_timeout=180000;
 const u32_t conv_timeout=40000;//for test
@@ -85,12 +85,12 @@ const u32_t client_retry_interval=1000;
 
 const u32_t server_handshake_timeout=10000;// this should be much longer than clients. client retry initially ,server retry passtively*/
 
-const int conv_clear_ratio=10;  //conv grabage collecter check 1/10 of all conv one time
-const int conn_clear_ratio=10;
-const int conv_clear_min=5;
+const int conv_clear_ratio=30;  //conv grabage collecter check 1/30 of all conv one time
+const int conn_clear_ratio=50;
+const int conv_clear_min=1;
 const int conn_clear_min=1;
 
-
+const u32_t conv_clear_interval=1000;
 const u32_t conn_clear_interval=1000;
 
 
@@ -98,7 +98,7 @@ const i32_t max_fail_time=0;//disable
 
 const u32_t heartbeat_interval=1000;
 
-const u32_t timer_interval=500;//this should be smaller than heartbeat_interval and retry interval;
+const u32_t timer_interval=400;//this should be smaller than heartbeat_interval and retry interval;
 
 //const uint32_t conv_timeout=120000; //120 second
 //const u32_t conv_timeout=120000; //for test
@@ -135,7 +135,7 @@ typedef u64_t anti_replay_seq_t;
 typedef u64_t fd64_t;
 
 //enum dest_type{none=0,type_fd64_ip_port,type_fd64,type_fd64_ip_port_conv,type_fd64_conv/*,type_fd*/};
-enum dest_type{none=0,type_fd64_ip_port,type_fd64,type_fd,type_fd_ip_port/*,type_fd*/};
+enum dest_type{none=0,type_fd64_ip_port,type_fd64,type_fd,type_write_fd,type_fd_ip_port/*,type_fd*/};
 
 struct ip_port_t
 {
@@ -176,6 +176,13 @@ struct fd_info_t
 	ip_port_t ip_port;
 };
 
+struct pseudo_header {
+    u_int32_t source_address;
+    u_int32_t dest_address;
+    u_int8_t placeholder;
+    u_int8_t protocol;
+    u_int16_t tcp_length;
+};
 
 u64_t get_current_time();
 u64_t get_current_time_us();
@@ -209,6 +216,7 @@ void setnonblocking(int sock);
 int set_buf_size(int fd,int socket_buf_size,int force_socket_buf=0);
 
 unsigned short csum(const unsigned short *ptr,int nbytes);
+unsigned short tcp_csum(const pseudo_header & ph,const unsigned short *ptr,int nbytes);
 
 void  signal_handler(int sig);
 int numbers_to_char(id_t id1,id_t id2,id_t id3,char * &data,int &len);

connection.h

@@ -107,7 +107,7 @@ struct conn_info_t     //stores info for a raw connection.for client ,there is o
 	fec_encode_manager_t fec_encode_manager;
 	fec_decode_manager_t fec_decode_manager;
 	my_timer_t timer;
-	ip_port_t ip_port;
+	//ip_port_t ip_port;
 	u64_t last_active_time;
 	stat_t stat;
 	conn_info_t()

doc/README.zh-cn.md

@@ -11,9 +11,21 @@
 
 ![image0](/images/Capture2.PNG)
 
-另外，可以和udp2raw串联使用，在加速的同时把UDP伪装成TCP，防止UDP被运营商QOS或屏蔽。udp2raw: https://github.com/wangyu-/udp2raw-tunnel
+对于某些运营商，UDPspeeder跟udp2raw配合可以达到更好的速度，udp2raw负责把UDP伪装成TCP，来绕过运营商的UDP限速。
+
+udp2raw的repo:
+
+https://github.com/wangyu-/udp2raw-tunnel
+
+如果你嫌UDPspeeder+OpenVPN麻烦，你可以尝试tinyFecVPN，一个集成了UDPspeeder功能的VPN：
+
+tinyFecVPN的repo:
+
+https://github.com/wangyu-/tinyFecVPN
+
+
 #### 效果
-![image0](/images/Capture8.PNG)
+![image0](/images/cn/ping_compare_cn.PNG)
 
 ![image0](/images/cn/scp_compare.PNG)
 #### 原理简介
@@ -67,14 +79,13 @@ https://github.com/wangyu-/UDPspeeder/releases
 
 `-f20:10` 表示对每20个原始数据发送10个冗余包。`-f20:10` 和`-f 20:10`都是可以的，空格可以省略，对于所有的单字节option都是如此。对于双字节option，例如后面的`--mode 0`和`--mtu 1200`，空格不可以省略。
 
-`-k` 指定一个字符串，server/client间所有收发的包都会被异或，改变协议特征，防止UDPspeeder的协议被运营商针对。
+`-k` 指定一个字符串，开启简单的异或加密
 
+如果需要更省流量，请加上`--mode 0`，`--mode 0`模式会牺牲一点点的延迟(默认最多8ms，可调)换取更低的流量消耗。
 
 ###### 注意
 
-要为UDPspeeder加速的应用设置好MTU(不是在UDPspeeder中，是在被加速的应用中)，建议设置为1200。 
-
-另外，如果被加速的应用不能调整MTU，也可以在UDPspeeder中通过`--mode 0 --mtu 1200`设置MTU。关于`--mode 0`和`--mtu`的具体含义请看下文。
+要为UDPspeeder加速的应用设置好MTU(不是在UDPspeeder中，是在被加速的应用中)，建议设置为1200。 另外，如果被加速的应用不能调整MTU，也可以在UDPspeeder中通过`--mode 0 --mtu 1200`设置MTU。关于`--mode 0`和`--mtu`的具体解释请看下文。
 
 # 进阶操作说明
 
@@ -138,7 +149,7 @@ mode 0更省流量，在丢包率正常的情况下效果和mode 1是一样的
 
 mode 0使用起来可以不用关注mtu，因为fec编码器会帮你把包切分到合理的大小；用mode 1时必须合理设置上层应用的mtu。mode 0模式中--mtu选项决定切分的片段的长度，mode 1模式中--mtu选项只起检查作用，如果超过了--mtu指定的值，数据包会被丢弃。
 
-mode 0模式的流量消耗基本完全透明。mode 1因为涉及到数据按最大长度对齐，所以流量消耗不是完全可预期。不过就实际使用来看，mode 1消耗的额外流量不多。
+mode 0模式的流量消耗基本完全透明。mode 1因为涉及到数据按最大长度对齐，所以流量消耗不是完全可预期。<del>不过就实际使用来看，mode 1消耗的额外流量不多。</del> mode 1一般会比mode 0多消耗零点几倍的流量，对于在意流量的人，推荐用mode 0。
 
 mode 0模式数据包一般不会乱序，除非网络本身有严重乱序；mode 1模式被恢复的数据包可能会乱序，不过UDP本来就允许乱序，对绝大多数应用没有影响。mode 0模式反而可以纠正一些乱序情况。
 
@@ -165,8 +176,6 @@ mode 0模式允许你发送的数据包大小超过物理接口的MTU而几乎
 ##### `--disable-obscure`
 UDPspeeder默认情况下会对每个发出的数据包随机填充和异或一些字节(4~32字节)，这样通过抓包难以发现你发了冗余数据，防止VPS被封。这个功能只是为了小心谨慎，即使你关掉这个功能，基本上也没问题，关掉可以省一些带宽和CPU。
 
-##### `-q,--queue-len`
-编码器在做FEC前最多积攒多少个数据包，只对mode 0有效。除非是使用下文`V2版如何多倍发包`里面提到的用法，不建议改动。
 #### `--fifo` option
 用fifo(命名管道)向运行中的程序发送command。例如`--fifo fifo.file`，可用的command有：
 ```
@@ -190,16 +199,16 @@ echo mode 0 > fifo.file
 
 ### V2版如何多倍发包
 
-只要在设置-f参数时把x设置为1，fec算法就退化为多倍发包了。例如-f1:1，表示2倍发包，-f1:2表示3倍发包，以此类推。另外可以加上`--mode 0 -q1`参数，防止fec编码器试图积攒和合并数据，获得最低的延迟。
+只要在设置-f参数时把x设置为1，fec算法就退化为多倍发包了。例如-f1:1，表示2倍发包，-f1:2表示3倍发包，以此类推。另外建议加上"--mode 1"参数，防止fec编码器试图积攒和合并数据，获得最低的延迟。
 
 2倍发包的完整参数：
 
 ```
-./speederv2 -s -l0.0.0.0:4096 -r127.0.0.1:7777  -f1:1 -k "passwd" --mode 0 -q1
-./speederv2 -c -l0.0.0.0:3333 -r44.55.66.77:4096 -f1:1 -k "passwd" --mode 0 -q1
+./speederv2 -s -l0.0.0.0:4096 -r127.0.0.1:7777  -f1:1 -k "passwd" --mode 1
+./speederv2 -c -l0.0.0.0:3333 -r44.55.66.77:4096 -f1:1 -k "passwd" --mode 1
 ```
 
-使用了`--mode 0 -q1`以后，`--timeout`选项不起作用，所以不用调。
+使用了`--mode 1`以后，`--timeout`选项不起作用，所以不用调。
 
 如果你只需要多倍发包，可以直接用回V1版，V1版配置更简单，占用内存更小，而且经过了几个月的考验，很稳定。
 
@@ -227,9 +236,9 @@ FEC算法很吃CPU，初次使用建议关注UDPspeeder的CPU占用。如果CPU
 
 ### 为什么使用之后效果反而变差了？
 
-有可能是你用了mode 0参数，而又没调好参数。
+有可能是你用了`--mode 0`参数，而又没调好参数。
 
-如果你没有使用mode 0，而确实效果变差了，那很可能是因为你的运营商对UDP有限制。一般看视频和下载都是TCP流量，而用UDPspeeder中转后流量变成了UDP流量，如果运营商对UDP做了限制，就可能导致效果比不用还差。用udp2raw可以解决，udp2raw: https://github.com/wangyu-/udp2raw-tunnel
+如果你没有使用`--mode 0`，而确实效果变差了，那很可能是因为你的运营商对UDP有限制。一般看视频和下载都是TCP流量，而用UDPspeeder中转后流量变成了UDP流量，如果运营商对UDP做了限制，就可能导致效果比不用还差。用udp2raw可以解决，udp2raw: https://github.com/wangyu-/udp2raw-tunnel
 
 
 ### UDPspeeder和BBR/锐速配合
@@ -255,12 +264,18 @@ UDPspeeder和Kcptun配合，UDPspeeder和Kcptun可以并联也可以串联。
 #### UDPspeeder + OpenVPN加速任何流量，也适用于其他VPN
 ![image0](/images/Capture2.PNG)
 
-具体配置见，[UDPspeeder + openvpn config guide](/doc/udpspeeder_openvpn.md).
-
 可以和BBR/锐速叠加，不过BBR/锐速部署在VPS上只对从本地到VPS的流量有效，对从本地到第三方服务器的流量无效。
 
 需要在服务端开启ipforward和NAT。在客户端改路由表（可以手动修改，也可以由OpenVPN的redirect-gateway选项自动加好）。
 
+Linux具体配置: [UDPspeeder + openvpn config guide](/doc/udpspeeder_openvpn.md).
+
+Windows具体配置: [win10系统UDPspeeder+OpenVPN的完整设置](https://github.com/wangyu-/UDPspeeder/wiki/win10系统UDPspeeder-OpenVPN的完整设置)
+
+如果UDPspeeder + OpenVPN对你来说显得太麻烦了，你可以尝试一下tinyFecVPN,一个集成了UDPspeeder功能的VPN:
+
+https://github.com/wangyu-/tinyFecVPN/
+
 #### UDPspeeder + kcptun/finalspeed + $*** 同时加速tcp和udp流量
 如果你需要用加速的tcp看视频和下载文件，这样效果可能比没有BBR的UDPspeeder+vpn方案更好。另外，如果你需要玩游戏，但是嫌配VPN麻烦，也可以用这种方案。
 ![image0](/images/cn/speeder_kcptun.PNG)
@@ -281,9 +296,9 @@ run at client side:
 
 这就是全部的命令了。issue里有很多人困惑于怎么把tcp和udp流量"分开"，其实很简单就可以做到。
 
-如果只需要加速UDP，不需要加速TCP，可以把kcptun换成其他的任意端口转发方式，比如ncat/socat/ssh tunnel/iptables。
+如果只需要加速UDP，不需要加速TCP，可以把kcptun换成其他的任意端口转发方式，比如ncat/socat/ssh tunnel/iptables/[tinyPortMapper](https://github.com/wangyu-/tinyPortMapper/releases)。
 
-另外，如果没有kcptun只有BBR/锐速的话，也可以把kcptun换成ncat/socat/ssh tunnel/iptables。这样，TCP流量由锐速/BBR加速，UDP由UDPspeeder加速。
+另外，如果没有kcptun只有BBR/锐速的话，也可以把kcptun换成ncat/socat/ssh tunnel/iptables/[tinyPortMapper](https://github.com/wangyu-/tinyPortMapper/releases)。这样，TCP流量由锐速/BBR加速，UDP由UDPspeeder加速。
 
 #### UDPspeeder + openvpn + $*** 混合方案，也适用于其他VPN
 也是我正在用的方案。优点是可以随时在vpn和$\*\*\*方案间快速切换。
@@ -295,6 +310,20 @@ run at client side:
 
 可以和BBR/锐速叠加，BBR/锐速只要部署在VPS上就有效。
 
+也可以用[tinyFecVPN](https://github.com/wangyu-/tinyFecVPN/) + $\*\*\* ，配置起来更简单。
+
+# 应用实例
+
+#### win10系统UDPspeeder+OpenVPN的完整设置
+
+https://github.com/wangyu-/UDPspeeder/wiki/win10系统UDPspeeder-OpenVPN的完整设置
+
+
+#### 用树莓派做路由器，搭建透明代理，加速游戏主机的网络
+
+https://github.com/wangyu-/UDPspeeder/wiki/用树莓派做路由器，搭建透明代理，加速游戏主机的网络
+
+
 # 编译教程
 暂时先参考udp2raw的这篇教程，几乎一样的过程。
 

doc/udpspeeder_openvpn.md

@@ -100,3 +100,8 @@ or
 ip route add 44.55.66.77 dev XXX
 ```
 (run at client side)
+
+##### Other Info
+You can also use tinyFecVPN,a lightweight VPN with build-in FEC support:
+
+https://github.com/wangyu-/tinyFecVPN

fec_manager.cpp

@@ -146,11 +146,11 @@ fec_encode_manager_t::fec_encode_manager_t()
 	}
 	timer_fd64=fd_manager.create(timer_fd);
 
-	re_init(fec_data_num,fec_redundant_num,fec_mtu,fec_queue_len,fec_timeout,fec_mode);
+	reset_fec_parameter(g_fec_data_num,g_fec_redundant_num,g_fec_mtu,g_fec_queue_len,g_fec_timeout,g_fec_mode);
+
 
-	seq=(u32_t)get_true_random_number(); //TODO temp solution for a bug.
 }
-int fec_encode_manager_t::re_init(int data_num,int redundant_num,int mtu,int queue_len,int timeout,int mode)
+int fec_encode_manager_t::reset_fec_parameter(int data_num,int redundant_num,int mtu,int queue_len,int timeout,int mode)
 {
 	fec_data_num=data_num;
 	fec_redundant_num=redundant_num;
@@ -160,15 +160,8 @@ int fec_encode_manager_t::re_init(int data_num,int redundant_num,int mtu,int que
 	fec_mode=mode;
 
 	assert(data_num+redundant_num<max_fec_packet_num);
-	counter=0;
-	blob_encode.clear();
-	ready_for_output=0;
-	//seq=0;
 
-	itimerspec zero_its;
-	memset(&zero_its, 0, sizeof(zero_its));
-
-	timerfd_settime(timer_fd, TFD_TIMER_ABSTIME, &zero_its, 0);
+	clear();
 
 	return 0;
 }
@@ -225,15 +218,19 @@ int fec_encode_manager_t::input(char *s,int len/*,int &is_first_packet*/)
 	//int counter_back=counter;
 	assert(fec_mode==0||fec_mode==1);
 
-	if(fec_mode==0&& s!=0 &&counter==0&&blob_encode.get_shard_len(fec_data_num,len)>=fec_mtu)
+	if(fec_mode==0&& s!=0 &&counter==0)
 	{
-		mylog(log_warn,"message too long len=%d,ignored\n",len);
+		int out_len=blob_encode.get_shard_len(fec_data_num,len);
+		if(out_len>fec_mtu)
+		{
+			mylog(log_warn,"message too long ori_len=%d out_len=%d fec_mtu=%d,ignored\n",len,out_len,fec_mtu);
 			return -1;
 		}
-	if(fec_mode==1&&s!=0&&len>=fec_mtu)
+	}
+	if(fec_mode==1&&s!=0&&len>fec_mtu)
 	{
-		mylog(log_warn,"message too long len=%d fec_mtu=%d,ignored\n",len,fec_mtu);
-		return -1;
+		mylog(log_warn,"mode==1,message len=%d,fec_mtu=%d,len>fec_mtu,packet may not be able to deliver\n",len,fec_mtu);
+		//return -1;
 	}
 	if(s==0&&counter==0)
 	{
@@ -242,7 +239,7 @@ int fec_encode_manager_t::input(char *s,int len/*,int &is_first_packet*/)
 	}
 	if(s==0) about_to_fec=1;//now
 
-	if(fec_mode==0&& blob_encode.get_shard_len(fec_data_num,len)>=fec_mtu) {about_to_fec=1; delayed_append=1;}//fec then add packet
+	if(fec_mode==0&& blob_encode.get_shard_len(fec_data_num,len)>fec_mtu) {about_to_fec=1; delayed_append=1;}//fec then add packet
 
 	if(fec_mode==0) assert(counter<fec_queue_len);//counter will never equal fec_pending_num,if that happens fec should already been done.
 	if(fec_mode==1) assert(counter<fec_data_num);
@@ -489,15 +486,12 @@ int fec_encode_manager_t::output(int &n,char ** &s_arr,int *&len)
 	}
 	return 0;
 }
-
+/*
 int fec_decode_manager_t::re_init()
 {
-	for(int i=0;i<(int)fec_buff_num;i++)
-		fec_data[i].used=0;
-	ready_for_output=0;
-	index=0;
+	clear();
 	return 0;
-}
+}*/
 
 int fec_decode_manager_t::input(char *s,int len)
 {

fec_manager.h

@@ -37,10 +37,16 @@ struct anti_replay_t
 	unordered_set<u32_t> st;
 	int index;
 	anti_replay_t()
+	{
+		clear();
+	}
+	int clear()
 	{
 		memset(replay_buffer,-1,sizeof(replay_buffer));
+		st.clear();
 		st.rehash(anti_replay_buff_size*3);
 		index=0;
+		return 0;
 	}
 	void set_invaild(u32_t seq)
 	{
@@ -140,6 +146,22 @@ public:
 	fec_encode_manager_t();
 	~fec_encode_manager_t();
 
+	int clear()
+	{
+		counter=0;
+		blob_encode.clear();
+		ready_for_output=0;
+
+		itimerspec zero_its;
+		memset(&zero_its, 0, sizeof(zero_its));
+
+		timerfd_settime(timer_fd, TFD_TIMER_ABSTIME, &zero_its, 0);
+
+		seq=(u32_t)get_true_random_number(); //TODO temp solution for a bug.
+
+		return 0;
+	}
+
 	my_time_t get_first_packet_time()
 	{
 		return first_packet_time_for_output;
@@ -155,7 +177,7 @@ public:
 		return fec_mode;
 	}
 	u64_t get_timer_fd64();
-	int re_init(int data_num,int redundant_num,int mtu,int pending_num,int pending_time,int type);
+	int reset_fec_parameter(int data_num,int redundant_num,int mtu,int pending_num,int pending_time,int type);
 	int input(char *s,int len/*,int &is_first_packet*/);
 	int output(int &n,char ** &s_arr,int *&len);
 };
@@ -200,7 +222,7 @@ public:
 	fec_decode_manager_t()
 	{
 		fec_data=new fec_data_t[fec_buff_num+5];
-		re_init();
+		clear();
 	}
 	fec_decode_manager_t(const fec_decode_manager_t &b)
 	{
@@ -210,7 +232,21 @@ public:
 	{
 		delete fec_data;
 	}
-	int re_init();
+	int clear()
+	{
+		anti_replay.clear();
+		mp.clear();
+		mp.rehash(fec_buff_num*3);
+
+		for(int i=0;i<(int)fec_buff_num;i++)
+			fec_data[i].used=0;
+		ready_for_output=0;
+		index=0;
+
+		return 0;
+	}
+
+	//int re_init();
 	int input(char *s,int len);
 	int output(int &n,char ** &s_arr,int* &len_arr);
 };

main.cpp

@@ -9,10 +9,70 @@
 #include "fec_manager.h"
 #include "misc.h"
 #include "tunnel.h"
-#include "tun_dev.h"
+//#include "tun_dev.h"
+#include "git_version.h"
 using namespace std;
 
 
+static void print_help()
+{
+	char git_version_buf[100]={0};
+	strncpy(git_version_buf,gitversion,10);
+
+	printf("UDPspeeder V2\n");
+	printf("git version: %s    ",git_version_buf);
+	printf("build date: %s %s\n",__DATE__,__TIME__);
+	printf("repository: https://github.com/wangyu-/UDPspeeder\n");
+	printf("\n");
+	printf("usage:\n");
+	printf("    run as client: ./this_program -c -l local_listen_ip:local_port -r server_ip:server_port  [options]\n");
+	printf("    run as server: ./this_program -s -l server_listen_ip:server_port -r remote_ip:remote_port  [options]\n");
+	printf("\n");
+	printf("common options, must be same on both sides:\n");
+	printf("    -k,--key              <string>        key for simple xor encryption. if not set, xor is disabled\n");
+
+	printf("main options:\n");
+	printf("    -f,--fec              x:y             forward error correction, send y redundant packets for every x packets\n");
+	printf("    --timeout             <number>        how long could a packet be held in queue before doing fec, unit: ms, default: 8ms\n");
+	printf("    --mode                <number>        fec-mode,available values: 0, 1; 0 cost less bandwidth, 1 cost less latency(default)\n");
+	printf("    --report              <number>        turn on send/recv report, and set a period for reporting, unit: s\n");
+
+	printf("advanced options:\n");
+	printf("    --mtu                 <number>        mtu. for mode 0, the program will split packet to segment smaller than mtu_value.\n");
+	printf("                                          for mode 1, no packet will be split, the program just check if the mtu is exceed.\n");
+	printf("                                          default value: 1250\n");
+	printf("    -j,--jitter           <number>        simulated jitter. randomly delay first packet for 0~<number> ms, default value: 0.\n");
+	printf("                                          do not use if you dont know what it means.\n");
+	printf("    -i,--interval         <number>        scatter each fec group to a interval of <number> ms, to protect burst packet loss.\n");
+	printf("                                          default value: 0. do not use if you dont know what it means.\n");
+	printf("    --random-drop         <number>        simulate packet loss, unit: 0.01%%. default value: 0\n");
+	printf("    --disable-obscure     <number>        disable obscure, to save a bit bandwidth and cpu\n");
+//	printf("    --disable-xor         <number>        disable xor\n");
+
+	printf("developer options:\n");
+	printf("    --fifo                <string>        use a fifo(named pipe) for sending commands to the running program, so that you\n");
+	printf("                                          can change fec encode parameters dynamically, check readme.md in repository for\n");
+	printf("                                          supported commands.\n");
+	printf("    -j ,--jitter          jmin:jmax       similiar to -j above, but create jitter randomly between jmin and jmax\n");
+	printf("    -i,--interval         imin:imax       similiar to -i above, but scatter randomly between imin and imax\n");
+    printf("    -q,--queue-len        <number>        max fec queue len, only for mode 0\n");
+    printf("    --decode-buf          <number>        size of buffer of fec decoder,u nit: packet, default: 2000\n");
+    printf("    --fix-latency         <number>        try to stabilize latency, only for mode 0\n");
+    printf("    --delay-capacity      <number>        max number of delayed packets\n");
+	printf("    --disable-fec         <number>        completely disable fec, turn the program into a normal udp tunnel\n");
+	printf("    --sock-buf            <number>        buf size for socket, >=10 and <=10240, unit: kbyte, default: 1024\n");
+	printf("log and help options:\n");
+	printf("    --log-level           <number>        0: never    1: fatal   2: error   3: warn \n");
+	printf("                                          4: info (default)      5: debug   6: trace\n");
+	printf("    --log-position                        enable file name, function name, line number in log\n");
+	printf("    --disable-color                       disable log color\n");
+	printf("    -h,--help                             print this help message\n");
+
+	//printf("common options,these options must be same on both side\n");
+}
+
+
+
 int main(int argc, char *argv[])
 {
 	//working_mode=tunnel_mode;
@@ -25,14 +85,34 @@ int main(int argc, char *argv[])
 	assert(sizeof(i16_t)==2);
 	dup2(1, 2);		//redirect stderr to stdout
 	int i, j, k;
+
+	if (argc == 1)
+	{
+		print_help();
+		myexit( -1);
+	}
+	for (i = 0; i < argc; i++)
+	{
+		if(strcmp(argv[i],"-h")==0||strcmp(argv[i],"--help")==0)
+		{
+			print_help();
+			myexit(0);
+		}
+	}
+
+
 	process_arg(argc,argv);
 
 	delay_manager.set_capacity(delay_capacity);
 	local_ip_uint32=inet_addr(local_ip);
 	remote_ip_uint32=inet_addr(remote_ip);
+	sub_net_uint32=inet_addr(sub_net);
 
-	if(working_mode==tunnel_mode)
+	if(strlen(tun_dev)==0)
 	{
+		sprintf(tun_dev,"tun%u",get_true_random_number()%1000);
+	}
+
 	if(client_or_server==client_mode)
 	{
 		tunnel_client_event_loop();
@@ -41,18 +121,6 @@ int main(int argc, char *argv[])
 	{
 		tunnel_server_event_loop();
 	}
-	}
-	else
-	{
-		if(client_or_server==client_mode)
-		{
-			tun_dev_client_event_loop();
-		}
-		else
-		{
-			tun_dev_server_event_loop();
-		}
-	}
 
 	return 0;
 }

makefile

@@ -8,7 +8,7 @@ cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 #cc_bcm2708=/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 -ggdb
 
-SOURCES=main.cpp log.cpp common.cpp lib/fec.c lib/rs.c packet.cpp delay_manager.cpp fd_manager.cpp connection.cpp fec_manager.cpp tun_dev.cpp misc.cpp tunnel.cpp
+SOURCES=main.cpp log.cpp common.cpp lib/fec.c lib/rs.c packet.cpp delay_manager.cpp fd_manager.cpp connection.cpp fec_manager.cpp misc.cpp tunnel.cpp
 
 NAME=speederv2
 TARGETS=amd64 arm mips24kc_be x86  mips24kc_le

misc.cpp

@@ -40,8 +40,17 @@ int time_mono_test=0;
 int delay_capacity=0;
 
 
+char sub_net[100]="10.22.22.0";
+u32_t sub_net_uint32=0;
+
+char tun_dev[100]="";
 
 
+int keep_reconnect=0;
+
+int tun_mtu=1500;
+
+int mssfix=1;
 
 
 int from_normal_to_fec(conn_info_t & conn_info,char *data,int len,int & out_n,char **&out_arr,int *&out_len,my_time_t *&out_delay)
@@ -55,13 +64,17 @@ int from_normal_to_fec(conn_info_t & conn_info,char *data,int len,int & out_n,ch
 	inner_stat_t &inner_stat=conn_info.stat.normal_to_fec;
 	if(disable_fec)
 	{
-		assert(data!=0);
+		if(data==0)
+		{
+			out_n=0;
+			return 0;
+		}
+		//assert(data!=0);
 		inner_stat.input_packet_num++;
 		inner_stat.input_packet_size+=len;
 		inner_stat.output_packet_num++;
 		inner_stat.output_packet_size+=len;
 
-		if(data==0) return 0;
 		out_n=1;
 		static char *data_static;
 		data_static=data;
@@ -166,7 +179,11 @@ int from_fec_to_normal(conn_info_t & conn_info,char *data,int len,int & out_n,ch
 		inner_stat.output_packet_num++;
 		inner_stat.output_packet_size+=len;
 
-		if(data==0) return 0;
+		if(data==0)
+		{
+			out_n=0;
+			return 0;
+		}
 		out_n=1;
 		static char *data_static;
 		data_static=data;
@@ -472,7 +489,7 @@ int unit_test()
 		int * len;
 		fec_decode_manager.output(n,s_arr,len);
 
-		fec_encode_manager.re_init(3,2,g_fec_mtu,g_fec_queue_len,g_fec_timeout,1);
+		fec_encode_manager.reset_fec_parameter(3,2,g_fec_mtu,g_fec_queue_len,g_fec_timeout,1);
 
 		fec_encode_manager.input((char *) a.c_str(), a.length());
 		fec_encode_manager.output(n,s_arr,len);
@@ -554,15 +571,15 @@ void process_arg(int argc, char *argv[])
 		{"fec", required_argument,   0,'f'},
 		{"jitter", required_argument,   0,'j'},
 		{"fifo", required_argument,    0, 1},
-		{"tun-dev", optional_argument,    0, 1},
+		{"sub-net", required_argument,    0, 1},
+		{"tun-dev", required_argument,    0, 1},
+		{"tun-mtu", required_argument,    0, 1},
+		{"disable-mssfix", no_argument,    0, 1},
+		{"keep-reconnect", no_argument,    0, 1},
 		{NULL, 0, 0, 0}
       };
     int option_index = 0;
-	if (argc == 1)
-	{
-		print_help();
-		myexit( -1);
-	}
+
 	for (i = 0; i < argc; i++)
 	{
 		if(strcmp(argv[i],"--unit-test")==0)
@@ -571,14 +588,7 @@ void process_arg(int argc, char *argv[])
 			myexit(0);
 		}
 	}
-	for (i = 0; i < argc; i++)
-	{
-		if(strcmp(argv[i],"-h")==0||strcmp(argv[i],"--help")==0)
-		{
-			print_help();
-			myexit(0);
-		}
-	}
+
 	for (i = 0; i < argc; i++)
 	{
 		if(strcmp(argv[i],"--log-level")==0)
@@ -609,11 +619,6 @@ void process_arg(int argc, char *argv[])
 	}
 	log_bare(log_info, "\n");
 
-	if (argc == 1)
-	{
-		print_help();
-		myexit(-1);
-	}
 
 	int no_l = 1, no_r = 1;
 	while ((opt = getopt_long(argc, argv, "l:r:hcsk:j:f:p:n:i:q:",long_options,&option_index)) != -1)
@@ -872,12 +877,35 @@ void process_arg(int argc, char *argv[])
 
 				mylog(log_info,"fifo_file =%s \n",fifo_file);
 			}
+			else if(strcmp(long_options[option_index].name,"keep-reconnect")==0)
+			{
+				keep_reconnect=1;
+				mylog(log_info,"keep_reconnect enabled\n");
+			}
+			else if(strcmp(long_options[option_index].name,"sub-net")==0)
+			{
+				sscanf(optarg,"%s",sub_net);
+				mylog(log_info,"sub_net %s\n",sub_net);
+
+			}
 			else if(strcmp(long_options[option_index].name,"tun-dev")==0)
 			{
-				//sscanf(optarg,"%s",fifo_file);
-				mylog(log_info,"enabled tun-dev mode\n");
+				sscanf(optarg,"%s",tun_dev);
+				mylog(log_info,"tun_dev=%s\n",tun_dev);
+
+				mylog(log_info,"running at tun-dev mode\n");
 				working_mode=tun_dev_mode;
 			}
+			else if(strcmp(long_options[option_index].name,"tun-mtu")==0)
+			{
+				sscanf(optarg,"%d",&tun_mtu);
+				mylog(log_warn,"changed tun_mtu,tun_mtu=%d\n",tun_mtu);
+			}
+			else if(strcmp(long_options[option_index].name,"disable-mssfix")==0)
+			{
+				mssfix=0;
+				mylog(log_warn,"mssfix disabled\n");
+			}
 			else
 			{
 				mylog(log_fatal,"unknown option\n");
@@ -937,60 +965,3 @@ void process_arg(int argc, char *argv[])
 
 }
 
-void print_help()
-{
-	char git_version_buf[100]={0};
-	strncpy(git_version_buf,gitversion,10);
-
-	printf("UDPspeeder V2\n");
-	printf("git version: %s    ",git_version_buf);
-	printf("build date: %s %s\n",__DATE__,__TIME__);
-	printf("repository: https://github.com/wangyu-/UDPspeeder\n");
-	printf("\n");
-	printf("usage:\n");
-	printf("    run as client: ./this_program -c -l local_listen_ip:local_port -r server_ip:server_port  [options]\n");
-	printf("    run as server: ./this_program -s -l server_listen_ip:server_port -r remote_ip:remote_port  [options]\n");
-	printf("\n");
-	printf("common options, must be same on both sides:\n");
-	printf("    -k,--key              <string>        key for simple xor encryption. if not set, xor is disabled\n");
-
-	printf("main options:\n");
-	printf("    -f,--fec              x:y             forward error correction, send y redundant packets for every x packets\n");
-	printf("    --timeout             <number>        how long could a packet be held in queue before doing fec, unit: ms, default: 8ms\n");
-	printf("    --mode                <number>        fec-mode,available values: 0, 1; 0 cost less bandwidth, 1 cost less latency(default)\n");
-	printf("    --report              <number>        turn on send/recv report, and set a period for reporting, unit: s\n");
-
-	printf("advanced options:\n");
-	printf("    --mtu                 <number>        mtu. for mode 0, the program will split packet to segment smaller than mtu_value.\n");
-	printf("                                          for mode 1, no packet will be split, the program just check if the mtu is exceed.\n");
-	printf("                                          default value: 1250\n");
-	printf("    -j,--jitter           <number>        simulated jitter. randomly delay first packet for 0~<number> ms, default value: 0.\n");
-	printf("                                          do not use if you dont know what it means.\n");
-	printf("    -i,--interval         <number>        scatter each fec group to a interval of <number> ms, to protect burst packet loss.\n");
-	printf("                                          default value: 0. do not use if you dont know what it means.\n");
-	printf("    --random-drop         <number>        simulate packet loss, unit: 0.01%%. default value: 0\n");
-	printf("    --disable-obscure     <number>        disable obscure, to save a bit bandwidth and cpu\n");
-//	printf("    --disable-xor         <number>        disable xor\n");
-
-	printf("developer options:\n");
-	printf("    --fifo                <string>        use a fifo(named pipe) for sending commands to the running program, so that you\n");
-	printf("                                          can change fec encode parameters dynamically, check readme.md in repository for\n");
-	printf("                                          supported commands.\n");
-	printf("    -j ,--jitter          jmin:jmax       similiar to -j above, but create jitter randomly between jmin and jmax\n");
-	printf("    -i,--interval         imin:imax       similiar to -i above, but scatter randomly between imin and imax\n");
-    printf("    -q,--queue-len        <number>        max fec queue len, only for mode 0\n");
-    printf("    --decode-buf          <number>        size of buffer of fec decoder,u nit: packet, default: 2000\n");
-    printf("    --fix-latency         <number>        try to stabilize latency, only for mode 0\n");
-    printf("    --delay-capacity      <number>        max number of delayed packets\n");
-	printf("    --disable-fec         <number>        completely disable fec, turn the program into a normal udp tunnel\n");
-	printf("    --sock-buf            <number>        buf size for socket, >=10 and <=10240, unit: kbyte, default: 1024\n");
-	printf("log and help options:\n");
-	printf("    --log-level           <number>        0: never    1: fatal   2: error   3: warn \n");
-	printf("                                          4: info (default)      5: debug   6: trace\n");
-	printf("    --log-position                        enable file name, function name, line number in log\n");
-	printf("    --disable-color                       disable log color\n");
-	printf("    -h,--help                             print this help message\n");
-
-	//printf("common options,these options must be same on both side\n");
-}
-

misc.h

@@ -13,7 +13,7 @@
 #include "fd_manager.h"
 #include "delay_manager.h"
 #include "fec_manager.h"
-#include "git_version.h"
+
 
 
 extern char fifo_file[1000];
@@ -46,7 +46,11 @@ extern int time_mono_test;
 
 extern int delay_capacity;
 
+extern int keep_reconnect;
 
+extern int tun_mtu;
+
+extern int mssfix;
 
 
 int from_normal_to_fec(conn_info_t & conn_info,char *data,int len,int & out_n,char **&out_arr,int *&out_len,my_time_t *&out_delay);
@@ -58,9 +62,12 @@ int handle_command(char *s);
 
 int unit_test();
 
-void print_help();
+//void print_help();
 
 void process_arg(int argc, char *argv[]);
 
+extern char sub_net[100];
+extern u32_t sub_net_uint32;
+extern char tun_dev[100];
 
 #endif /* MISC_H_ */

packet.cpp

@@ -177,9 +177,7 @@ int my_send(const dest_t &dest,char *data,int len)
 {
 	if(dest.cook)
 	{
-		put_crc32(data,len);
-		if(!disable_obscure)do_obscure(data,len);
-		if(!disable_xor)encrypt_0(data,len,key_string);
+		do_cook(data,len);
 	}
 	switch(dest.type)
 	{
@@ -201,6 +199,11 @@ int my_send(const dest_t &dest,char *data,int len)
 			return send_fd(dest.inner.fd,data,len,0);
 			break;
 		}
+		case type_write_fd:
+		{
+			return write(dest.inner.fd,data,len);
+			break;
+		}
 		case type_fd64:
 		{
 
@@ -322,6 +325,14 @@ int put_crc32(char * s,int &len)
 	return 0;
 }
 
+int do_cook(char * data,int &len)
+{
+	put_crc32(data,len);
+	if(!disable_obscure)do_obscure(data,len);
+	if(!disable_xor)encrypt_0(data,len,key_string);
+	return 0;
+}
+
 int de_cook(char * s,int &len)
 {
 	if(!disable_xor)decrypt_0(s,len,key_string);

packet.h

@@ -42,5 +42,6 @@ int put_conv(u32_t conv,const char * input,int len_in,char *&output,int &len_out
 int get_conv(u32_t &conv,const char *input,int len_in,char *&output,int &len_out );
 int put_crc32(char * s,int &len);
 int rm_crc32(char * s,int &len);
+int do_cook(char * data,int &len);
 int de_cook(char * s,int &len);
 #endif /* PACKET_H_ */

tun_dev.cpp

@@ -1,411 +0,0 @@
-/*
- * tun.cpp
- *
- *  Created on: Oct 26, 2017
- *      Author: root
- */
-
-
-#include "common.h"
-#include "log.h"
-#include "misc.h"
-
-
-int get_tun_fd(char * dev_name)
-{
-	int tun_fd=open("/dev/net/tun",O_RDWR);
-
-	if(tun_fd <0)
-	{
-		mylog(log_fatal,"open /dev/net/tun failed");
-		myexit(-1);
-	}
-	struct ifreq ifr;
-	memset(&ifr, 0, sizeof(ifr));
-	ifr.ifr_flags = IFF_TUN|IFF_NO_PI;
-
-	strncpy(ifr.ifr_name, dev_name, IFNAMSIZ);
-
-	if(ioctl(tun_fd, TUNSETIFF, (void *)&ifr) != 0)
-	{
-		mylog(log_fatal,"open /dev/net/tun failed");
-		myexit(-1);
-	}
-	return tun_fd;
-}
-
-int set_if(char *if_name,char * local_ip,char * remote_ip,int mtu)
-{
-	//printf("i m here1\n");
-	struct ifreq ifr;
-	struct sockaddr_in sai;
-	memset(&ifr,0,sizeof(ifr));
-	memset(&sai, 0, sizeof(struct sockaddr));
-
-	int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-	strncpy(ifr.ifr_name, if_name, IFNAMSIZ);
-
-    sai.sin_family = AF_INET;
-    sai.sin_port = 0;
-    sai.sin_addr.s_addr = inet_addr(local_ip);
-    memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
-    assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0);
-
-
-
-    sai.sin_addr.s_addr = inet_addr(local_ip);
-    memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
-    assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0);
-
-
-
-    sai.sin_addr.s_addr = inet_addr(remote_ip);
-    memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
-    assert(ioctl(sockfd, SIOCSIFDSTADDR, &ifr)==0);
-
-    ifr.ifr_mtu=mtu;
-    assert(ioctl(sockfd, SIOCSIFMTU, &ifr)==0);
-
-
-    assert(ioctl(sockfd, SIOCGIFFLAGS, &ifr)==0);
-   // ifr.ifr_flags |= ( IFF_UP|IFF_POINTOPOINT|IFF_RUNNING|IFF_NOARP|IFF_MULTICAST );
-    ifr.ifr_flags |= ( IFF_UP|IFF_POINTOPOINT|IFF_RUNNING|IFF_NOARP|IFF_MULTICAST );
-    assert(ioctl(sockfd, SIOCSIFFLAGS, &ifr)==0);
-
-    //printf("i m here2\n");
-	return 0;
-}
-
-//enum tun_header_t {header_reserved=0,header_normal=1,header_new=2,header_reject=3};
-const char header_normal=1;
-const char header_new_connect=2;
-const char header_reject=3;
-
-int put_header(char header,char *& data,int &len)
-{
-	assert(len>=0);
-	data=data-1;
-	data[0]=header;
-	len+=1;
-	return 0;
-}
-int get_header(char &header,char *& data,int &len)
-{
-	assert(len>=0);
-	if(len<1) return -1;
-	header=data[0];
-	data=data+1;
-	len-=1;
-	return 0;
-}
-
-
-int tun_dev_client_event_loop()
-{
-	char buf0[buf_len+100];
-	char *data=buf0+100;
-	int len;
-	int i,j,k,ret;
-	int epoll_fd,tun_fd;
-
-	int remote_fd;
-	fd64_t remote_fd64;
-
-	tun_fd=get_tun_fd("tun11");
-	assert(tun_fd>0);
-
-	assert(new_connected_socket(remote_fd,remote_ip_uint32,remote_port)==0);
-	remote_fd64=fd_manager.create(remote_fd);
-
-	assert(set_if("tun11","10.0.0.2","10.0.0.1",1000)==0);
-
-	epoll_fd = epoll_create1(0);
-	assert(epoll_fd>0);
-
-	const int max_events = 4096;
-	struct epoll_event ev, events[max_events];
-	if (epoll_fd < 0) {
-		mylog(log_fatal,"epoll return %d\n", epoll_fd);
-		myexit(-1);
-	}
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = remote_fd64;
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, remote_fd, &ev);
-	if (ret!=0) {
-		mylog(log_fatal,"add  remote_fd64 error\n");
-		myexit(-1);
-	}
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = tun_fd;
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, tun_fd, &ev);
-	if (ret!=0) {
-		mylog(log_fatal,"add  tun_fd error\n");
-		myexit(-1);
-	}
-
-	dest_t dest;
-	dest.type=type_fd64;
-	dest.inner.fd64=remote_fd64;
-	//dest.conv=conv;
-	//dest.inner.ip_port=dest_ip_port;
-	//dest.cook=1;
-
-
-	int got_feed_back=0;
-
-	while(1)////////////////////////
-	{
-
-		if(about_to_exit) myexit(0);
-
-		int nfds = epoll_wait(epoll_fd, events, max_events, 180 * 1000);
-		if (nfds < 0) {  //allow zero
-			if(errno==EINTR  )
-			{
-				mylog(log_info,"epoll interrupted by signal\n");
-				myexit(0);
-			}
-			else
-			{
-				mylog(log_fatal,"epoll_wait return %d\n", nfds);
-				myexit(-1);
-			}
-		}
-		int idx;
-		for (idx = 0; idx < nfds; ++idx)
-		{
-			if(events[idx].data.u64==(u64_t)tun_fd)
-			{
-				len=read(tun_fd,data,max_data_len);
-				assert(len>=0);
-
-				mylog(log_trace,"Received packet from tun,len: %d\n",len);
-
-				if(got_feed_back==0)
-					put_header(header_new_connect,data,len);
-				else
-					put_header(header_normal,data,len);
-
-				delay_manager.add(0,dest,data,len);;
-			}
-			else if(events[idx].data.u64==(u64_t)remote_fd64)
-			{
-				fd64_t fd64=events[idx].data.u64;
-				int fd=fd_manager.to_fd(fd64);
-
-				len=recv(fd,data,max_data_len,0);
-
-				if(len<0)
-				{
-					mylog(log_warn,"recv return %d,errno=%s\n",len,strerror(errno));
-					continue;
-				}
-
-				char header=0;
-				if(get_header(header,data,len)!=0)
-				{
-					mylog(log_warn,"get_header failed\n");
-					continue;
-				}
-				if(header==header_reject)
-				{
-					mylog(log_fatal,"server switched to handle another client,exit\n");
-					myexit(-1);
-					continue;
-				}
-				else if(header==header_normal)
-				{
-					got_feed_back=1;
-				}
-				else
-				{
-					mylog(log_warn,"invalid header\n");
-					continue;
-				}
-
-				mylog(log_trace,"Received packet from udp,len: %d\n",len);
-				assert(len>=0);
-
-				assert(write(tun_fd,data,len)>=0);
-			}
-		}
-		delay_manager.check();
-	}
-
-
-	return 0;
-}
-
-int tun_dev_server_event_loop()
-{
-	char buf0[buf_len+100];
-	char *data=buf0+100;
-	int len;
-	int i,j,k,ret;
-	int epoll_fd,tun_fd;
-
-	int local_listen_fd;
-	//fd64_t local_listen_fd64;
-
-	tun_fd=get_tun_fd("tun11");
-	assert(tun_fd>0);
-
-	assert(new_listen_socket(local_listen_fd,local_ip_uint32,local_port)==0);
-  //  local_listen_fd64=fd_manager.create(local_listen_fd);
-
-	assert(set_if("tun11","10.0.0.1","10.0.0.2",1000)==0);
-
-	epoll_fd = epoll_create1(0);
-	assert(epoll_fd>0);
-
-	const int max_events = 4096;
-	struct epoll_event ev, events[max_events];
-	if (epoll_fd < 0) {
-		mylog(log_fatal,"epoll return %d\n", epoll_fd);
-		myexit(-1);
-	}
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = local_listen_fd;
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, local_listen_fd, &ev);
-	if (ret!=0) {
-		mylog(log_fatal,"add  udp_listen_fd error\n");
-		myexit(-1);
-	}
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = tun_fd;
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, tun_fd, &ev);
-	if (ret!=0) {
-		mylog(log_fatal,"add  tun_fd error\n");
-		myexit(-1);
-	}
-
-	//ip_port_t dest_ip_port;
-
-	dest_t dest;
-	dest.type=type_fd_ip_port;
-
-	dest.inner.fd_ip_port.fd=local_listen_fd;
-	dest.inner.fd_ip_port.ip_port.ip=0;
-	dest.inner.fd_ip_port.ip_port.port=0;
-	//dest.conv=conv;
-	//dest.inner.ip_port=dest_ip_port;
-	//dest.cook=1;
-
-	while(1)////////////////////////
-	{
-
-		if(about_to_exit) myexit(0);
-
-		int nfds = epoll_wait(epoll_fd, events, max_events, 180 * 1000);
-		if (nfds < 0) {  //allow zero
-			if(errno==EINTR  )
-			{
-				mylog(log_info,"epoll interrupted by signal\n");
-				myexit(0);
-			}
-			else
-			{
-				mylog(log_fatal,"epoll_wait return %d\n", nfds);
-				myexit(-1);
-			}
-		}
-		int idx;
-		for (idx = 0; idx < nfds; ++idx)
-		{
-
-			if(events[idx].data.u64==(u64_t)local_listen_fd)
-			{
-				struct sockaddr_in udp_new_addr_in={0};
-				socklen_t udp_new_addr_len = sizeof(sockaddr_in);
-				if ((len = recvfrom(local_listen_fd, data, max_data_len, 0,
-						(struct sockaddr *) &udp_new_addr_in, &udp_new_addr_len)) == -1) {
-					mylog(log_error,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",strerror(errno));
-					continue;
-					//myexit(1);
-				};
-				char header=0;
-				if(get_header(header,data,len)!=0)
-				{
-					mylog(log_warn,"get_header failed\n");
-					continue;
-				}
-
-				if((dest.inner.fd_ip_port.ip_port.ip==udp_new_addr_in.sin_addr.s_addr) && (dest.inner.fd_ip_port.ip_port.port=ntohs(udp_new_addr_in.sin_port)))
-				{
-					if(header!=header_new_connect&& header!=header_normal)
-					{
-						mylog(log_warn,"invalid header\n");
-						continue;
-					}
-				}
-				else
-				{
-					if(header==header_new_connect)
-					{
-						mylog(log_info,"new connection from %s:%d \n", inet_ntoa(udp_new_addr_in.sin_addr),
-												ntohs(udp_new_addr_in.sin_port));
-						dest.inner.fd_ip_port.ip_port.ip=udp_new_addr_in.sin_addr.s_addr;
-						dest.inner.fd_ip_port.ip_port.port=ntohs(udp_new_addr_in.sin_port);
-					}
-					else
-					{
-						mylog(log_info,"rejected connection from %s:%d\n", inet_ntoa(udp_new_addr_in.sin_addr),ntohs(udp_new_addr_in.sin_port));
-
-
-						len=1;
-						data[0]=header_reject;
-
-						dest_t tmp_dest;
-						tmp_dest.type=type_fd_ip_port;
-
-						tmp_dest.inner.fd_ip_port.fd=local_listen_fd;
-						tmp_dest.inner.fd_ip_port.ip_port.ip=udp_new_addr_in.sin_addr.s_addr;
-						tmp_dest.inner.fd_ip_port.ip_port.port=ntohs(udp_new_addr_in.sin_port);
-
-						delay_manager.add(0,tmp_dest,data,len);;
-						continue;
-					}
-				}
-
-
-
-				mylog(log_trace,"Received packet from %s:%d,len: %d\n", inet_ntoa(udp_new_addr_in.sin_addr),
-						ntohs(udp_new_addr_in.sin_port),len);
-
-				ret=write(tun_fd,data,len);
-				if( ret<0 )
-				{
-					mylog(log_warn,"write to tun failed len=%d ret=%d\n errno=%s\n",len,ret,strerror(errno));
-				}
-
-			}
-			else if(events[idx].data.u64==(u64_t)tun_fd)
-			{
-				len=read(tun_fd,data,max_data_len);
-				assert(len>=0);
-
-				mylog(log_trace,"Received packet from tun,len: %d\n",len);
-
-				if(dest.inner.fd64_ip_port.ip_port.to_u64()==0)
-				{
-					mylog(log_warn,"there is no client yet\n");
-					continue;
-				}
-
-				put_header(header_normal,data,len);
-
-				delay_manager.add(0,dest,data,len);;
-
-
-			}
-		}
-		delay_manager.check();
-	}
-
-
-	return 0;
-}

tun_dev.h

@@ -1,16 +0,0 @@
-/*
- * tun.h
- *
- *  Created on: Oct 26, 2017
- *      Author: root
- */
-
-#ifndef TUN_DEV_H_
-#define TUN_DEV_H_
-
-
-int tun_dev_client_event_loop();
-
-int tun_dev_server_event_loop();
-
-#endif /* TUN_H_ */

tunnel.cpp

@@ -70,12 +70,12 @@ int tunnel_client_event_loop()
 		myexit(-1);
 	}
 
-	u64_t fd64=conn_info.fec_encode_manager.get_timer_fd64();
+	u64_t tmp_fd64=conn_info.fec_encode_manager.get_timer_fd64();
 	ev.events = EPOLLIN;
-	ev.data.u64 = fd64;
+	ev.data.u64 = tmp_fd64;
 
 	mylog(log_debug,"conn_info.fec_encode_manager.get_timer_fd64()=%llu\n",conn_info.fec_encode_manager.get_timer_fd64());
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd_manager.to_fd(fd64), &ev);
+	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd_manager.to_fd(tmp_fd64), &ev);
 	if (ret!= 0) {
 		mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
 		myexit(-1);
@@ -173,6 +173,7 @@ int tunnel_client_event_loop()
 
 				if(events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64())
 				{
+					fd64_t fd64=events[idx].data.u64;
 					mylog(log_trace,"events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64()\n");
 
 					//mylog(log_info,"timer!!!\n");
@@ -314,6 +315,7 @@ int tunnel_client_event_loop()
 					if(!conn_info.conv_manager.is_conv_used(conv))
 					{
 						mylog(log_trace,"!conn_info.conv_manager.is_conv_used(conv)");
+						continue;
 					}
 
 					conn_info.conv_manager.update_active_time(conv);