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

Fix Nullpointer

Browse source
This commit is contained in:
PolynomialDivision 2017-07-17 23:36:06 +02:00
parent 70749ab488
commit cfd6944b97
3 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/include/networksocket.h
View file

@ -1,6 +1,10 @@
#ifndef __DAWN_NETWORKSOCKET_H
#define __DAWN_NETWORKSOCKET_H
#include <pthread.h>
pthread_mutex_t send_mutex;
int init_socket_runopts(char *_ip, char *_port, int broadcast_socket);
int send_string(char *msg);
void close_socket();

5
src/main.c
View file

@ -59,6 +59,11 @@ int main(int argc, char **argv) {
return 1;
}
if (pthread_mutex_init(&send_mutex, NULL) != 0) {
printf("\n mutex init failed\n");
return 1;
}
init_socket_runopts(opt_broadcast_ip, opt_broadcast_port, 1);
pthread_t tid_probe;

34
src/network/networksocket.c
View file

@ -16,7 +16,7 @@
#include "ubus.h"
/* Network Defines */
#define MAX_RECV_STRING 1500
#define MAX_RECV_STRING 500
#define NET_CONFIG_PATH "/etc/wlancontroller/networkconfig.conf"
/* Network Attributes */
@ -61,6 +61,17 @@ void *receive_msg(void *args) {
continue;
}
if(recv_string == NULL)
{
return 0;
}
if(strlen(recv_string) <= 0)
{
return 0;
}
recv_string[recv_string_len] = '\0';
printf("[WC] Network-Received: %s\n", recv_string);
probe_entry prob_req;
@ -69,7 +80,6 @@ void *receive_msg(void *args) {
blob_buf_init(&b, 0);
blobmsg_add_json_from_string(&b, recv_string);
//recv_string[recv_string_len] = '\0';
char *str;
str = blobmsg_format_json(b.head, true);
@ -77,11 +87,26 @@ void *receive_msg(void *args) {
/*
TODO: REFACTOR THIS!!! (just workaround)
OTHERWISE NULLPOINTER?!
*/
if(str == NULL)
{
return 0;
}
if( strlen(str) <= 0)
{
return 0;
}
/*
HERE IS NULLPOINTER PROBABLY
*/
if(strstr(str, "clients") != NULL) {
parse_to_clients(b.head);
} else
} else if(strstr(str, "target")!= NULL)
{
if(parse_to_probe_req(b.head, &prob_req) == 0)
{
@ -101,6 +126,7 @@ void *receive_msg(void *args) {
}
int send_string(char *msg) {
pthread_mutex_lock(&send_mutex);
int msglen = strlen(msg);
printf("Sending string! %s\n", msg);
if (sendto( sock,
@ -112,6 +138,8 @@ int send_string(char *msg) {
perror ("sendto()");
exit (EXIT_FAILURE);
}
pthread_mutex_unlock(&send_mutex);
/*if (sendto(sock, msg, msglen, 0, (struct sockaddr *)&addr,
sizeof(addr)) != msglen) {