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

fix indent with clang-format

Browse Source
This commit is contained in:
yancey 2023-02-07 07:11:49 -05:00
parent 87b0db8862
commit 9217e0e9e6
21 changed files with 7584 additions and 8903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

450
client.cpp
View File

@ -14,7 +14,6 @@ u64_t laste_detect_time=0;
int use_udp_for_detection = 0; int use_udp_for_detection = 0;
int use_tcp_for_detection = 1; int use_tcp_for_detection = 1;
extern pcap_t *pcap_handle; extern pcap_t *pcap_handle;
extern int pcap_captured_full_len; extern int pcap_captured_full_len;
@ -34,15 +33,10 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
#ifdef UDP2RAW_MP #ifdef UDP2RAW_MP
// mylog(log_debug,"pcap cnt :%d\n",pcap_cnt); // mylog(log_debug,"pcap cnt :%d\n",pcap_cnt);
if(send_with_pcap&&!pcap_header_captured) if (send_with_pcap && !pcap_header_captured) {
{ if (get_current_time() - laste_detect_time > detect_interval) {
if(get_current_time()-laste_detect_time>detect_interval)
{
laste_detect_time = get_current_time(); laste_detect_time = get_current_time();
} } else {
else
{
return 0; return 0;
} }
/* /*
@ -57,11 +51,9 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
address_t tmp_addr = remote_addr; address_t tmp_addr = remote_addr;
tmp_addr.set_port(port); tmp_addr.set_port(port);
if(use_udp_for_detection) if (use_udp_for_detection) {
{
int new_udp_fd = socket(tmp_addr.get_type(), SOCK_DGRAM, IPPROTO_UDP); int new_udp_fd = socket(tmp_addr.get_type(), SOCK_DGRAM, IPPROTO_UDP);
if(new_udp_fd<0) if (new_udp_fd < 0) {
{
mylog(log_warn, "create new_udp_fd error\n"); mylog(log_warn, "create new_udp_fd error\n");
return -1; return -1;
} }
@ -69,20 +61,17 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
u64_t tmp = get_true_random_number(); u64_t tmp = get_true_random_number();
int ret = sendto(new_udp_fd, (char *)(&tmp), sizeof(tmp), 0, (struct sockaddr *)&tmp_addr.inner, tmp_addr.get_len()); int ret = sendto(new_udp_fd, (char *)(&tmp), sizeof(tmp), 0, (struct sockaddr *)&tmp_addr.inner, tmp_addr.get_len());
if(ret==-1) if (ret == -1) {
{
mylog(log_warn, "sendto() failed\n"); mylog(log_warn, "sendto() failed\n");
} }
sock_close(new_udp_fd); sock_close(new_udp_fd);
} }
if(use_tcp_for_detection) if (use_tcp_for_detection) {
{
static int last_tcp_fd = -1; static int last_tcp_fd = -1;
int new_tcp_fd = socket(tmp_addr.get_type(), SOCK_STREAM, IPPROTO_TCP); int new_tcp_fd = socket(tmp_addr.get_type(), SOCK_STREAM, IPPROTO_TCP);
if(new_tcp_fd<0) if (new_tcp_fd < 0) {
{
mylog(log_warn, "create new_tcp_fd error\n"); mylog(log_warn, "create new_tcp_fd error\n");
return -1; return -1;
} }
@ -94,29 +83,24 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
// close(new_tcp_fd); // close(new_tcp_fd);
} }
mylog(log_info, "waiting for a use-able packet to be captured\n"); mylog(log_info, "waiting for a use-able packet to be captured\n");
return 0; return 0;
} }
#endif #endif
if(raw_info.disabled) if (raw_info.disabled) {
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
conn_info.my_id = get_true_random_number_nz(); conn_info.my_id = get_true_random_number_nz();
mylog(log_info, "state back to client_idle\n"); mylog(log_info, "state back to client_idle\n");
} }
if(conn_info.state.client_current_state==client_idle) if (conn_info.state.client_current_state == client_idle) {
{
raw_info.rst_received = 0; raw_info.rst_received = 0;
raw_info.disabled = 0; raw_info.disabled = 0;
fail_time_counter++; fail_time_counter++;
if(max_fail_time>0&&fail_time_counter>max_fail_time) if (max_fail_time > 0 && fail_time_counter > max_fail_time) {
{
mylog(log_fatal, "max_fail_time exceed\n"); mylog(log_fatal, "max_fail_time exceed\n");
myexit(-1); myexit(-1);
} }
@ -124,14 +108,10 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
conn_info.blob->anti_replay.re_init(); conn_info.blob->anti_replay.re_init();
conn_info.my_id = get_true_random_number_nz(); /// todo no need to do this everytime conn_info.my_id = get_true_random_number_nz(); /// todo no need to do this everytime
address_t tmp_addr; address_t tmp_addr;
// u32_t new_ip=0; // u32_t new_ip=0;
if(!force_source_ip) if (!force_source_ip) {
{ if (get_src_adress2(tmp_addr, remote_addr) != 0) {
if(get_src_adress2(tmp_addr,remote_addr)!=0)
{
mylog(log_warn, "get_src_adress() failed\n"); mylog(log_warn, "get_src_adress() failed\n");
return -1; return -1;
} }
@ -149,55 +129,42 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
send_info.src_ip=new_ip; send_info.src_ip=new_ip;
}*/ }*/
} } else {
else
{
tmp_addr = source_addr; tmp_addr = source_addr;
} }
send_info.new_src_ip.from_address_t(tmp_addr); send_info.new_src_ip.from_address_t(tmp_addr);
if (force_source_port == 0) if (force_source_port == 0) {
{
send_info.src_port = client_bind_to_a_new_port2(bind_fd, tmp_addr); send_info.src_port = client_bind_to_a_new_port2(bind_fd, tmp_addr);
} } else {
else
{
send_info.src_port = source_port; send_info.src_port = source_port;
} }
if (raw_mode == mode_icmp) if (raw_mode == mode_icmp) {
{
send_info.dst_port = send_info.src_port; send_info.dst_port = send_info.src_port;
} }
mylog(log_info, "using port %d\n", send_info.src_port); mylog(log_info, "using port %d\n", send_info.src_port);
init_filter(send_info.src_port); init_filter(send_info.src_port);
if(raw_mode==mode_icmp||raw_mode==mode_udp) if (raw_mode == mode_icmp || raw_mode == mode_udp) {
{
conn_info.state.client_current_state = client_handshake1; conn_info.state.client_current_state = client_handshake1;
mylog(log_info, "state changed from client_idle to client_pre_handshake\n"); mylog(log_info, "state changed from client_idle to client_pre_handshake\n");
} }
if(raw_mode==mode_faketcp) if (raw_mode == mode_faketcp) {
{ if (use_tcp_dummy_socket) {
if(use_tcp_dummy_socket)
{
setnonblocking(bind_fd); setnonblocking(bind_fd);
int ret = connect(bind_fd, (struct sockaddr *)&remote_addr.inner, remote_addr.get_len()); int ret = connect(bind_fd, (struct sockaddr *)&remote_addr.inner, remote_addr.get_len());
mylog(log_debug, "ret=%d,errno=%s, %d %s\n", ret, get_sock_error(), bind_fd, remote_addr.get_str()); mylog(log_debug, "ret=%d,errno=%s, %d %s\n", ret, get_sock_error(), bind_fd, remote_addr.get_str());
// mylog(log_info,"ret=%d,errno=,%d %s\n",ret,bind_fd,remote_addr.get_str()); // mylog(log_info,"ret=%d,errno=,%d %s\n",ret,bind_fd,remote_addr.get_str());
conn_info.state.client_current_state = client_tcp_handshake_dummy; conn_info.state.client_current_state = client_tcp_handshake_dummy;
mylog(log_info, "state changed from client_idle to client_tcp_handshake_dummy\n"); mylog(log_info, "state changed from client_idle to client_tcp_handshake_dummy\n");
} } else {
else
{
conn_info.state.client_current_state = client_tcp_handshake; conn_info.state.client_current_state = client_tcp_handshake;
mylog(log_info, "state changed from client_idle to client_tcp_handshake\n"); mylog(log_info, "state changed from client_idle to client_tcp_handshake\n");
} }
} }
conn_info.last_state_time = get_current_time(); conn_info.last_state_time = get_current_time();
conn_info.last_hb_sent_time = 0; conn_info.last_hb_sent_time = 0;
@ -206,20 +173,14 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
if (conn_info.state.client_current_state == client_tcp_handshake) // send and resend syn if (conn_info.state.client_current_state == client_tcp_handshake) // send and resend syn
{ {
assert(raw_mode == mode_faketcp); assert(raw_mode == mode_faketcp);
if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) {
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
mylog(log_info, "state back to client_idle from client_tcp_handshake\n"); mylog(log_info, "state back to client_idle from client_tcp_handshake\n");
return 0; return 0;
} } else if (get_current_time() - conn_info.last_hb_sent_time > client_retry_interval) {
else if (get_current_time() - conn_info.last_hb_sent_time > client_retry_interval) if (raw_mode == mode_faketcp) {
{ if (conn_info.last_hb_sent_time == 0) {
if (raw_mode == mode_faketcp)
{
if (conn_info.last_hb_sent_time == 0)
{
send_info.psh = 0; send_info.psh = 0;
send_info.syn = 1; send_info.syn = 1;
send_info.ack = 0; send_info.ack = 0;
@ -234,40 +195,27 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
conn_info.last_hb_sent_time = get_current_time(); conn_info.last_hb_sent_time = get_current_time();
mylog(log_info, "(re)sent tcp syn\n"); mylog(log_info, "(re)sent tcp syn\n");
return 0; return 0;
} } else {
else
{
return 0; return 0;
} }
return 0; return 0;
} } else if (conn_info.state.client_current_state == client_tcp_handshake_dummy) {
else if(conn_info.state.client_current_state==client_tcp_handshake_dummy)
{
assert(raw_mode == mode_faketcp); assert(raw_mode == mode_faketcp);
if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) {
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
mylog(log_info, "state back to client_idle from client_tcp_handshake_dummy\n"); mylog(log_info, "state back to client_idle from client_tcp_handshake_dummy\n");
return 0; return 0;
} }
} } else if (conn_info.state.client_current_state == client_handshake1) // send and resend handshake1
else if(conn_info.state.client_current_state==client_handshake1)//send and resend handshake1
{
if(get_current_time()-conn_info.last_state_time>client_handshake_timeout)
{ {
if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) {
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
mylog(log_info, "state back to client_idle from client_handshake1\n"); mylog(log_info, "state back to client_idle from client_handshake1\n");
return 0; return 0;
} } else if (get_current_time() - conn_info.last_hb_sent_time > client_retry_interval) {
else if(get_current_time()-conn_info.last_hb_sent_time>client_retry_interval) if (raw_mode == mode_faketcp) {
{ if (conn_info.last_hb_sent_time == 0) {
if(raw_mode==mode_faketcp)
{
if(conn_info.last_hb_sent_time==0)
{
send_info.seq++; send_info.seq++;
send_info.ack_seq = recv_info.seq + 1; send_info.ack_seq = recv_info.seq + 1;
send_info.ts_ack = recv_info.ts; send_info.ts_ack = recv_info.ts;
@ -284,10 +232,7 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
send_handshake(raw_info, conn_info.my_id, 0, const_id); send_handshake(raw_info, conn_info.my_id, 0, const_id);
send_info.seq += raw_info.send_info.data_len; send_info.seq += raw_info.send_info.data_len;
} } else {
else
{
send_handshake(raw_info, conn_info.my_id, 0, const_id); send_handshake(raw_info, conn_info.my_id, 0, const_id);
if (raw_mode == mode_icmp) if (raw_mode == mode_icmp)
send_info.my_icmp_seq++; send_info.my_icmp_seq++;
@ -296,27 +241,18 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
conn_info.last_hb_sent_time = get_current_time(); conn_info.last_hb_sent_time = get_current_time();
mylog(log_info, "(re)sent handshake1\n"); mylog(log_info, "(re)sent handshake1\n");
return 0; return 0;
} } else {
else
{
return 0; return 0;
} }
return 0; return 0;
} } else if (conn_info.state.client_current_state == client_handshake2) {
else if(conn_info.state.client_current_state==client_handshake2) if (get_current_time() - conn_info.last_state_time > client_handshake_timeout) {
{
if(get_current_time()-conn_info.last_state_time>client_handshake_timeout)
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
mylog(log_info, "state back to client_idle from client_handshake2\n"); mylog(log_info, "state back to client_idle from client_handshake2\n");
return 0; return 0;
} } else if (get_current_time() - conn_info.last_hb_sent_time > client_retry_interval) {
else if(get_current_time()-conn_info.last_hb_sent_time>client_retry_interval) if (raw_mode == mode_faketcp) {
{ if (conn_info.last_hb_sent_time == 0) {
if(raw_mode==mode_faketcp)
{
if(conn_info.last_hb_sent_time==0)
{
send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len; send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len;
send_info.ts_ack = recv_info.ts; send_info.ts_ack = recv_info.ts;
raw_info.reserved_send_seq = send_info.seq; raw_info.reserved_send_seq = send_info.seq;
@ -325,10 +261,7 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
send_handshake(raw_info, conn_info.my_id, conn_info.oppsite_id, const_id); send_handshake(raw_info, conn_info.my_id, conn_info.oppsite_id, const_id);
send_info.seq += raw_info.send_info.data_len; send_info.seq += raw_info.send_info.data_len;
} } else {
else
{
send_handshake(raw_info, conn_info.my_id, conn_info.oppsite_id, const_id); send_handshake(raw_info, conn_info.my_id, conn_info.oppsite_id, const_id);
if (raw_mode == mode_icmp) if (raw_mode == mode_icmp)
send_info.my_icmp_seq++; send_info.my_icmp_seq++;
@ -337,41 +270,31 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
mylog(log_info, "(re)sent handshake2\n"); mylog(log_info, "(re)sent handshake2\n");
return 0; return 0;
} } else {
else
{
return 0; return 0;
} }
return 0; return 0;
} } else if (conn_info.state.client_current_state == client_ready) {
else if(conn_info.state.client_current_state==client_ready)
{
fail_time_counter = 0; fail_time_counter = 0;
mylog(log_trace, "time %llu,%llu\n", get_current_time(), conn_info.last_state_time); mylog(log_trace, "time %llu,%llu\n", get_current_time(), conn_info.last_state_time);
if(get_current_time()-conn_info.last_hb_recv_time>client_conn_timeout) if (get_current_time() - conn_info.last_hb_recv_time > client_conn_timeout) {
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
conn_info.my_id = get_true_random_number_nz(); conn_info.my_id = get_true_random_number_nz();
mylog(log_info, "state back to client_idle from client_ready bc of server-->client direction timeout\n"); mylog(log_info, "state back to client_idle from client_ready bc of server-->client direction timeout\n");
return 0; return 0;
} }
if(get_current_time()- conn_info.last_oppsite_roller_time>client_conn_uplink_timeout) if (get_current_time() - conn_info.last_oppsite_roller_time > client_conn_uplink_timeout) {
{
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
conn_info.my_id = get_true_random_number_nz(); conn_info.my_id = get_true_random_number_nz();
mylog(log_info, "state back to client_idle from client_ready bc of client-->server direction timeout\n"); mylog(log_info, "state back to client_idle from client_ready bc of client-->server direction timeout\n");
} }
if (get_current_time() - conn_info.last_hb_sent_time < heartbeat_interval) {
if(get_current_time()-conn_info.last_hb_sent_time<heartbeat_interval)
{
return 0; return 0;
} }
mylog(log_debug, "heartbeat sent <%x,%x>\n", conn_info.oppsite_id, conn_info.my_id); mylog(log_debug, "heartbeat sent <%x,%x>\n", conn_info.oppsite_id, conn_info.my_id);
if (hb_mode == 0) if (hb_mode == 0)
@ -380,27 +303,22 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
send_safer(conn_info, 'h', hb_buf, hb_len); send_safer(conn_info, 'h', hb_buf, hb_len);
conn_info.last_hb_sent_time = get_current_time(); conn_info.last_hb_sent_time = get_current_time();
return 0; return 0;
} } else {
else
{
mylog(log_fatal, "unknown state,this shouldnt happen.\n"); mylog(log_fatal, "unknown state,this shouldnt happen.\n");
myexit(-1); myexit(-1);
} }
return 0; return 0;
} }
int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info,char type,char *data,int data_len) int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info, char type, char *data, int data_len) {
{
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
if(!recv_info.new_src_ip.equal(send_info.new_dst_ip)||recv_info.src_port!=send_info.dst_port) if (!recv_info.new_src_ip.equal(send_info.new_dst_ip) || recv_info.src_port != send_info.dst_port) {
{
mylog(log_warn, "unexpected adress %s %s %d %d,this shouldnt happen.\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port); mylog(log_warn, "unexpected adress %s %s %d %d,this shouldnt happen.\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port);
return -1; return -1;
} }
if(conn_info.state.client_current_state==client_handshake2) if (conn_info.state.client_current_state == client_handshake2) {
{
mylog(log_info, "changed state from to client_handshake2 to client_ready\n"); mylog(log_info, "changed state from to client_handshake2 to client_ready\n");
conn_info.state.client_current_state = client_ready; conn_info.state.client_current_state = client_ready;
conn_info.last_hb_sent_time = 0; conn_info.last_hb_sent_time = 0;
@ -408,14 +326,11 @@ int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info,char type,char *data,
conn_info.last_oppsite_roller_time = conn_info.last_hb_recv_time; conn_info.last_oppsite_roller_time = conn_info.last_hb_recv_time;
client_on_timer(conn_info); client_on_timer(conn_info);
} }
if(data_len>=0&&type=='h') if (data_len >= 0 && type == 'h') {
{
mylog(log_debug, "[hb]heart beat received,oppsite_roller=%d\n", int(conn_info.oppsite_roller)); mylog(log_debug, "[hb]heart beat received,oppsite_roller=%d\n", int(conn_info.oppsite_roller));
conn_info.last_hb_recv_time = get_current_time(); conn_info.last_hb_recv_time = get_current_time();
return 0; return 0;
} } else if (data_len >= int(sizeof(u32_t)) && type == 'd') {
else if(data_len>= int( sizeof(u32_t))&&type=='d')
{
mylog(log_trace, "received a data from fake tcp,len:%d\n", data_len); mylog(log_trace, "received a data from fake tcp,len:%d\n", data_len);
if (hb_mode == 0) if (hb_mode == 0)
@ -425,8 +340,7 @@ int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info,char type,char *data,
memcpy(&tmp_conv_id, &data[0], sizeof(tmp_conv_id)); memcpy(&tmp_conv_id, &data[0], sizeof(tmp_conv_id));
tmp_conv_id = ntohl(tmp_conv_id); tmp_conv_id = ntohl(tmp_conv_id);
if(!conn_info.blob->conv_manager.c.is_conv_used(tmp_conv_id)) if (!conn_info.blob->conv_manager.c.is_conv_used(tmp_conv_id)) {
{
mylog(log_info, "unknow conv %d,ignore\n", tmp_conv_id); mylog(log_info, "unknow conv %d,ignore\n", tmp_conv_id);
return 0; return 0;
} }
@ -443,17 +357,13 @@ int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info,char type,char *data,
// tmp_sockaddr.sin_port= htons(uint16_t((u64<<32u)>>32u)); // tmp_sockaddr.sin_port= htons(uint16_t((u64<<32u)>>32u));
int ret = sendto(udp_fd, data + sizeof(u32_t), data_len - (sizeof(u32_t)), 0, (struct sockaddr *)&tmp_addr.inner, tmp_addr.get_len()); int ret = sendto(udp_fd, data + sizeof(u32_t), data_len - (sizeof(u32_t)), 0, (struct sockaddr *)&tmp_addr.inner, tmp_addr.get_len());
if(ret<0) if (ret < 0) {
{
mylog(log_warn, "sento returned %d,%s,%02x,%s\n", ret, get_sock_error(), int(tmp_addr.get_type()), tmp_addr.get_str()); mylog(log_warn, "sento returned %d,%s,%02x,%s\n", ret, get_sock_error(), int(tmp_addr.get_type()), tmp_addr.get_str());
// perror("ret<0"); // perror("ret<0");
} }
} } else {
else
{
mylog(log_warn, "unknown packet,this shouldnt happen.\n"); mylog(log_warn, "unknown packet,this shouldnt happen.\n");
return -1; return -1;
} }
@ -461,7 +371,8 @@ int client_on_raw_recv_hs2_or_ready(conn_info_t &conn_info,char type,char *data,
} }
int client_on_raw_recv(conn_info_t &conn_info) // called when raw fd received a packet. int client_on_raw_recv(conn_info_t &conn_info) // called when raw fd received a packet.
{ {
char* data;int data_len; char *data;
int data_len;
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
@ -473,41 +384,31 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
if (pre_recv_raw_packet() < 0) return -1; if (pre_recv_raw_packet() < 0) return -1;
#endif #endif
if(conn_info.state.client_current_state==client_idle ) if (conn_info.state.client_current_state == client_idle) {
{
discard_raw_packet(); discard_raw_packet();
// recv(raw_recv_fd, 0,0, 0 ); // recv(raw_recv_fd, 0,0, 0 );
} } else if (conn_info.state.client_current_state == client_tcp_handshake || conn_info.state.client_current_state == client_tcp_handshake_dummy) // received syn ack
else if(conn_info.state.client_current_state==client_tcp_handshake||conn_info.state.client_current_state==client_tcp_handshake_dummy)//received syn ack
{ {
assert(raw_mode == mode_faketcp); assert(raw_mode == mode_faketcp);
if(recv_raw0(raw_info,data,data_len)<0) if (recv_raw0(raw_info, data, data_len) < 0) {
{
return -1; return -1;
} }
if(data_len>=max_data_len+1) if (data_len >= max_data_len + 1) {
{
mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", data_len); mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", data_len);
return -1; return -1;
} }
if(!recv_info.new_src_ip.equal(send_info.new_dst_ip)||recv_info.src_port!=send_info.dst_port) if (!recv_info.new_src_ip.equal(send_info.new_dst_ip) || recv_info.src_port != send_info.dst_port) {
{
mylog(log_debug, "unexpected adress %s %s %d %d\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port); mylog(log_debug, "unexpected adress %s %s %d %d\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port);
return -1; return -1;
} }
if(data_len==0&&raw_info.recv_info.syn==1&&raw_info.recv_info.ack==1) if (data_len == 0 && raw_info.recv_info.syn == 1 && raw_info.recv_info.ack == 1) {
{ if (conn_info.state.client_current_state == client_tcp_handshake) {
if(conn_info.state.client_current_state==client_tcp_handshake) if (recv_info.ack_seq != send_info.seq + 1) {
{
if(recv_info.ack_seq!=send_info.seq+1)
{
mylog(log_debug, "seq ack_seq mis match\n"); mylog(log_debug, "seq ack_seq mis match\n");
return -1; return -1;
} }
mylog(log_info, "state changed from client_tcp_handshake to client_handshake1\n"); mylog(log_info, "state changed from client_tcp_handshake to client_handshake1\n");
} } else {
else
{
send_info.seq = recv_info.ack_seq - 1; send_info.seq = recv_info.ack_seq - 1;
mylog(log_info, "state changed from client_tcp_dummy to client_handshake1\n"); mylog(log_info, "state changed from client_tcp_dummy to client_handshake1\n");
// send_info.ack_seq=recv_info.seq+1; // send_info.ack_seq=recv_info.seq+1;
@ -518,27 +419,21 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
conn_info.last_hb_sent_time = 0; conn_info.last_hb_sent_time = 0;
client_on_timer(conn_info); client_on_timer(conn_info);
return 0; return 0;
} } else {
else
{
mylog(log_debug, "unexpected packet type,expected:syn ack\n"); mylog(log_debug, "unexpected packet type,expected:syn ack\n");
return -1; return -1;
} }
} } else if (conn_info.state.client_current_state == client_handshake1) // recevied respond of handshake1
else if(conn_info.state.client_current_state==client_handshake1)//recevied respond of handshake1
{
if(recv_bare(raw_info,data,data_len)!=0)
{ {
if (recv_bare(raw_info, data, data_len) != 0) {
mylog(log_debug, "recv_bare failed!\n"); mylog(log_debug, "recv_bare failed!\n");
return -1; return -1;
} }
if(!recv_info.new_src_ip.equal(send_info.new_dst_ip)||recv_info.src_port!=send_info.dst_port) if (!recv_info.new_src_ip.equal(send_info.new_dst_ip) || recv_info.src_port != send_info.dst_port) {
{
mylog(log_debug, "unexpected adress %s %s %d %d\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port); mylog(log_debug, "unexpected adress %s %s %d %d\n", recv_info.new_src_ip.get_str1(), send_info.new_dst_ip.get_str2(), recv_info.src_port, send_info.dst_port);
return -1; return -1;
} }
if(data_len<int( 3*sizeof(my_id_t))) if (data_len < int(3 * sizeof(my_id_t))) {
{
mylog(log_debug, "too short to be a handshake\n"); mylog(log_debug, "too short to be a handshake\n");
return -1; return -1;
} }
@ -554,22 +449,17 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
memcpy(&tmp_oppsite_const_id, &data[sizeof(my_id_t) * 2], sizeof(tmp_oppsite_const_id)); memcpy(&tmp_oppsite_const_id, &data[sizeof(my_id_t) * 2], sizeof(tmp_oppsite_const_id));
tmp_oppsite_const_id = ntohl(tmp_oppsite_const_id); tmp_oppsite_const_id = ntohl(tmp_oppsite_const_id);
if(tmp_my_id!=conn_info.my_id) if (tmp_my_id != conn_info.my_id) {
{
mylog(log_debug, "tmp_my_id doesnt match\n"); mylog(log_debug, "tmp_my_id doesnt match\n");
return -1; return -1;
} }
if (raw_mode == mode_faketcp) {
if(raw_mode==mode_faketcp) if (recv_info.ack_seq != send_info.seq) {
{
if(recv_info.ack_seq!=send_info.seq)
{
mylog(log_debug, "seq ack_seq mis match\n"); mylog(log_debug, "seq ack_seq mis match\n");
return -1; return -1;
} }
if(recv_info.seq!=send_info.ack_seq) if (recv_info.seq != send_info.ack_seq) {
{
mylog(log_debug, "seq ack_seq mis match\n"); mylog(log_debug, "seq ack_seq mis match\n");
return -1; return -1;
} }
@ -584,20 +474,17 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
client_on_timer(conn_info); client_on_timer(conn_info);
return 0; return 0;
} } else if (conn_info.state.client_current_state == client_handshake2 || conn_info.state.client_current_state == client_ready) // received heartbeat or data
else if(conn_info.state.client_current_state==client_handshake2||conn_info.state.client_current_state==client_ready)//received heartbeat or data
{ {
vector<char> type_vec; vector<char> type_vec;
vector<string> data_vec; vector<string> data_vec;
recv_safer_multi(conn_info, type_vec, data_vec); recv_safer_multi(conn_info, type_vec, data_vec);
if(data_vec.empty()) if (data_vec.empty()) {
{
mylog(log_debug, "recv_safer failed!\n"); mylog(log_debug, "recv_safer failed!\n");
return -1; return -1;
} }
for(int i=0;i<(int)type_vec.size();i++) for (int i = 0; i < (int)type_vec.size(); i++) {
{
char type = type_vec[i]; char type = type_vec[i];
char *data = (char *)data_vec[i].c_str(); // be careful, do not append data to it char *data = (char *)data_vec[i].c_str(); // be careful, do not append data to it
int data_len = data_vec[i].length(); int data_len = data_vec[i].length();
@ -605,16 +492,13 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
} }
return 0; return 0;
} } else {
else
{
mylog(log_fatal, "unknown state,this shouldnt happen.\n"); mylog(log_fatal, "unknown state,this shouldnt happen.\n");
myexit(-1); myexit(-1);
} }
return 0; return 0;
} }
int client_on_udp_recv(conn_info_t &conn_info) int client_on_udp_recv(conn_info_t &conn_info) {
{
int recv_len; int recv_len;
char buf[buf_len]; char buf[buf_len];
address_t::storage_t udp_new_addr_in = {{0}}; address_t::storage_t udp_new_addr_in = {{0}};
@ -626,14 +510,12 @@ int client_on_udp_recv(conn_info_t &conn_info)
// myexit(1); // myexit(1);
}; };
if(recv_len==max_data_len+1) if (recv_len == max_data_len + 1) {
{
mylog(log_warn, "huge packet, data_len > %d,dropped\n", max_data_len); mylog(log_warn, "huge packet, data_len > %d,dropped\n", max_data_len);
return -1; return -1;
} }
if(recv_len>=mtu_warn) if (recv_len >= mtu_warn) {
{
mylog(log_warn, "huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ", recv_len, mtu_warn); mylog(log_warn, "huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ", recv_len, mtu_warn);
} }
@ -641,53 +523,45 @@ int client_on_udp_recv(conn_info_t &conn_info)
tmp_addr.from_sockaddr((sockaddr *)&udp_new_addr_in, udp_new_addr_len); tmp_addr.from_sockaddr((sockaddr *)&udp_new_addr_in, udp_new_addr_len);
u32_t conv; u32_t conv;
if(!conn_info.blob->conv_manager.c.is_data_used(tmp_addr)) if (!conn_info.blob->conv_manager.c.is_data_used(tmp_addr)) {
{ if (conn_info.blob->conv_manager.c.get_size() >= max_conv_num) {
if(conn_info.blob->conv_manager.c.get_size() >=max_conv_num)
{
mylog(log_warn, "ignored new udp connect bc max_conv_num exceed\n"); mylog(log_warn, "ignored new udp connect bc max_conv_num exceed\n");
return -1; return -1;
} }
conv = conn_info.blob->conv_manager.c.get_new_conv(); conv = conn_info.blob->conv_manager.c.get_new_conv();
conn_info.blob->conv_manager.c.insert_conv(conv, tmp_addr); conn_info.blob->conv_manager.c.insert_conv(conv, tmp_addr);
mylog(log_info, "new packet from %s,conv_id=%x\n", tmp_addr.get_str(), conv); mylog(log_info, "new packet from %s,conv_id=%x\n", tmp_addr.get_str(), conv);
} } else {
else
{
conv = conn_info.blob->conv_manager.c.find_conv_by_data(tmp_addr); conv = conn_info.blob->conv_manager.c.find_conv_by_data(tmp_addr);
} }
conn_info.blob->conv_manager.c.update_active_time(conv); conn_info.blob->conv_manager.c.update_active_time(conv);
if(conn_info.state.client_current_state==client_ready) if (conn_info.state.client_current_state == client_ready) {
{
send_data_safer(conn_info, buf, recv_len, conv); send_data_safer(conn_info, buf, recv_len, conv);
} }
return 0; return 0;
} }
void udp_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) void udp_accept_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) {
{
conn_info_t &conn_info = *((conn_info_t *)watcher->data); conn_info_t &conn_info = *((conn_info_t *)watcher->data);
client_on_udp_recv(conn_info); client_on_udp_recv(conn_info);
} }
void raw_recv_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) void raw_recv_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) {
{
if (is_udp2raw_mp) assert(0 == 1); if (is_udp2raw_mp) assert(0 == 1);
conn_info_t &conn_info = *((conn_info_t *)watcher->data); conn_info_t &conn_info = *((conn_info_t *)watcher->data);
client_on_raw_recv(conn_info); client_on_raw_recv(conn_info);
} }
#ifdef UDP2RAW_MP #ifdef UDP2RAW_MP
void async_cb(struct ev_loop *loop, struct ev_async *watcher, int revents) void async_cb(struct ev_loop *loop, struct ev_async *watcher, int revents) {
{
conn_info_t &conn_info = *((conn_info_t *)watcher->data); conn_info_t &conn_info = *((conn_info_t *)watcher->data);
if(send_with_pcap&&!pcap_header_captured) if (send_with_pcap && !pcap_header_captured) {
{ int empty = 0;
int empty=0;char *p;int len; char *p;
int len;
pthread_mutex_lock(&queue_mutex); pthread_mutex_lock(&queue_mutex);
empty = my_queue.empty(); empty = my_queue.empty();
if(!empty) if (!empty) {
{
my_queue.peek_front(p, len); my_queue.peek_front(p, len);
my_queue.pop_front(); my_queue.pop_front();
} }
@ -709,21 +583,20 @@ void async_cb(struct ev_loop *loop, struct ev_async *watcher, int revents)
} }
// mylog(log_info,"async_cb called\n"); // mylog(log_info,"async_cb called\n");
while(1) while (1) {
{ int empty = 0;
int empty=0;char *p;int len; char *p;
int len;
pthread_mutex_lock(&queue_mutex); pthread_mutex_lock(&queue_mutex);
empty = my_queue.empty(); empty = my_queue.empty();
if(!empty) if (!empty) {
{
my_queue.peek_front(p, len); my_queue.peek_front(p, len);
my_queue.pop_front(); my_queue.pop_front();
} }
pthread_mutex_unlock(&queue_mutex); pthread_mutex_unlock(&queue_mutex);
if (empty) break; if (empty) break;
if(g_fix_gro==0&&len>max_data_len) if (g_fix_gro == 0 && len > max_data_len) {
{
mylog(log_warn, "huge packet %d > %d, dropped. maybe you need to turn down mtu at upper level, or maybe you need the --fix-gro option\n", len, max_data_len); mylog(log_warn, "huge packet %d > %d, dropped. maybe you need to turn down mtu at upper level, or maybe you need the --fix-gro option\n", len, max_data_len);
break; break;
} }
@ -737,21 +610,18 @@ void async_cb(struct ev_loop *loop, struct ev_async *watcher, int revents)
} }
} }
#endif #endif
void clear_timer_cb(struct ev_loop *loop, struct ev_timer *watcher, int revents) void clear_timer_cb(struct ev_loop *loop, struct ev_timer *watcher, int revents) {
{
conn_info_t &conn_info = *((conn_info_t *)watcher->data); conn_info_t &conn_info = *((conn_info_t *)watcher->data);
client_on_timer(conn_info); client_on_timer(conn_info);
} }
void fifo_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) void fifo_cb(struct ev_loop *loop, struct ev_io *watcher, int revents) {
{
conn_info_t &conn_info = *((conn_info_t *)watcher->data); conn_info_t &conn_info = *((conn_info_t *)watcher->data);
char buf[buf_len]; char buf[buf_len];
int fifo_fd = watcher->fd; int fifo_fd = watcher->fd;
int len = read(fifo_fd, buf, sizeof(buf)); int len = read(fifo_fd, buf, sizeof(buf));
if(len<0) if (len < 0) {
{
mylog(log_warn, "fifo read failed len=%d,errno=%s\n", len, get_sock_error()); mylog(log_warn, "fifo read failed len=%d,errno=%s\n", len, get_sock_error());
return; return;
} }
@ -759,20 +629,15 @@ void fifo_cb(struct ev_loop *loop, struct ev_io *watcher, int revents)
while (len >= 1 && buf[len - 1] == '\n') while (len >= 1 && buf[len - 1] == '\n')
buf[len - 1] = 0; buf[len - 1] = 0;
mylog(log_info, "got data from fifo,len=%d,s=[%s]\n", len, buf); mylog(log_info, "got data from fifo,len=%d,s=[%s]\n", len, buf);
if(strcmp(buf,"reconnect")==0) if (strcmp(buf, "reconnect") == 0) {
{
mylog(log_info, "received command: reconnect\n"); mylog(log_info, "received command: reconnect\n");
conn_info.state.client_current_state = client_idle; conn_info.state.client_current_state = client_idle;
conn_info.my_id = get_true_random_number_nz(); conn_info.my_id = get_true_random_number_nz();
} } else {
else
{
mylog(log_info, "unknown command\n"); mylog(log_info, "unknown command\n");
} }
} }
int client_event_loop() int client_event_loop() {
{
char buf[buf_len]; char buf[buf_len];
conn_info_t conn_info; conn_info_t conn_info;
@ -783,10 +648,8 @@ int client_event_loop()
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
#ifdef UDP2RAW_LINUX #ifdef UDP2RAW_LINUX
if(lower_level) if (lower_level) {
{ if (lower_level_manual) {
if(lower_level_manual)
{
int index; int index;
init_ifindex(if_name, raw_send_fd, index); init_ifindex(if_name, raw_send_fd, index);
// init_ifindex(if_name); // init_ifindex(if_name);
@ -797,37 +660,26 @@ int client_event_loop()
send_info.addr_ll.sll_protocol = htons(ETH_P_IP); send_info.addr_ll.sll_protocol = htons(ETH_P_IP);
memcpy(&send_info.addr_ll.sll_addr, dest_hw_addr, ETHER_ADDR_LEN); memcpy(&send_info.addr_ll.sll_addr, dest_hw_addr, ETHER_ADDR_LEN);
mylog(log_info, "we are running at lower-level (manual) mode\n"); mylog(log_info, "we are running at lower-level (manual) mode\n");
} } else {
else
{
u32_t dest_ip; u32_t dest_ip;
string if_name_string; string if_name_string;
string hw_string; string hw_string;
assert(remote_addr.get_type() == AF_INET); assert(remote_addr.get_type() == AF_INET);
if(retry_on_error==0) if (retry_on_error == 0) {
{ if (find_lower_level_info(remote_addr.inner.ipv4.sin_addr.s_addr, dest_ip, if_name_string, hw_string) != 0) {
if(find_lower_level_info(remote_addr.inner.ipv4.sin_addr.s_addr,dest_ip,if_name_string,hw_string)!=0)
{
mylog(log_fatal, "auto detect lower-level info failed for %s,specific it manually\n", remote_addr.get_ip()); mylog(log_fatal, "auto detect lower-level info failed for %s,specific it manually\n", remote_addr.get_ip());
myexit(-1); myexit(-1);
} }
} } else {
else
{
int ok = 0; int ok = 0;
while(!ok) while (!ok) {
{ if (find_lower_level_info(remote_addr.inner.ipv4.sin_addr.s_addr, dest_ip, if_name_string, hw_string) != 0) {
if(find_lower_level_info(remote_addr.inner.ipv4.sin_addr.s_addr,dest_ip,if_name_string,hw_string)!=0)
{
mylog(log_warn, "auto detect lower-level info failed for %s,retry in %d seconds\n", remote_addr.get_ip(), retry_on_error_interval); mylog(log_warn, "auto detect lower-level info failed for %s,retry in %d seconds\n", remote_addr.get_ip(), retry_on_error_interval);
sleep(retry_on_error_interval); sleep(retry_on_error_interval);
} } else {
else
{
ok = 1; ok = 1;
} }
} }
} }
mylog(log_info, "we are running at lower-level (auto) mode,%s %s %s\n", my_ntoa(dest_ip), if_name_string.c_str(), hw_string.c_str()); mylog(log_info, "we are running at lower-level (auto) mode,%s %s %s\n", my_ntoa(dest_ip), if_name_string.c_str(), hw_string.c_str());
@ -856,20 +708,17 @@ int client_event_loop()
memcpy(&send_info.addr_ll.sll_addr, dest_hw_addr, ETHER_ADDR_LEN); memcpy(&send_info.addr_ll.sll_addr, dest_hw_addr, ETHER_ADDR_LEN);
// mylog(log_info,"we are running at lower-level (manual) mode\n"); // mylog(log_info,"we are running at lower-level (manual) mode\n");
} }
} }
#endif #endif
#ifdef UDP2RAW_MP #ifdef UDP2RAW_MP
address_t tmp_addr; address_t tmp_addr;
if(get_src_adress2(tmp_addr,remote_addr)!=0) if (get_src_adress2(tmp_addr, remote_addr) != 0) {
{
mylog(log_error, "get_src_adress() failed\n"); mylog(log_error, "get_src_adress() failed\n");
myexit(-1); myexit(-1);
} }
if(strcmp(dev,"")==0) if (strcmp(dev, "") == 0) {
{
mylog(log_info, "--dev have not been set, trying to detect automatically, available devices:\n"); mylog(log_info, "--dev have not been set, trying to detect automatically, available devices:\n");
mylog(log_info, "available device(device name: ip address ; description):\n"); mylog(log_info, "available device(device name: ip address ; description):\n");
@ -879,8 +728,7 @@ int client_event_loop()
int found = 0; int found = 0;
pcap_if_t *interfaces, *d; pcap_if_t *interfaces, *d;
if(pcap_findalldevs(&interfaces,errbuf)==-1) if (pcap_findalldevs(&interfaces, errbuf) == -1) {
{
mylog(log_fatal, "error in pcap_findalldevs(),%s\n", errbuf); mylog(log_fatal, "error in pcap_findalldevs(),%s\n", errbuf);
myexit(-1); myexit(-1);
} }
@ -889,82 +737,61 @@ int client_event_loop()
log_bare(log_warn, "%s:", d->name); log_bare(log_warn, "%s:", d->name);
int cnt = 0; int cnt = 0;
for (pcap_addr_t *a = d->addresses; a != NULL; a = a->next) { for (pcap_addr_t *a = d->addresses; a != NULL; a = a->next) {
if(a->addr==NULL) if (a->addr == NULL) {
{
log_bare(log_debug, " [a->addr==NULL]"); log_bare(log_debug, " [a->addr==NULL]");
continue; continue;
} }
if(a->addr->sa_family == AF_INET||a->addr->sa_family == AF_INET6) if (a->addr->sa_family == AF_INET || a->addr->sa_family == AF_INET6) {
{
cnt++; cnt++;
if(a->addr->sa_family ==AF_INET) if (a->addr->sa_family == AF_INET) {
{
char s[max_addr_len]; char s[max_addr_len];
inet_ntop(AF_INET, &((struct sockaddr_in *)a->addr)->sin_addr, s, max_addr_len); inet_ntop(AF_INET, &((struct sockaddr_in *)a->addr)->sin_addr, s, max_addr_len);
log_bare(log_warn, " [%s]", s); log_bare(log_warn, " [%s]", s);
if(a->addr->sa_family==raw_ip_version) if (a->addr->sa_family == raw_ip_version) {
{ if (((struct sockaddr_in *)a->addr)->sin_addr.s_addr == tmp_addr.inner.ipv4.sin_addr.s_addr) {
if(((struct sockaddr_in*)a->addr)->sin_addr.s_addr ==tmp_addr.inner.ipv4.sin_addr.s_addr)
{
found++; found++;
strcpy(dev, d->name); strcpy(dev, d->name);
} }
} }
} } else {
else
{
assert(a->addr->sa_family == AF_INET6); assert(a->addr->sa_family == AF_INET6);
char s[max_addr_len]; char s[max_addr_len];
inet_ntop(AF_INET6, &((struct sockaddr_in6 *)a->addr)->sin6_addr, s, max_addr_len); inet_ntop(AF_INET6, &((struct sockaddr_in6 *)a->addr)->sin6_addr, s, max_addr_len);
log_bare(log_warn, " [%s]", s); log_bare(log_warn, " [%s]", s);
if(a->addr->sa_family==raw_ip_version) if (a->addr->sa_family == raw_ip_version) {
{ if (memcmp(&((struct sockaddr_in6 *)a->addr)->sin6_addr, &tmp_addr.inner.ipv6.sin6_addr, sizeof(struct in6_addr)) == 0) {
if( memcmp( &((struct sockaddr_in6*)a->addr)->sin6_addr,&tmp_addr.inner.ipv6.sin6_addr,sizeof(struct in6_addr))==0 )
{
found++; found++;
strcpy(dev, d->name); strcpy(dev, d->name);
} }
} }
} }
} } else {
else
{
log_bare(log_debug, " [unknow:%d]", int(a->addr->sa_family)); log_bare(log_debug, " [unknow:%d]", int(a->addr->sa_family));
} }
} }
if (cnt == 0) log_bare(log_warn, " [no ip found]"); if (cnt == 0) log_bare(log_warn, " [no ip found]");
if(d->description==0) if (d->description == 0) {
{
log_bare(log_warn, "; (no description available)"); log_bare(log_warn, "; (no description available)");
} } else {
else
{
log_bare(log_warn, "; %s", d->description); log_bare(log_warn, "; %s", d->description);
} }
log_bare(log_warn, "\n"); log_bare(log_warn, "\n");
} }
if(found==0) if (found == 0) {
{
mylog(log_fatal, "no matched device found for ip: [%s]\n", tmp_addr.get_ip()); mylog(log_fatal, "no matched device found for ip: [%s]\n", tmp_addr.get_ip());
myexit(-1); myexit(-1);
} } else if (found == 1) {
else if(found==1)
{
mylog(log_info, "using device:[%s], ip: [%s]\n", dev, tmp_addr.get_ip()); mylog(log_info, "using device:[%s], ip: [%s]\n", dev, tmp_addr.get_ip());
} } else {
else
{
mylog(log_fatal, "more than one devices found for ip: [%s] , you need to use --dev manually\n", tmp_addr.get_ip()); mylog(log_fatal, "more than one devices found for ip: [%s] , you need to use --dev manually\n", tmp_addr.get_ip());
myexit(-1); myexit(-1);
} }
} } else {
else
{
mylog(log_info, "--dev has been manually set, using device:[%s]\n", dev); mylog(log_info, "--dev has been manually set, using device:[%s]\n", dev);
} }
#endif #endif
@ -972,17 +799,15 @@ int client_event_loop()
send_info.src_port = 0; send_info.src_port = 0;
memset(&send_info.new_src_ip, 0, sizeof(send_info.new_src_ip)); memset(&send_info.new_src_ip, 0, sizeof(send_info.new_src_ip));
int i, j, k;int ret; int i, j, k;
int ret;
send_info.new_dst_ip.from_address_t(remote_addr); send_info.new_dst_ip.from_address_t(remote_addr);
send_info.dst_port = remote_addr.get_port(); send_info.dst_port = remote_addr.get_port();
udp_fd = socket(local_addr.get_type(), SOCK_DGRAM, IPPROTO_UDP); udp_fd = socket(local_addr.get_type(), SOCK_DGRAM, IPPROTO_UDP);
set_buf_size(udp_fd, socket_buf_size); set_buf_size(udp_fd, socket_buf_size);
if (::bind(udp_fd, (struct sockaddr *)&local_addr.inner, local_addr.get_len()) == -1) { if (::bind(udp_fd, (struct sockaddr *)&local_addr.inner, local_addr.get_len()) == -1) {
mylog(log_fatal, "socket bind error\n"); mylog(log_fatal, "socket bind error\n");
// perror("socket bind error"); // perror("socket bind error");
@ -1010,14 +835,12 @@ int client_event_loop()
// myexit(-1); // myexit(-1);
// } // }
struct ev_io udp_accept_watcher; struct ev_io udp_accept_watcher;
udp_accept_watcher.data = &conn_info; udp_accept_watcher.data = &conn_info;
ev_io_init(&udp_accept_watcher, udp_accept_cb, udp_fd, EV_READ); ev_io_init(&udp_accept_watcher, udp_accept_cb, udp_fd, EV_READ);
ev_io_start(loop, &udp_accept_watcher); ev_io_start(loop, &udp_accept_watcher);
// ev.events = EPOLLIN; // ev.events = EPOLLIN;
// ev.data.u64 = raw_recv_fd; // ev.data.u64 = raw_recv_fd;
@ -1058,8 +881,7 @@ int client_event_loop()
struct ev_io fifo_watcher; struct ev_io fifo_watcher;
fifo_watcher.data = &conn_info; fifo_watcher.data = &conn_info;
if(fifo_file[0]!=0) if (fifo_file[0] != 0) {
{
fifo_fd = create_fifo(fifo_file); fifo_fd = create_fifo(fifo_file);
ev_io_init(&fifo_watcher, fifo_cb, fifo_fd, EV_READ); ev_io_init(&fifo_watcher, fifo_cb, fifo_fd, EV_READ);

496
common.cpp
View File

File diff suppressed because it is too large Load Diff

174
common.h
View File

@ -44,7 +44,6 @@ const int is_udp2raw_mp=1;
#include <libnet.h> #include <libnet.h>
#endif #endif
#else #else
#define UDP2RAW_LINUX #define UDP2RAW_LINUX
const int is_udp2raw_mp = 0; const int is_udp2raw_mp = 0;
@ -80,7 +79,6 @@ typedef int socklen_t;
#include <netinet/in.h> #include <netinet/in.h>
#endif #endif
#include <unordered_map> #include <unordered_map>
#include <fstream> #include <fstream>
#include <string> #include <string>
@ -100,7 +98,6 @@ using namespace std;
#define UDP2RAW_BIG_ENDIAN 1 #define UDP2RAW_BIG_ENDIAN 1
#endif #endif
#if defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN || \ #if defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN || \
defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ || \ defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ || \
defined(__LITTLE_ENDIAN__) || \ defined(__LITTLE_ENDIAN__) || \
@ -115,12 +112,10 @@ using namespace std;
#error "endian detection conflicts" #error "endian detection conflicts"
#endif #endif
#if !defined(UDP2RAW_BIG_ENDIAN) && !defined(UDP2RAW_LITTLE_ENDIAN) #if !defined(UDP2RAW_BIG_ENDIAN) && !defined(UDP2RAW_LITTLE_ENDIAN)
#error "endian detection failed" #error "endian detection failed"
#endif #endif
#if defined(__MINGW32__) #if defined(__MINGW32__)
int inet_pton(int af, const char *src, void *dst); int inet_pton(int af, const char *src, void *dst);
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
@ -132,20 +127,17 @@ int get_sock_errno();
#if defined(__MINGW32__) #if defined(__MINGW32__)
typedef SOCKET my_fd_t; typedef SOCKET my_fd_t;
inline int sock_close(my_fd_t fd) inline int sock_close(my_fd_t fd) {
{
return closesocket(fd); return closesocket(fd);
} }
#else #else
typedef int my_fd_t; typedef int my_fd_t;
inline int sock_close(my_fd_t fd) inline int sock_close(my_fd_t fd) {
{
return close(fd); return close(fd);
} }
#endif #endif
typedef unsigned long long u64_t; // this works on most platform,avoid using the PRId64 typedef unsigned long long u64_t; // this works on most platform,avoid using the PRId64
typedef long long i64_t; typedef long long i64_t;
@ -188,10 +180,8 @@ u32_t sdbm(unsigned char *str,int len);
struct address_t // TODO scope id struct address_t // TODO scope id
{ {
struct hash_function struct hash_function {
{ u32_t operator()(const address_t &key) const {
u32_t operator()(const address_t &key) const
{
return sdbm((unsigned char *)&key.inner, sizeof(key.inner)); return sdbm((unsigned char *)&key.inner, sizeof(key.inner));
} }
}; };
@ -203,16 +193,13 @@ struct address_t //TODO scope id
}; };
storage_t inner; storage_t inner;
address_t() address_t() {
{
clear(); clear();
} }
void clear() void clear() {
{
memset(&inner, 0, sizeof(inner)); memset(&inner, 0, sizeof(inner));
} }
int from_ip_port(u32_t ip, int port) int from_ip_port(u32_t ip, int port) {
{
clear(); clear();
inner.ipv4.sin_family = AF_INET; inner.ipv4.sin_family = AF_INET;
inner.ipv4.sin_port = htons(port); inner.ipv4.sin_port = htons(port);
@ -220,17 +207,13 @@ struct address_t //TODO scope id
return 0; return 0;
} }
int from_ip_port_new(int type, void * ip, int port) int from_ip_port_new(int type, void *ip, int port) {
{
clear(); clear();
if(type==AF_INET) if (type == AF_INET) {
{
inner.ipv4.sin_family = AF_INET; inner.ipv4.sin_family = AF_INET;
inner.ipv4.sin_port = htons(port); inner.ipv4.sin_port = htons(port);
inner.ipv4.sin_addr.s_addr = *((u32_t *)ip); inner.ipv4.sin_addr.s_addr = *((u32_t *)ip);
} } else if (type == AF_INET6) {
else if(type==AF_INET6)
{
inner.ipv6.sin6_family = AF_INET6; inner.ipv6.sin6_family = AF_INET6;
inner.ipv6.sin6_port = htons(port); inner.ipv6.sin6_port = htons(port);
inner.ipv6.sin6_addr = *((in6_addr *)ip); inner.ipv6.sin6_addr = *((in6_addr *)ip);
@ -247,18 +230,15 @@ struct address_t //TODO scope id
char *get_str(); char *get_str();
void to_str(char *); void to_str(char *);
inline u32_t get_type() inline u32_t get_type() {
{
u32_t ret = ((sockaddr *)&inner)->sa_family; u32_t ret = ((sockaddr *)&inner)->sa_family;
assert(ret == AF_INET || ret == AF_INET6); assert(ret == AF_INET || ret == AF_INET6);
return ret; return ret;
} }
inline u32_t get_len() inline u32_t get_len() {
{
u32_t type = get_type(); u32_t type = get_type();
switch(type) switch (type) {
{
case AF_INET: case AF_INET:
return sizeof(sockaddr_in); return sizeof(sockaddr_in);
case AF_INET6: case AF_INET6:
@ -269,11 +249,9 @@ struct address_t //TODO scope id
return -1; return -1;
} }
inline u32_t get_port() inline u32_t get_port() {
{
u32_t type = get_type(); u32_t type = get_type();
switch(type) switch (type) {
{
case AF_INET: case AF_INET:
return ntohs(inner.ipv4.sin_port); return ntohs(inner.ipv4.sin_port);
case AF_INET6: case AF_INET6:
@ -284,11 +262,9 @@ struct address_t //TODO scope id
return -1; return -1;
} }
inline void set_port(int port) inline void set_port(int port) {
{
u32_t type = get_type(); u32_t type = get_type();
switch(type) switch (type) {
{
case AF_INET: case AF_INET:
inner.ipv4.sin_port = htons(port); inner.ipv4.sin_port = htons(port);
break; break;
@ -301,8 +277,7 @@ struct address_t //TODO scope id
return; return;
} }
bool operator == (const address_t &b) const bool operator==(const address_t &b) const {
{
// return this->data==b.data; // return this->data==b.data;
return memcmp(&this->inner, &b.inner, sizeof(this->inner)) == 0; return memcmp(&this->inner, &b.inner, sizeof(this->inner)) == 0;
} }
@ -314,16 +289,13 @@ struct address_t //TODO scope id
namespace std { namespace std {
template <> template <>
struct hash<address_t> struct hash<address_t> {
{ std::size_t operator()(const address_t &key) const {
std::size_t operator()(const address_t& key) const
{
// return address_t::hash_function(k); // return address_t::hash_function(k);
return sdbm((unsigned char *)&key.inner, sizeof(key.inner)); return sdbm((unsigned char *)&key.inner, sizeof(key.inner));
} }
}; };
} } // namespace std
union my_ip_t // just a simple version of address_t,stores ip only union my_ip_t // just a simple version of address_t,stores ip only
{ {
@ -337,21 +309,15 @@ union my_ip_t //just a simple version of address_t,stores ip only
char *get_str2() const; char *get_str2() const;
int from_address_t(address_t a); int from_address_t(address_t a);
}; };
struct not_copy_able_t struct not_copy_able_t {
{ not_copy_able_t() {
not_copy_able_t()
{
} }
not_copy_able_t(const not_copy_able_t &other) not_copy_able_t(const not_copy_able_t &other) {
{
assert(0 == 1); assert(0 == 1);
} }
const not_copy_able_t & operator=(const not_copy_able_t &other) const not_copy_able_t &operator=(const not_copy_able_t &other) {
{
assert(0 == 1); assert(0 == 1);
return other; return other;
} }
@ -368,44 +334,43 @@ const int buf_len=max_data_len+400;
#ifdef UDP2RAW_MP #ifdef UDP2RAW_MP
const int queue_len = 200; const int queue_len = 200;
struct queue_t struct queue_t {
{
char data[queue_len][huge_buf_len]; char data[queue_len][huge_buf_len];
int data_len[queue_len]; int data_len[queue_len];
int head = 0; int head = 0;
int tail = 0; int tail = 0;
void clear() void clear() {
{
head = tail = 0; head = tail = 0;
} }
int empty() int empty() {
{ if (head == tail)
if(head==tail) return 1; return 1;
else return 0; else
return 0;
} }
int full() int full() {
{ if ((tail + 1) % queue_len == head)
if( (tail+1)%queue_len==head ) return 1; return 1;
else return 0; else
return 0;
} }
void peek_front(char * & p,int &len) void peek_front(char *&p, int &len) {
{
assert(!empty()); assert(!empty());
p = data[head]; p = data[head];
len = data_len[head]; len = data_len[head];
} }
void pop_front() void pop_front() {
{
assert(!empty()); assert(!empty());
head++;head%=queue_len; head++;
head %= queue_len;
} }
void push_back(char * p,int len) void push_back(char *p, int len) {
{
assert(!full()); assert(!full());
memcpy(data[tail], p, len); memcpy(data[tail], p, len);
data_len[tail] = len; data_len[tail] = len;
tail++;tail%=queue_len; tail++;
tail %= queue_len;
} }
}; };
@ -474,12 +439,10 @@ int create_fifo(char * file);
void print_binary_chars(const char *a, int len); void print_binary_chars(const char *a, int len);
template <class key_t> template <class key_t>
struct lru_collector_t:not_copy_able_t struct lru_collector_t : not_copy_able_t {
{
// typedef void* key_t; // typedef void* key_t;
//#define key_t void* //#define key_t void*
struct lru_pair_t struct lru_pair_t {
{
key_t key; key_t key;
my_time_t ts; my_time_t ts;
}; };
@ -487,65 +450,61 @@ struct lru_collector_t:not_copy_able_t
unordered_map<key_t, typename list<lru_pair_t>::iterator> mp; unordered_map<key_t, typename list<lru_pair_t>::iterator> mp;
list<lru_pair_t> q; list<lru_pair_t> q;
int update(key_t key) int update(key_t key) {
{
assert(mp.find(key) != mp.end()); assert(mp.find(key) != mp.end());
auto it = mp[key]; auto it = mp[key];
q.erase(it); q.erase(it);
my_time_t value = get_current_time(); my_time_t value = get_current_time();
if(!q.empty()) if (!q.empty()) {
{
assert(value >= q.front().ts); assert(value >= q.front().ts);
} }
lru_pair_t tmp; tmp.key=key; tmp.ts=value; lru_pair_t tmp;
tmp.key = key;
tmp.ts = value;
q.push_front(tmp); q.push_front(tmp);
mp[key] = q.begin(); mp[key] = q.begin();
return 0; return 0;
} }
int new_key(key_t key) int new_key(key_t key) {
{
assert(mp.find(key) == mp.end()); assert(mp.find(key) == mp.end());
my_time_t value = get_current_time(); my_time_t value = get_current_time();
if(!q.empty()) if (!q.empty()) {
{
assert(value >= q.front().ts); assert(value >= q.front().ts);
} }
lru_pair_t tmp; tmp.key=key; tmp.ts=value; lru_pair_t tmp;
tmp.key = key;
tmp.ts = value;
q.push_front(tmp); q.push_front(tmp);
mp[key] = q.begin(); mp[key] = q.begin();
return 0; return 0;
} }
int size() int size() {
{
return q.size(); return q.size();
} }
int empty() int empty() {
{
return q.empty(); return q.empty();
} }
void clear() void clear() {
{ mp.clear();
mp.clear(); q.clear(); q.clear();
} }
my_time_t ts_of(key_t key) my_time_t ts_of(key_t key) {
{
assert(mp.find(key) != mp.end()); assert(mp.find(key) != mp.end());
return mp[key]->ts; return mp[key]->ts;
} }
my_time_t peek_back(key_t &key) my_time_t peek_back(key_t &key) {
{
assert(!q.empty()); assert(!q.empty());
auto it=q.end(); it--; auto it = q.end();
it--;
key = it->key; key = it->key;
return it->ts; return it->ts;
} }
void erase(key_t key) void erase(key_t key) {
{
assert(mp.find(key) != mp.end()); assert(mp.find(key) != mp.end());
q.erase(mp[key]); q.erase(mp[key]);
mp.erase(key); mp.erase(key);
@ -560,5 +519,4 @@ struct lru_collector_t:not_copy_able_t
}*/ }*/
}; };
#endif /* COMMON_H_ */ #endif /* COMMON_H_ */

284
connection.cpp
View File

@ -15,67 +15,53 @@ const int disable_conn_clear=0;//a raw connection is called conn.
conn_manager_t conn_manager; conn_manager_t conn_manager;
anti_replay_seq_t anti_replay_t::get_new_seq_for_send() anti_replay_seq_t anti_replay_t::get_new_seq_for_send() {
{
return anti_replay_seq++; return anti_replay_seq++;
} }
anti_replay_t::anti_replay_t() anti_replay_t::anti_replay_t() {
{
max_packet_received = 0; max_packet_received = 0;
anti_replay_seq = get_true_random_number_64() / 10; // random first seq anti_replay_seq = get_true_random_number_64() / 10; // random first seq
// memset(window,0,sizeof(window)); //not necessary // memset(window,0,sizeof(window)); //not necessary
} }
void anti_replay_t::re_init() void anti_replay_t::re_init() {
{
max_packet_received = 0; max_packet_received = 0;
// memset(window,0,sizeof(window)); // memset(window,0,sizeof(window));
} }
int anti_replay_t::is_vaild(u64_t seq) int anti_replay_t::is_vaild(u64_t seq) {
{
if (disable_anti_replay) return 1; if (disable_anti_replay) return 1;
// if(disabled) return 0; // if(disabled) return 0;
if(seq==max_packet_received) return 0; if (seq == max_packet_received)
else if(seq>max_packet_received) return 0;
{ else if (seq > max_packet_received) {
if(seq-max_packet_received>=anti_replay_window_size) if (seq - max_packet_received >= anti_replay_window_size) {
{
memset(window, 0, sizeof(window)); memset(window, 0, sizeof(window));
window[seq % anti_replay_window_size] = 1; window[seq % anti_replay_window_size] = 1;
} } else {
else
{
for (u64_t i = max_packet_received + 1; i < seq; i++) for (u64_t i = max_packet_received + 1; i < seq; i++)
window[i % anti_replay_window_size] = 0; window[i % anti_replay_window_size] = 0;
window[seq % anti_replay_window_size] = 1; window[seq % anti_replay_window_size] = 1;
} }
max_packet_received = seq; max_packet_received = seq;
return 1; return 1;
} } else if (seq < max_packet_received) {
else if(seq<max_packet_received) if (max_packet_received - seq >= anti_replay_window_size)
{ return 0;
if(max_packet_received-seq>=anti_replay_window_size) return 0; else {
else if (window[seq % anti_replay_window_size] == 1)
{ return 0;
if (window[seq%anti_replay_window_size]==1) return 0; else {
else
{
window[seq % anti_replay_window_size] = 1; window[seq % anti_replay_window_size] = 1;
return 1; return 1;
} }
} }
} }
return 0; // for complier check return 0; // for complier check
} }
void conn_info_t::recover(const conn_info_t &conn_info) {
void conn_info_t::recover(const conn_info_t &conn_info)
{
raw_info = conn_info.raw_info; raw_info = conn_info.raw_info;
raw_info.rst_received = 0; raw_info.rst_received = 0;
@ -91,11 +77,9 @@ conn_manager_t conn_manager;
my_roller = 0; // no need to set,but for easier debug,set it to zero my_roller = 0; // no need to set,but for easier debug,set it to zero
oppsite_roller = 0; // same as above oppsite_roller = 0; // same as above
last_oppsite_roller_time = 0; last_oppsite_roller_time = 0;
} }
void conn_info_t::re_init() void conn_info_t::re_init() {
{
// send_packet_info.protocol=g_packet_info_send.protocol; // send_packet_info.protocol=g_packet_info_send.protocol;
if (program_mode == server_mode) if (program_mode == server_mode)
state.server_current_state = server_idle; state.server_current_state = server_idle;
@ -110,49 +94,37 @@ conn_manager_t conn_manager;
oppsite_roller = 0; oppsite_roller = 0;
last_oppsite_roller_time = 0; last_oppsite_roller_time = 0;
} }
conn_info_t::conn_info_t() conn_info_t::conn_info_t() {
{
blob = 0; blob = 0;
re_init(); re_init();
} }
void conn_info_t::prepare() void conn_info_t::prepare() {
{
assert(blob == 0); assert(blob == 0);
blob = new blob_t; blob = new blob_t;
if(program_mode==server_mode) if (program_mode == server_mode) {
{
blob->conv_manager.s.additional_clear_function = server_clear_function; blob->conv_manager.s.additional_clear_function = server_clear_function;
} } else {
else
{
assert(program_mode == client_mode); assert(program_mode == client_mode);
} }
} }
conn_info_t::conn_info_t(const conn_info_t&b) conn_info_t::conn_info_t(const conn_info_t &b) {
{
assert(0 == 1); assert(0 == 1);
// mylog(log_error,"called!!!!!!!!!!!!!\n"); // mylog(log_error,"called!!!!!!!!!!!!!\n");
} }
conn_info_t& conn_info_t::operator=(const conn_info_t& b) conn_info_t &conn_info_t::operator=(const conn_info_t &b) {
{
mylog(log_fatal, "not allowed\n"); mylog(log_fatal, "not allowed\n");
myexit(-1); myexit(-1);
return *this; return *this;
} }
conn_info_t::~conn_info_t() conn_info_t::~conn_info_t() {
{ if (program_mode == server_mode) {
if(program_mode==server_mode) if (state.server_current_state == server_ready) {
{
if(state.server_current_state==server_ready)
{
assert(blob != 0); assert(blob != 0);
assert(oppsite_const_id != 0); assert(oppsite_const_id != 0);
// assert(conn_manager.const_id_mp.find(oppsite_const_id)!=conn_manager.const_id_mp.end()); // conn_manager 's deconstuction function erases it // assert(conn_manager.const_id_mp.find(oppsite_const_id)!=conn_manager.const_id_mp.end()); // conn_manager 's deconstuction function erases it
} } else {
else
{
assert(blob == 0); assert(blob == 0);
assert(oppsite_const_id == 0); assert(oppsite_const_id == 0);
} }
@ -166,9 +138,7 @@ conn_manager_t conn_manager;
// send_packet_info.protocol=g_packet_info_send.protocol; // send_packet_info.protocol=g_packet_info_send.protocol;
} }
conn_manager_t::conn_manager_t() {
conn_manager_t::conn_manager_t()
{
ready_num = 0; ready_num = 0;
mp.reserve(10007); mp.reserve(10007);
// clear_it=mp.begin(); // clear_it=mp.begin();
@ -179,14 +149,12 @@ conn_manager_t conn_manager;
// current_ready_ip=0; // current_ready_ip=0;
// current_ready_port=0; // current_ready_port=0;
} }
int conn_manager_t::exist(address_t addr) int conn_manager_t::exist(address_t addr) {
{
// u64_t u64=0; // u64_t u64=0;
// u64=ip; // u64=ip;
// u64<<=32u; // u64<<=32u;
// u64|=port; // u64|=port;
if(mp.find(addr)!=mp.end()) if (mp.find(addr) != mp.end()) {
{
return 1; return 1;
} }
return 0; return 0;
@ -208,13 +176,10 @@ conn_manager_t conn_manager;
// u64<<=32u; // u64<<=32u;
// u64|=port; // u64|=port;
unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr); unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr);
if(it==mp.end()) if (it == mp.end()) {
{
mp[addr] = new conn_info_t; mp[addr] = new conn_info_t;
// lru.new_key(addr); // lru.new_key(addr);
} } else {
else
{
// lru.update(addr); // lru.update(addr);
} }
return mp[addr]; return mp[addr];
@ -226,21 +191,16 @@ conn_manager_t conn_manager;
// u64<<=32u; // u64<<=32u;
// u64|=port; // u64|=port;
unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr); unordered_map<address_t, conn_info_t *>::iterator it = mp.find(addr);
if(it==mp.end()) if (it == mp.end()) {
{
mp[addr] = new conn_info_t; mp[addr] = new conn_info_t;
// lru.new_key(addr); // lru.new_key(addr);
} } else {
else
{
// lru.update(addr); // lru.update(addr);
} }
return *mp[addr]; return *mp[addr];
} }
int conn_manager_t::erase(unordered_map<address_t,conn_info_t*>::iterator erase_it) int conn_manager_t::erase(unordered_map<address_t, conn_info_t *>::iterator erase_it) {
{ if (erase_it->second->state.server_current_state == server_ready) {
if(erase_it->second->state.server_current_state==server_ready)
{
ready_num--; ready_num--;
assert(i32_t(ready_num) != -1); assert(i32_t(ready_num) != -1);
assert(erase_it->second != 0); assert(erase_it->second != 0);
@ -252,7 +212,6 @@ conn_manager_t conn_manager;
assert(erase_it->second->oppsite_const_id != 0); assert(erase_it->second->oppsite_const_id != 0);
assert(const_id_mp.find(erase_it->second->oppsite_const_id) != const_id_mp.end()); assert(const_id_mp.find(erase_it->second->oppsite_const_id) != const_id_mp.end());
// assert(timer_fd_mp.find(erase_it->second->timer_fd)!=timer_fd_mp.end()); // assert(timer_fd_mp.find(erase_it->second->timer_fd)!=timer_fd_mp.end());
const_id_mp.erase(erase_it->second->oppsite_const_id); const_id_mp.erase(erase_it->second->oppsite_const_id);
@ -264,30 +223,24 @@ conn_manager_t conn_manager;
// close(erase_it->second->timer_fd);// close will auto delte it from epoll // close(erase_it->second->timer_fd);// close will auto delte it from epoll
delete (erase_it->second); delete (erase_it->second);
mp.erase(erase_it->first); mp.erase(erase_it->first);
} } else {
else
{
assert(erase_it->second->blob == 0); assert(erase_it->second->blob == 0);
assert(erase_it->second->timer_fd64 == 0); assert(erase_it->second->timer_fd64 == 0);
assert(erase_it->second->oppsite_const_id == 0); assert(erase_it->second->oppsite_const_id == 0);
delete (erase_it->second); delete (erase_it->second);
mp.erase(erase_it->first); mp.erase(erase_it->first);
} }
return 0; return 0;
} }
int conn_manager_t::clear_inactive() int conn_manager_t::clear_inactive() {
{ if (get_current_time() - last_clear_time > conn_clear_interval) {
if(get_current_time()-last_clear_time>conn_clear_interval)
{
last_clear_time = get_current_time(); last_clear_time = get_current_time();
return clear_inactive0(); return clear_inactive0();
} }
return 0; return 0;
} }
int conn_manager_t::clear_inactive0() int conn_manager_t::clear_inactive0() {
{
unordered_map<address_t, conn_info_t *>::iterator it; unordered_map<address_t, conn_info_t *>::iterator it;
unordered_map<address_t, conn_info_t *>::iterator old_it; unordered_map<address_t, conn_info_t *>::iterator old_it;
@ -304,31 +257,22 @@ int conn_manager_t::clear_inactive0()
num_to_clean = min(num_to_clean, (int)mp.size()); num_to_clean = min(num_to_clean, (int)mp.size());
u64_t current_time = get_current_time(); u64_t current_time = get_current_time();
for(;;) for (;;) {
{
if (cnt >= num_to_clean) break; if (cnt >= num_to_clean) break;
if (mp.begin() == mp.end()) break; if (mp.begin() == mp.end()) break;
if(it==mp.end()) if (it == mp.end()) {
{
it = mp.begin(); it = mp.begin();
} }
if(it->second->state.server_current_state==server_ready &&current_time - it->second->last_hb_recv_time <=server_conn_timeout) if (it->second->state.server_current_state == server_ready && current_time - it->second->last_hb_recv_time <= server_conn_timeout) {
{
it++; it++;
} } else if (it->second->state.server_current_state != server_ready && current_time - it->second->last_state_time <= server_handshake_timeout) {
else if(it->second->state.server_current_state!=server_ready&& current_time - it->second->last_state_time <=server_handshake_timeout )
{
it++; it++;
} } else if (it->second->blob != 0 && it->second->blob->conv_manager.s.get_size() > 0) {
else if(it->second->blob!=0&&it->second->blob->conv_manager.s.get_size() >0)
{
assert(it->second->state.server_current_state == server_ready); assert(it->second->state.server_current_state == server_ready);
it++; it++;
} } else {
else
{
mylog(log_info, "[%s:%d]inactive conn cleared \n", it->second->raw_info.recv_info.new_src_ip.get_str1(), it->second->raw_info.recv_info.src_port); mylog(log_info, "[%s:%d]inactive conn cleared \n", it->second->raw_info.recv_info.new_src_ip.get_str1(), it->second->raw_info.recv_info.src_port);
old_it = it; old_it = it;
it++; it++;
@ -341,13 +285,10 @@ int conn_manager_t::clear_inactive0()
return 0; return 0;
} }
int send_bare(raw_info_t &raw_info, const char *data, int len) // send function with encryption but no anti replay,this is used when client and server verifys each other int send_bare(raw_info_t &raw_info, const char *data, int len) // send function with encryption but no anti replay,this is used when client and server verifys each other
// you have to design the protocol carefully, so that you wont be affect by relay attack // you have to design the protocol carefully, so that you wont be affect by relay attack
{ {
if(len<0) if (len < 0) {
{
mylog(log_debug, "input_len <0\n"); mylog(log_debug, "input_len <0\n");
return -1; return -1;
} }
@ -357,7 +298,6 @@ int send_bare(raw_info_t &raw_info,const char* data,int len)//send function with
char send_data_buf[buf_len]; // buf for send data and send hb char send_data_buf[buf_len]; // buf for send data and send hb
char send_data_buf2[buf_len]; char send_data_buf2[buf_len];
// static send_bare[buf_len]; // static send_bare[buf_len];
iv_t iv = get_true_random_number_64(); iv_t iv = get_true_random_number_64();
padding_t padding = get_true_random_number_64(); padding_t padding = get_true_random_number_64();
@ -369,8 +309,7 @@ int send_bare(raw_info_t &raw_info,const char* data,int len)//send function with
memcpy(send_data_buf + sizeof(iv) + sizeof(padding) + 1, data, len); memcpy(send_data_buf + sizeof(iv) + sizeof(padding) + 1, data, len);
int new_len = len + sizeof(iv) + sizeof(padding) + 1; int new_len = len + sizeof(iv) + sizeof(padding) + 1;
if(my_encrypt(send_data_buf,send_data_buf2,new_len)!=0) if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0) {
{
return -1; return -1;
} }
send_raw0(raw_info, send_data_buf2, new_len); send_raw0(raw_info, send_data_buf2, new_len);
@ -380,26 +319,22 @@ int reserved_parse_bare(const char *input,int input_len,char* & data,int & len)
{ {
static char recv_data_buf[buf_len]; static char recv_data_buf[buf_len];
if(input_len<0) if (input_len < 0) {
{
mylog(log_debug, "input_len <0\n"); mylog(log_debug, "input_len <0\n");
return -1; return -1;
} }
if(my_decrypt(input,recv_data_buf,input_len)!=0) if (my_decrypt(input, recv_data_buf, input_len) != 0) {
{
mylog(log_debug, "decrypt_fail in recv bare\n"); mylog(log_debug, "decrypt_fail in recv bare\n");
return -1; return -1;
} }
if(recv_data_buf[sizeof(iv_t)+sizeof(padding_t)]!='b') if (recv_data_buf[sizeof(iv_t) + sizeof(padding_t)] != 'b') {
{
mylog(log_debug, "not a bare packet\n"); mylog(log_debug, "not a bare packet\n");
return -1; return -1;
} }
len = input_len; len = input_len;
data = recv_data_buf + sizeof(iv_t) + sizeof(padding_t) + 1; data = recv_data_buf + sizeof(iv_t) + sizeof(padding_t) + 1;
len -= sizeof(iv_t) + sizeof(padding_t) + 1; len -= sizeof(iv_t) + sizeof(padding_t) + 1;
if(len<0) if (len < 0) {
{
mylog(log_debug, "len <0\n"); mylog(log_debug, "len <0\n");
return -1; return -1;
} }
@ -411,21 +346,18 @@ int recv_bare(raw_info_t &raw_info,char* & data,int & len)//recv function with e
packet_info_t &send_info = raw_info.send_info; packet_info_t &send_info = raw_info.send_info;
packet_info_t &recv_info = raw_info.recv_info; packet_info_t &recv_info = raw_info.recv_info;
if(recv_raw0(raw_info,data,len)<0) if (recv_raw0(raw_info, data, len) < 0) {
{
// printf("recv_raw_fail in recv bare\n"); // printf("recv_raw_fail in recv bare\n");
return -1; return -1;
} }
if(len>=max_data_len+1) if (len >= max_data_len + 1) {
{
mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", len); mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", len);
return -1; return -1;
} }
mylog(log_trace, "data len=%d\n", len); mylog(log_trace, "data len=%d\n", len);
if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1))) if ((raw_mode == mode_faketcp && (recv_info.syn == 1 || recv_info.ack != 1))) {
{
mylog(log_debug, "unexpect packet type recv_info.syn=%d recv_info.ack=%d \n", recv_info.syn, recv_info.ack); mylog(log_debug, "unexpect packet type recv_info.syn=%d recv_info.ack=%d \n", recv_info.syn, recv_info.ack);
return -1; return -1;
} }
@ -437,10 +369,14 @@ int send_handshake(raw_info_t &raw_info,my_id_t id1,my_id_t id2,my_id_t id3)// a
packet_info_t &send_info = raw_info.send_info; packet_info_t &send_info = raw_info.send_info;
packet_info_t &recv_info = raw_info.recv_info; packet_info_t &recv_info = raw_info.recv_info;
char * data;int len; char *data;
int len;
// len=sizeof(id_t)*3; // len=sizeof(id_t)*3;
if (numbers_to_char(id1, id2, id3, data, len) != 0) return -1; if (numbers_to_char(id1, id2, id3, data, len) != 0) return -1;
if(send_bare(raw_info,data,len)!=0) {mylog(log_warn,"send bare fail\n");return -1;} if (send_bare(raw_info, data, len) != 0) {
mylog(log_warn, "send bare fail\n");
return -1;
}
return 0; return 0;
} }
/* /*
@ -456,17 +392,14 @@ int recv_handshake(packet_info_t &info,id_t &id1,id_t &id2,id_t &id3)
int send_safer(conn_info_t &conn_info, char type, const char *data, int len) // safer transfer function with anti-replay,when mutually verification is done. int send_safer(conn_info_t &conn_info, char type, const char *data, int len) // safer transfer function with anti-replay,when mutually verification is done.
{ {
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
if(type!='h'&&type!='d') if (type != 'h' && type != 'd') {
{
mylog(log_warn, "first byte is not h or d ,%x\n", type); mylog(log_warn, "first byte is not h or d ,%x\n", type);
return -1; return -1;
} }
char send_data_buf[buf_len]; // buf for send data and send hb char send_data_buf[buf_len]; // buf for send data and send hb
char send_data_buf2[buf_len]; char send_data_buf2[buf_len];
@ -482,7 +415,6 @@ int send_safer(conn_info_t &conn_info,char type,const char* data,int len) //saf
memcpy(send_data_buf + sizeof(n_tmp_id) * 2, &n_seq, sizeof(n_seq)); memcpy(send_data_buf + sizeof(n_tmp_id) * 2, &n_seq, sizeof(n_seq));
send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq)] = type; send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq)] = type;
send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq) + 1] = conn_info.my_roller; send_data_buf[sizeof(n_tmp_id) * 2 + sizeof(n_seq) + 1] = conn_info.my_roller;
@ -490,33 +422,24 @@ int send_safer(conn_info_t &conn_info,char type,const char* data,int len) //saf
int new_len = len + sizeof(n_seq) + sizeof(n_tmp_id) * 2 + 2; int new_len = len + sizeof(n_seq) + sizeof(n_tmp_id) * 2 + 2;
if(g_fix_gro==0) if (g_fix_gro == 0) {
{ if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0) {
if (my_encrypt(send_data_buf, send_data_buf2, new_len) != 0)
{
return -1; return -1;
} }
} } else {
else if (my_encrypt(send_data_buf, send_data_buf2 + 2, new_len) != 0) {
{
if (my_encrypt(send_data_buf, send_data_buf2+2, new_len) != 0)
{
return -1; return -1;
} }
write_u16(send_data_buf2, new_len); write_u16(send_data_buf2, new_len);
new_len += 2; new_len += 2;
if(cipher_mode==cipher_xor) if (cipher_mode == cipher_xor) {
{
send_data_buf2[0] ^= gro_xor[0]; send_data_buf2[0] ^= gro_xor[0];
send_data_buf2[1] ^= gro_xor[1]; send_data_buf2[1] ^= gro_xor[1];
} } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
else if(cipher_mode==cipher_aes128cbc||cipher_mode==cipher_aes128cbc)
{
aes_ecb_encrypt1(send_data_buf2); aes_ecb_encrypt1(send_data_buf2);
} }
} }
if (send_raw0(conn_info.raw_info, send_data_buf2, new_len) != 0) return -1; if (send_raw0(conn_info.raw_info, send_data_buf2, new_len) != 0) return -1;
if (after_send_raw0(conn_info.raw_info) != 0) return -1; if (after_send_raw0(conn_info.raw_info) != 0) return -1;
@ -537,21 +460,17 @@ int send_data_safer(conn_info_t &conn_info,const char* data,int len,u32_t conv_n
int new_len = len + sizeof(n_conv_num); int new_len = len + sizeof(n_conv_num);
send_safer(conn_info, 'd', send_data_buf, new_len); send_safer(conn_info, 'd', send_data_buf, new_len);
return 0; return 0;
} }
int reserved_parse_safer(conn_info_t &conn_info, const char *input, int input_len, char &type, char *&data, int &len) // subfunction for recv_safer,allow overlap int reserved_parse_safer(conn_info_t &conn_info, const char *input, int input_len, char &type, char *&data, int &len) // subfunction for recv_safer,allow overlap
{ {
static char recv_data_buf[buf_len]; static char recv_data_buf[buf_len];
// char *recv_data_buf=recv_data_buf0; //fix strict alias warning // char *recv_data_buf=recv_data_buf0; //fix strict alias warning
if(my_decrypt(input,recv_data_buf,input_len)!=0) if (my_decrypt(input, recv_data_buf, input_len) != 0) {
{
// printf("decrypt fail\n"); // printf("decrypt fail\n");
return -1; return -1;
} }
// char *a=recv_data_buf; // char *a=recv_data_buf;
// id_t h_oppiste_id= ntohl ( *((id_t * )(recv_data_buf)) ); // id_t h_oppiste_id= ntohl ( *((id_t * )(recv_data_buf)) );
my_id_t h_oppsite_id; my_id_t h_oppsite_id;
@ -568,8 +487,7 @@ int reserved_parse_safer(conn_info_t &conn_info,const char * input,int input_len
memcpy(&h_seq, recv_data_buf + sizeof(my_id_t) * 2, sizeof(h_seq)); memcpy(&h_seq, recv_data_buf + sizeof(my_id_t) * 2, sizeof(h_seq));
h_seq = ntoh64(h_seq); h_seq = ntoh64(h_seq);
if(h_oppsite_id!=conn_info.oppsite_id||h_my_id!=conn_info.my_id) if (h_oppsite_id != conn_info.oppsite_id || h_my_id != conn_info.my_id) {
{
mylog(log_debug, "id and oppsite_id verification failed %x %x %x %x \n", h_oppsite_id, conn_info.oppsite_id, h_my_id, conn_info.my_id); mylog(log_debug, "id and oppsite_id verification failed %x %x %x %x \n", h_oppsite_id, conn_info.oppsite_id, h_my_id, conn_info.my_id);
return -1; return -1;
} }
@ -583,45 +501,36 @@ int reserved_parse_safer(conn_info_t &conn_info,const char * input,int input_len
data = recv_data_buf + sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2; data = recv_data_buf + sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2;
len = input_len - (sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2); len = input_len - (sizeof(anti_replay_seq_t) + sizeof(my_id_t) * 2);
if (data[0] != 'h' && data[0] != 'd') {
if(data[0]!='h'&&data[0]!='d')
{
mylog(log_debug, "first byte is not h or d ,%x\n", data[0]); mylog(log_debug, "first byte is not h or d ,%x\n", data[0]);
return -1; return -1;
} }
uint8_t roller = data[1]; uint8_t roller = data[1];
type = data[0]; type = data[0];
data += 2; data += 2;
len -= 2; len -= 2;
if(len<0) if (len < 0) {
{
mylog(log_debug, "len <0 ,%d\n", len); mylog(log_debug, "len <0 ,%d\n", len);
return -1; return -1;
} }
if(roller!=conn_info.oppsite_roller) if (roller != conn_info.oppsite_roller) {
{
conn_info.oppsite_roller = roller; conn_info.oppsite_roller = roller;
conn_info.last_oppsite_roller_time = get_current_time(); conn_info.last_oppsite_roller_time = get_current_time();
} }
if (hb_mode == 0) if (hb_mode == 0)
conn_info.my_roller++; // increase on a successful recv conn_info.my_roller++; // increase on a successful recv
else if(hb_mode==1) else if (hb_mode == 1) {
{
if (type == 'h') if (type == 'h')
conn_info.my_roller++; conn_info.my_roller++;
} } else {
else
{
mylog(log_fatal, "unknow hb_mode\n"); mylog(log_fatal, "unknow hb_mode\n");
myexit(-1); myexit(-1);
} }
if (after_recv_raw0(conn_info.raw_info) != 0) return -1; // TODO might need to move this function to somewhere else after --fix-gro is introduced if (after_recv_raw0(conn_info.raw_info) != 0) return -1; // TODO might need to move this function to somewhere else after --fix-gro is introduced
return 0; return 0;
@ -631,7 +540,8 @@ int recv_safer_notused(conn_info_t &conn_info,char &type,char* &data,int &len)//
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
char * recv_data;int recv_len; char *recv_data;
int recv_len;
// static char recv_data_buf[buf_len]; // static char recv_data_buf[buf_len];
if (recv_raw0(conn_info.raw_info, recv_data, recv_len) != 0) return -1; if (recv_raw0(conn_info.raw_info, recv_data, recv_len) != 0) return -1;
@ -644,7 +554,8 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
char * recv_data;int recv_len; char *recv_data;
int recv_len;
assert(type_arr.empty()); assert(type_arr.empty());
assert(data_arr.empty()); assert(data_arr.empty());
@ -654,55 +565,45 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
char *data; char *data;
int len; int len;
if(g_fix_gro==0) if (g_fix_gro == 0) {
{
int ret = reserved_parse_safer(conn_info, recv_data, recv_len, type, data, len); int ret = reserved_parse_safer(conn_info, recv_data, recv_len, type, data, len);
if(ret==0) if (ret == 0) {
{
type_arr.push_back(type); type_arr.push_back(type);
data_arr.emplace_back(data, data + len); data_arr.emplace_back(data, data + len);
// std::copy(data,data+len,data_arr[0]); // std::copy(data,data+len,data_arr[0]);
} }
return 0; return 0;
} else } else {
{
char *ori_recv_data = recv_data; char *ori_recv_data = recv_data;
int ori_recv_len = recv_len; int ori_recv_len = recv_len;
// mylog(log_debug,"recv_len:%d\n",recv_len); // mylog(log_debug,"recv_len:%d\n",recv_len);
int cnt = 0; int cnt = 0;
while(recv_len>=16) while (recv_len >= 16) {
{
cnt++; cnt++;
int single_len_no_xor; int single_len_no_xor;
single_len_no_xor = read_u16(recv_data); single_len_no_xor = read_u16(recv_data);
int single_len; int single_len;
if(cipher_mode==cipher_xor) if (cipher_mode == cipher_xor) {
{
recv_data[0] ^= gro_xor[0]; recv_data[0] ^= gro_xor[0];
recv_data[1] ^= gro_xor[1]; recv_data[1] ^= gro_xor[1];
} } else if (cipher_mode == cipher_aes128cbc || cipher_mode == cipher_aes128cbc) {
else if(cipher_mode==cipher_aes128cbc||cipher_mode==cipher_aes128cbc)
{
aes_ecb_decrypt1(recv_data); aes_ecb_decrypt1(recv_data);
} }
single_len = read_u16(recv_data); single_len = read_u16(recv_data);
recv_len -= 2; recv_len -= 2;
recv_data += 2; recv_data += 2;
if(single_len > recv_len) if (single_len > recv_len) {
{
mylog(log_debug, "illegal single_len %d(%d), recv_len %d left,dropped\n", single_len, single_len_no_xor, recv_len); mylog(log_debug, "illegal single_len %d(%d), recv_len %d left,dropped\n", single_len, single_len_no_xor, recv_len);
break; break;
} }
if(single_len> max_data_len ) if (single_len > max_data_len) {
{
mylog(log_warn, "single_len %d(%d) > %d, maybe you need to turn down mtu at upper level\n", single_len, single_len_no_xor, max_data_len); mylog(log_warn, "single_len %d(%d) > %d, maybe you need to turn down mtu at upper level\n", single_len, single_len_no_xor, max_data_len);
break; break;
} }
int ret = reserved_parse_safer(conn_info, recv_data, single_len, type, data, len); int ret = reserved_parse_safer(conn_info, recv_data, single_len, type, data, len);
if(ret!=0) if (ret != 0) {
{
mylog(log_debug, "parse failed, offset= %d,single_len=%d(%d)\n", (int)(recv_data - ori_recv_data), single_len, single_len_no_xor); mylog(log_debug, "parse failed, offset= %d,single_len=%d(%d)\n", (int)(recv_data - ori_recv_data), single_len, single_len_no_xor);
} else { } else {
type_arr.push_back(type); type_arr.push_back(type);
@ -712,15 +613,13 @@ int recv_safer_multi(conn_info_t &conn_info,vector<char> &type_arr,vector<string
recv_data += single_len; recv_data += single_len;
recv_len -= single_len; recv_len -= single_len;
} }
if(cnt>1) if (cnt > 1) {
{
mylog(log_debug, "got a suspected gro packet, %d packets recovered, recv_len=%d, loop_cnt=%d\n", (int)data_arr.size(), ori_recv_len, cnt); mylog(log_debug, "got a suspected gro packet, %d packets recovered, recv_len=%d, loop_cnt=%d\n", (int)data_arr.size(), ori_recv_len, cnt);
} }
return 0; return 0;
} }
} }
void server_clear_function(u64_t u64) // used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection), void server_clear_function(u64_t u64) // used in conv_manager in server mode.for server we have to use one udp fd for one conv(udp connection),
// so we have to close the fd when conv expires // so we have to close the fd when conv expires
{ {
@ -738,7 +637,8 @@ void server_clear_function(u64_t u64)//used in conv_manager in server mode.for s
{ {
mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd); mylog(log_fatal,"fd:%d epoll delete failed!!!!\n",fd);
myexit(-1); //this shouldnt happen myexit(-1); //this shouldnt happen
}*/ //no need }*/
// no need
/*ret= close(fd); //closed fd should be auto removed from epoll /*ret= close(fd); //closed fd should be auto removed from epoll

96
connection.h
View File

@ -50,36 +50,29 @@ struct conv_manager_t // manage the udp connections
long long last_clear_time; long long last_clear_time;
conv_manager_t() conv_manager_t() {
{
// clear_it=conv_last_active_time.begin(); // clear_it=conv_last_active_time.begin();
long long last_clear_time = 0; long long last_clear_time = 0;
additional_clear_function = 0; additional_clear_function = 0;
} }
~conv_manager_t() ~conv_manager_t() {
{
clear(); clear();
} }
int get_size() int get_size() {
{
return conv_to_data.size(); return conv_to_data.size();
} }
void reserve() void reserve() {
{
data_to_conv.reserve(10007); data_to_conv.reserve(10007);
conv_to_data.reserve(10007); conv_to_data.reserve(10007);
// conv_last_active_time.reserve(10007); // conv_last_active_time.reserve(10007);
lru.mp.reserve(10007); lru.mp.reserve(10007);
} }
void clear() void clear() {
{
if (disable_conv_clear) return; if (disable_conv_clear) return;
if(additional_clear_function!=0) if (additional_clear_function != 0) {
{ for (auto it = conv_to_data.begin(); it != conv_to_data.end(); it++) {
for(auto it=conv_to_data.begin();it!=conv_to_data.end();it++)
{
// int fd=int((it->second<<32u)>>32u); // int fd=int((it->second<<32u)>>32u);
additional_clear_function(it->second); additional_clear_function(it->second);
} }
@ -91,53 +84,42 @@ struct conv_manager_t // manage the udp connections
// conv_last_active_time.clear(); // conv_last_active_time.clear();
// clear_it=conv_last_active_time.begin(); // clear_it=conv_last_active_time.begin();
} }
u32_t get_new_conv() u32_t get_new_conv() {
{
u32_t conv = get_true_random_number_nz(); u32_t conv = get_true_random_number_nz();
while(conv_to_data.find(conv)!=conv_to_data.end()) while (conv_to_data.find(conv) != conv_to_data.end()) {
{
conv = get_true_random_number_nz(); conv = get_true_random_number_nz();
} }
return conv; return conv;
} }
int is_conv_used(u32_t conv) int is_conv_used(u32_t conv) {
{
return conv_to_data.find(conv) != conv_to_data.end(); return conv_to_data.find(conv) != conv_to_data.end();
} }
int is_data_used(T data) int is_data_used(T data) {
{
return data_to_conv.find(data) != data_to_conv.end(); return data_to_conv.find(data) != data_to_conv.end();
} }
u32_t find_conv_by_data(T data) u32_t find_conv_by_data(T data) {
{
return data_to_conv[data]; return data_to_conv[data];
} }
T find_data_by_conv(u32_t conv) T find_data_by_conv(u32_t conv) {
{
return conv_to_data[conv]; return conv_to_data[conv];
} }
int update_active_time(u32_t conv) int update_active_time(u32_t conv) {
{
// return conv_last_active_time[conv]=get_current_time(); // return conv_last_active_time[conv]=get_current_time();
lru.update(conv); lru.update(conv);
return 0; return 0;
} }
int insert_conv(u32_t conv,T data) int insert_conv(u32_t conv, T data) {
{
data_to_conv[data] = conv; data_to_conv[data] = conv;
conv_to_data[conv] = data; conv_to_data[conv] = data;
// conv_last_active_time[conv]=get_current_time(); // conv_last_active_time[conv]=get_current_time();
lru.new_key(conv); lru.new_key(conv);
return 0; return 0;
} }
int erase_conv(u32_t conv) int erase_conv(u32_t conv) {
{
if (disable_conv_clear) return 0; if (disable_conv_clear) return 0;
T data = conv_to_data[conv]; T data = conv_to_data[conv];
if(additional_clear_function!=0) if (additional_clear_function != 0) {
{
additional_clear_function(data); additional_clear_function(data);
} }
conv_to_data.erase(conv); conv_to_data.erase(conv);
@ -146,20 +128,16 @@ struct conv_manager_t // manage the udp connections
lru.erase(conv); lru.erase(conv);
return 0; return 0;
} }
int clear_inactive(char * info=0) int clear_inactive(char *info = 0) {
{ if (get_current_time() - last_clear_time > conv_clear_interval) {
if(get_current_time()-last_clear_time>conv_clear_interval)
{
last_clear_time = get_current_time(); last_clear_time = get_current_time();
return clear_inactive0(info); return clear_inactive0(info);
} }
return 0; return 0;
} }
int clear_inactive0(char * info) int clear_inactive0(char *info) {
{
if (disable_conv_clear) return 0; if (disable_conv_clear) return 0;
unordered_map<u32_t, u64_t>::iterator it; unordered_map<u32_t, u64_t>::iterator it;
unordered_map<u32_t, u64_t>::iterator old_it; unordered_map<u32_t, u64_t>::iterator old_it;
@ -172,8 +150,7 @@ struct conv_manager_t // manage the udp connections
num_to_clean = min(num_to_clean, size); num_to_clean = min(num_to_clean, size);
my_time_t current_time = get_current_time(); my_time_t current_time = get_current_time();
for(;;) for (;;) {
{
if (cnt >= num_to_clean) break; if (cnt >= num_to_clean) break;
if (lru.empty()) break; if (lru.empty()) break;
@ -183,12 +160,9 @@ struct conv_manager_t // manage the udp connections
if (current_time - ts < conv_timeout) break; if (current_time - ts < conv_timeout) break;
erase_conv(conv); erase_conv(conv);
if(info==0) if (info == 0) {
{
mylog(log_info, "conv %x cleared\n", conv); mylog(log_info, "conv %x cleared\n", conv);
} } else {
else
{
mylog(log_info, "[%s]conv %x cleared\n", info, conv); mylog(log_info, "[%s]conv %x cleared\n", info, conv);
} }
cnt++; cnt++;
@ -196,7 +170,6 @@ struct conv_manager_t // manage the udp connections
return 0; return 0;
} }
/* /*
conv_manager_t(); conv_manager_t();
~conv_manager_t(); ~conv_manager_t();
@ -222,26 +195,18 @@ struct blob_t:not_copy_able_t //used in conn_info_t.
conv_manager_t<address_t> c; conv_manager_t<address_t> c;
conv_manager_t<u64_t> s; conv_manager_t<u64_t> s;
// avoid templates here and there, avoid pointer and type cast // avoid templates here and there, avoid pointer and type cast
tmp_union_t() tmp_union_t() {
{ if (program_mode == client_mode) {
if(program_mode==client_mode)
{
new (&c) conv_manager_t<address_t>(); new (&c) conv_manager_t<address_t>();
} } else {
else
{
assert(program_mode == server_mode); assert(program_mode == server_mode);
new (&s) conv_manager_t<u64_t>(); new (&s) conv_manager_t<u64_t>();
} }
} }
~tmp_union_t() ~tmp_union_t() {
{ if (program_mode == client_mode) {
if(program_mode==client_mode)
{
c.~conv_manager_t<address_t>(); c.~conv_manager_t<address_t>();
} } else {
else
{
assert(program_mode == server_mode); assert(program_mode == server_mode);
s.~conv_manager_t<u64_t>(); s.~conv_manager_t<u64_t>();
} }
@ -264,7 +229,6 @@ struct conn_info_t //stores info for a raw connection.for client ,there is o
my_id_t my_id; my_id_t my_id;
my_id_t oppsite_id; my_id_t oppsite_id;
fd64_t timer_fd64; fd64_t timer_fd64;
fd64_t udp_fd64; fd64_t udp_fd64;
@ -294,7 +258,6 @@ struct conn_info_t //stores info for a raw connection.for client ,there is o
struct conn_manager_t // manager for connections. for client,we dont need conn_manager since there is only one connection.for server we use one conn_manager for all connections struct conn_manager_t // manager for connections. for client,we dont need conn_manager since there is only one connection.for server we use one conn_manager for all connections
{ {
u32_t ready_num; u32_t ready_num;
// unordered_map<int,conn_info_t *> udp_fd_mp; //a bit dirty to used pointer,but can void unordered_map search // unordered_map<int,conn_info_t *> udp_fd_mp; //a bit dirty to used pointer,but can void unordered_map search
@ -328,7 +291,6 @@ struct conn_manager_t //manager for connections. for client,we dont need conn_m
int erase(unordered_map<address_t, conn_info_t *>::iterator erase_it); int erase(unordered_map<address_t, conn_info_t *>::iterator erase_it);
int clear_inactive(); int clear_inactive();
int clear_inactive0(); int clear_inactive0();
}; };
extern conn_manager_t conn_manager; extern conn_manager_t conn_manager;

363
encrypt.cpp Executable file → Normal file
View File

@ -28,9 +28,20 @@ unsigned char cipher_key_decrypt[cipher_key_len + 100]; //key for aes etc.
char gro_xor[256 + 100]; // dirty fix for gro char gro_xor[256 + 100]; // dirty fix for gro
unordered_map<int, const char *> auth_mode_tostring = {{auth_none, "none"}, {auth_md5, "md5"}, {auth_crc32, "crc32"},{auth_simple,"simple"},{auth_hmac_sha1,"hmac_sha1"},}; unordered_map<int, const char *> auth_mode_tostring = {
{auth_none, "none"},
{auth_md5, "md5"},
{auth_crc32, "crc32"},
{auth_simple, "simple"},
{auth_hmac_sha1, "hmac_sha1"},
};
unordered_map<int, const char *> cipher_mode_tostring={{cipher_none,"none"},{cipher_aes128cfb,"aes128cfb"},{cipher_aes128cbc,"aes128cbc"},{cipher_xor,"xor"},}; unordered_map<int, const char *> cipher_mode_tostring = {
{cipher_none, "none"},
{cipher_aes128cfb, "aes128cfb"},
{cipher_aes128cbc, "aes128cbc"},
{cipher_xor, "xor"},
};
// TODO aes-gcm // TODO aes-gcm
auth_mode_t auth_mode = auth_md5; auth_mode_t auth_mode = auth_md5;
@ -41,8 +52,7 @@ int aes128cfb_old=0;
// TODO key negotiation and forward secrecy // TODO key negotiation and forward secrecy
int my_init_keys(const char * user_passwd,int is_client) int my_init_keys(const char *user_passwd, int is_client) {
{
char tmp[1000] = ""; char tmp[1000] = "";
int len = strlen(user_passwd); int len = strlen(user_passwd);
@ -52,11 +62,9 @@ int my_init_keys(const char * user_passwd,int is_client)
md5((uint8_t *)tmp, strlen(tmp), (uint8_t *)normal_key); md5((uint8_t *)tmp, strlen(tmp), (uint8_t *)normal_key);
if (auth_mode == auth_hmac_sha1) if (auth_mode == auth_hmac_sha1)
is_hmac_used = 1; is_hmac_used = 1;
if(is_hmac_used||g_fix_gro||1) if (is_hmac_used || g_fix_gro || 1) {
{
unsigned char salt[400] = ""; unsigned char salt[400] = "";
char salt_text[400] = "udp2raw_salt1"; char salt_text[400] = "udp2raw_salt1";
md5((uint8_t *)(salt_text), strlen(salt_text), salt); // TODO different salt per session md5((uint8_t *)(salt_text), strlen(salt_text), salt); // TODO different salt per session
@ -72,14 +80,15 @@ int my_init_keys(const char * user_passwd,int is_client)
const char *info_cipher_encrypt = "cipher_key server-->client"; const char *info_cipher_encrypt = "cipher_key server-->client";
const char *info_cipher_decrypt = "cipher_key client-->server"; const char *info_cipher_decrypt = "cipher_key client-->server";
if(is_client) if (is_client) {
{
const char *tmp; const char *tmp;
tmp=info_hmac_encrypt; info_hmac_encrypt=info_hmac_decrypt;info_hmac_decrypt=tmp; tmp = info_hmac_encrypt;
tmp=info_cipher_encrypt; info_cipher_encrypt=info_cipher_decrypt;info_cipher_decrypt=tmp; info_hmac_encrypt = info_hmac_decrypt;
} info_hmac_decrypt = tmp;
else tmp = info_cipher_encrypt;
{ info_cipher_encrypt = info_cipher_decrypt;
info_cipher_decrypt = tmp;
} else {
// nop // nop
} }
@ -143,8 +152,7 @@ void simple_hash(unsigned char *str,int len,unsigned char res[8]) //djb2+ sdbm
u32_t hash2 = 0; u32_t hash2 = 0;
int c; int c;
int i = 0; int i = 0;
while(c = *str++,i++!=len) while (c = *str++, i++ != len) {
{
// hash = ((hash << 5) + hash) + c; /* hash * 33 + c */ // hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */ hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */
hash2 = c + (hash2 << 6) + (hash2 << 16) - hash2; hash2 = c + (hash2 << 6) + (hash2 << 16) - hash2;
@ -156,16 +164,14 @@ void simple_hash(unsigned char *str,int len,unsigned char res[8]) //djb2+ sdbm
memcpy(res + sizeof(hash), &hash2, sizeof(hash2)); memcpy(res + sizeof(hash), &hash2, sizeof(hash2));
} }
int auth_md5_cal(const char *data,char * output,int &len) int auth_md5_cal(const char *data, char *output, int &len) {
{
memcpy(output, data, len); // TODO inefficient code memcpy(output, data, len); // TODO inefficient code
md5((unsigned char *)output, len, (unsigned char *)(output + len)); md5((unsigned char *)output, len, (unsigned char *)(output + len));
len += 16; len += 16;
return 0; return 0;
} }
int auth_hmac_sha1_cal(const char *data,char * output,int &len) int auth_hmac_sha1_cal(const char *data, char *output, int &len) {
{
mylog(log_trace, "auth_hmac_sha1_cal() is called\n"); mylog(log_trace, "auth_hmac_sha1_cal() is called\n");
memcpy(output, data, len); // TODO inefficient code memcpy(output, data, len); // TODO inefficient code
sha1_hmac(hmac_key_encrypt, 20, (const unsigned char *)data, len, (unsigned char *)(output + len)); sha1_hmac(hmac_key_encrypt, 20, (const unsigned char *)data, len, (unsigned char *)(output + len));
@ -174,11 +180,9 @@ int auth_hmac_sha1_cal(const char *data,char * output,int &len)
return 0; return 0;
} }
int auth_hmac_sha1_verify(const char *data,int &len) int auth_hmac_sha1_verify(const char *data, int &len) {
{
mylog(log_trace, "auth_hmac_sha1_verify() is called\n"); mylog(log_trace, "auth_hmac_sha1_verify() is called\n");
if(len<20) if (len < 20) {
{
mylog(log_trace, "auth_hmac_sha1_verify len<20\n"); mylog(log_trace, "auth_hmac_sha1_verify len<20\n");
return -1; return -1;
} }
@ -186,8 +190,7 @@ int auth_hmac_sha1_verify(const char *data,int &len)
sha1_hmac(hmac_key_decrypt, 20, (const unsigned char *)data, len - 20, (unsigned char *)(res)); sha1_hmac(hmac_key_decrypt, 20, (const unsigned char *)data, len - 20, (unsigned char *)(res));
if(memcmp(res,data+len-20,20)!=0) if (memcmp(res, data + len - 20, 20) != 0) {
{
mylog(log_trace, "auth_hmac_sha1 check failed\n"); mylog(log_trace, "auth_hmac_sha1 check failed\n");
return -2; return -2;
} }
@ -195,8 +198,7 @@ int auth_hmac_sha1_verify(const char *data,int &len)
return 0; return 0;
} }
int auth_crc32_cal(const char *data,char * output,int &len) int auth_crc32_cal(const char *data, char *output, int &len) {
{
memcpy(output, data, len); // TODO inefficient code memcpy(output, data, len); // TODO inefficient code
unsigned int ret = crc32h((unsigned char *)output, len); unsigned int ret = crc32h((unsigned char *)output, len);
unsigned int ret_n = htonl(ret); unsigned int ret_n = htonl(ret);
@ -205,16 +207,14 @@ int auth_crc32_cal(const char *data,char * output,int &len)
return 0; return 0;
} }
int auth_simple_cal(const char *data,char * output,int &len) int auth_simple_cal(const char *data, char *output, int &len) {
{
// char res[4]; // char res[4];
memcpy(output, data, len); // TODO inefficient code memcpy(output, data, len); // TODO inefficient code
simple_hash((unsigned char *)output, len, (unsigned char *)(output + len)); simple_hash((unsigned char *)output, len, (unsigned char *)(output + len));
len += 8; len += 8;
return 0; return 0;
} }
int auth_simple_verify(const char *data,int &len) int auth_simple_verify(const char *data, int &len) {
{
if (len < 8) return -1; if (len < 8) return -1;
unsigned char res[8]; unsigned char res[8];
len -= 8; len -= 8;
@ -224,16 +224,12 @@ int auth_simple_verify(const char *data,int &len)
return 0; return 0;
} }
int auth_none_cal(const char *data, char *output, int &len) {
int auth_none_cal(const char *data,char * output,int &len)
{
memcpy(output, data, len); memcpy(output, data, len);
return 0; return 0;
} }
int auth_md5_verify(const char *data,int &len) int auth_md5_verify(const char *data, int &len) {
{ if (len < 16) {
if(len<16)
{
mylog(log_trace, "auth_md5_verify len<16\n"); mylog(log_trace, "auth_md5_verify len<16\n");
return -1; return -1;
} }
@ -241,16 +237,14 @@ int auth_md5_verify(const char *data,int &len)
md5((unsigned char *)data, len - 16, (unsigned char *)md5_res); md5((unsigned char *)data, len - 16, (unsigned char *)md5_res);
if(memcmp(md5_res,data+len-16,16)!=0) if (memcmp(md5_res, data + len - 16, 16) != 0) {
{
mylog(log_trace, "auth_md5_verify md5 check failed\n"); mylog(log_trace, "auth_md5_verify md5 check failed\n");
return -2; return -2;
} }
len -= 16; len -= 16;
return 0; return 0;
} }
int auth_none_verify(const char *data,int &len) int auth_none_verify(const char *data, int &len) {
{
return 0; return 0;
} }
@ -276,12 +270,10 @@ int cipher_xor_decrypt(const char * data, char *output,int &len, char *key) {
return 0; return 0;
} }
int padding(char *data ,int &data_len,int padding_num) int padding(char *data, int &data_len, int padding_num) {
{
int old_len = data_len; int old_len = data_len;
data_len += 1; data_len += 1;
if(data_len%padding_num!=0) if (data_len % padding_num != 0) {
{
data_len = (data_len / padding_num) * padding_num + padding_num; data_len = (data_len / padding_num) * padding_num + padding_num;
} }
unsigned char *p = (unsigned char *)&data[data_len - 1]; unsigned char *p = (unsigned char *)&data[data_len - 1];
@ -289,53 +281,48 @@ int padding(char *data ,int &data_len,int padding_num)
return 0; return 0;
} }
int de_padding(const char *data ,int &data_len,int padding_num) int de_padding(const char *data, int &data_len, int padding_num) {
{
if (data_len == 0) return -1; if (data_len == 0) return -1;
if ((uint8_t)data[data_len - 1] > padding_num) return -1; if ((uint8_t)data[data_len - 1] > padding_num) return -1;
data_len -= (uint8_t)data[data_len - 1]; data_len -= (uint8_t)data[data_len - 1];
if(data_len<0) if (data_len < 0) {
{
return -1; return -1;
} }
return 0; return 0;
} }
void aes_ecb_encrypt(const char *data,char *output) void aes_ecb_encrypt(const char *data, char *output) {
{
static int first_time = 1; static int first_time = 1;
char *key = (char *)cipher_key_encrypt; char *key = (char *)cipher_key_encrypt;
if(aes_key_optimize) if (aes_key_optimize) {
{ if (first_time == 0)
if(first_time==0) key=0; key = 0;
else first_time=0; else
first_time = 0;
} }
AES_ECB_encrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output); AES_ECB_encrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output);
} }
void aes_ecb_encrypt1(char *data) void aes_ecb_encrypt1(char *data) {
{
char buf[16]; char buf[16];
memcpy(buf, data, 16); memcpy(buf, data, 16);
aes_ecb_encrypt(buf, data); aes_ecb_encrypt(buf, data);
} }
void aes_ecb_decrypt(const char *data,char *output) void aes_ecb_decrypt(const char *data, char *output) {
{
static int first_time = 1; static int first_time = 1;
char *key = (char *)cipher_key_decrypt; char *key = (char *)cipher_key_decrypt;
if(aes_key_optimize) if (aes_key_optimize) {
{ if (first_time == 0)
if(first_time==0) key=0; key = 0;
else first_time=0; else
first_time = 0;
} }
AES_ECB_decrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output); AES_ECB_decrypt_buffer((uint8_t *)data, (uint8_t *)key, (uint8_t *)output);
} }
void aes_ecb_decrypt1(char *data) void aes_ecb_decrypt1(char *data) {
{
char buf[16]; char buf[16];
memcpy(buf, data, 16); memcpy(buf, data, 16);
aes_ecb_decrypt(buf, data); aes_ecb_decrypt(buf, data);
} }
int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cbc_encrypt(const char *data, char *output, int &len, char *key) {
{
static int first_time = 1; static int first_time = 1;
char buf[buf_len]; char buf[buf_len];
@ -343,83 +330,81 @@ int cipher_aes128cbc_encrypt(const char *data,char *output,int &len,char * key)
if (padding(buf, len, 16) < 0) return -1; if (padding(buf, len, 16) < 0) return -1;
if(aes_key_optimize) if (aes_key_optimize) {
{ if (first_time == 0)
if(first_time==0) key=0; key = 0;
else first_time=0; else
first_time = 0;
} }
AES_CBC_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv); AES_CBC_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv);
return 0; return 0;
} }
int cipher_aes128cfb_encrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cfb_encrypt(const char *data, char *output, int &len, char *key) {
{
static int first_time = 1; static int first_time = 1;
assert(len >= 16); assert(len >= 16);
char buf[buf_len]; char buf[buf_len];
memcpy(buf, data, len); // TODO inefficient code memcpy(buf, data, len); // TODO inefficient code
if(aes_key_optimize) if (aes_key_optimize) {
{ if (first_time == 0)
if(first_time==0) key=0; key = 0;
else first_time=0; else
first_time = 0;
} }
if(!aes128cfb_old) if (!aes128cfb_old) {
{
aes_ecb_encrypt(data, buf); // encrypt the first block aes_ecb_encrypt(data, buf); // encrypt the first block
} }
AES_CFB_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv); AES_CFB_encrypt_buffer((unsigned char *)output, (unsigned char *)buf, len, (unsigned char *)key, (unsigned char *)zero_iv);
return 0; return 0;
} }
int auth_crc32_verify(const char *data,int &len) int auth_crc32_verify(const char *data, int &len) {
{ if (len < int(sizeof(unsigned int))) {
if(len<int(sizeof(unsigned int)))
{
mylog(log_debug, "auth_crc32_verify len<%d\n", int(sizeof(unsigned int))); mylog(log_debug, "auth_crc32_verify len<%d\n", int(sizeof(unsigned int)));
return -1; return -1;
} }
unsigned int ret = crc32h((unsigned char *)data, len - sizeof(unsigned int)); unsigned int ret = crc32h((unsigned char *)data, len - sizeof(unsigned int));
unsigned int ret_n = htonl(ret); unsigned int ret_n = htonl(ret);
if(memcmp(data+len-sizeof(unsigned int),&ret_n,sizeof(unsigned int))!=0) if (memcmp(data + len - sizeof(unsigned int), &ret_n, sizeof(unsigned int)) != 0) {
{
mylog(log_debug, "auth_crc32_verify memcmp fail\n"); mylog(log_debug, "auth_crc32_verify memcmp fail\n");
return -1; return -1;
} }
len -= sizeof(unsigned int); len -= sizeof(unsigned int);
return 0; return 0;
} }
int cipher_none_encrypt(const char *data,char *output,int &len,char * key) int cipher_none_encrypt(const char *data, char *output, int &len, char *key) {
{
memcpy(output, data, len); memcpy(output, data, len);
return 0; return 0;
} }
int cipher_aes128cbc_decrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cbc_decrypt(const char *data, char *output, int &len, char *key) {
{
static int first_time = 1; static int first_time = 1;
if(len%16 !=0) {mylog(log_debug,"len%%16!=0\n");return -1;} if (len % 16 != 0) {
if(aes_key_optimize) mylog(log_debug, "len%%16!=0\n");
{ return -1;
if(first_time==0) key=0; }
else first_time=0; if (aes_key_optimize) {
if (first_time == 0)
key = 0;
else
first_time = 0;
} }
AES_CBC_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv); AES_CBC_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv);
if (de_padding(output, len, 16) < 0) return -1; if (de_padding(output, len, 16) < 0) return -1;
return 0; return 0;
} }
int cipher_aes128cfb_decrypt(const char *data,char *output,int &len,char * key) int cipher_aes128cfb_decrypt(const char *data, char *output, int &len, char *key) {
{
static int first_time = 1; static int first_time = 1;
if (len < 16) return -1; if (len < 16) return -1;
if(aes_key_optimize) if (aes_key_optimize) {
{ if (first_time == 0)
if(first_time==0) key=0; key = 0;
else first_time=0; else
first_time = 0;
} }
AES_CFB_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv); AES_CFB_decrypt_buffer((unsigned char *)output, (unsigned char *)data, len, (unsigned char *)key, (unsigned char *)zero_iv);
if (!aes128cfb_old) if (!aes128cfb_old)
@ -428,81 +413,97 @@ int cipher_aes128cfb_decrypt(const char *data,char *output,int &len,char * key)
return 0; return 0;
} }
int cipher_none_decrypt(const char *data,char *output,int &len,char * key) int cipher_none_decrypt(const char *data, char *output, int &len, char *key) {
{
memcpy(output, data, len); memcpy(output, data, len);
return 0; return 0;
} }
int auth_cal(const char *data,char * output,int &len) int auth_cal(const char *data, char *output, int &len) {
{
mylog(log_trace, "auth:%d\n", auth_mode); mylog(log_trace, "auth:%d\n", auth_mode);
switch(auth_mode) switch (auth_mode) {
{ case auth_crc32:
case auth_crc32:return auth_crc32_cal(data, output, len); return auth_crc32_cal(data, output, len);
case auth_md5:return auth_md5_cal(data, output, len); case auth_md5:
case auth_simple:return auth_simple_cal(data, output, len); return auth_md5_cal(data, output, len);
case auth_none:return auth_none_cal(data, output, len); case auth_simple:
case auth_hmac_sha1:return auth_hmac_sha1_cal(data,output,len); return auth_simple_cal(data, output, len);
case auth_none:
return auth_none_cal(data, output, len);
case auth_hmac_sha1:
return auth_hmac_sha1_cal(data, output, len);
// default: return auth_md5_cal(data,output,len);//default; // default: return auth_md5_cal(data,output,len);//default;
default: assert(0==1); default:
assert(0 == 1);
} }
return -1; return -1;
} }
int auth_verify(const char *data,int &len) int auth_verify(const char *data, int &len) {
{
mylog(log_trace, "auth:%d\n", auth_mode); mylog(log_trace, "auth:%d\n", auth_mode);
switch(auth_mode) switch (auth_mode) {
{ case auth_crc32:
case auth_crc32:return auth_crc32_verify(data, len); return auth_crc32_verify(data, len);
case auth_md5:return auth_md5_verify(data, len); case auth_md5:
case auth_simple:return auth_simple_verify(data, len); return auth_md5_verify(data, len);
case auth_none:return auth_none_verify(data, len); case auth_simple:
case auth_hmac_sha1:return auth_hmac_sha1_verify(data,len); return auth_simple_verify(data, len);
case auth_none:
return auth_none_verify(data, len);
case auth_hmac_sha1:
return auth_hmac_sha1_verify(data, len);
// default: return auth_md5_verify(data,len);//default // default: return auth_md5_verify(data,len);//default
default: assert(0==1); default:
assert(0 == 1);
} }
return -1; return -1;
} }
int cipher_encrypt(const char *data,char *output,int &len,char * key) int cipher_encrypt(const char *data, char *output, int &len, char *key) {
{
mylog(log_trace, "cipher:%d\n", cipher_mode); mylog(log_trace, "cipher:%d\n", cipher_mode);
switch(cipher_mode) switch (cipher_mode) {
{ case cipher_aes128cbc:
case cipher_aes128cbc:return cipher_aes128cbc_encrypt(data,output,len, key); return cipher_aes128cbc_encrypt(data, output, len, key);
case cipher_aes128cfb:return cipher_aes128cfb_encrypt(data,output,len, key); case cipher_aes128cfb:
case cipher_xor:return cipher_xor_encrypt(data,output,len, key); return cipher_aes128cfb_encrypt(data, output, len, key);
case cipher_none:return cipher_none_encrypt(data,output,len, key); case cipher_xor:
return cipher_xor_encrypt(data, output, len, key);
case cipher_none:
return cipher_none_encrypt(data, output, len, key);
// default:return cipher_aes128cbc_encrypt(data,output,len, key); // default:return cipher_aes128cbc_encrypt(data,output,len, key);
default: assert(0==1); default:
assert(0 == 1);
} }
return -1; return -1;
} }
int cipher_decrypt(const char *data,char *output,int &len,char * key) int cipher_decrypt(const char *data, char *output, int &len, char *key) {
{
mylog(log_trace, "cipher:%d\n", cipher_mode); mylog(log_trace, "cipher:%d\n", cipher_mode);
switch(cipher_mode) switch (cipher_mode) {
{ case cipher_aes128cbc:
case cipher_aes128cbc:return cipher_aes128cbc_decrypt(data,output,len, key); return cipher_aes128cbc_decrypt(data, output, len, key);
case cipher_aes128cfb:return cipher_aes128cfb_decrypt(data,output,len, key); case cipher_aes128cfb:
case cipher_xor:return cipher_xor_decrypt(data,output,len, key); return cipher_aes128cfb_decrypt(data, output, len, key);
case cipher_none:return cipher_none_decrypt(data,output,len, key); case cipher_xor:
return cipher_xor_decrypt(data, output, len, key);
case cipher_none:
return cipher_none_decrypt(data, output, len, key);
// default: return cipher_aes128cbc_decrypt(data,output,len,key); // default: return cipher_aes128cbc_decrypt(data,output,len,key);
default: assert(0==1); default:
assert(0 == 1);
} }
return -1; return -1;
} }
int encrypt_AE(const char *data,char *output,int &len /*,char * key*/) int encrypt_AE(const char *data, char *output, int &len /*,char * key*/) {
{
mylog(log_trace, "encrypt_AE is called\n"); mylog(log_trace, "encrypt_AE is called\n");
char buf[buf_len]; char buf[buf_len];
char buf2[buf_len]; char buf2[buf_len];
memcpy(buf, data, len); memcpy(buf, data, len);
if(cipher_encrypt(buf,buf2,len,(char *)cipher_key_encrypt) !=0) {mylog(log_debug,"cipher_encrypt failed ");return -1;} if (cipher_encrypt(buf, buf2, len, (char *)cipher_key_encrypt) != 0) {
if(auth_cal(buf2,output,len)!=0) {mylog(log_debug,"auth_cal failed ");return -1;} mylog(log_debug, "cipher_encrypt failed ");
return -1;
}
if (auth_cal(buf2, output, len) != 0) {
mylog(log_debug, "auth_cal failed ");
return -1;
}
// printf("%d %x %x\n",len,(int)(output[0]),(int)(output[1])); // printf("%d %x %x\n",len,(int)(output[0]),(int)(output[1]));
// print_binary_chars(output,len); // print_binary_chars(output,len);
@ -511,59 +512,77 @@ int encrypt_AE(const char *data,char *output,int &len /*,char * key*/)
return 0; return 0;
} }
int decrypt_AE(const char *data,char *output,int &len /*,char * key*/) int decrypt_AE(const char *data, char *output, int &len /*,char * key*/) {
{
mylog(log_trace, "decrypt_AE is called\n"); mylog(log_trace, "decrypt_AE is called\n");
// printf("%d %x %x\n",len,(int)(data[0]),(int)(data[1])); // printf("%d %x %x\n",len,(int)(data[0]),(int)(data[1]));
// print_binary_chars(data,len); // print_binary_chars(data,len);
if(auth_verify(data,len)!=0) {mylog(log_debug,"auth_verify failed\n");return -1;} if (auth_verify(data, len) != 0) {
if(cipher_decrypt(data,output,len,(char *)cipher_key_decrypt) !=0) {mylog(log_debug,"cipher_decrypt failed \n"); return -1;} mylog(log_debug, "auth_verify failed\n");
return -1;
}
if (cipher_decrypt(data, output, len, (char *)cipher_key_decrypt) != 0) {
mylog(log_debug, "cipher_decrypt failed \n");
return -1;
}
return 0; return 0;
} }
int my_encrypt(const char *data,char *output,int &len /*,char * key*/) int my_encrypt(const char *data, char *output, int &len /*,char * key*/) {
{ if (len < 0) {
if(len<0) {mylog(log_trace,"len<0");return -1;} mylog(log_trace, "len<0");
if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;} return -1;
}
if (len > max_data_len) {
mylog(log_warn, "len>max_data_len");
return -1;
}
if (is_hmac_used) if (is_hmac_used)
return encrypt_AE(data, output, len); return encrypt_AE(data, output, len);
char buf[buf_len]; char buf[buf_len];
char buf2[buf_len]; char buf2[buf_len];
memcpy(buf, data, len); memcpy(buf, data, len);
if(auth_cal(buf,buf2,len)!=0) {mylog(log_debug,"auth_cal failed ");return -1;} if (auth_cal(buf, buf2, len) != 0) {
if(cipher_encrypt(buf2,output,len,normal_key) !=0) {mylog(log_debug,"cipher_encrypt failed ");return -1;} mylog(log_debug, "auth_cal failed ");
return -1;
}
if (cipher_encrypt(buf2, output, len, normal_key) != 0) {
mylog(log_debug, "cipher_encrypt failed ");
return -1;
}
return 0; return 0;
} }
int my_decrypt(const char *data,char *output,int &len /*,char * key*/) int my_decrypt(const char *data, char *output, int &len /*,char * key*/) {
{
if (len < 0) return -1; if (len < 0) return -1;
if(len>max_data_len) {mylog(log_warn,"len>max_data_len");return -1;} if (len > max_data_len) {
mylog(log_warn, "len>max_data_len");
return -1;
}
if (is_hmac_used) if (is_hmac_used)
return decrypt_AE(data, output, len); return decrypt_AE(data, output, len);
if(cipher_decrypt(data,output,len,normal_key) !=0) {mylog(log_debug,"cipher_decrypt failed \n"); return -1;} if (cipher_decrypt(data, output, len, normal_key) != 0) {
if(auth_verify(output,len)!=0) {mylog(log_debug,"auth_verify failed\n");return -1;} mylog(log_debug, "cipher_decrypt failed \n");
return -1;
}
if (auth_verify(output, len) != 0) {
mylog(log_debug, "auth_verify failed\n");
return -1;
}
return 0; return 0;
} }
int encrypt_AEAD(uint8_t *data, uint8_t *output, int &len, uint8_t *key, uint8_t *header, int hlen) {
int encrypt_AEAD(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen)
{
// TODO // TODO
return -1; return -1;
} }
int decrypt_AEAD(uint8_t *data,uint8_t *output,int &len,uint8_t * key,uint8_t *header,int hlen) int decrypt_AEAD(uint8_t *data, uint8_t *output, int &len, uint8_t *key, uint8_t *header, int hlen) {
{
// TODO // TODO
return -1; return -1;
} }

20
encrypt.h Executable file → Normal file
View File

@ -1,13 +1,10 @@
#ifndef UDP2RAW_ENCRYPTION_H_ #ifndef UDP2RAW_ENCRYPTION_H_
#define UDP2RAW_ENCRYPTION_H_ #define UDP2RAW_ENCRYPTION_H_
//#include "aes.h" //#include "aes.h"
//#include "md5.h" //#include "md5.h"
#include "common.h" #include "common.h"
// using namespace std; // using namespace std;
// extern char key[16]; // extern char key[16];
@ -19,15 +16,20 @@ int my_init_keys(const char *,int);
int my_encrypt(const char *data, char *output, int &len); int my_encrypt(const char *data, char *output, int &len);
int my_decrypt(const char *data, char *output, int &len); int my_decrypt(const char *data, char *output, int &len);
unsigned short csum(const unsigned short *ptr, int nbytes); unsigned short csum(const unsigned short *ptr, int nbytes);
enum auth_mode_t { auth_none = 0,
auth_md5,
auth_crc32,
auth_simple,
auth_hmac_sha1,
auth_end };
enum auth_mode_t {auth_none=0,auth_md5,auth_crc32,auth_simple,auth_hmac_sha1,auth_end}; enum cipher_mode_t { cipher_none = 0,
cipher_aes128cbc,
cipher_xor,
enum cipher_mode_t {cipher_none=0,cipher_aes128cbc,cipher_xor,cipher_aes128cfb,cipher_end}; cipher_aes128cfb,
cipher_end };
extern auth_mode_t auth_mode; extern auth_mode_t auth_mode;
extern cipher_mode_t cipher_mode; extern cipher_mode_t cipher_mode;

31
fd_manager.cpp
View File

@ -5,60 +5,49 @@
* Author: root * Author: root
*/ */
#include "fd_manager.h" #include "fd_manager.h"
int fd_manager_t::fd_exist(int fd) int fd_manager_t::fd_exist(int fd) {
{
return fd_to_fd64_mp.find(fd) != fd_to_fd64_mp.end(); return fd_to_fd64_mp.find(fd) != fd_to_fd64_mp.end();
} }
int fd_manager_t::exist(fd64_t fd64) int fd_manager_t::exist(fd64_t fd64) {
{
return fd64_to_fd_mp.find(fd64) != fd64_to_fd_mp.end(); return fd64_to_fd_mp.find(fd64) != fd64_to_fd_mp.end();
} }
int fd_manager_t::to_fd(fd64_t fd64) int fd_manager_t::to_fd(fd64_t fd64) {
{
assert(exist(fd64)); assert(exist(fd64));
return fd64_to_fd_mp[fd64]; return fd64_to_fd_mp[fd64];
} }
void fd_manager_t::fd64_close(fd64_t fd64) void fd_manager_t::fd64_close(fd64_t fd64) {
{
assert(exist(fd64)); assert(exist(fd64));
int fd = fd64_to_fd_mp[fd64]; int fd = fd64_to_fd_mp[fd64];
fd64_to_fd_mp.erase(fd64); fd64_to_fd_mp.erase(fd64);
fd_to_fd64_mp.erase(fd); fd_to_fd64_mp.erase(fd);
if(exist_info(fd64)) if (exist_info(fd64)) {
{
fd_info_mp.erase(fd64); fd_info_mp.erase(fd64);
} }
// assert(close(fd)==0); // assert(close(fd)==0);
sock_close(fd); sock_close(fd);
} }
void fd_manager_t::reserve(int n) void fd_manager_t::reserve(int n) {
{
fd_to_fd64_mp.reserve(n); fd_to_fd64_mp.reserve(n);
fd64_to_fd_mp.reserve(n); fd64_to_fd_mp.reserve(n);
fd_info_mp.reserve(n); fd_info_mp.reserve(n);
} }
u64_t fd_manager_t::create(int fd) u64_t fd_manager_t::create(int fd) {
{
assert(!fd_exist(fd)); assert(!fd_exist(fd));
fd64_t fd64 = counter++; fd64_t fd64 = counter++;
fd_to_fd64_mp[fd] = fd64; fd_to_fd64_mp[fd] = fd64;
fd64_to_fd_mp[fd64] = fd; fd64_to_fd_mp[fd64] = fd;
return fd64; return fd64;
} }
fd_manager_t::fd_manager_t() fd_manager_t::fd_manager_t() {
{
counter = u32_t(-1); counter = u32_t(-1);
counter += 100; counter += 100;
reserve(10007); reserve(10007);
} }
fd_info_t & fd_manager_t::get_info(fd64_t fd64) fd_info_t& fd_manager_t::get_info(fd64_t fd64) {
{
assert(exist(fd64)); assert(exist(fd64));
return fd_info_mp[fd64]; return fd_info_mp[fd64];
} }
int fd_manager_t::exist_info(fd64_t fd64) int fd_manager_t::exist_info(fd64_t fd64) {
{
return fd_info_mp.find(fd64) != fd_info_mp.end(); return fd_info_mp.find(fd64) != fd_info_mp.end();
} }

4
fd_manager.h
View File

@ -12,8 +12,7 @@
//#include "packet.h" //#include "packet.h"
#include "connection.h" #include "connection.h"
struct fd_info_t struct fd_info_t {
{
// ip_port_t ip_port; // ip_port_t ip_port;
conn_info_t *p_conn_info; conn_info_t *p_conn_info;
}; };
@ -29,6 +28,7 @@ struct fd_manager_t //conver fd to a uniq 64bit number,avoid fd value conflict
void reserve(int n); void reserve(int n);
u64_t create(int fd); u64_t create(int fd);
fd_manager_t(); fd_manager_t();
private: private:
u64_t counter; u64_t counter;
unordered_map<int, fd64_t> fd_to_fd64_mp; unordered_map<int, fd64_t> fd_to_fd64_mp;

9
log.cpp Executable file → Normal file
View File

@ -7,11 +7,9 @@ int enable_log_position=0;
int enable_log_color = 1; int enable_log_color = 1;
void log0(const char* file, const char* function, int line, int level, const char* str, ...) { void log0(const char* file, const char* function, int line, int level, const char* str, ...) {
if (level > log_level) return; if (level > log_level) return;
if (level > log_trace || level < 0) return; if (level > log_trace || level < 0) return;
time_t timer; time_t timer;
char buffer[100]; char buffer[100];
struct tm* tm_info; struct tm* tm_info;
@ -39,14 +37,12 @@ void log0(const char * file,const char * function,int line,int level,const char*
// printf(log_color[level]); // printf(log_color[level]);
fflush(stdout); fflush(stdout);
if(log_level==log_fatal) if (log_level == log_fatal) {
{
about_to_exit = 1; about_to_exit = 1;
} }
} }
void log_bare(int level,const char* str, ...) void log_bare(int level, const char* str, ...) {
{
if (level > log_level) return; if (level > log_level) return;
if (level > log_trace || level < 0) return; if (level > log_trace || level < 0) return;
if (enable_log_color) if (enable_log_color)
@ -58,5 +54,4 @@ void log_bare(int level,const char* str, ...)
if (enable_log_color) if (enable_log_color)
printf("%s", RESET); printf("%s", RESET);
fflush(stdout); fflush(stdout);
} }

7
log.h Executable file → Normal file
View File

@ -2,13 +2,10 @@
#ifndef UDP2RAW_LOG_MYLOG_H_ #ifndef UDP2RAW_LOG_MYLOG_H_
#define UDP2RAW_LOG_MYLOG_H_ #define UDP2RAW_LOG_MYLOG_H_
#include "common.h" #include "common.h"
using namespace std; using namespace std;
#define RED "\x1B[31m" #define RED "\x1B[31m"
#define GRN "\x1B[32m" #define GRN "\x1B[32m"
#define YEL "\x1B[33m" #define YEL "\x1B[33m"
@ -18,7 +15,6 @@ using namespace std;
#define WHT "\x1B[37m" #define WHT "\x1B[37m"
#define RESET "\x1B[0m" #define RESET "\x1B[0m"
const int log_never = 0; const int log_never = 0;
const int log_fatal = 1; const int log_fatal = 1;
const int log_error = 2; const int log_error = 2;
@ -35,7 +31,6 @@ extern int log_level;
extern int enable_log_position; extern int enable_log_position;
extern int enable_log_color; extern int enable_log_color;
#ifdef MY_DEBUG #ifdef MY_DEBUG
#define mylog(__first_argu__dummy_abcde__, ...) printf(__VA_ARGS__) #define mylog(__first_argu__dummy_abcde__, ...) printf(__VA_ARGS__)
@ -43,12 +38,10 @@ extern int enable_log_color;
#define mylog(...) log0(__FILE__, __FUNCTION__, __LINE__, __VA_ARGS__) #define mylog(...) log0(__FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
#endif #endif
//#define mylog(__first_argu__dummy_abcde__,...) {;} //#define mylog(__first_argu__dummy_abcde__,...) {;}
void log0(const char* file, const char* function, int line, int level, const char* str, ...); void log0(const char* file, const char* function, int line, int level, const char* str, ...);
void log_bare(int level, const char* str, ...); void log_bare(int level, const char* str, ...);
#endif #endif

34
main.cpp Executable file → Normal file
View File

@ -7,19 +7,16 @@
#include "encrypt.h" #include "encrypt.h"
#include "fd_manager.h" #include "fd_manager.h"
void sigpipe_cb(struct ev_loop *l, ev_signal *w, int revents) void sigpipe_cb(struct ev_loop *l, ev_signal *w, int revents) {
{
mylog(log_info, "got sigpipe, ignored"); mylog(log_info, "got sigpipe, ignored");
} }
void sigterm_cb(struct ev_loop *l, ev_signal *w, int revents) void sigterm_cb(struct ev_loop *l, ev_signal *w, int revents) {
{
mylog(log_info, "got sigterm, exit"); mylog(log_info, "got sigterm, exit");
myexit(0); myexit(0);
} }
void sigint_cb(struct ev_loop *l, ev_signal *w, int revents) void sigint_cb(struct ev_loop *l, ev_signal *w, int revents) {
{
mylog(log_info, "got sigint, exit"); mylog(log_info, "got sigint, exit");
myexit(0); myexit(0);
} }
@ -27,8 +24,7 @@ void sigint_cb(struct ev_loop *l, ev_signal *w, int revents)
int client_event_loop(); int client_event_loop();
int server_event_loop(); int server_event_loop();
int main(int argc, char *argv[]) int main(int argc, char *argv[]) {
{
assert(sizeof(unsigned short) == 2); assert(sizeof(unsigned short) == 2);
assert(sizeof(unsigned int) == 4); assert(sizeof(unsigned int) == 4);
assert(sizeof(unsigned long long) == 8); assert(sizeof(unsigned long long) == 8);
@ -44,8 +40,7 @@ int main(int argc, char *argv[])
pre_process_arg(argc, argv); pre_process_arg(argc, argv);
if(program_mode==client_mode) if (program_mode == client_mode) {
{
struct ev_loop *loop = ev_default_loop(0); struct ev_loop *loop = ev_default_loop(0);
#if !defined(__MINGW32__) #if !defined(__MINGW32__)
ev_signal signal_watcher_sigpipe; ev_signal signal_watcher_sigpipe;
@ -60,9 +55,7 @@ int main(int argc, char *argv[])
ev_signal signal_watcher_sigint; ev_signal signal_watcher_sigint;
ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT); ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT);
ev_signal_start(loop, &signal_watcher_sigint); ev_signal_start(loop, &signal_watcher_sigint);
} } else {
else
{
#ifdef UDP2RAW_LINUX #ifdef UDP2RAW_LINUX
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
signal(SIGHUP, signal_handler); signal(SIGHUP, signal_handler);
@ -73,15 +66,11 @@ int main(int argc, char *argv[])
mylog(log_fatal, "server mode not supported in multi-platform version\n"); mylog(log_fatal, "server mode not supported in multi-platform version\n");
myexit(-1); myexit(-1);
#endif #endif
} }
#if !defined(__MINGW32__) #if !defined(__MINGW32__)
if(geteuid() != 0) if (geteuid() != 0) {
{
mylog(log_warn, "root check failed, it seems like you are using a non-root account. we can try to continue, but it may fail. If you want to run udp2raw as non-root, you have to add iptables rule manually, and grant udp2raw CAP_NET_RAW capability, check README.md in repo for more info.\n"); mylog(log_warn, "root check failed, it seems like you are using a non-root account. we can try to continue, but it may fail. If you want to run udp2raw as non-root, you have to add iptables rule manually, and grant udp2raw CAP_NET_RAW capability, check README.md in repo for more info.\n");
} } else {
else
{
mylog(log_warn, "you can run udp2raw with non-root account for better security. check README.md in repo for more info.\n"); mylog(log_warn, "you can run udp2raw with non-root account for better security. check README.md in repo for more info.\n");
} }
#endif #endif
@ -102,12 +91,9 @@ int main(int argc, char *argv[])
init_raw_socket(); init_raw_socket();
#endif #endif
if(program_mode==client_mode) if (program_mode == client_mode) {
{
client_event_loop(); client_event_loop();
} } else {
else
{
#ifdef UDP2RAW_LINUX #ifdef UDP2RAW_LINUX
server_event_loop(); server_event_loop();
#else #else

603
misc.cpp
View File

File diff suppressed because it is too large Load Diff

32
misc.h
View File

@ -8,7 +8,6 @@
#ifndef MISC_H_ #ifndef MISC_H_
#define MISC_H_ #define MISC_H_
#include "common.h" #include "common.h"
#include "log.h" #include "log.h"
#include "network.h" #include "network.h"
@ -26,7 +25,6 @@ extern int enable_dns_resolve;
extern int ttl_value; extern int ttl_value;
const u32_t max_handshake_conn_num = 10000; const u32_t max_handshake_conn_num = 10000;
const u32_t max_ready_conn_num = 1000; const u32_t max_ready_conn_num = 1000;
const u32_t anti_replay_window_size = 4000; const u32_t anti_replay_window_size = 4000;
@ -45,7 +43,6 @@ const int conn_clear_min=1;
const u32_t conv_clear_interval = 1000; // ms const u32_t conv_clear_interval = 1000; // ms
const u32_t conn_clear_interval = 1000; // ms const u32_t conn_clear_interval = 1000; // ms
const i32_t max_fail_time = 0; // disable const i32_t max_fail_time = 0; // disable
const u32_t heartbeat_interval = 600; // ms const u32_t heartbeat_interval = 600; // ms
@ -63,14 +60,25 @@ const uint32_t server_conn_timeout=conv_timeout+60000;//ms. this should be 60s+
const u32_t iptables_rule_keep_interval = 20; // unit: second; const u32_t iptables_rule_keep_interval = 20; // unit: second;
enum server_current_state_t {server_idle=0,server_handshake1,server_ready}; //server state machine enum server_current_state_t { server_idle = 0,
enum client_current_state_t {client_idle=0,client_tcp_handshake,client_handshake1,client_handshake2,client_ready,client_tcp_handshake_dummy};//client state machine server_handshake1,
server_ready }; // server state machine
enum client_current_state_t { client_idle = 0,
client_tcp_handshake,
client_handshake1,
client_handshake2,
client_ready,
client_tcp_handshake_dummy }; // client state machine
enum raw_mode_t{mode_faketcp=0,mode_udp,mode_icmp,mode_end}; enum raw_mode_t { mode_faketcp = 0,
enum program_mode_t {unset_mode=0,client_mode,server_mode}; mode_udp,
mode_icmp,
mode_end };
enum program_mode_t { unset_mode = 0,
client_mode,
server_mode };
union current_state_t union current_state_t {
{
server_current_state_t server_current_state; server_current_state_t server_current_state;
client_current_state_t client_current_state; client_current_state_t client_current_state;
}; };
@ -99,7 +107,6 @@ extern int fail_time_counter;//determine if the max_fail_time is reached
extern int epoll_trigger_counter; // for debug only extern int epoll_trigger_counter; // for debug only
extern int debug_flag; // for debug only extern int debug_flag; // for debug only
extern int simple_rule; // deprecated. extern int simple_rule; // deprecated.
extern int keep_rule; // whether to monitor the iptables rule periodly,re-add if losted extern int keep_rule; // whether to monitor the iptables rule periodly,re-add if losted
extern int auto_add_iptables_rule; // if -a is set extern int auto_add_iptables_rule; // if -a is set
@ -113,7 +120,6 @@ extern int debug_resend; // debug only
extern char key_string[1000]; // -k option extern char key_string[1000]; // -k option
extern char fifo_file[1000]; extern char fifo_file[1000];
extern raw_mode_t raw_mode; extern raw_mode_t raw_mode;
extern u32_t raw_ip_version; extern u32_t raw_ip_version;
@ -124,11 +130,9 @@ extern int about_to_exit;
extern int socket_buf_size; extern int socket_buf_size;
extern pthread_t keep_thread; extern pthread_t keep_thread;
extern int keep_thread_running; extern int keep_thread_running;
int process_lower_level_arg(); int process_lower_level_arg();
void print_help(); void print_help();
void iptables_rule(); void iptables_rule();
@ -146,8 +150,6 @@ int iptables_gen_add(const char * s,u32_t const_id);
int iptables_rule_init(const char *s, u32_t const_id, int keep); int iptables_rule_init(const char *s, u32_t const_id, int keep);
int keep_iptables_rule(); int keep_iptables_rule();
void signal_handler(int sig); void signal_handler(int sig);
#endif /* MISC_H_ */ #endif /* MISC_H_ */

1
my_ev.h
View File

@ -2,4 +2,3 @@
#include "my_ev_common.h" #include "my_ev_common.h"
#include "ev.h" #include "ev.h"

5
my_ev_common.h
View File

@ -1,6 +1,8 @@
#define EV_STANDALONE 1 #define EV_STANDALONE 1
#define EV_COMMON void *data; unsigned long long u64; #define EV_COMMON \
void *data; \
unsigned long long u64;
#define EV_COMPAT3 0 #define EV_COMPAT3 0
//#include <wepoll.h> //#include <wepoll.h>
@ -15,4 +17,3 @@
#endif #endif
//#define EV_VERIFY 2 //#define EV_VERIFY 2

950
network.cpp
View File

File diff suppressed because it is too large Load Diff

33
network.h
View File

@ -47,8 +47,7 @@ extern int send_with_pcap;
extern int pcap_header_captured; extern int pcap_header_captured;
extern int pcap_header_buf[buf_len]; extern int pcap_header_buf[buf_len];
struct icmphdr struct icmphdr {
{
uint8_t type; uint8_t type;
uint8_t code; uint8_t code;
uint16_t check_sum; uint16_t check_sum;
@ -57,8 +56,7 @@ struct icmphdr
}; };
#endif #endif
struct my_iphdr struct my_iphdr {
{
#ifdef UDP2RAW_LITTLE_ENDIAN #ifdef UDP2RAW_LITTLE_ENDIAN
unsigned char ihl : 4; unsigned char ihl : 4;
unsigned char version : 4; unsigned char version : 4;
@ -78,11 +76,8 @@ struct my_iphdr
/*The options start here. */ /*The options start here. */
}; };
struct my_udphdr {
struct my_udphdr /*__extension__*/ union {
{
/*__extension__*/ union
{
struct struct
{ {
u_int16_t uh_sport; /* source port */ u_int16_t uh_sport; /* source port */
@ -100,11 +95,8 @@ struct my_udphdr
}; };
}; };
struct my_tcphdr {
struct my_tcphdr /*__extension__*/ union {
{
/*__extension__*/ union
{
struct struct
{ {
u_int16_t th_sport; /* source port */ u_int16_t th_sport; /* source port */
@ -163,8 +155,7 @@ struct my_tcphdr
}; };
}; };
struct my_ip6hdr struct my_ip6hdr {
{
#ifdef UDP2RAW_LITTLE_ENDIAN #ifdef UDP2RAW_LITTLE_ENDIAN
uint8_t traffic_class_high : 4; uint8_t traffic_class_high : 4;
uint8_t version : 4; uint8_t version : 4;
@ -185,8 +176,7 @@ struct my_ip6hdr
struct in6_addr dst; struct in6_addr dst;
}; };
struct my_icmphdr struct my_icmphdr {
{
uint8_t type; uint8_t type;
uint8_t code; uint8_t code;
uint16_t check_sum; uint16_t check_sum;
@ -215,7 +205,6 @@ struct packet_info_t //todo change this to union
{ {
uint8_t protocol; uint8_t protocol;
// u32_t src_ip; // u32_t src_ip;
// u32_t dst_ip; // u32_t dst_ip;
my_ip_t new_src_ip; my_ip_t new_src_ip;
@ -233,7 +222,6 @@ struct packet_info_t //todo change this to union
u32_t ts, ts_ack; u32_t ts, ts_ack;
uint16_t my_icmp_seq; uint16_t my_icmp_seq;
bool has_ts; bool has_ts;
@ -247,8 +235,7 @@ struct packet_info_t //todo change this to union
packet_info_t(); packet_info_t();
}; };
struct raw_info_t struct raw_info_t {
{
packet_info_t send_info; packet_info_t send_info;
packet_info_t recv_info; packet_info_t recv_info;
// int last_send_len; // int last_send_len;
@ -262,7 +249,6 @@ struct raw_info_t
}; // g_raw_info; }; // g_raw_info;
int init_raw_socket(); int init_raw_socket();
void init_filter(int port); void init_filter(int port);
@ -321,5 +307,4 @@ int after_send_raw0(raw_info_t &raw_info);
int after_recv_raw0(raw_info_t &raw_info); int after_recv_raw0(raw_info_t &raw_info);
#endif /* NETWORK_H_ */ #endif /* NETWORK_H_ */

34
pcap_wrapper.cpp
View File

@ -32,26 +32,23 @@ char* (*pcap_lookupdev)(char *)=0;
int (*pcap_findalldevs)(pcap_if_t **, char *) = 0; int (*pcap_findalldevs)(pcap_if_t **, char *) = 0;
struct init_pcap_t struct init_pcap_t {
{ init_pcap_t() {
init_pcap_t()
{
init_pcap(); init_pcap();
} }
} do_it; } do_it;
static void init_npcap_dll_path() static void init_npcap_dll_path() {
{ BOOL(WINAPI * SetDllDirectory)
BOOL(WINAPI *SetDllDirectory)(LPCTSTR); (LPCTSTR);
char sysdir_name[512]; char sysdir_name[512];
int len; int len;
SetDllDirectory = (BOOL(WINAPI *)(LPCTSTR))GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA"); SetDllDirectory = (BOOL(WINAPI *)(LPCTSTR))GetProcAddress(GetModuleHandle("kernel32.dll"), "SetDllDirectoryA");
if (SetDllDirectory == NULL) { if (SetDllDirectory == NULL) {
printf("Error in SetDllDirectory\n"); printf("Error in SetDllDirectory\n");
} } else {
else {
len = GetSystemDirectory(sysdir_name, 480); // be safe len = GetSystemDirectory(sysdir_name, 480); // be safe
if (!len) if (!len)
printf("Error in GetSystemDirectory (%d)\n", (int)GetLastError()); printf("Error in GetSystemDirectory (%d)\n", (int)GetLastError());
@ -61,24 +58,22 @@ static void init_npcap_dll_path()
} }
} }
#define EXPORT_FUN(XXX) do{ XXX= (__typeof__(XXX)) GetProcAddress(wpcap, #XXX); }while(0) #define EXPORT_FUN(XXX) \
int init_pcap() do { \
{ XXX = (__typeof__(XXX))GetProcAddress(wpcap, #XXX); \
} while (0)
int init_pcap() {
HMODULE wpcap = LoadLibrary("wpcap.dll"); HMODULE wpcap = LoadLibrary("wpcap.dll");
if(wpcap!=0) if (wpcap != 0) {
{
printf("using system32/wpcap.dll\n"); printf("using system32/wpcap.dll\n");
} } else {
else
{
init_npcap_dll_path(); init_npcap_dll_path();
// SetDllDirectory("C:\\Windows\\System32\\Npcap\\"); // SetDllDirectory("C:\\Windows\\System32\\Npcap\\");
wpcap = LoadLibrary("wpcap.dll"); wpcap = LoadLibrary("wpcap.dll");
if (wpcap != 0) if (wpcap != 0)
printf("using system32/npcap/wpcap.dll\n"); printf("using system32/npcap/wpcap.dll\n");
} }
if(wpcap==0) if (wpcap == 0) {
{
printf("cant not open wpcap.dll, make sure winpcap/npcap is installed\n"); printf("cant not open wpcap.dll, make sure winpcap/npcap is installed\n");
exit(-1); exit(-1);
} }
@ -121,5 +116,4 @@ int init_pcap()
//pcap_loop = (__typeof__(pcap_loop))GetProcAddress(wpcap, "pcap_loop"); //pcap_loop = (__typeof__(pcap_loop))GetProcAddress(wpcap, "pcap_loop");
*/ */
return 0; return 0;
} }

16
pcap_wrapper.h
View File

@ -7,13 +7,11 @@
//#include <sys/time.h> //#include <sys/time.h>
//#include <stdint.h> //#include <stdint.h>
struct bpf_program struct bpf_program {
{
char a[4096]; char a[4096];
}; };
struct pcap_t struct pcap_t {
{
char a[4096]; char a[4096];
}; };
@ -36,7 +34,6 @@ typedef enum {
PCAP_D_OUT PCAP_D_OUT
} pcap_direction_t; } pcap_direction_t;
struct pcap_addr { struct pcap_addr {
struct pcap_addr *next; struct pcap_addr *next;
struct sockaddr *addr; /* address */ struct sockaddr *addr; /* address */
@ -56,11 +53,8 @@ struct pcap_if {
typedef struct pcap_if pcap_if_t; typedef struct pcap_if pcap_if_t;
typedef struct pcap_addr pcap_addr_t; typedef struct pcap_addr pcap_addr_t;
typedef unsigned char u_char; typedef unsigned char u_char;
#define PCAP_ERRBUF_SIZE 256 #define PCAP_ERRBUF_SIZE 256
#define DLT_NULL 0 /* BSD loopback encapsulation */ #define DLT_NULL 0 /* BSD loopback encapsulation */
@ -112,16 +106,12 @@ extern char* (*pcap_lookupdev)(char *);
extern int (*pcap_findalldevs)(pcap_if_t **, char *); extern int (*pcap_findalldevs)(pcap_if_t **, char *);
inline int pcap_set_immediate_mode(pcap_t *,int) inline int pcap_set_immediate_mode(pcap_t *, int) {
{
return 0; return 0;
} }
//#ifdef __cplusplus //#ifdef __cplusplus
//} //}
//#endif //#endif
int init_pcap(); int init_pcap();

289
server.cpp
View File

@ -34,9 +34,7 @@ int server_on_timer_multi(conn_info_t &conn_info) //for server. called when a t
assert(conn_info.state.server_current_state == server_ready); assert(conn_info.state.server_current_state == server_ready);
if (conn_info.state.server_current_state == server_ready) {
if(conn_info.state.server_current_state==server_ready)
{
conn_info.blob->conv_manager.s.clear_inactive(ip_port); conn_info.blob->conv_manager.s.clear_inactive(ip_port);
/* /*
if( get_current_time()-conn_info.last_hb_recv_time>heartbeat_timeout ) if( get_current_time()-conn_info.last_hb_recv_time>heartbeat_timeout )
@ -49,10 +47,10 @@ int server_on_timer_multi(conn_info_t &conn_info) //for server. called when a t
mylog(log_info,"changed state to server_nothing\n"); mylog(log_info,"changed state to server_nothing\n");
return 0; return 0;
}*/ //dont need to do this at server,conn_manger will clear expired connections }*/
// dont need to do this at server,conn_manger will clear expired connections
if(get_current_time()-conn_info.last_hb_sent_time<heartbeat_interval) if (get_current_time() - conn_info.last_hb_sent_time < heartbeat_interval) {
{
return 0; return 0;
} }
@ -63,19 +61,15 @@ int server_on_timer_multi(conn_info_t &conn_info) //for server. called when a t
conn_info.last_hb_sent_time = get_current_time(); conn_info.last_hb_sent_time = get_current_time();
mylog(log_debug, "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 {
else
{
mylog(log_fatal, "this shouldnt happen!\n"); mylog(log_fatal, "this shouldnt happen!\n");
myexit(-1); myexit(-1);
} }
return 0; return 0;
} }
int server_on_raw_recv_ready(conn_info_t &conn_info, char *ip_port, char type, char *data, int data_len) // called while the state for a connection is server_ready int server_on_raw_recv_ready(conn_info_t &conn_info, char *ip_port, char type, char *data, int data_len) // called while the state for a connection is server_ready
// receives data and heart beat by recv_safer. // receives data and heart beat by recv_safer.
{ {
raw_info_t &raw_info = conn_info.raw_info; raw_info_t &raw_info = conn_info.raw_info;
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
@ -83,7 +77,6 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
// sprintf(ip_port,"%s:%d",my_ntoa(recv_info.src_ip),recv_info.src_port); // sprintf(ip_port,"%s:%d",my_ntoa(recv_info.src_ip),recv_info.src_port);
/* /*
if (recv_info.src_ip != send_info.dst_ip if (recv_info.src_ip != send_info.dst_ip
|| recv_info.src_port != send_info.dst_port) { || recv_info.src_port != send_info.dst_port) {
@ -96,15 +89,12 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
mylog(log_debug, "[%s][hb]received hb \n", ip_port); mylog(log_debug, "[%s][hb]received hb \n", ip_port);
conn_info.last_hb_recv_time = get_current_time(); conn_info.last_hb_recv_time = get_current_time();
return 0; return 0;
} else if (type== 'd' && data_len >=int( sizeof(u32_t) )) } else if (type == 'd' && data_len >= int(sizeof(u32_t))) {
{
// u32_t tmp_conv_id = ntohl(*((u32_t *) &data[0])); // u32_t tmp_conv_id = ntohl(*((u32_t *) &data[0]));
my_id_t tmp_conv_id; my_id_t tmp_conv_id;
memcpy(&tmp_conv_id, &data[0], sizeof(tmp_conv_id)); memcpy(&tmp_conv_id, &data[0], sizeof(tmp_conv_id));
tmp_conv_id = ntohl(tmp_conv_id); tmp_conv_id = ntohl(tmp_conv_id);
if (hb_mode == 0) if (hb_mode == 0)
conn_info.last_hb_recv_time = get_current_time(); conn_info.last_hb_recv_time = get_current_time();
@ -173,8 +163,6 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
conn_info.blob->conv_manager.s.insert_conv(tmp_conv_id, new_udp_fd64); conn_info.blob->conv_manager.s.insert_conv(tmp_conv_id, new_udp_fd64);
// assert(conn_manager.udp_fd_mp.find(new_udp_fd)==conn_manager.udp_fd_mp.end()); // assert(conn_manager.udp_fd_mp.find(new_udp_fd)==conn_manager.udp_fd_mp.end());
// conn_manager.udp_fd_mp[new_udp_fd] = &conn_info; // conn_manager.udp_fd_mp[new_udp_fd] = &conn_info;
@ -183,9 +171,6 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha
mylog(log_info, "[%s]new conv conv_id=%x, assigned fd=%d\n", ip_port, mylog(log_info, "[%s]new conv conv_id=%x, assigned fd=%d\n", ip_port,
tmp_conv_id, new_udp_fd); tmp_conv_id, new_udp_fd);
} }
fd64_t fd64 = conn_info.blob->conv_manager.s.find_data_by_conv(tmp_conv_id); fd64_t fd64 = conn_info.blob->conv_manager.s.find_data_by_conv(tmp_conv_id);
@ -220,12 +205,10 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
mylog(log_info, "[%s]received handshake oppsite_id:%x my_id:%x\n", ip_port, conn_info.oppsite_id, conn_info.my_id); mylog(log_info, "[%s]received handshake oppsite_id:%x my_id:%x\n", ip_port, conn_info.oppsite_id, conn_info.my_id);
mylog(log_info, "[%s]oppsite const_id:%x \n", ip_port, tmp_oppsite_const_id); mylog(log_info, "[%s]oppsite const_id:%x \n", ip_port, tmp_oppsite_const_id);
if(conn_manager.const_id_mp.find(tmp_oppsite_const_id)==conn_manager.const_id_mp.end()) if (conn_manager.const_id_mp.find(tmp_oppsite_const_id) == conn_manager.const_id_mp.end()) {
{
// conn_manager.const_id_mp= // conn_manager.const_id_mp=
if(conn_manager.ready_num>=max_ready_conn_num) if (conn_manager.ready_num >= max_ready_conn_num) {
{
mylog(log_info, "[%s]max_ready_conn_num,cant turn to ready\n", ip_port); mylog(log_info, "[%s]max_ready_conn_num,cant turn to ready\n", ip_port);
conn_info.state.server_current_state = server_idle; conn_info.state.server_current_state = server_idle;
return 0; return 0;
@ -237,7 +220,6 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
conn_manager.ready_num++; conn_manager.ready_num++;
conn_manager.const_id_mp[tmp_oppsite_const_id] = &conn_info; conn_manager.const_id_mp[tmp_oppsite_const_id] = &conn_info;
// conn_info.last_state_time=get_current_time(); //dont change this!!!!!!!!!!!!!!!!!!!!!!!!! // conn_info.last_state_time=get_current_time(); //dont change this!!!!!!!!!!!!!!!!!!!!!!!!!
// conn_manager.current_ready_ip=ip; // conn_manager.current_ready_ip=ip;
@ -265,7 +247,6 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
// assert(conn_manager.timer_fd_mp.find(new_timer_fd)==conn_manager.timer_fd_mp.end()); // assert(conn_manager.timer_fd_mp.find(new_timer_fd)==conn_manager.timer_fd_mp.end());
// conn_manager.timer_fd_mp[new_timer_fd] = &conn_info;//pack_u64(ip,port); // conn_manager.timer_fd_mp[new_timer_fd] = &conn_info;//pack_u64(ip,port);
// timer_fd_mp[new_timer_fd] // timer_fd_mp[new_timer_fd]
/* /*
if(oppsite_const_id!=0&&tmp_oppsite_const_id!=oppsite_const_id) //TODO MOVE TO READY if(oppsite_const_id!=0&&tmp_oppsite_const_id!=oppsite_const_id) //TODO MOVE TO READY
@ -274,28 +255,25 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
conv_manager.clear(); conv_manager.clear();
}*/ }*/
// oppsite_const_id=tmp_oppsite_const_id; // oppsite_const_id=tmp_oppsite_const_id;
} } else {
else
{
conn_info_t &ori_conn_info = *conn_manager.const_id_mp[tmp_oppsite_const_id]; conn_info_t &ori_conn_info = *conn_manager.const_id_mp[tmp_oppsite_const_id];
if(ori_conn_info.state.server_current_state==server_ready) if (ori_conn_info.state.server_current_state == server_ready) {
{ if (conn_info.last_state_time < ori_conn_info.last_state_time) {
if(conn_info.last_state_time<ori_conn_info.last_state_time)
{
mylog(log_info, "[%s]conn_info.last_state_time<ori_conn_info.last_state_time. ignored new handshake\n", ip_port); mylog(log_info, "[%s]conn_info.last_state_time<ori_conn_info.last_state_time. ignored new handshake\n", ip_port);
conn_info.state.server_current_state = server_idle; conn_info.state.server_current_state = server_idle;
conn_info.oppsite_const_id = 0; conn_info.oppsite_const_id = 0;
return 0; return 0;
} }
address_t addr1;addr1.from_ip_port_new(raw_ip_version,&ori_conn_info.raw_info.recv_info.new_src_ip,ori_conn_info.raw_info.recv_info.src_port); address_t addr1;
addr1.from_ip_port_new(raw_ip_version, &ori_conn_info.raw_info.recv_info.new_src_ip, ori_conn_info.raw_info.recv_info.src_port);
if (!conn_manager.exist(addr1)) // TODO remove this if (!conn_manager.exist(addr1)) // TODO remove this
{ {
mylog(log_fatal, "[%s]this shouldnt happen\n", ip_port); mylog(log_fatal, "[%s]this shouldnt happen\n", ip_port);
myexit(-1); myexit(-1);
} }
address_t addr2;addr2.from_ip_port_new(raw_ip_version,&conn_info.raw_info.recv_info.new_src_ip,conn_info.raw_info.recv_info.src_port); address_t addr2;
addr2.from_ip_port_new(raw_ip_version, &conn_info.raw_info.recv_info.new_src_ip, conn_info.raw_info.recv_info.src_port);
if (!conn_manager.exist(addr2)) // TODO remove this if (!conn_manager.exist(addr2)) // TODO remove this
{ {
mylog(log_fatal, "[%s]this shouldnt happen2\n", ip_port); mylog(log_fatal, "[%s]this shouldnt happen2\n", ip_port);
@ -307,10 +285,8 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
p = p_ori; p = p_ori;
p_ori = tmp; p_ori = tmp;
mylog(log_info, "[%s]grabbed a connection\n", ip_port); mylog(log_info, "[%s]grabbed a connection\n", ip_port);
// ori_conn_info.state.server_current_state=server_ready; // ori_conn_info.state.server_current_state=server_ready;
ori_conn_info.recover(conn_info); ori_conn_info.recover(conn_info);
@ -323,14 +299,10 @@ int server_on_raw_recv_pre_ready(conn_info_t &conn_info,char * ip_port,u32_t tmp
ori_conn_info.last_hb_recv_time = get_current_time(); ori_conn_info.last_hb_recv_time = get_current_time();
conn_info.state.server_current_state = server_idle; conn_info.state.server_current_state = server_idle;
conn_info.oppsite_const_id = 0; conn_info.oppsite_const_id = 0;
} } else {
else
{
mylog(log_fatal, "[%s]this should never happen\n", ip_port); mylog(log_fatal, "[%s]this should never happen\n", ip_port);
myexit(-1); myexit(-1);
} }
@ -350,8 +322,7 @@ int server_on_raw_recv_handshake1(conn_info_t &conn_info,char * ip_port,char * d
// char ip_port[40]; // char ip_port[40];
// sprintf(ip_port,"%s:%d",my_ntoa(ip),port); // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
if(data_len<int( 3*sizeof(my_id_t))) if (data_len < int(3 * sizeof(my_id_t))) {
{
mylog(log_debug, "[%s] data_len=%d too short to be a handshake\n", ip_port, data_len); mylog(log_debug, "[%s] data_len=%d too short to be a handshake\n", ip_port, data_len);
return -1; return -1;
} }
@ -367,22 +338,18 @@ int server_on_raw_recv_handshake1(conn_info_t &conn_info,char * ip_port,char * d
if (tmp_my_id == 0) // received init handshake again if (tmp_my_id == 0) // received init handshake again
{ {
if(raw_mode==mode_faketcp) if (raw_mode == mode_faketcp) {
{
send_info.seq = recv_info.ack_seq; send_info.seq = recv_info.ack_seq;
send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len; send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len;
send_info.ts_ack = recv_info.ts; send_info.ts_ack = recv_info.ts;
} }
if(raw_mode==mode_icmp) if (raw_mode == mode_icmp) {
{
send_info.my_icmp_seq = recv_info.my_icmp_seq; send_info.my_icmp_seq = recv_info.my_icmp_seq;
} }
send_handshake(raw_info, conn_info.my_id, tmp_oppsite_id, const_id); //////////////send send_handshake(raw_info, conn_info.my_id, tmp_oppsite_id, const_id); //////////////send
mylog(log_info, "[%s]changed state to server_handshake1,my_id is %x\n", ip_port, conn_info.my_id); mylog(log_info, "[%s]changed state to server_handshake1,my_id is %x\n", ip_port, conn_info.my_id);
} } else if (tmp_my_id == conn_info.my_id) {
else if(tmp_my_id==conn_info.my_id)
{
conn_info.oppsite_id = tmp_oppsite_id; conn_info.oppsite_id = tmp_oppsite_id;
// id_t tmp_oppsite_const_id=ntohl(* ((u32_t *)&data[sizeof(id_t)*2])); // id_t tmp_oppsite_const_id=ntohl(* ((u32_t *)&data[sizeof(id_t)*2]));
@ -390,30 +357,24 @@ int server_on_raw_recv_handshake1(conn_info_t &conn_info,char * ip_port,char * d
memcpy(&tmp_oppsite_const_id, &data[sizeof(my_id_t) * 2], sizeof(tmp_oppsite_const_id)); memcpy(&tmp_oppsite_const_id, &data[sizeof(my_id_t) * 2], sizeof(tmp_oppsite_const_id));
tmp_oppsite_const_id = ntohl(tmp_oppsite_const_id); tmp_oppsite_const_id = ntohl(tmp_oppsite_const_id);
if (raw_mode == mode_faketcp) {
if(raw_mode==mode_faketcp)
{
send_info.seq = recv_info.ack_seq; send_info.seq = recv_info.ack_seq;
send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len; send_info.ack_seq = recv_info.seq + raw_info.recv_info.data_len;
send_info.ts_ack = recv_info.ts; send_info.ts_ack = recv_info.ts;
} }
if(raw_mode==mode_icmp) if (raw_mode == mode_icmp) {
{
send_info.my_icmp_seq = recv_info.my_icmp_seq; send_info.my_icmp_seq = recv_info.my_icmp_seq;
} }
server_on_raw_recv_pre_ready(conn_info, ip_port, tmp_oppsite_const_id); server_on_raw_recv_pre_ready(conn_info, ip_port, tmp_oppsite_const_id);
} } else {
else
{
mylog(log_debug, "[%s]invalid my_id %x,my_id is %x\n", ip_port, tmp_my_id, conn_info.my_id); mylog(log_debug, "[%s]invalid my_id %x,my_id is %x\n", ip_port, tmp_my_id, conn_info.my_id);
} }
return 0; return 0;
} }
int server_on_recv_safer_multi(conn_info_t &conn_info,char type,char *data,int data_len) int server_on_recv_safer_multi(conn_info_t &conn_info, char type, char *data, int data_len) {
{
return 0; return 0;
} }
int server_on_raw_recv_multi() // called when server received an raw packet int server_on_raw_recv_multi() // called when server received an raw packet
@ -424,8 +385,7 @@ int server_on_raw_recv_multi() //called when server received an raw packet
packet_info_t &peek_info = peek_raw_info.recv_info; packet_info_t &peek_info = peek_raw_info.recv_info;
mylog(log_trace, "got a packet\n"); mylog(log_trace, "got a packet\n");
if (pre_recv_raw_packet() < 0) return -1; if (pre_recv_raw_packet() < 0) return -1;
if(peek_raw(peek_raw_info)<0) if (peek_raw(peek_raw_info) < 0) {
{
discard_raw_packet(); discard_raw_packet();
// recv(raw_recv_fd, 0,0, 0 );// // recv(raw_recv_fd, 0,0, 0 );//
// struct sockaddr saddr; // struct sockaddr saddr;
@ -433,14 +393,13 @@ int server_on_raw_recv_multi() //called when server received an raw packet
/// recvfrom(raw_recv_fd, 0,0, 0 ,&saddr , &saddr_size);// /// recvfrom(raw_recv_fd, 0,0, 0 ,&saddr , &saddr_size);//
mylog(log_trace, "peek_raw failed\n"); mylog(log_trace, "peek_raw failed\n");
return -1; return -1;
}else } else {
{
mylog(log_trace, "peek_raw success\n"); mylog(log_trace, "peek_raw success\n");
} }
// u32_t ip=peek_info.src_ip;uint16_t port=peek_info.src_port; // u32_t ip=peek_info.src_ip;uint16_t port=peek_info.src_port;
int data_len;
int data_len; char *data; char *data;
address_t addr; address_t addr;
addr.from_ip_port_new(raw_ip_version, &peek_info.new_src_ip, peek_info.src_port); addr.from_ip_port_new(raw_ip_version, &peek_info.new_src_ip, peek_info.src_port);
@ -450,18 +409,14 @@ int server_on_raw_recv_multi() //called when server received an raw packet
// sprintf(ip_port,"%s:%d",my_ntoa(ip),port); // sprintf(ip_port,"%s:%d",my_ntoa(ip),port);
mylog(log_trace, "[%s]peek_raw\n", ip_port); mylog(log_trace, "[%s]peek_raw\n", ip_port);
if(raw_mode==mode_faketcp&&peek_info.syn==1) if (raw_mode == mode_faketcp && peek_info.syn == 1) {
{ if (!conn_manager.exist(addr) || conn_manager.find_insert(addr).state.server_current_state != server_ready) { // reply any syn ,before state become ready
if(!conn_manager.exist(addr)||conn_manager.find_insert(addr).state.server_current_state!=server_ready)
{//reply any syn ,before state become ready
raw_info_t tmp_raw_info; raw_info_t tmp_raw_info;
if(recv_raw0(tmp_raw_info,data,data_len)<0) if (recv_raw0(tmp_raw_info, data, data_len) < 0) {
{
return 0; return 0;
} }
if(data_len>=max_data_len+1) if (data_len >= max_data_len + 1) {
{
mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", data_len); mylog(log_debug, "data_len=%d >= max_data_len+1,ignored", data_len);
return -1; return -1;
} }
@ -477,13 +432,11 @@ int server_on_raw_recv_multi() //called when server received an raw packet
send_info.dst_port = recv_info.src_port; send_info.dst_port = recv_info.src_port;
send_info.new_dst_ip = recv_info.new_src_ip; send_info.new_dst_ip = recv_info.new_src_ip;
if(lower_level) if (lower_level) {
{
handle_lower_level(raw_info); handle_lower_level(raw_info);
} }
if(data_len==0&&raw_info.recv_info.syn==1&&raw_info.recv_info.ack==0) if (data_len == 0 && raw_info.recv_info.syn == 1 && raw_info.recv_info.ack == 0) {
{
send_info.ack_seq = recv_info.seq + 1; send_info.ack_seq = recv_info.seq + 1;
send_info.psh = 0; send_info.psh = 0;
@ -495,18 +448,14 @@ int server_on_raw_recv_multi() //called when server received an raw packet
send_raw0(raw_info, 0, 0); send_raw0(raw_info, 0, 0);
return 0; return 0;
} }
} } else {
else
{
discard_raw_packet(); discard_raw_packet();
// recv(raw_recv_fd, 0,0,0); // recv(raw_recv_fd, 0,0,0);
} }
return 0; return 0;
} }
if(!conn_manager.exist(addr)) if (!conn_manager.exist(addr)) {
{ if (conn_manager.mp.size() >= max_handshake_conn_num) {
if(conn_manager.mp.size()>=max_handshake_conn_num)
{
mylog(log_info, "[%s]reached max_handshake_conn_num,ignored new handshake\n", ip_port); mylog(log_info, "[%s]reached max_handshake_conn_num,ignored new handshake\n", ip_port);
discard_raw_packet(); discard_raw_packet();
// recv(raw_recv_fd, 0,0, 0 );// // recv(raw_recv_fd, 0,0, 0 );//
@ -515,17 +464,13 @@ int server_on_raw_recv_multi() //called when server received an raw packet
raw_info_t tmp_raw_info; raw_info_t tmp_raw_info;
if (raw_mode == mode_icmp) {
if(raw_mode==mode_icmp)
{
tmp_raw_info.send_info.dst_port = tmp_raw_info.send_info.src_port = addr.get_port(); tmp_raw_info.send_info.dst_port = tmp_raw_info.send_info.src_port = addr.get_port();
} }
if(recv_bare(tmp_raw_info,data,data_len)<0) if (recv_bare(tmp_raw_info, data, data_len) < 0) {
{
return 0; return 0;
} }
if(data_len<int( 3*sizeof(my_id_t))) if (data_len < int(3 * sizeof(my_id_t))) {
{
mylog(log_debug, "[%s]too short to be a handshake\n", ip_port); mylog(log_debug, "[%s]too short to be a handshake\n", ip_port);
return -1; return -1;
} }
@ -535,8 +480,7 @@ int server_on_raw_recv_multi() //called when server received an raw packet
memcpy(&zero, &data[sizeof(my_id_t)], sizeof(zero)); memcpy(&zero, &data[sizeof(my_id_t)], sizeof(zero));
zero = ntohl(zero); zero = ntohl(zero);
if(zero!=0) if (zero != 0) {
{
mylog(log_debug, "[%s]not a invalid initial handshake\n", ip_port); mylog(log_debug, "[%s]not a invalid initial handshake\n", ip_port);
return -1; return -1;
} }
@ -553,16 +497,13 @@ int server_on_raw_recv_multi() //called when server received an raw packet
// conn_info.ip_port.ip=ip; // conn_info.ip_port.ip=ip;
// conn_info.ip_port.port=port; // conn_info.ip_port.port=port;
send_info.new_src_ip = recv_info.new_dst_ip; send_info.new_src_ip = recv_info.new_dst_ip;
send_info.src_port = recv_info.dst_port; send_info.src_port = recv_info.dst_port;
send_info.dst_port = recv_info.src_port; send_info.dst_port = recv_info.src_port;
send_info.new_dst_ip = recv_info.new_src_ip; send_info.new_dst_ip = recv_info.new_src_ip;
if(lower_level) if (lower_level) {
{
handle_lower_level(raw_info); handle_lower_level(raw_info);
} }
@ -571,7 +512,6 @@ int server_on_raw_recv_multi() //called when server received an raw packet
conn_info.my_id = get_true_random_number_nz(); conn_info.my_id = get_true_random_number_nz();
mylog(log_info, "[%s]created new conn,state: server_handshake1,my_id is %x\n", ip_port, conn_info.my_id); mylog(log_info, "[%s]created new conn,state: server_handshake1,my_id is %x\n", ip_port, conn_info.my_id);
conn_info.state.server_current_state = server_handshake1; conn_info.state.server_current_state = server_handshake1;
@ -581,46 +521,36 @@ int server_on_raw_recv_multi() //called when server received an raw packet
return 0; return 0;
} }
conn_info_t &conn_info = conn_manager.find_insert(addr); // insert if not exist conn_info_t &conn_info = conn_manager.find_insert(addr); // insert if not exist
packet_info_t &send_info = conn_info.raw_info.send_info; packet_info_t &send_info = conn_info.raw_info.send_info;
packet_info_t &recv_info = conn_info.raw_info.recv_info; packet_info_t &recv_info = conn_info.raw_info.recv_info;
raw_info_t &raw_info = conn_info.raw_info; raw_info_t &raw_info = conn_info.raw_info;
if(conn_info.state.server_current_state==server_handshake1) if (conn_info.state.server_current_state == server_handshake1) {
{ if (recv_bare(raw_info, data, data_len) != 0) {
if(recv_bare(raw_info,data,data_len)!=0)
{
return -1; return -1;
} }
return server_on_raw_recv_handshake1(conn_info, ip_port, data, data_len); return server_on_raw_recv_handshake1(conn_info, ip_port, data, data_len);
} }
if(conn_info.state.server_current_state==server_ready) if (conn_info.state.server_current_state == server_ready) {
{
vector<char> type_vec; vector<char> type_vec;
vector<string> data_vec; vector<string> data_vec;
recv_safer_multi(conn_info, type_vec, data_vec); recv_safer_multi(conn_info, type_vec, data_vec);
if(data_vec.empty()) if (data_vec.empty()) {
{
mylog(log_debug, "recv_safer failed!\n"); mylog(log_debug, "recv_safer failed!\n");
return -1; return -1;
} }
for(int i=0;i<(int)type_vec.size();i++) for (int i = 0; i < (int)type_vec.size(); i++) {
{
char type = type_vec[i]; char type = type_vec[i];
char *data = (char *)data_vec[i].c_str(); // be careful, do not append data to it char *data = (char *)data_vec[i].c_str(); // be careful, do not append data to it
int data_len = data_vec[i].length(); int data_len = data_vec[i].length();
server_on_raw_recv_ready(conn_info, ip_port, type, data, data_len); server_on_raw_recv_ready(conn_info, ip_port, type, data, data_len);
} }
return 0; return 0;
} }
if(conn_info.state.server_current_state==server_idle) if (conn_info.state.server_current_state == server_idle) {
{
discard_raw_packet(); discard_raw_packet();
// recv(raw_recv_fd, 0,0, 0 );// // recv(raw_recv_fd, 0,0, 0 );//
return 0; return 0;
@ -630,8 +560,7 @@ int server_on_raw_recv_multi() //called when server received an raw packet
return -1; return -1;
} }
int server_on_udp_recv(conn_info_t &conn_info,fd64_t fd64) int server_on_udp_recv(conn_info_t &conn_info, fd64_t fd64) {
{
char buf[buf_len]; char buf[buf_len];
if (conn_info.state.server_current_state != server_ready) // TODO remove this for peformance if (conn_info.state.server_current_state != server_ready) // TODO remove this for peformance
@ -652,82 +581,64 @@ int server_on_udp_recv(conn_info_t &conn_info,fd64_t fd64)
mylog(log_trace, "received a packet from udp_fd,len:%d\n", recv_len); mylog(log_trace, "received a packet from udp_fd,len:%d\n", recv_len);
if(recv_len==max_data_len+1) if (recv_len == max_data_len + 1) {
{
mylog(log_warn, "huge packet, data_len > %d,dropped\n", max_data_len); mylog(log_warn, "huge packet, data_len > %d,dropped\n", max_data_len);
return -1; return -1;
} }
if(recv_len<0) if (recv_len < 0) {
{
mylog(log_debug, "udp fd,recv_len<0 continue,%s\n", strerror(errno)); mylog(log_debug, "udp fd,recv_len<0 continue,%s\n", strerror(errno));
return -1; return -1;
} }
if(recv_len>=mtu_warn) if (recv_len >= mtu_warn) {
{
mylog(log_warn, "huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ", recv_len, mtu_warn); mylog(log_warn, "huge packet,data len=%d (>=%d).strongly suggested to set a smaller mtu at upper level,to get rid of this warn\n ", recv_len, mtu_warn);
} }
// conn_info.conv_manager->update_active_time(conv_id); server dosnt update from upd side,only update from raw side. (client updates at both side) // conn_info.conv_manager->update_active_time(conv_id); server dosnt update from upd side,only update from raw side. (client updates at both side)
if(conn_info.state.server_current_state==server_ready) if (conn_info.state.server_current_state == server_ready) {
{
send_data_safer(conn_info, buf, recv_len, conv_id); send_data_safer(conn_info, buf, recv_len, conv_id);
// send_data(g_packet_info_send,buf,recv_len,my_id,oppsite_id,conv_id); // send_data(g_packet_info_send,buf,recv_len,my_id,oppsite_id,conv_id);
mylog(log_trace, "send_data_safer ,sent !!\n"); mylog(log_trace, "send_data_safer ,sent !!\n");
} }
return 0; return 0;
} }
int server_event_loop() {
int server_event_loop()
{
char buf[buf_len]; char buf[buf_len];
int i, j, k;int ret; int i, j, k;
int ret;
if(raw_ip_version==AF_INET) if (raw_ip_version == AF_INET) {
{ if (local_addr.inner.ipv4.sin_addr.s_addr != 0) {
if(local_addr.inner.ipv4.sin_addr.s_addr!=0)
{
bind_addr_used = 1; bind_addr_used = 1;
bind_addr.v4 = local_addr.inner.ipv4.sin_addr.s_addr; bind_addr.v4 = local_addr.inner.ipv4.sin_addr.s_addr;
} }
} } else {
else
{
assert(raw_ip_version == AF_INET6); assert(raw_ip_version == AF_INET6);
char zero_arr[16] = {0}; char zero_arr[16] = {0};
if(memcmp(&local_addr.inner.ipv6.sin6_addr,zero_arr,16)!=0) if (memcmp(&local_addr.inner.ipv6.sin6_addr, zero_arr, 16) != 0) {
{
bind_addr_used = 1; bind_addr_used = 1;
bind_addr.v6 = local_addr.inner.ipv6.sin6_addr; bind_addr.v6 = local_addr.inner.ipv6.sin6_addr;
} }
} }
// bind_address_uint32=local_ip_uint32;//only server has bind adress,client sets it to zero // bind_address_uint32=local_ip_uint32;//only server has bind adress,client sets it to zero
if(lower_level) if (lower_level) {
{ if (lower_level_manual) {
if(lower_level_manual)
{
init_ifindex(if_name, raw_send_fd, ifindex); init_ifindex(if_name, raw_send_fd, ifindex);
mylog(log_info, "we are running at lower-level (manual) mode\n"); mylog(log_info, "we are running at lower-level (manual) mode\n");
} } else {
else
{
mylog(log_info, "we are running at lower-level (auto) mode\n"); mylog(log_info, "we are running at lower-level (auto) mode\n");
} }
} }
if(raw_mode==mode_faketcp) if (raw_mode == mode_faketcp) {
{
bind_fd = socket(local_addr.get_type(), SOCK_STREAM, 0); bind_fd = socket(local_addr.get_type(), SOCK_STREAM, 0);
} } else if (raw_mode == mode_udp || raw_mode == mode_icmp) // bind an adress to avoid collision,for icmp,there is no port,just bind a udp port
else if(raw_mode==mode_udp||raw_mode==mode_icmp)//bind an adress to avoid collision,for icmp,there is no port,just bind a udp port
{ {
bind_fd = socket(local_addr.get_type(), SOCK_DGRAM, 0); bind_fd = socket(local_addr.get_type(), SOCK_DGRAM, 0);
} }
@ -739,24 +650,18 @@ int server_event_loop()
// temp_bind_addr.sin_port = local_addr.get_port(); // temp_bind_addr.sin_port = local_addr.get_port();
// temp_bind_addr.sin_addr.s_addr = local_addr.inner.ipv4.sin_addr.s_addr; // temp_bind_addr.sin_addr.s_addr = local_addr.inner.ipv4.sin_addr.s_addr;
if (bind(bind_fd, (struct sockaddr*)&local_addr.inner, local_addr.get_len()) !=0) if (bind(bind_fd, (struct sockaddr *)&local_addr.inner, local_addr.get_len()) != 0) {
{
mylog(log_fatal, "bind fail\n"); mylog(log_fatal, "bind fail\n");
myexit(-1); myexit(-1);
} }
if(raw_mode==mode_faketcp) if (raw_mode == mode_faketcp) {
{ if (listen(bind_fd, SOMAXCONN) != 0) {
if(listen(bind_fd, SOMAXCONN) != 0 )
{
mylog(log_fatal, "listen fail\n"); mylog(log_fatal, "listen fail\n");
myexit(-1); myexit(-1);
} }
} }
// init_raw_socket(); // init_raw_socket();
init_filter(local_addr.get_port()); // bpf filter init_filter(local_addr.get_port()); // bpf filter
@ -788,8 +693,7 @@ int server_event_loop()
int fifo_fd = -1; int fifo_fd = -1;
if(fifo_file[0]!=0) if (fifo_file[0] != 0) {
{
fifo_fd = create_fifo(fifo_file); fifo_fd = create_fifo(fifo_file);
ev.events = EPOLLIN; ev.events = EPOLLIN;
ev.data.u64 = fifo_fd; ev.data.u64 = fifo_fd;
@ -802,40 +706,32 @@ int server_event_loop()
mylog(log_info, "fifo_file=%s\n", fifo_file); mylog(log_info, "fifo_file=%s\n", fifo_file);
} }
while (1) //////////////////////// while (1) ////////////////////////
{ {
if (about_to_exit) myexit(0); if (about_to_exit) myexit(0);
int nfds = epoll_wait(epollfd, events, max_events, 180 * 1000); int nfds = epoll_wait(epollfd, events, max_events, 180 * 1000);
if (nfds < 0) { // allow zero if (nfds < 0) { // allow zero
if(errno==EINTR ) if (errno == EINTR) {
{
mylog(log_info, "epoll interrupted by signal,continue\n"); mylog(log_info, "epoll interrupted by signal,continue\n");
// myexit(0); // myexit(0);
} } else {
else
{
mylog(log_fatal, "epoll_wait return %d,%s\n", nfds, strerror(errno)); mylog(log_fatal, "epoll_wait return %d,%s\n", nfds, strerror(errno));
myexit(-1); myexit(-1);
} }
} }
int idx; int idx;
for (idx = 0; idx < nfds; ++idx) for (idx = 0; idx < nfds; ++idx) {
{
// mylog(log_debug,"ndfs: %d \n",nfds); // mylog(log_debug,"ndfs: %d \n",nfds);
epoll_trigger_counter++; epoll_trigger_counter++;
// printf("%d %d %d %d\n",timer_fd,raw_recv_fd,raw_send_fd,n); // printf("%d %d %d %d\n",timer_fd,raw_recv_fd,raw_send_fd,n);
if ((events[idx].data.u64 ) == (u64_t)timer_fd) if ((events[idx].data.u64) == (u64_t)timer_fd) {
{
if (debug_flag) begin_time = get_current_time(); if (debug_flag) begin_time = get_current_time();
conn_manager.clear_inactive(); conn_manager.clear_inactive();
u64_t dummy; u64_t dummy;
int unused = read(timer_fd, &dummy, 8); int unused = read(timer_fd, &dummy, 8);
// current_time_rough=get_current_time(); // current_time_rough=get_current_time();
if(debug_flag) if (debug_flag) {
{
end_time = get_current_time(); end_time = get_current_time();
mylog(log_debug, "timer_fd,%llu,%llu,%llu\n", begin_time, end_time, end_time - begin_time); mylog(log_debug, "timer_fd,%llu,%llu,%llu\n", begin_time, end_time, end_time - begin_time);
} }
@ -843,22 +739,16 @@ int server_event_loop()
mylog(log_trace, "epoll_trigger_counter: %d \n", epoll_trigger_counter); mylog(log_trace, "epoll_trigger_counter: %d \n", epoll_trigger_counter);
epoll_trigger_counter = 0; epoll_trigger_counter = 0;
} } else if (events[idx].data.u64 == (u64_t)raw_recv_fd) {
else if (events[idx].data.u64 == (u64_t)raw_recv_fd)
{
if (debug_flag) begin_time = get_current_time(); if (debug_flag) begin_time = get_current_time();
server_on_raw_recv_multi(); server_on_raw_recv_multi();
if(debug_flag) if (debug_flag) {
{
end_time = get_current_time(); end_time = get_current_time();
mylog(log_debug, "raw_recv_fd,%llu,%llu,%llu \n", begin_time, end_time, end_time - begin_time); mylog(log_debug, "raw_recv_fd,%llu,%llu,%llu \n", begin_time, end_time, end_time - begin_time);
} }
} } else if (events[idx].data.u64 == (u64_t)fifo_fd) {
else if (events[idx].data.u64 == (u64_t)fifo_fd)
{
int len = read(fifo_fd, buf, sizeof(buf)); int len = read(fifo_fd, buf, sizeof(buf));
if(len<0) if (len < 0) {
{
mylog(log_warn, "fifo read failed len=%d,errno=%s\n", len, strerror(errno)); mylog(log_warn, "fifo read failed len=%d,errno=%s\n", len, strerror(errno));
continue; continue;
} }
@ -868,13 +758,9 @@ int server_event_loop()
buf[len - 1] = 0; buf[len - 1] = 0;
mylog(log_info, "got data from fifo,len=%d,s=[%s]\n", len, buf); mylog(log_info, "got data from fifo,len=%d,s=[%s]\n", len, buf);
mylog(log_info, "unknown command\n"); mylog(log_info, "unknown command\n");
} } else if (events[idx].data.u64 > u32_t(-1)) {
else if (events[idx].data.u64>u32_t(-1) )
{
fd64_t fd64 = events[idx].data.u64; fd64_t fd64 = events[idx].data.u64;
if(!fd_manager.exist(fd64)) if (!fd_manager.exist(fd64)) {
{
mylog(log_trace, "fd64 no longer exist\n"); mylog(log_trace, "fd64 no longer exist\n");
return -1; return -1;
} }
@ -883,36 +769,29 @@ int server_event_loop()
conn_info_t &conn_info = *p_conn_info; conn_info_t &conn_info = *p_conn_info;
if (fd64 == conn_info.timer_fd64) //////////timer_fd64 if (fd64 == conn_info.timer_fd64) //////////timer_fd64
{ {
if (debug_flag) begin_time = get_current_time(); if (debug_flag) begin_time = get_current_time();
int fd = fd_manager.to_fd(fd64); int fd = fd_manager.to_fd(fd64);
u64_t dummy; u64_t dummy;
int unused = read(fd, &dummy, 8); int unused = read(fd, &dummy, 8);
assert(conn_info.state.server_current_state == server_ready); // TODO remove this for peformance assert(conn_info.state.server_current_state == server_ready); // TODO remove this for peformance
server_on_timer_multi(conn_info); server_on_timer_multi(conn_info);
if(debug_flag) if (debug_flag) {
{
end_time = get_current_time(); end_time = get_current_time();
mylog(log_debug, "(events[idx].data.u64 >>32u) == 2u ,%llu,%llu,%llu \n", begin_time, end_time, end_time - begin_time); mylog(log_debug, "(events[idx].data.u64 >>32u) == 2u ,%llu,%llu,%llu \n", begin_time, end_time, end_time - begin_time);
} }
} } else // udp_fd64
else//udp_fd64
{ {
if (debug_flag) begin_time = get_current_time(); if (debug_flag) begin_time = get_current_time();
server_on_udp_recv(conn_info, fd64); server_on_udp_recv(conn_info, fd64);
if(debug_flag) if (debug_flag) {
{
end_time = get_current_time(); end_time = get_current_time();
mylog(log_debug, "(events[idx].data.u64 >>32u) == 1u,%lld,%lld,%lld \n", begin_time, end_time, end_time - begin_time); mylog(log_debug, "(events[idx].data.u64 >>32u) == 1u,%lld,%lld,%lld \n", begin_time, end_time, end_time - begin_time);
} }
} }
} } else {
else
{
mylog(log_fatal, "unknown fd,this should never happen\n"); mylog(log_fatal, "unknown fd,this should never happen\n");
myexit(-1); myexit(-1);
} }
} }
} }
return 0; return 0;