github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-01-19 14:29:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

trival

Browse Source
This commit is contained in:
wangyu 2017-07-23 03:01:29 +08:00 committed by wangyu
parent 7525459d1a
commit c71abcd001
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.cpp
View File

@ -2709,7 +2709,6 @@ int server_on_raw_recv(packet_info_t &info,char * data,int data_len)
int client_event_loop() int client_event_loop()
{ {
char buf[buf_len]; char buf[buf_len];
char raw_recv_buf3[buf_len];
int i, j, k;int ret; int i, j, k;int ret;
@ -2795,13 +2794,13 @@ int client_event_loop()
} }
int new_len=data_len; int new_len=data_len;
memcpy(raw_recv_buf3,data,new_len); //for safety,copy to a new buffer,will remove later //memcpy(raw_recv_buf3,data,new_len); //for safety,copy to a new buffer,will remove later
if(data_len!=0) if(data_len!=0)
{ {
if(pre_recv(raw_recv_buf3,new_len)<0) if(pre_recv(data,new_len)<0)
continue; continue;
} }
client_on_raw_recv(g_packet_info_recv,raw_recv_buf3,new_len); client_on_raw_recv(g_packet_info_recv,data,new_len);
} }
if(events[n].data.u64 ==epoll_timer_fd_sn) if(events[n].data.u64 ==epoll_timer_fd_sn)
{ {
@ -2876,7 +2875,6 @@ int client_event_loop()
int server_event_loop() int server_event_loop()
{ {
char buf[buf_len]; char buf[buf_len];
char raw_recv_buf3[buf_len];
conv_manager.set_clear_function(server_clear); conv_manager.set_clear_function(server_clear);
int i, j, k;int ret; int i, j, k;int ret;
@ -2998,17 +2996,16 @@ int server_event_loop()
} }
int new_len=data_len; int new_len=data_len;
memcpy(raw_recv_buf3,data,new_len);
if(data_len!=0) if(data_len!=0)
{ {
//if(raw_mode==mode_tcp || ((raw_mode==mode_udp||raw_mode==mode_icmp) &&server_current_state!=server_nothing )) //if(raw_mode==mode_tcp || ((raw_mode==mode_udp||raw_mode==mode_icmp) &&server_current_state!=server_nothing ))
//{ //{
if(pre_recv(raw_recv_buf3,new_len)<0) if(pre_recv(data,new_len)<0)
continue; continue;
//} //}
} }
server_on_raw_recv(g_packet_info_recv,raw_recv_buf3,new_len); server_on_raw_recv(g_packet_info_recv,data,new_len);
} }
} }