From d3290a9a94eccaf7da42f0f0dd7c41459f25a88d Mon Sep 17 00:00:00 2001 From: wangyu- Date: Thu, 31 Aug 2017 10:36:33 -0500 Subject: [PATCH] fixed possible alignment issue --- common.cpp | 16 +++++++--- doc/README.zh-cn.md | 4 +++ images/route.PNG | Bin 0 -> 17806 bytes main.cpp | 75 ++++++++++++++++++++++++++++++++++---------- makefile | 1 + network.cpp | 49 ++++++++++++++++++++--------- 6 files changed, 110 insertions(+), 35 deletions(-) create mode 100644 images/route.PNG diff --git a/common.cpp b/common.cpp index 3dd1fc8..2aaf085 100644 --- a/common.cpp +++ b/common.cpp @@ -330,12 +330,12 @@ int set_buf_size(int fd) { if(setsockopt(fd, SOL_SOCKET, SO_SNDBUFFORCE, &socket_buf_size, sizeof(socket_buf_size))<0) { - mylog(log_fatal,"SO_SNDBUFFORCE fail,fd %d\n",fd); + mylog(log_fatal,"SO_SNDBUFFORCE fail socket_buf_size=%d errno=%s\n",socket_buf_size,strerror(errno)); myexit(1); } if(setsockopt(fd, SOL_SOCKET, SO_RCVBUFFORCE, &socket_buf_size, sizeof(socket_buf_size))<0) { - mylog(log_fatal,"SO_RCVBUFFORCE fail,fd %d\n",fd); + mylog(log_fatal,"SO_RCVBUFFORCE fail socket_buf_size=%d errno=%s\n",socket_buf_size,strerror(errno)); myexit(1); } return 0; @@ -386,9 +386,15 @@ int numbers_to_char(id_t id1,id_t id2,id_t id3,char * &data,int &len) int char_to_numbers(const char * data,int len,id_t &id1,id_t &id2,id_t &id3) { if(len`，记下第一跳的地址，这个就是`网关ip`。再运行`arp -s <网关ip>`，可以同时查到出口网卡名和mac。 ![](/images/lower_level.PNG) + +如果traceroute第一跳结果是`* * *`，说明网关屏蔽了对traceroute的应答。需要用`ip route`或`route`查询网关： + +![](/images/route.PNG) ##### server端获得--lower-level参数的办法 如果client有公网ip，就`traceroute `。下一步和client端的方法一样。 diff --git a/images/route.PNG b/images/route.PNG new file mode 100644 index 0000000000000000000000000000000000000000..8433e51907a80f7d54684d07b793ffbfe62665d5 GIT binary patch literal 17806 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%0D{K$O)xr^yk(TuV2v01V%~WF2VN`kkgC>XX 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 literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 6f2ac0e..16366f4 100755 --- a/main.cpp +++ b/main.cpp @@ -787,9 +787,9 @@ int send_data_safer(conn_info_t &conn_info,const char* data,int len,u32_t conv_n } int 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_buf0[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,key)!=0) { //printf("decrypt fail\n"); @@ -799,15 +799,24 @@ int parse_safer(conn_info_t &conn_info,const char * input,int input_len,char &ty //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)) ); + id_t h_oppsite_id; + memcpy(&h_oppsite_id,recv_data_buf,sizeof(h_oppsite_id)); + h_oppsite_id=ntohl(h_oppsite_id); - id_t h_my_id= ntohl ( *((id_t * )(recv_data_buf+sizeof(id_t))) ); + //id_t h_my_id= ntohl ( *((id_t * )(recv_data_buf+sizeof(id_t))) ); + id_t h_my_id; + memcpy(&h_my_id,recv_data_buf+sizeof(id_t),sizeof(h_my_id)); + h_my_id=ntohl(h_my_id); - anti_replay_seq_t h_seq= ntoh64 ( *((anti_replay_seq_t * )(recv_data_buf +sizeof(id_t) *2 )) ); + //anti_replay_seq_t h_seq= ntoh64 ( *((anti_replay_seq_t * )(recv_data_buf +sizeof(id_t) *2 )) ); + anti_replay_seq_t h_seq; + memcpy(&h_seq,recv_data_buf +sizeof(id_t) *2 ,sizeof(h_seq)); + h_seq=ntoh64(h_seq); - if(h_oppiste_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_oppiste_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; } @@ -1331,9 +1340,20 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p mylog(log_debug,"too short to be a handshake\n"); return -1; } - id_t tmp_oppsite_id= ntohl(* ((u32_t *)&data[0])); - id_t tmp_my_id=ntohl(* ((u32_t *)&data[sizeof(id_t)])); - id_t tmp_oppsite_const_id=ntohl(* ((u32_t *)&data[sizeof(id_t)*2])); + //id_t tmp_oppsite_id= ntohl(* ((u32_t *)&data[0])); + id_t tmp_oppsite_id; + memcpy(&tmp_oppsite_id,&data[0],sizeof(tmp_oppsite_id)); + tmp_oppsite_id=ntohl(tmp_oppsite_id); + + //id_t tmp_my_id=ntohl(* ((u32_t *)&data[sizeof(id_t)])); + id_t tmp_my_id; + memcpy(&tmp_my_id,&data[sizeof(id_t)],sizeof(tmp_my_id)); + tmp_my_id=ntohl(tmp_my_id); + + //id_t tmp_oppsite_const_id=ntohl(* ((u32_t *)&data[sizeof(id_t)*2])); + id_t tmp_oppsite_const_id; + memcpy(&tmp_oppsite_const_id,&data[sizeof(id_t)*2],sizeof(tmp_oppsite_const_id)); + tmp_oppsite_const_id=ntohl(tmp_oppsite_const_id); if(tmp_my_id!=conn_info.my_id) { @@ -1401,7 +1421,10 @@ int client_on_raw_recv(conn_info_t &conn_info) //called when raw fd received a p conn_info.last_hb_recv_time=get_current_time(); - u32_t tmp_conv_id= ntohl(* ((u32_t *)&data[0])); + //u32_t tmp_conv_id= ntohl(* ((u32_t *)&data[0])); + u32_t tmp_conv_id; + memcpy(&tmp_conv_id,&data[0],sizeof(tmp_conv_id)); + tmp_conv_id=ntohl(tmp_conv_id); if(!conn_info.blob->conv_manager.is_conv_used(tmp_conv_id)) { @@ -1566,7 +1589,11 @@ int server_on_raw_recv_multi() //called when server received an raw packet return -1; } - id_t zero=ntohl(* ((u32_t *)&data[sizeof(id_t)])); + //id_t zero=ntohl(* ((u32_t *)&data[sizeof(id_t)])); + id_t zero; + memcpy(&zero,&data[sizeof(id_t)],sizeof(zero)); + zero=ntohl(zero); + if(zero!=0) { mylog(log_debug,"[%s]not a invalid initial handshake\n",ip_port); @@ -1663,8 +1690,15 @@ int server_on_raw_recv_handshake1(conn_info_t &conn_info,char * ip_port,char * d mylog(log_debug,"[%s] data_len=%d too short to be a handshake\n",ip_port,data_len); return -1; } - id_t tmp_oppsite_id= ntohl(* ((u32_t *)&data[0])); - id_t tmp_my_id=ntohl(* ((u32_t *)&data[sizeof(id_t)])); + //id_t tmp_oppsite_id= ntohl(* ((u32_t *)&data[0])); + id_t tmp_oppsite_id; + memcpy(&tmp_oppsite_id,(u32_t *)&data[0],sizeof(tmp_oppsite_id)); + tmp_oppsite_id=ntohl(tmp_oppsite_id); + + //id_t tmp_my_id=ntohl(* ((u32_t *)&data[sizeof(id_t)])); + id_t tmp_my_id; + memcpy(&tmp_my_id,&data[sizeof(id_t)],sizeof(tmp_my_id)); + tmp_my_id=ntohl(tmp_my_id); if(tmp_my_id==0) //received init handshake again { @@ -1685,7 +1719,12 @@ int server_on_raw_recv_handshake1(conn_info_t &conn_info,char * ip_port,char * d else if(tmp_my_id==conn_info.my_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])); + + id_t tmp_oppsite_const_id; + memcpy(&tmp_oppsite_const_id,&data[sizeof(id_t)*2],sizeof(tmp_oppsite_const_id)); + tmp_oppsite_const_id=ntohl(tmp_oppsite_const_id); + if(raw_mode==mode_faketcp) { @@ -1735,7 +1774,11 @@ int server_on_raw_recv_ready(conn_info_t &conn_info,char * ip_port,char type,cha } 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])); + id_t tmp_conv_id; + memcpy(&tmp_conv_id,&data[0],sizeof(tmp_conv_id)); + tmp_conv_id=ntohl(tmp_conv_id); + conn_info.last_hb_recv_time = get_current_time(); diff --git a/makefile b/makefile index 006a022..641c49c 100755 --- a/makefile +++ b/makefile @@ -1,6 +1,7 @@ cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++ cc_local=g++ cc_mips34kc=/toolchains/OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-g++ +#cc_arm= /toolchains/gcc-linaro-4.9.4-2017.01-x86_64_arm-linux-gnueabi/bin/arm-linux-gnueabi-g++ -march=armv6 -marm cc_arm= /toolchains/arm-2014.05/bin/arm-none-linux-gnueabi-g++ #cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ FLAGS= -std=c++11 -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers diff --git a/network.cpp b/network.cpp index 67dd4e1..fde70ca 100644 --- a/network.cpp +++ b/network.cpp @@ -201,7 +201,7 @@ int init_raw_socket() if(setsockopt(raw_send_fd, SOL_SOCKET, SO_SNDBUFFORCE, &socket_buf_size, sizeof(socket_buf_size))<0) { - mylog(log_fatal,"SO_SNDBUFFORCE fail\n"); + mylog(log_fatal,"SO_SNDBUFFORCE fail socket_buf_size=%d errno=%s\n",socket_buf_size,strerror(errno)); myexit(1); } @@ -219,7 +219,7 @@ int init_raw_socket() if(setsockopt(raw_recv_fd, SOL_SOCKET, SO_RCVBUFFORCE, &socket_buf_size, sizeof(socket_buf_size))<0) { - mylog(log_fatal,"SO_RCVBUFFORCE fail\n"); + mylog(log_fatal,"SO_RCVBUFFORCE fail socket_buf_size=%d errno=%s\n",socket_buf_size,strerror(errno)); myexit(1); } @@ -844,8 +844,8 @@ int send_raw_tcp(raw_info_t &raw_info,const char * payload, int payloadlen) { //mylog(log_debug,"syn %d\n",send_info.syn); - char send_raw_tcp_buf0[buf_len]; - char *send_raw_tcp_buf=send_raw_tcp_buf0; + char send_raw_tcp_buf[buf_len]; + //char *send_raw_tcp_buf=send_raw_tcp_buf0; struct tcphdr *tcph = (struct tcphdr *) (send_raw_tcp_buf + sizeof(struct pseudo_header)); @@ -884,14 +884,20 @@ int send_raw_tcp(raw_info_t &raw_info,const char * payload, int payloadlen) { send_raw_tcp_buf[i++] = 0x08; //ts i=6 send_raw_tcp_buf[i++] = 0x0a; //i=7 - *(u32_t*) (&send_raw_tcp_buf[i]) = htonl( - (u32_t) get_current_time()); + //*(u32_t*) (&send_raw_tcp_buf[i]) = htonl( + // (u32_t) get_current_time()); + + u32_t ts=htonl((u32_t) get_current_time()); + memcpy(&send_raw_tcp_buf[i],&ts,sizeof(ts)); i += 4; //mylog(log_info,"[syn]\n",send_info.ts_ack); - *(u32_t*) (&send_raw_tcp_buf[i]) = htonl(send_info.ts_ack); + //*(u32_t*) (&send_raw_tcp_buf[i]) = htonl(send_info.ts_ack); + u32_t ts_ack=htonl(send_info.ts_ack); + memcpy(&send_raw_tcp_buf[i],&ts_ack,sizeof(ts_ack)); + i += 4; send_raw_tcp_buf[i++] = 0x01; @@ -908,14 +914,19 @@ int send_raw_tcp(raw_info_t &raw_info,const char * payload, int payloadlen) { send_raw_tcp_buf[i++] = 0x08; //ts //i=2 send_raw_tcp_buf[i++] = 0x0a; //i=3; - *(u32_t*) (&send_raw_tcp_buf[i]) = htonl( - (u32_t) get_current_time()); + //*(u32_t*) (&send_raw_tcp_buf[i]) = htonl( + // (u32_t) get_current_time()); + + u32_t ts=htonl((u32_t) get_current_time()); + memcpy(&send_raw_tcp_buf[i],&ts,sizeof(ts)); i += 4; //mylog(log_info,"\n",send_info.ts_ack); - *(u32_t*) (&send_raw_tcp_buf[i]) = htonl(send_info.ts_ack); + //*(u32_t*) (&send_raw_tcp_buf[i]) = htonl(send_info.ts_ack); + u32_t ts_ack=htonl(send_info.ts_ack); + memcpy(&send_raw_tcp_buf[i],&ts_ack,sizeof(ts_ack)); i += 4; } @@ -1334,8 +1345,14 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen) if(tcp_option[6]==0x08 &&tcp_option[7]==0x0a) { recv_info.has_ts=1; - recv_info.ts=ntohl(*(u32_t*)(&tcp_option[8])); - recv_info.ts_ack=ntohl(*(u32_t*)(&tcp_option[12])); + //recv_info.ts=ntohl(*(u32_t*)(&tcp_option[8])); + memcpy(&recv_info.ts,&tcp_option[8],sizeof(recv_info.ts)); + recv_info.ts=ntohl(recv_info.ts); + + //recv_info.ts_ack=ntohl(*(u32_t*)(&tcp_option[12])); + memcpy(&recv_info.ts_ack,&tcp_option[12],sizeof(recv_info.ts_ack)); + recv_info.ts_ack=ntohl(recv_info.ts_ack); + //g_packet_info_send.ts_ack= ntohl(*(uint32_t*)(&tcp_option[8])); } else @@ -1348,8 +1365,12 @@ int recv_raw_tcp(raw_info_t &raw_info,char * &payload,int &payloadlen) if(tcp_option[2]==0x08 &&tcp_option[3]==0x0a) { recv_info.has_ts=1; - recv_info.ts=ntohl(*(u32_t*)(&tcp_option[4])); - recv_info.ts_ack=ntohl(*(u32_t*)(&tcp_option[8])); + //recv_info.ts=ntohl(*(u32_t*)(&tcp_option[4])); + memcpy(&recv_info.ts,&tcp_option[4],sizeof(recv_info.ts)); + recv_info.ts=ntohl(recv_info.ts); + //recv_info.ts_ack=ntohl(*(u32_t*)(&tcp_option[8])); + memcpy(&recv_info.ts_ack,&tcp_option[8],sizeof(recv_info.ts_ack)); + recv_info.ts_ack=ntohl(recv_info.ts_ack); //g_packet_info_send.ts_ack= ntohl(*(uint32_t*)(&tcp_option[0])); } else