github/wangyu-UDPspeeder
1
0
Fork 0
mirror of https://github.com/wangyu-/UDPspeeder.git synced 2025-01-31 12:19:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

more log,more robust

Browse Source
This commit is contained in:
wangyu- 2017-10-27 22:51:33 -05:00
parent a3b5187b1f
commit 7de806f57a
3 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
misc.cpp
View File

@ -173,7 +173,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_num++;
inner_stat.output_packet_size+=len; inner_stat.output_packet_size+=len;
if(data==0) return 0; if(data==0)
{
out_n=0;
return 0;
}
out_n=1; out_n=1;
static char *data_static; static char *data_static;
data_static=data; data_static=data;
@ -880,11 +884,11 @@ void process_arg(int argc, char *argv[])
mylog(log_info,"fifo_file =%s \n",fifo_file); mylog(log_info,"fifo_file =%s \n",fifo_file);
} }
else if(strcmp(long_options[option_index].name,"tun-dev")==0) else if(strcmp(long_options[option_index].name,"sub-net")==0)
{ {
//sscanf(optarg,"%s",fifo_file); sscanf(optarg,"%s",sub_net);
mylog(log_info,"enabled tun-dev mode\n"); mylog(log_info,"sub_net %s\n",sub_net);
working_mode=tun_dev_mode;
} }
else if(strcmp(long_options[option_index].name,"tun-dev")==0) else if(strcmp(long_options[option_index].name,"tun-dev")==0)
{ {
@ -894,6 +898,7 @@ void process_arg(int argc, char *argv[])
mylog(log_info,"tun_dev =%s \n",tun_dev); mylog(log_info,"tun_dev =%s \n",tun_dev);
} }
mylog(log_info,"running at tun-dev mode\n"); mylog(log_info,"running at tun-dev mode\n");
working_mode=tun_dev_mode;
} }
else else
{ {

84
tun_dev.cpp
View File

@ -48,38 +48,27 @@ int set_if(char *if_name,u32_t local_ip,u32_t remote_ip,int mtu)
sai.sin_family = AF_INET; sai.sin_family = AF_INET;
sai.sin_port = 0; sai.sin_port = 0;
sai.sin_addr.s_addr = local_ip; sai.sin_addr.s_addr = local_ip;
memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr)); memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0); assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0); //set source ip
//sai.sin_addr.s_addr = local_ip;
//memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
//assert(ioctl(sockfd, SIOCSIFADDR, &ifr)==0);
sai.sin_addr.s_addr = remote_ip; sai.sin_addr.s_addr = remote_ip;
memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr)); memcpy(&ifr.ifr_addr,&sai, sizeof(struct sockaddr));
assert(ioctl(sockfd, SIOCSIFDSTADDR, &ifr)==0); assert(ioctl(sockfd, SIOCSIFDSTADDR, &ifr)==0);//set dest ip
ifr.ifr_mtu=mtu; ifr.ifr_mtu=mtu;
assert(ioctl(sockfd, SIOCSIFMTU, &ifr)==0); assert(ioctl(sockfd, SIOCSIFMTU, &ifr)==0);//set mtu
assert(ioctl(sockfd, SIOCGIFFLAGS, &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 );
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); assert(ioctl(sockfd, SIOCSIFFLAGS, &ifr)==0);
//printf("i m here2\n"); //printf("i m here2\n");
return 0; 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_normal=1;
const char header_new_connect=2; const char header_new_connect=2;
const char header_reject=3; const char header_reject=3;
@ -89,9 +78,6 @@ int put_header(char header,char * data,int &len)
assert(len>=0); assert(len>=0);
data[len]=header; data[len]=header;
len+=1; len+=1;
//data=data-1;
//data[0]=header;
//len+=1;
return 0; return 0;
} }
int get_header(char &header,char * data,int &len) int get_header(char &header,char * data,int &len)
@ -111,15 +97,15 @@ int from_normal_to_fec2(conn_info_t & conn_info,dest_t &dest,char * data,int len
for(int i=0;i<out_n;i++) for(int i=0;i<out_n;i++)
{ {
//put_header(header,out_arr[i],out_len[i]);
char tmp_buf[buf_len]; char tmp_buf[buf_len];
int tmp_len=out_len[i]; int tmp_len=out_len[i];
memcpy(tmp_buf,out_arr[i],out_len[i]); memcpy(tmp_buf,out_arr[i],out_len[i]);
put_header(header,tmp_buf,tmp_len); put_header(header,tmp_buf,tmp_len);
delay_send(out_delay[i],dest,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]); //put_header(header,out_arr[i],out_len[i]);//modify in place
//delay_send(out_delay[i],dest,out_arr[i],out_len[i]); //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; return 0;
} }
@ -140,8 +126,7 @@ int from_fec_to_normal2(conn_info_t & conn_info,dest_t &dest,char * data,int len
int tun_dev_client_event_loop() int tun_dev_client_event_loop()
{ {
char buf0[buf_len+100]; char data[buf_len];
char *data=buf0+100;
int len; int len;
int i,j,k,ret; int i,j,k,ret;
int epoll_fd,tun_fd; int epoll_fd,tun_fd;
@ -184,8 +169,6 @@ int tun_dev_client_event_loop()
} }
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.u64 = delay_manager.get_timer_fd(); ev.data.u64 = delay_manager.get_timer_fd();
@ -197,24 +180,20 @@ int tun_dev_client_event_loop()
} }
conn_info_t *conn_info_p=new conn_info_t; 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 conn_info_t &conn_info=*conn_info_p; //huge size of conn_info,do not allocate on stack
u64_t fd64=conn_info.fec_encode_manager.get_timer_fd64(); u64_t tmp_timer_fd64=conn_info.fec_encode_manager.get_timer_fd64();
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.u64 = fd64; 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()); 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_timer_fd64), &ev);
if (ret!= 0) { if (ret!= 0) {
mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n"); mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
myexit(-1); myexit(-1);
} }
//my_timer_t timer;
conn_info.timer.add_fd_to_epoll(epoll_fd); conn_info.timer.add_fd_to_epoll(epoll_fd);
conn_info.timer.set_timer_repeat_us(timer_interval*1000); conn_info.timer.set_timer_repeat_us(timer_interval*1000);
@ -239,10 +218,6 @@ int tun_dev_client_event_loop()
} }
//dest.conv=conv;
//dest.inner.ip_port=dest_ip_port;
//dest.cook=1;
dest_t udp_dest; dest_t udp_dest;
udp_dest.cook=1; udp_dest.cook=1;
udp_dest.type=type_fd64; udp_dest.type=type_fd64;
@ -285,9 +260,9 @@ int tun_dev_client_event_loop()
else if(events[idx].data.u64==conn_info.fec_encode_manager.get_timer_fd64()) 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"); mylog(log_trace,"events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64()\n");
//mylog(log_info,"timer!!!\n");
uint64_t value; uint64_t value;
if(!fd_manager.exist(fd64)) //fd64 has been closed if(!fd_manager.exist(fd64)) //fd64 has been closed
{ {
@ -306,7 +281,6 @@ int tun_dev_client_event_loop()
} }
assert(value==1); assert(value==1);
char header=(got_feed_back==0?header_new_connect:header_normal); char header=(got_feed_back==0?header_new_connect:header_normal);
from_normal_to_fec2(conn_info,udp_dest,0,0,header); from_normal_to_fec2(conn_info,udp_dest,0,0,header);
} }
@ -362,7 +336,7 @@ int tun_dev_client_event_loop()
else if(header==header_normal) else if(header==header_normal)
{ {
if(got_feed_back==0) if(got_feed_back==0)
mylog(log_info,"connect accepted by server %d\n",int(header)); mylog(log_info,"connect accepted by server\n");
got_feed_back=1; got_feed_back=1;
} }
else else
@ -397,7 +371,7 @@ int tun_dev_client_event_loop()
} }
else else
{ {
//assert(0==1); assert(0==1);
} }
} }
delay_manager.check(); delay_manager.check();
@ -409,22 +383,16 @@ int tun_dev_client_event_loop()
int tun_dev_server_event_loop() int tun_dev_server_event_loop()
{ {
char buf0[buf_len+100]; char data[buf_len];
char *data=buf0+100;
int len; int len;
int i,j,k,ret; int i,j,k,ret;
int epoll_fd,tun_fd; int epoll_fd,tun_fd;
int local_listen_fd; int local_listen_fd;
//fd64_t local_listen_fd64;
tun_fd=get_tun_fd(tun_dev); tun_fd=get_tun_fd(tun_dev);
assert(tun_fd>0); assert(tun_fd>0);
assert(new_listen_socket(local_listen_fd,local_ip_uint32,local_port)==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);
assert(set_if(tun_dev,htonl((ntohl(sub_net_uint32)&0xFFFFFF00)|1),htonl((ntohl(sub_net_uint32)&0xFFFFFF00 )|2),g_fec_mtu)==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); epoll_fd = epoll_create1(0);
@ -464,23 +432,20 @@ int tun_dev_server_event_loop()
} }
conn_info_t *conn_info_p=new conn_info_t; 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 conn_info_t &conn_info=*conn_info_p; //huge size of conn_info,do not allocate on stack
u64_t fd64=conn_info.fec_encode_manager.get_timer_fd64(); u64_t tmp_timer_fd64=conn_info.fec_encode_manager.get_timer_fd64();
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.u64 = fd64; 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()); 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_timer_fd64), &ev);
if (ret!= 0) { if (ret!= 0) {
mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n"); mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
myexit(-1); myexit(-1);
} }
//my_timer_t timer;
conn_info.timer.add_fd_to_epoll(epoll_fd); conn_info.timer.add_fd_to_epoll(epoll_fd);
conn_info.timer.set_timer_repeat_us(timer_interval*1000); conn_info.timer.set_timer_repeat_us(timer_interval*1000);
@ -549,8 +514,9 @@ int tun_dev_server_event_loop()
} }
else if(events[idx].data.u64==conn_info.fec_encode_manager.get_timer_fd64()) 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"); 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"); //mylog(log_info,"timer!!!\n");
uint64_t value; uint64_t value;
if(!fd_manager.exist(fd64)) //fd64 has been closed if(!fd_manager.exist(fd64)) //fd64 has been closed
@ -653,7 +619,11 @@ int tun_dev_server_event_loop()
else if(events[idx].data.u64==(u64_t)tun_fd) else if(events[idx].data.u64==(u64_t)tun_fd)
{ {
len=read(tun_fd,data,max_data_len); len=read(tun_fd,data,max_data_len);
assert(len>=0); 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); mylog(log_trace,"Received packet from tun,len: %d\n",len);
@ -686,7 +656,7 @@ int tun_dev_server_event_loop()
} }
else else
{ {
//assert(0==1); assert(0==1);
} }
} }
delay_manager.check(); delay_manager.check();

7
tunnel.cpp
View File

@ -70,12 +70,12 @@ int tunnel_client_event_loop()
myexit(-1); 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.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()); 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) { if (ret!= 0) {
mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n"); mylog(log_fatal,"add fec_encode_manager.get_timer_fd64() error\n");
myexit(-1); myexit(-1);
@ -173,6 +173,7 @@ int tunnel_client_event_loop()
if(events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64()) 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_trace,"events[idx].data.u64 == conn_info.fec_encode_manager.get_timer_fd64()\n");
//mylog(log_info,"timer!!!\n"); //mylog(log_info,"timer!!!\n");