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

fixed anti_replay dead loop

Browse Source
This commit is contained in:
wangyu 2017-08-04 04:22:16 +08:00 committed by wangyu
parent 203eccb2d0
commit 351d14734f
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common.cpp
View File

@ -51,23 +51,37 @@ char * my_ntoa(uint32_t ip)
void init_random_number_fd()
{
random_number_fd=open("/dev/urandom",O_RDONLY);
if(random_number_fd==-1)
{
mylog(log_fatal,"error open /dev/urandom\n");
exit(-1);
}
setnonblocking(random_number_fd);
}
uint64_t get_true_random_number_64()
{
uint64_t ret;
read(random_number_fd,&ret,sizeof(ret));
int size=read(random_number_fd,&ret,sizeof(ret));
if(size!=sizeof(ret))
{
mylog(log_fatal,"get random number failed\n",size);
exit(-1);
}
return ret;
}
uint32_t get_true_random_number()
{
uint32_t ret;
read(random_number_fd,&ret,sizeof(ret));
int size=read(random_number_fd,&ret,sizeof(ret));
if(size!=sizeof(ret))
{
mylog(log_fatal,"get random number failed\n",size);
exit(-1);
}
return ret;
}
uint32_t get_true_random_number_nz() //nz for non-zero

2
log.h
View File

@ -87,6 +87,8 @@ extern int enable_log_color;
//#define mylog(__first_argu__dummy_abcde__,...) printf(__VA_ARGS__)
//#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, ...);

22
main.cpp
View File

@ -54,7 +54,7 @@ struct anti_replay_t
{
disabled=0;
max_packet_received=0;
anti_replay_seq=get_true_random_number();
anti_replay_seq=get_true_random_number_64()/10;//random first seq
//memset(window,0,sizeof(window)); //not necessary
}
void re_init()
@ -86,7 +86,7 @@ struct anti_replay_t
}
else
{
for (uint32_t i=max_packet_received+1;i<seq;i++)
for (uint64_t i=max_packet_received+1;i<seq;i++)
window[i%anti_replay_window_size]=0;
window[seq%anti_replay_window_size]=1;
}
@ -881,7 +881,7 @@ int parse_safer(conn_info_t &conn_info,const char * input,int input_len,char* &d
}
if (conn_info.blob->anti_replay.is_vaild(h_seq) != 1) {
mylog(log_warn,"dropped replay packet\n");
mylog(log_debug,"dropped replay packet\n");
return -1;
}
@ -1086,10 +1086,7 @@ int client_on_timer(conn_info_t &conn_info) //for client
{
conn_info.state.client_current_state=client_tcp_handshake;
mylog(log_info,"state changed from client_idle to client_tcp_handshake\n");
send_info.psh = 0;
send_info.syn = 1;
send_info.ack = 0;
send_info.ts_ack =0;
}
conn_info.last_state_time=get_current_time();
conn_info.last_resent_time=0;
@ -1112,8 +1109,12 @@ int client_on_timer(conn_info_t &conn_info) //for client
{
if (conn_info.last_resent_time == 0)
{
send_info.ack_seq = recv_info.seq + 1;
//send_info.ts_ack = recv_info.ts;
send_info.psh = 0;
send_info.syn = 1;
send_info.ack = 0;
send_info.ts_ack =0;
send_info.seq=get_true_random_number();
send_info.ack_seq=get_true_random_number();
}
}
@ -1283,7 +1284,7 @@ int server_on_timer_multi(conn_info_t &conn_info)
conn_info.last_hb_sent_time=get_current_time();
mylog(log_trace,"heart beat sent<%x,%x>\n",conn_info.my_id,conn_info.oppsite_id);
mylog(log_debug,"heart beat sent<%x,%x>\n",conn_info.my_id,conn_info.oppsite_id);
}
else
{
@ -1513,6 +1514,7 @@ int server_on_raw_recv_multi()
send_info.psh = 0;
send_info.syn = 1;
send_info.ack = 1;
send_info.ts_ack=recv_info.ts;
mylog(log_info,"received syn,sent syn ack back\n");
send_raw0(raw_info, 0, 0);