Merge branch 'feature/refactor_config_handling' into feature/add_ubus_methods

src/include/crypto.h

@@ -9,7 +9,7 @@ char *unbase_64(unsigned char *input, int length);
 
 void gcrypt_init();
 
-void gcrypt_set_key_and_iv(char *key, char *iv);
+void gcrypt_set_key_and_iv(const char *key, const char *iv);
 
 //char *gcrypt_encrypt_msg(char *msg, size_t msg_length);
 char *gcrypt_encrypt_msg(char *msg, size_t msg_length, int *out_length);

src/include/datastorage.h

@@ -37,11 +37,18 @@ struct probe_metric_s {
     int no_ht_support;
     int no_vht_support;
     int rssi;
+    int low_rssi;
     int freq;
     int chan_util;
     int max_chan_util;
-    int min_rssi;
+    int rssi_val;
+    int low_rssi_val;
+    int chan_util_val;
+    int max_chan_util_val;
     int min_probe_count;
+    int bandwith_threshold;
+    int use_station_count;
+    int eval_probe_req;
 };
 
 struct time_config_s {
@@ -52,6 +59,15 @@ struct time_config_s {
     time_t update_hostapd;
 };
 
+struct network_config_s {
+    const char* broadcast_ip;
+    int broadcast_port;
+    const char* multicast;
+    const char* shared_key;
+    const char* iv;
+    int bool_multicast;
+};
+
 struct time_config_s timeout_config;
 
 // ---------------- Global variables ----------------
@@ -137,6 +153,7 @@ typedef struct ap_s {
     uint8_t vht;
     uint32_t channel_utilization;
     time_t time;
+    uint32_t station_count;
 } ap;
 
 // ---------------- Defines ----------------
@@ -179,14 +196,14 @@ ap ap_array_get_ap(uint8_t bssid_addr[]);
 #define TIME_THRESHOLD 120  // every minute
 
 // ---------------- Global variables ----------------
-char sort_string[SORT_NUM];
+char* sort_string;
 
 // ---------------- Functions -------------------
 int mac_is_equal(uint8_t addr1[], uint8_t addr2[]);
 
 int mac_is_greater(uint8_t addr1[], uint8_t addr2[]);
 
-int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[]);
+int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automatic_kick);
 
 
 /* List stuff */

src/include/dawn_iwinfo.h

@@ -8,4 +8,6 @@
 
 int get_rssi_iwinfo(__uint8_t *client_addr);
 
+int get_bandwidth_iwinfo(__uint8_t *client_addr, float *rx_rate, float *tx_rate);
+
 #endif //DAWN_RSSI_H

src/include/dawn_uci.h

@@ -5,4 +5,14 @@ struct probe_metric_s uci_get_dawn_metric();
 
 struct time_config_s uci_get_time_config();
 
+struct network_config_s uci_get_dawn_network();
+
+const char* uci_get_dawn_hostapd_dir();
+
+const char* uci_get_dawn_sort_order();
+
+int uci_init();
+
+int uci_clear();
+
 #endif //DAWN_UCI_H_H

src/include/multicastsocket.h

@@ -3,4 +3,6 @@
 
 int setup_multicast_socket(const char *_multicast_ip, unsigned short _multicast_port, struct sockaddr_in *addr);
 
+int remove_multicast_socket(int socket);
+
 #endif

src/include/networksocket.h

@@ -5,7 +5,7 @@
 
 pthread_mutex_t send_mutex;
 
-int init_socket_runopts(char *_ip, char *_port, int broadcast_socket);
+int init_socket_runopts(const char *_ip, int _port, int _multicast_socket);
 
 int send_string(char *msg);
 

src/include/ubus.h

@@ -8,7 +8,7 @@
 
 #define MIN_PROBE_REQ 2  // TODO: Parse from config file...
 
-int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir);
+int dawn_init_ubus(const char *ubus_socket, const char *hostapd_dir);
 
 int parse_to_probe_req(struct blob_attr *msg, probe_entry *prob_req);
 
@@ -24,7 +24,7 @@ void del_client_all_interfaces(const uint8_t *client_addr, uint32_t reason, uint
 
 void *update_clients_thread(void *arg);
 
-char *hostapd_dir_glob;
+const char *hostapd_dir_glob;
 
 int ubus_call_umdns();
 
@@ -32,4 +32,6 @@ int ubus_send_probe_via_network(struct probe_entry_s probe_entry);
 
 void update_hostapd_sockets(struct uloop_timeout *t);
 
+void add_client_update_timer(time_t time);
+
 #endif