removed tun_dev.cpp and .h

main.cpp

@@ -9,7 +9,7 @@
 #include "fec_manager.h"
 #include "misc.h"
 #include "tunnel.h"
-#include "tun_dev.h"
+//#include "tun_dev.h"
 using namespace std;
 
 
@@ -37,28 +37,13 @@ int main(int argc, char *argv[])
 		sprintf(tun_dev,"tun%u",get_true_random_number()%1000);
 	}
 
-	if(working_mode==tunnel_mode)
+	if(client_or_server==client_mode)
 	{
-		if(client_or_server==client_mode)
-		{
-			tunnel_client_event_loop();
-		}
-		else
-		{
-			tunnel_server_event_loop();
-		}
+		tunnel_client_event_loop();
 	}
 	else
 	{
-		//disable_fec=1;
-		if(client_or_server==client_mode)
-		{
-			tun_dev_client_event_loop();
-		}
-		else
-		{
-			tun_dev_server_event_loop();
-		}
+		tunnel_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

tun_dev.cpp

@@ -1,678 +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,u32_t local_ip,u32_t 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 = local_ip;
-    memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
-    assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0); //set source ip
-
-    sai.sin_addr.s_addr = remote_ip;
-    memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
-    assert(ioctl(sockfd, SIOCSIFDSTADDR, &ifr)==0);//set dest ip
-
-    ifr.ifr_mtu=mtu;
-    assert(ioctl(sockfd, SIOCSIFMTU, &ifr)==0);//set mtu
-
-
-    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 );//set interface flags
-    assert(ioctl(sockfd, SIOCSIFFLAGS, &ifr)==0);
-
-    //printf("i m here2\n");
-	return 0;
-}
-
-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[len]=header;
-	len+=1;
-	return 0;
-}
-int get_header(char &header,char * data,int &len)
-{
-	assert(len>=0);
-	if(len<1) return -1;
-	len-=1;
-	header=data[len];
-
-	return 0;
-}
-int from_normal_to_fec2(conn_info_t & conn_info,dest_t &dest,char * data,int len,char header)
-{
-	int  out_n;char **out_arr;int *out_len;my_time_t *out_delay;
-
-	from_normal_to_fec(conn_info,data,len,out_n,out_arr,out_len,out_delay);
-
-	for(int i=0;i<out_n;i++)
-	{
-
-		char tmp_buf[buf_len];
-		int tmp_len=out_len[i];
-		memcpy(tmp_buf,out_arr[i],out_len[i]);
-		put_header(header,tmp_buf,tmp_len);
-		delay_send(out_delay[i],dest,tmp_buf,tmp_len);//this is slow but safer.just use this one
-
-		//put_header(header,out_arr[i],out_len[i]);//modify in place
-		//delay_send(out_delay[i],dest,out_arr[i],out_len[i]);//warning this is currently okay,but if you modified fec encoder,you  may have to use the above code
-	}
-	return 0;
-}
-
-int from_fec_to_normal2(conn_info_t & conn_info,dest_t &dest,char * data,int len)
-{
-	int  out_n;char **out_arr;int *out_len;my_time_t *out_delay;
-
-	from_fec_to_normal(conn_info,data,len,out_n,out_arr,out_len,out_delay);
-
-	for(int i=0;i<out_n;i++)
-	{
-		delay_send(out_delay[i],dest,out_arr[i],out_len[i]);
-	}
-
-	return 0;
-}
-
-int tun_dev_client_event_loop()
-{
-	char data[buf_len];
-	int len;
-	int i,j,k,ret;
-	int epoll_fd,tun_fd;
-
-	int remote_fd;
-	fd64_t remote_fd64;
-
-	tun_fd=get_tun_fd(tun_dev);
-	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(tun_dev,htonl((ntohl(sub_net_uint32)&0xFFFFFF00)|2),htonl((ntohl(sub_net_uint32)&0xFFFFFF00 )|1),g_fec_mtu)==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);
-	}
-
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = delay_manager.get_timer_fd();
-
-	mylog(log_debug,"delay_manager.get_timer_fd()=%d\n",delay_manager.get_timer_fd());
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, delay_manager.get_timer_fd(), &ev);
-	if (ret!= 0) {
-		mylog(log_fatal,"add delay_manager.get_timer_fd() error\n");
-		myexit(-1);
-	}
-
-
-    conn_info_t *conn_info_p=new conn_info_t;
-    conn_info_t &conn_info=*conn_info_p;  //huge size of conn_info,do not allocate on stack
-
-	u64_t tmp_timer_fd64=conn_info.fec_encode_manager.get_timer_fd64();
-	ev.events = EPOLLIN;
-	ev.data.u64 = tmp_timer_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(tmp_timer_fd64), &ev);
-	if (ret!= 0) {
-		mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
-		myexit(-1);
-	}
-
-	conn_info.timer.add_fd_to_epoll(epoll_fd);
-	conn_info.timer.set_timer_repeat_us(timer_interval*1000);
-
-
-
-
-
-	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(epoll_fd, 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);
-	}
-
-
-	dest_t udp_dest;
-	udp_dest.cook=1;
-	udp_dest.type=type_fd64;
-	udp_dest.inner.fd64=remote_fd64;
-
-	dest_t tun_dest;
-	tun_dest.type=type_write_fd;
-	tun_dest.inner.fd=tun_fd;
-
-	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)conn_info.timer.get_timer_fd())
-			{
-				uint64_t value;
-				read(conn_info.timer.get_timer_fd(), &value, 8);
-				mylog(log_trace,"events[idx].data.u64==(u64_t)conn_info.timer.get_timer_fd()\n");
-				conn_info.stat.report_as_client();
-			}
-
-			else 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");
-
-				uint64_t value;
-				if(!fd_manager.exist(fd64))   //fd64 has been closed
-				{
-					mylog(log_trace,"!fd_manager.exist(fd64)");
-					continue;
-				}
-				if((ret=read(fd_manager.to_fd(fd64), &value, 8))!=8)
-				{
-					mylog(log_trace,"(ret=read(fd_manager.to_fd(fd64), &value, 8))!=8,ret=%d\n",ret);
-					continue;
-				}
-				if(value==0)
-				{
-					mylog(log_debug,"value==0\n");
-					continue;
-				}
-				assert(value==1);
-
-				char header=(got_feed_back==0?header_new_connect:header_normal);
-				from_normal_to_fec2(conn_info,udp_dest,0,0,header);
-			}
-			else if(events[idx].data.u64==(u64_t)tun_fd)
-			{
-				len=read(tun_fd,data,max_data_len);
-
-				if(len<0)
-				{
-					mylog(log_warn,"read from tun_fd return %d,errno=%s\n",len,strerror(errno));
-					continue;
-				}
-				if(len>=20)
-				{
-					u32_t dest_ip=htonl(read_u32(data+16));
-					if(  ( ntohl(sub_net_uint32)&0xFFFFFF00 ) !=  ( ntohl (dest_ip) &0xFFFFFF00) )
-					{
-						string sub=my_ntoa(dest_ip);
-						string dst=my_ntoa( htonl( ntohl (dest_ip) &0xFFFFFF00)   );
-						mylog(log_warn,"packet's dest ip [%s] not in subnet [%s],dropped\n", sub.c_str(), dst.c_str());
-						continue;
-					}
-				}
-
-				mylog(log_trace,"Received packet from tun,len: %d\n",len);
-
-				char header=(got_feed_back==0?header_new_connect:header_normal);
-				from_normal_to_fec2(conn_info,udp_dest,data,len,header);
-
-			}
-			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;
-				}
-
-				if(de_cook(data,len)<0)
-				{
-					mylog(log_warn,"de_cook(data,len)failed \n");
-					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 restarted or switched to handle another client,exited\n");
-					myexit(-1);
-					continue;
-				}
-				else if(header==header_normal)
-				{
-					if(got_feed_back==0)
-						mylog(log_info,"connection accepted by server\n");
-					got_feed_back=1;
-				}
-				else
-				{
-					mylog(log_warn,"invalid header %d %d\n",int(header),len);
-					continue;
-				}
-
-				mylog(log_trace,"Received packet from udp,len: %d\n",len);
-
-				from_fec_to_normal2(conn_info,tun_dest,data,len);
-
-			}
-		    else if (events[idx].data.u64 == (u64_t)delay_manager.get_timer_fd())
-		    {
-				uint64_t value;
-				read(delay_manager.get_timer_fd(), &value, 8);
-				mylog(log_trace,"events[idx].data.u64 == (u64_t)delay_manager.get_timer_fd()\n");
-
-			}
-			else if (events[idx].data.u64 == (u64_t)fifo_fd)
-			{
-				char buf[buf_len];
-				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;
-				}
-				buf[len]=0;
-				handle_command(buf);
-			}
-			else
-			{
-				assert(0==1);
-			}
-		}
-		delay_manager.check();
-	}
-
-
-	return 0;
-}
-
-int tun_dev_server_event_loop()
-{
-	char data[buf_len];
-	int len;
-	int i,j,k,ret;
-	int epoll_fd,tun_fd;
-	int local_listen_fd;
-
-	tun_fd=get_tun_fd(tun_dev);
-	assert(tun_fd>0);
-
-	assert(new_listen_socket(local_listen_fd,local_ip_uint32,local_port)==0);
-	assert(set_if(tun_dev,htonl((ntohl(sub_net_uint32)&0xFFFFFF00)|1),htonl((ntohl(sub_net_uint32)&0xFFFFFF00 )|2),g_fec_mtu)==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);
-	}
-
-	ev.events = EPOLLIN;
-	ev.data.u64 = delay_manager.get_timer_fd();
-
-	mylog(log_debug,"delay_manager.get_timer_fd()=%d\n",delay_manager.get_timer_fd());
-	ret = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, delay_manager.get_timer_fd(), &ev);
-	if (ret!= 0) {
-		mylog(log_fatal,"add delay_manager.get_timer_fd() error\n");
-		myexit(-1);
-	}
-
-
-    conn_info_t *conn_info_p=new conn_info_t;
-    conn_info_t &conn_info=*conn_info_p;  //huge size of conn_info,do not allocate on stack
-
-	u64_t tmp_timer_fd64=conn_info.fec_encode_manager.get_timer_fd64();
-	ev.events = EPOLLIN;
-	ev.data.u64 = tmp_timer_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(tmp_timer_fd64), &ev);
-	if (ret!= 0) {
-		mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
-		myexit(-1);
-	}
-
-	conn_info.timer.add_fd_to_epoll(epoll_fd);
-	conn_info.timer.set_timer_repeat_us(timer_interval*1000);
-
-
-
-
-	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(epoll_fd, 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);
-	}
-
-	dest_t udp_dest;
-	udp_dest.cook=1;
-	udp_dest.type=type_fd_ip_port;
-
-	udp_dest.inner.fd_ip_port.fd=local_listen_fd;
-	udp_dest.inner.fd_ip_port.ip_port.ip=0;
-	udp_dest.inner.fd_ip_port.ip_port.port=0;
-
-	dest_t tun_dest;
-	tun_dest.type=type_write_fd;
-	tun_dest.inner.fd=tun_fd;
-
-	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)conn_info.timer.get_timer_fd())
-			{
-				uint64_t value;
-				read(conn_info.timer.get_timer_fd(), &value, 8);
-
-				if(udp_dest.inner.fd64_ip_port.ip_port.to_u64()==0)
-				{
-					continue;
-				}
-				conn_info.stat.report_as_server(udp_dest.inner.fd_ip_port.ip_port);
-			}
-			else if(events[idx].data.u64==conn_info.fec_encode_manager.get_timer_fd64())
-			{
-				assert(udp_dest.inner.fd64_ip_port.ip_port.to_u64()!=0);
-				mylog(log_trace,"events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64()\n");
-				uint64_t fd64=events[idx].data.u64;
-				//mylog(log_info,"timer!!!\n");
-				uint64_t value;
-				if(!fd_manager.exist(fd64))   //fd64 has been closed
-				{
-					mylog(log_trace,"!fd_manager.exist(fd64)");
-					continue;
-				}
-				if((ret=read(fd_manager.to_fd(fd64), &value, 8))!=8)
-				{
-					mylog(log_trace,"(ret=read(fd_manager.to_fd(fd64), &value, 8))!=8,ret=%d\n",ret);
-					continue;
-				}
-				if(value==0)
-				{
-					mylog(log_debug,"value==0\n");
-					continue;
-				}
-				assert(value==1);
-
-				from_normal_to_fec2(conn_info,udp_dest,0,0,header_normal);
-			}
-			else 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)) < 0) {
-					mylog(log_error,"recv_from error,this shouldnt happen,err=%s,but we can try to continue\n",strerror(errno));
-					continue;
-					//myexit(1);
-				};
-
-				if(de_cook(data,len)<0)
-				{
-					mylog(log_warn,"de_cook(data,len)failed \n");
-					continue;
-
-				}
-
-				char header=0;
-				if(get_header(header,data,len)!=0)
-				{
-					mylog(log_warn,"get_header failed\n");
-					continue;
-				}
-
-				if((udp_dest.inner.fd_ip_port.ip_port.ip==udp_new_addr_in.sin_addr.s_addr) && (udp_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));
-						udp_dest.inner.fd_ip_port.ip_port.ip=udp_new_addr_in.sin_addr.s_addr;
-						udp_dest.inner.fd_ip_port.ip_port.port=ntohs(udp_new_addr_in.sin_port);
-						conn_info.fec_decode_manager.clear();
-						conn_info.fec_encode_manager.clear();
-						memset(&conn_info.stat,0,sizeof(conn_info.stat));
-
-					}
-					else if(header==header_normal)
-					{
-						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;
-						do_cook(data,len);
-
-
-						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;
-					}
-					else
-					{
-						mylog(log_warn,"invalid header\n");
-					}
-				}
-
-				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);
-
-				from_fec_to_normal2(conn_info,tun_dest,data,len);
-
-			}
-			else if(events[idx].data.u64==(u64_t)tun_fd)
-			{
-				len=read(tun_fd,data,max_data_len);
-				if(len<0)
-				{
-					mylog(log_warn,"read from tun_fd return %d,errno=%s\n",len,strerror(errno));
-					continue;
-				}
-
-				mylog(log_trace,"Received packet from tun,len: %d\n",len);
-
-				if(udp_dest.inner.fd64_ip_port.ip_port.to_u64()==0)
-				{
-					mylog(log_debug,"received packet from tun,but there is no client yet,dropped packet\n");
-					continue;
-				}
-
-				from_normal_to_fec2(conn_info,udp_dest,data,len,header_normal);
-
-			}
-		    else if (events[idx].data.u64 == (u64_t)delay_manager.get_timer_fd())
-		    {
-				uint64_t value;
-				read(delay_manager.get_timer_fd(), &value, 8);
-				mylog(log_trace,"events[idx].data.u64 == (u64_t)delay_manager.get_timer_fd()\n");
-			}
-			else if (events[idx].data.u64 == (u64_t)fifo_fd)
-			{
-				char buf[buf_len];
-				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;
-				}
-				buf[len]=0;
-				handle_command(buf);
-			}
-			else
-			{
-				assert(0==1);
-			}
-		}
-		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_ */