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

conv_manager_t<address_t> works

Browse Source
This commit is contained in:
wangyu- 2018-07-19 05:32:25 -05:00
parent 2f0c02def2
commit f050946ac5
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
connection.h
View File

@ -116,7 +116,7 @@ struct conv_manager_t // manage the udp connections
{ {
return data_to_conv[data]; return data_to_conv[data];
} }
u64_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];
} }
@ -126,10 +126,10 @@ struct conv_manager_t // manage the udp connections
lru.update(conv); lru.update(conv);
return 0; return 0;
} }
int insert_conv(u32_t conv,u64_t u64) int insert_conv(u32_t conv,T data)
{ {
data_to_conv[u64]=conv; data_to_conv[data]=conv;
conv_to_data[conv]=u64; 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;
@ -137,13 +137,13 @@ struct conv_manager_t // manage the udp connections
int erase_conv(u32_t conv) int erase_conv(u32_t conv)
{ {
if(disable_conv_clear) return 0; if(disable_conv_clear) return 0;
u64_t u64=conv_to_data[conv]; T data=conv_to_data[conv];
if(program_mode==server_mode) if(additional_clear_function!=0)
{ {
server_clear_function(u64); additional_clear_function(data);
} }
conv_to_data.erase(conv); conv_to_data.erase(conv);
data_to_conv.erase(u64); data_to_conv.erase(data);
//conv_last_active_time.erase(conv); //conv_last_active_time.erase(conv);
lru.erase(conv); lru.erase(conv);
return 0; return 0;
@ -221,9 +221,9 @@ struct blob_t:not_copy_able_t //used in conn_info_t. conv_manager_t and anti_re
{ {
struct //TODO change to unconstrained union struct //TODO change to unconstrained union
{ {
conv_manager_t<u64_t> c; conv_manager_t<address_t> c;
conv_manager_t<u64_t> s; conv_manager_t<u64_t> s;
conv_manager_t<address_t> test; //conv_manager_t<address_t> test;
}conv_manager; }conv_manager;
anti_replay_t anti_replay; anti_replay_t anti_replay;

34
main.cpp
View File

@ -504,25 +504,26 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p
conn_info.blob->conv_manager.c.update_active_time(tmp_conv_id); conn_info.blob->conv_manager.c.update_active_time(tmp_conv_id);
u64_t u64=conn_info.blob->conv_manager.c.find_data_by_conv(tmp_conv_id); //u64_t u64=conn_info.blob->conv_manager.c.find_data_by_conv(tmp_conv_id);
address_t tmp_addr=conn_info.blob->conv_manager.c.find_data_by_conv(tmp_conv_id);
//sockaddr_in tmp_sockaddr={0};
//tmp_sockaddr.sin_family = AF_INET;
//tmp_sockaddr.sin_addr.s_addr=(u64>>32u);
//tmp_sockaddr.sin_port= htons(uint16_t((u64<<32u)>>32u));
sockaddr_in tmp_sockaddr={0}; int ret=sendto(udp_fd,data+sizeof(u32_t),data_len -(sizeof(u32_t)),0,(struct sockaddr *)&tmp_addr.inner,tmp_addr.get_len());
tmp_sockaddr.sin_family = AF_INET;
tmp_sockaddr.sin_addr.s_addr=(u64>>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_sockaddr,sizeof(tmp_sockaddr));
if(ret<0) if(ret<0)
{ {
mylog(log_warn,"sento returned %d\n",ret); mylog(log_warn,"sento returned %d\n",ret);
//perror("ret<0"); //perror("ret<0");
} }
mylog(log_trace,"%s :%d\n",inet_ntoa(tmp_sockaddr.sin_addr),ntohs(tmp_sockaddr.sin_port)); //mylog(log_trace,"%s :%d\n",inet_ntoa(tmp_sockaddr.sin_addr),ntohs(tmp_sockaddr.sin_port));
mylog(log_trace,"%d byte sent\n",ret); mylog(log_trace,"%d byte sent\n",ret);
} }
else else
@ -1403,10 +1404,13 @@ int client_event_loop()
}*/ }*/
//last_udp_recv_time=get_current_time(); //last_udp_recv_time=get_current_time();
u64_t u64=((u64_t(udp_new_addr_in.sin_addr.s_addr))<<32u)+ntohs(udp_new_addr_in.sin_port); address_t tmp_address;
tmp_address.from_sockaddr((sockaddr *)&udp_new_addr_in,udp_new_addr_len);
//u64_t u64=((u64_t(udp_new_addr_in.sin_addr.s_addr))<<32u)+ntohs(udp_new_addr_in.sin_port);
u32_t conv; u32_t conv;
if(!conn_info.blob->conv_manager.c.is_data_used(u64)) //u64_t u64;//////todo
if(!conn_info.blob->conv_manager.c.is_data_used(tmp_address))
{ {
if(conn_info.blob->conv_manager.c.get_size() >=max_conv_num) if(conn_info.blob->conv_manager.c.get_size() >=max_conv_num)
{ {
@ -1414,12 +1418,12 @@ int client_event_loop()
continue; continue;
} }
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,u64); conn_info.blob->conv_manager.c.insert_conv(conv,tmp_address);
mylog(log_info,"new packet from %s:%d,conv_id=%x\n",inet_ntoa(udp_new_addr_in.sin_addr),ntohs(udp_new_addr_in.sin_port),conv); mylog(log_info,"new packet from %s:%d,conv_id=%x\n",inet_ntoa(udp_new_addr_in.sin_addr),ntohs(udp_new_addr_in.sin_port),conv);
} }
else else
{ {
conv=conn_info.blob->conv_manager.c.find_conv_by_data(u64); conv=conn_info.blob->conv_manager.c.find_conv_by_data(tmp_address);
} }
conn_info.blob->conv_manager.c.update_active_time(conv); conn_info.blob->conv_manager.c.update_active_time(conv);