trival

cmake/CMakeLists.txt

@@ -17,3 +17,4 @@ set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -W
 #set(CMAKE_LINK_LIBRARY_FLAG "-lrt")
 add_executable(udp2raw_cmake ${SOURCE_FILES})
 target_link_libraries(udp2raw_cmake rt)
+target_link_libraries(udp2raw_cmake pthread)

log.h

@@ -3,7 +3,7 @@
 #define UDP2RAW_LOG_MYLOG_H_
 
 
-#include<common.h>
+#include "common.h"
 
 using namespace std;
 

main.cpp

@@ -650,7 +650,7 @@ int send_bare(raw_info_t &raw_info,const char* data,int len)//send function with
 	send_raw0(raw_info,send_data_buf2,new_len);
 	return 0;
 }
-int parse_bare(const char *input,int input_len,char* & data,int & len) // a sub function used in recv_bare
+int reserved_parse_bare(const char *input,int input_len,char* & data,int & len) // a sub function used in recv_bare
 {
 	static char recv_data_buf[buf_len];
 
@@ -695,7 +695,7 @@ int recv_bare(raw_info_t &raw_info,char* & data,int & len)//recv function with e
 		mylog(log_debug,"unexpect packet type recv_info.syn=%d recv_info.ack=%d \n",recv_info.syn,recv_info.ack);
 		return -1;
 	}
-	return parse_bare(data,len,data,len);
+	return reserved_parse_bare(data,len,data,len);
 }
 
 int send_handshake(raw_info_t &raw_info,id_t id1,id_t id2,id_t id3)// a warp for send_bare for sending handshake(this is not tcp handshake) easily
@@ -1562,6 +1562,10 @@ int server_on_raw_recv_multi() //called when server received an raw packet
 				return 0;
 			}
 		}
+		else
+		{
+			recv(raw_recv_fd, 0,0,0);
+		}
 		return 0;
 	}
 	if(!conn_manager.exist(ip,port))
@@ -1648,7 +1652,7 @@ int server_on_raw_recv_multi() //called when server received an raw packet
 		{
 			return -1;
 		}
-		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)
 	{
@@ -1660,8 +1664,16 @@ int server_on_raw_recv_multi() //called when server received an raw packet
 		//mylog(log_info,"after recv_safer\n");
 		return server_on_raw_recv_ready(conn_info,ip_port,type,data,data_len);
 	}
+
+	if(conn_info.state.server_current_state==server_idle)
+	{
+		recv(raw_recv_fd, 0,0, 0  );//
 		return 0;
 	}
+	mylog(log_fatal,"we should never run to here\n");
+	myexit(-1);
+	return -1;
+}
 
 /*
 int server_on_raw_recv_handshake1(conn_info_t &conn_info,id_t tmp_oppsite_id )