external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-03-09 15:40:12 +00:00
Code Issues Releases Wiki Activity

tcpsocket: use fixed size and endianness for length prefix of network messages

Browse source 
We can't use host-dependent endianness for network traffic.
The size of size_t also varies from host to host so stick with uint32_t.

Fixes: #92
This commit is contained in:
David Woodhouse 2020-06-08 11:38:28 +01:00 • committed by Polynomialdivision
parent 534f786616
commit 050c1d7fed
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/network/tcpsocket.c
View file

@ -82,7 +82,7 @@ static void client_to_server_state(struct ustream *s) {
static void client_read_cb(struct ustream *s, int bytes) { static void client_read_cb(struct ustream *s, int bytes) {
char *str; char *str;
int len = 0; int len = 0;
size_t final_len; uint32_t final_len;
int max_retry = 3, tried = 0; int max_retry = 3, tried = 0;
do { do {
@ -91,25 +91,25 @@ static void client_read_cb(struct ustream *s, int bytes) {
break; break;
if (network_config.use_symm_enc) { if (network_config.use_symm_enc) {
final_len = *(size_t*)str; final_len = ntohl(*(uint32_t *)str);
if(len < final_len) {//not complete msg, wait for next recv if(len < final_len) {//not complete msg, wait for next recv
fprintf(stderr,"not complete msg, len:%d, expected len:%zu\n", len, final_len); fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
if (tried++ == max_retry) { if (tried++ == max_retry) {
ustream_consume(s, len); ustream_consume(s, len);
return;//drop package return;//drop package
} }
continue; continue;
} }
char *dec = gcrypt_decrypt_msg(str+sizeof(size_t), final_len-sizeof(size_t)); char *dec = gcrypt_decrypt_msg(str+sizeof(final_len), final_len-sizeof(final_len));
handle_network_msg(dec); handle_network_msg(dec);
free(dec); free(dec);
ustream_consume(s, final_len);//one msg is processed ustream_consume(s, final_len);//one msg is processed
tried = 0; tried = 0;
} else { } else {
final_len = *(size_t*)str; final_len = ntohl(*(uint32_t *)str);
if(len < final_len){ if(len < final_len){
fprintf(stderr,"not complete msg, len:%d, expected len:%zu\n", len, final_len); fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
if (tried++ == max_retry) { if (tried++ == max_retry) {
ustream_consume(s, len); ustream_consume(s, len);
return; return;
@ -117,7 +117,7 @@ static void client_read_cb(struct ustream *s, int bytes) {
continue; continue;
} }
char* msg = malloc(final_len); char* msg = malloc(final_len);
memcpy(msg, str+sizeof(size_t), final_len-sizeof(size_t)); memcpy(msg, str+sizeof(final_len), final_len-sizeof(final_len));
handle_network_msg(msg); handle_network_msg(msg);
ustream_consume(s, final_len);//one msg is processed ustream_consume(s, final_len);//one msg is processed
free(msg); free(msg);
@ -247,11 +247,11 @@ void send_tcp(char *msg) {
char *enc = gcrypt_encrypt_msg(msg, msglen, &length_enc); char *enc = gcrypt_encrypt_msg(msg, msglen, &length_enc);
struct network_con_s *con; struct network_con_s *con;
size_t final_len = length_enc + sizeof(size_t); uint32_t final_len = length_enc + sizeof(final_len);
char *final_str = malloc(final_len); char *final_str = malloc(final_len);
size_t *msg_header = (size_t*)final_str; uint32_t *msg_header = (uint32_t *)final_str;
*msg_header = final_len; *msg_header = htonl(final_len);
memcpy(final_str+sizeof(size_t), enc, length_enc); memcpy(final_str+sizeof(final_len), enc, length_enc);
list_for_each_entry(con, &tcp_sock_list, list) list_for_each_entry(con, &tcp_sock_list, list)
{ {
if (con->connected) { if (con->connected) {
@ -269,11 +269,11 @@ void send_tcp(char *msg) {
free(enc); free(enc);
} else { } else {
size_t msglen = strlen(msg) + 1; size_t msglen = strlen(msg) + 1;
size_t final_len = msglen + sizeof(size_t); uint32_t final_len = msglen + sizeof(final_len);
char *final_str = malloc(final_len); char *final_str = malloc(final_len);
size_t *msg_header = (size_t*)final_str; uint32_t *msg_header = (uint32_t *)final_str;
*msg_header = final_len; *msg_header = htonl(final_len);
memcpy(final_str+sizeof(size_t), msg, msglen); memcpy(final_str+sizeof(final_len), msg, msglen);
struct network_con_s *con; struct network_con_s *con;
list_for_each_entry(con, &tcp_sock_list, list) list_for_each_entry(con, &tcp_sock_list, list)