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

switch to ubloop

Browse source
This commit is contained in:
PolynomialDivision 2017-11-20 12:19:44 +01:00
parent 90bb949342
commit 9c80d0542e
6 changed files with 92 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/utils/dawn_uci.c
View file

@ -63,6 +63,13 @@ struct time_config_s uci_get_time_config() {
if (ptr.o->type == UCI_TYPE_STRING)
ret.update_hostapd = atoi(ptr.o->v.string);
char tmp_remove_ap[] = "dawn.times.remove_ap";
if (uci_lookup_ptr(c, &ptr, tmp_remove_ap, 1) != UCI_OK) {
uci_perror(c, "uci_get_daw_metric Error");
return ret;
}
if (ptr.o->type == UCI_TYPE_STRING)
ret.remove_ap = atoi(ptr.o->v.string);
printf("Times: %lu, %lu, %lu %lu\n", ret.update_client, ret.remove_client, ret.remove_probe, ret.update_hostapd);

36
src/utils/ubus.c
View file

@ -14,6 +14,7 @@
#include "networksocket.h"
#include "utils.h"
#include "dawn_uci.h"
#include "datastorage.h"
static struct ubus_context *ctx = NULL;
static struct ubus_context *ctx_clients; /* own ubus conext otherwise strange behavior... */
@ -22,10 +23,16 @@ static struct ubus_context *ctx_clients; /* own ubus conext otherwise strange be
static struct ubus_subscriber hostapd_event;
static struct blob_buf b;
void update_clients(struct uloop_timeout *t);
struct uloop_timeout hostapd_timer = {
.cb = update_hostapd_sockets
};
struct uloop_timeout client_timer = {
.cb = update_clients
};
#define MAX_HOSTAPD_SOCKETS 10
uint32_t hostapd_sock_arr[MAX_HOSTAPD_SOCKETS];
int hostapd_sock_last = -1;
@ -455,8 +462,19 @@ int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir) {
subscribe_to_hostapd(hostapd_dir);
// update hostapd
uloop_timeout_add(&hostapd_timer);
// remove probe
//uloop_timeout_add(&probe_timeout);
uloop_add_data_cbs();
// get clients
const char *ubus_socket_clients = NULL;
ctx_clients = ubus_connect(ubus_socket_clients);
uloop_timeout_add(&client_timer);
//ubus_call_umdns();
uloop_run();
@ -587,24 +605,14 @@ static int ubus_get_clients() {
return 0;
}
void *update_clients_thread(void *arg) {
time_t time_update_client = *(time_t *) arg;
printf("Update client thread with time: %lu\n", time_update_client);
const char *ubus_socket = NULL;
ctx_clients = ubus_connect(ubus_socket);
while (1) {
sleep(time_update_client);
printf("[Thread] : Kicking clients!\n");
ubus_get_clients();
}
return 0;
void update_clients(struct uloop_timeout *t) {
ubus_get_clients();
uloop_timeout_set(&client_timer, timeout_config.update_client * 1000);
}
void update_hostapd_sockets(struct uloop_timeout *t) {
uloop_timeout_set(&hostapd_timer, timeout_config.update_hostapd);
subscribe_to_hostapd_interfaces(hostapd_dir_glob);
uloop_timeout_set(&hostapd_timer, timeout_config.update_hostapd * 1000);
}
void del_client_all_interfaces(const uint8_t *client_addr, uint32_t reason, uint8_t deauth, uint32_t ban_time) {