Update client thread

src/include/ubus.h

@@ -7,6 +7,9 @@
 
 int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir);
 int parse_to_probe_req(struct blob_attr *msg, probe_entry *prob_req);
+int parse_to_clients(struct blob_attr *msg);
+void *update_clients_thread(void *arg);
+
 char* hostapd_dir_glob;
 
 #endif

src/main.c

@@ -66,6 +66,11 @@ int main(int argc, char **argv) {
 
   pthread_t tid_client;
   pthread_create(&tid_client, NULL, &remove_client_array_thread, NULL);
+
+  pthread_t tid_get_client;
+  pthread_create(&tid_get_client, NULL, &update_clients_thread, NULL);
+
+
   
   //pthread_create(&tid, NULL, &remove_thread, NULL);
 

src/network/networksocket.c

@@ -16,7 +16,7 @@
 #include "ubus.h"
 
 /* Network Defines */
-#define MAX_RECV_STRING 255
+#define MAX_RECV_STRING 1500
 #define NET_CONFIG_PATH "/etc/wlancontroller/networkconfig.conf"
 
 /* Network Attributes */
@@ -69,13 +69,31 @@ void *receive_msg(void *args) {
     blob_buf_init(&b, 0);
     blobmsg_add_json_from_string(&b, recv_string);
 
-    recv_string[recv_string_len] = '\0';
+    //recv_string[recv_string_len] = '\0';
     char *str;
     str = blobmsg_format_json(b.head, true);
-    printf("Parsed: '%s'\n", str);
-    parse_to_probe_req(b.head, &prob_req);
 
-    insert_to_array(prob_req, 0);
+
+    /*
+      TODO: REFACTOR THIS!!! (just workaround)
+            OTHERWISE NULLPOINTER?!
+    */
+
+    if(strstr(str, "clients") != NULL) {
+      parse_to_clients(b.head);
+    } else 
+    {
+      if(parse_to_probe_req(b.head, &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);

src/storage/datastorage.c

@@ -283,12 +283,8 @@ void insert_client_to_array(client entry)
   pthread_mutex_lock(&client_array_mutex);
   entry.time = time(0);
 
-  printf("Deleting Client:\n");
   client_array_delete(entry);
-  printf("Inserting Client:\n");
   client_array_insert(entry);
-  printf("Inseted Client\n");
-
 
   pthread_mutex_unlock(&client_array_mutex);
 }

src/utils/ubus.c

@@ -112,6 +112,7 @@ static void hostapd_handle_remove(struct ubus_context *ctx,
 
 int parse_to_probe_req(struct blob_attr *msg, probe_entry *prob_req) {
   struct blob_attr *tb[__PROB_MAX];
+  
   blobmsg_parse(prob_policy, __PROB_MAX, tb, blob_data(msg), blob_len(msg));
 
   if (hwaddr_aton(blobmsg_data(tb[PROB_BSSID_ADDR]), prob_req->bssid_addr))
@@ -125,11 +126,20 @@ int parse_to_probe_req(struct blob_attr *msg, probe_entry *prob_req) {
 
   if (tb[PROB_SIGNAL]) {
     prob_req->signal = blobmsg_get_u32(tb[PROB_SIGNAL]);
+  } 
+  else
+  {
+    return -1;
   }
 
   if (tb[PROB_FREQ]) {
     prob_req->freq = blobmsg_get_u32(tb[PROB_FREQ]);
   }
+  else
+  {
+    return -1;
+  }
+
   return 0;
 }
 
@@ -233,8 +243,6 @@ int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir) {
 static void
 dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr, uint32_t freq)
 {
-  printf("DUMPING CLIENT:\n");
-
   client client_entry;
 
   hwaddr_aton(bssid_addr, client_entry.bssid_addr);
@@ -248,12 +256,6 @@ dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr
   sprintf(mac_buf_client, "%x:%x:%x:%x:%x:%x", MAC2STR(client_entry.client_addr));
   client_entry.freq = freq;
 
-  printf("Client Address: %s\n", mac_buf_client);
-  printf("AP Address: %s\n", mac_buf_ap);
-  printf("Freq: %d\n", freq);
-
-  //hwaddr_aton(client_addr, client_entry.client_addr);
-
   if (tb[CLIENT_AUTH]) {
     client_entry.auth =  blobmsg_get_u8(tb[CLIENT_AUTH]);
   }
@@ -290,8 +292,6 @@ dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr
   }
 
   insert_client_to_array(client_entry);
-
-  printf("Dumped Client!\n");
 }
 
 static void
@@ -302,12 +302,10 @@ dump_client_table(struct blob_attr *head, int len, const char* bssid_addr, uint3
 
   __blob_for_each_attr(attr, head, len) {
     hdr = blob_data(attr);
-    printf("%s\n", hdr->name); // mac client
 
     struct blob_attr *tb[__CLIENT_MAX];
     blobmsg_parse(client_policy, __CLIENT_MAX, tb, blobmsg_data(attr), blobmsg_len(attr));
-    char* str = blobmsg_format_json_indent(attr, true, -1);
+    //char* str = blobmsg_format_json_indent(attr, true, -1);
-    printf("%s\n", str);
 
     int tmp_int_mac[ETH_ALEN];
     uint8_t tmp_mac[ETH_ALEN];
@@ -319,33 +317,30 @@ dump_client_table(struct blob_attr *head, int len, const char* bssid_addr, uint3
   }
 }
 
-static int parse_to_clients(struct blob_attr *msg) {
+int parse_to_clients(struct blob_attr *msg) {
   struct blob_attr *tb[__CLIENT_TABLE_MAX];
 
   blobmsg_parse(client_table_policy, __CLIENT_TABLE_MAX, tb, blob_data(msg), blob_len(msg));
 
-
-
   if (tb[CLIENT_TABLE] && tb[CLIENT_TABLE_BSSID] && tb[CLIENT_TABLE_FREQ]) {
     dump_client_table(blobmsg_data(tb[CLIENT_TABLE]), blobmsg_data_len(tb[CLIENT_TABLE]), blobmsg_data(tb[CLIENT_TABLE_BSSID]), blobmsg_get_u32(tb[CLIENT_TABLE_FREQ]));
   }
 
-  printf("Parsing client request success!!!\n");
   return 0;
 }
 
 static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_attr *msg)
 {
-  char *str;
   if (!msg)
     return;
 
   parse_to_clients(msg);
 
-  str = blobmsg_format_json_indent(msg, true, -1);
+  char *str = blobmsg_format_json(msg, true);
-  printf("%s\n", str);
+  send_string(str);
   print_client_array();
-  free(str);
+
+  // TODO SEND CLIENT VIA NETWORK!
 }
 
 static int ubus_get_clients() {
@@ -358,7 +353,6 @@ static int ubus_get_clients() {
       char hostapd_iface[256];
       uint32_t id;
       sprintf(hostapd_iface, "hostapd.%s", entry->d_name);
-      printf("Subscribing to %s\n", hostapd_iface);
       int ret = ubus_lookup_id(ctx, hostapd_iface, &id);
       if(!ret)
       {  
@@ -368,4 +362,14 @@ static int ubus_get_clients() {
     }
   }
   return 0;
+}
+
+void *update_clients_thread(void *arg)
+{
+  while (1){
+    sleep(TIME_THRESHOLD_CLIENT);
+    printf("[Thread] : Updating clients!\n");
+    ubus_get_clients();
+  }
+  return 0;
 }