diff --git a/client.cpp b/client.cpp index 3876688..29375f8 100644 --- a/client.cpp +++ b/client.cpp @@ -500,7 +500,8 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p { vector type_vec; vector data_vec; - if(recv_safer_multi(conn_info,type_vec,data_vec)!=0) + recv_safer_multi(conn_info,type_vec,data_vec); + if(data_vec.empty()) { mylog(log_debug,"recv_safer failed!\n"); return -1; diff --git a/connection.cpp b/connection.cpp index d2b9d1b..69d0d96 100644 --- a/connection.cpp +++ b/connection.cpp @@ -497,8 +497,8 @@ int send_safer(conn_info_t &conn_info,char type,const char* data,int len) //saf return -1; } write_u16(send_data_buf2,new_len); - send_data_buf2[0]^=gro_xor[0]; - send_data_buf2[1]^=gro_xor[1]; + //send_data_buf2[0]^=gro_xor[0]; + //send_data_buf2[1]^=gro_xor[1]; new_len+=2; } @@ -649,15 +649,17 @@ int recv_safer_multi(conn_info_t &conn_info,vector &type_arr,vector2) { recv_len-=2; int single_len; - recv_data[0]^=gro_xor[0]; - recv_data[1]^=gro_xor[1]; + //recv_data[0]^=gro_xor[0]; + //recv_data[1]^=gro_xor[1]; single_len=read_u16(recv_data); recv_data+=2; if(single_len > recv_len) @@ -674,7 +676,7 @@ int recv_safer_multi(conn_info_t &conn_info,vector &type_arr,vector %d(single_max_data_len) dropped\n", g_packet_buf_len, + mylog(log_debug, "huge packet, data_len %d > %d(single_max_data_len) not dropped\n", g_packet_buf_len, single_max_data_len); - return -1; + //return -1; } } diff --git a/server.cpp b/server.cpp index b1cb859..abeaeea 100644 --- a/server.cpp +++ b/server.cpp @@ -595,7 +595,8 @@ int server_on_raw_recv_multi() //called when server received an raw packet { vector type_vec; vector data_vec; - if(recv_safer_multi(conn_info,type_vec,data_vec)!=0) + recv_safer_multi(conn_info,type_vec,data_vec); + if(data_vec.empty()) { mylog(log_debug,"recv_safer failed!\n"); return -1;