From 178327c581daa9beafb5c523840eaa0ebf108065 Mon Sep 17 00:00:00 2001 From: wangyu- Date: Wed, 6 Sep 2017 01:37:14 -0500 Subject: [PATCH] refactor --- main.cpp | 8 ++++---- network.cpp | 5 ++++- network.h | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/main.cpp b/main.cpp index 76cd912..1a73cdf 100755 --- a/main.cpp +++ b/main.cpp @@ -1121,9 +1121,9 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is send_info.seq++; send_info.ack_seq=recv_info.seq+1; send_info.ts_ack=recv_info.ts; - raw_info.reserved_seq=send_info.seq; + raw_info.reserved_send_seq=send_info.seq; } - send_info.seq=raw_info.reserved_seq; + send_info.seq=raw_info.reserved_send_seq; send_info.psh = 0; send_info.syn = 0; send_info.ack = 1; @@ -1167,9 +1167,9 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is { send_info.ack_seq=recv_info.seq+raw_info.recv_info.data_len; send_info.ts_ack=recv_info.ts; - raw_info.reserved_seq=send_info.seq; + raw_info.reserved_send_seq=send_info.seq; } - send_info.seq=raw_info.reserved_seq; + send_info.seq=raw_info.reserved_send_seq; send_handshake(raw_info,conn_info.my_id,conn_info.oppsite_id,const_id); send_info.seq+=raw_info.send_info.data_len; diff --git a/network.cpp b/network.cpp index ce85a39..a26e3ab 100644 --- a/network.cpp +++ b/network.cpp @@ -1678,7 +1678,10 @@ int after_recv_raw0(raw_info_t &raw_info) } else if(seq_mode==3) { - + if(recv_info.seq==send_info.ack_seq+1) + { + send_info.ack_seq=recv_info.seq+raw_info.recv_info.data_len; + } } } } diff --git a/network.h b/network.h index 5472571..0417e6f 100644 --- a/network.h +++ b/network.h @@ -77,7 +77,7 @@ struct raw_info_t //int last_send_len; //int last_recv_len; - u32_t reserved_seq; + u32_t reserved_send_seq; //uint32_t first_seq,first_ack_seq; };//g_raw_info;