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

remove comments

Browse source
This commit is contained in:
PolynomialDivision 2018-03-12 22:49:07 +01:00
parent cfbc69e71a
commit 1c14f32a6b
1 changed files with 1 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/network/networksocket.c
View file

@ -69,8 +69,6 @@ void *receive_msg(void *args) {
} }
recv_string[recv_string_len] = '\0'; recv_string[recv_string_len] = '\0';
//printf("[WC] Network-Received: %s\n", recv_string);
probe_entry prob_req; probe_entry prob_req;
struct blob_buf b; struct blob_buf b;
@ -80,14 +78,6 @@ void *receive_msg(void *args) {
char *str; char *str;
str = blobmsg_format_json(b.head, true); str = blobmsg_format_json(b.head, true);
/*
TODO: REFACTOR THIS!!! (just workaround)
OTHERWISE NULLPOINTER?!
* MAYBE THIS IS UNNECESSARY :O
*/
if (str == NULL) { if (str == NULL) {
return 0; return 0;
} }
@ -96,10 +86,6 @@ void *receive_msg(void *args) {
return 0; return 0;
} }
/*
HERE IS NULLPOINTER PROBABLY
*/
if (strstr(str, "clients") != NULL) { if (strstr(str, "clients") != NULL) {
parse_to_clients(b.head, 0, 0); parse_to_clients(b.head, 0, 0);
} else if (strstr(str, "target") != NULL) { } else if (strstr(str, "target") != NULL) {
@ -107,15 +93,6 @@ void *receive_msg(void *args) {
insert_to_array(prob_req, 0); insert_to_array(prob_req, 0);
} }
} }
//if(parse_to_probe_req(b.head, &prob_req) == 0)
//{
// insert_to_array(prob_req, 0);
//}
// insert to list
//insert_to_list(prob_req, 0);
} }
} }
@ -134,14 +111,11 @@ void *receive_msg_enc(void *args) {
if (strlen(recv_string) <= 0) { if (strlen(recv_string) <= 0) {
return 0; return 0;
} }
//recv_string[recv_string_len] = '\0';
char *base64_dec_str = malloc(B64_DECODE_LEN(strlen(recv_string))); char *base64_dec_str = malloc(B64_DECODE_LEN(strlen(recv_string)));
int base64_dec_length = b64_decode(recv_string, base64_dec_str, B64_DECODE_LEN(strlen(recv_string))); int base64_dec_length = b64_decode(recv_string, base64_dec_str, B64_DECODE_LEN(strlen(recv_string)));
char *dec = gcrypt_decrypt_msg(base64_dec_str, base64_dec_length); char *dec = gcrypt_decrypt_msg(base64_dec_str, base64_dec_length);
//printf("NETRWORK RECEIVED: %s\n", dec);
free(base64_dec_str); free(base64_dec_str);
handle_network_msg(dec); handle_network_msg(dec);
free(dec); free(dec);
@ -152,7 +126,6 @@ int send_string(char *msg) {
pthread_mutex_lock(&send_mutex); pthread_mutex_lock(&send_mutex);
size_t msglen = strlen(msg); size_t msglen = strlen(msg);
//printf("Sending string! %s\n", msg);
if (sendto(sock, if (sendto(sock,
msg, msg,
msglen, msglen,
@ -165,23 +138,13 @@ int send_string(char *msg) {
} }
pthread_mutex_unlock(&send_mutex); pthread_mutex_unlock(&send_mutex);
/*if (sendto(sock, msg, msglen, 0, (struct sockaddr *)&addr,
sizeof(addr)) != msglen) {
fprintf(stderr, "Failed to send message.\n");
return -1;
}*/
return 0; return 0;
} }
int send_string_enc(char *msg) { int send_string_enc(char *msg) {
pthread_mutex_lock(&send_mutex); pthread_mutex_lock(&send_mutex);
//printf("Sending string: %s\n", msg);
size_t msglen = strlen(msg); size_t msglen = strlen(msg);
int length_enc; int length_enc;
char *enc = gcrypt_encrypt_msg(msg, msglen + 1, &length_enc); char *enc = gcrypt_encrypt_msg(msg, msglen + 1, &length_enc);
@ -198,9 +161,8 @@ int send_string_enc(char *msg) {
pthread_mutex_unlock(&send_mutex); pthread_mutex_unlock(&send_mutex);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
//printf("Free %s: %p\n","base64_enc_str", base64_enc_str);
free(base64_enc_str); free(base64_enc_str);
//printf("Free %s: %p\n","enc", enc);
free(enc); free(enc);
pthread_mutex_unlock(&send_mutex); pthread_mutex_unlock(&send_mutex);
return 0; return 0;