external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-02-12 08:41:51 +00:00
Code Issues Releases Wiki Activity

Revert "Revert "tcpsocket: implement client_read_cb with ustream_read my wheels are much worse than offical wheels.""

Browse source 
This reverts commit c2a63293d1.
This commit is contained in:
twy_2000 2020-06-12 23:44:23 +08:00 committed by Polynomialdivision
parent ada3bf3ff2
commit b029a40b11
1 changed files with 22 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/network/tcpsocket.c
View file

@ -82,48 +82,30 @@ static void client_to_server_state(struct ustream *s) {
static void client_read_cb(struct ustream *s, int bytes) {
char *str;
int len = 0;
uint32_t final_len;
int max_retry = 3, tried = 0;
uint32_t final_len = sizeof(uint32_t);
str = malloc(final_len);
do {
str = ustream_get_read_buf(s, &len);
if (!str)
break;
if ((len = ustream_read(s, str, final_len)) < final_len){//ensure recv sizeof(uint32_t).
fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
goto out;
}
final_len = ntohl(*(uint32_t *)str) - sizeof(uint32_t);//the final_len in headder includes header itself
str = realloc(str, final_len);
if ((len = ustream_read(s, str, final_len)) < final_len) {//ensure recv final_len bytes.
fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
goto out;
}
if (network_config.use_symm_enc) {
final_len = ntohl(*(uint32_t *)str);
if(len < final_len) {//not complete msg, wait for next recv
fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
if (tried++ == max_retry) {
ustream_consume(s, len);
return;//drop package
}
continue;
}
char *dec = gcrypt_decrypt_msg(str+sizeof(final_len), final_len-sizeof(final_len));
handle_network_msg(dec);
free(dec);
ustream_consume(s, final_len);//one msg is processed
tried = 0;
} else {
final_len = ntohl(*(uint32_t *)str);
if(len < final_len){
fprintf(stderr,"not complete msg, len:%d, expected len:%u\n", len, final_len);
if (tried++ == max_retry) {
ustream_consume(s, len);
return;
}
continue;
}
char* msg = malloc(final_len);
memcpy(msg, str+sizeof(final_len), final_len-sizeof(final_len));
handle_network_msg(msg);
ustream_consume(s, final_len);//one msg is processed
free(msg);
tried = 0;
}
} while(1);
if (network_config.use_symm_enc) {
char *dec = gcrypt_decrypt_msg(str, final_len);//len of str is final_len
handle_network_msg(dec);
free(dec);
} else {
handle_network_msg(str);//len of str is final_len
}
out:
free(str);
}
static void server_cb(struct uloop_fd *fd, unsigned int events) {