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 decide function

Browse source
This commit is contained in:
PolynomialDivision 2017-09-22 17:07:34 +02:00
parent 5faea7f237
commit 45932ade66
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main.c
View file

@ -47,10 +47,10 @@ void daemon_shutdown()
// kill threads // kill threads
printf("Cancelling Threads!\n"); printf("Cancelling Threads!\n");
pthread_cancel(tid_probe); pthread_cancel(tid_probe);
pthread_cancel(tid_client); //pthread_cancel(tid_client);
pthread_cancel(tid_get_client); // pthread_cancel(tid_get_client);
//pthread_cancel(tid_kick_clients); //pthread_cancel(tid_kick_clients);
pthread_cancel(tid_ap); //pthread_cancel(tid_ap);
// free ressources // free ressources
printf("Freeing mutex ressources\n"); printf("Freeing mutex ressources\n");
@ -210,10 +210,10 @@ int main(int argc, char **argv) {
init_socket_runopts(opt_broadcast_ip, opt_broadcast_port, 1); init_socket_runopts(opt_broadcast_ip, opt_broadcast_port, 1);
pthread_create(&tid_probe, NULL, &remove_array_thread, NULL); pthread_create(&tid_probe, NULL, &remove_array_thread, NULL);
pthread_create(&tid_client, NULL, &remove_client_array_thread, NULL); //pthread_create(&tid_client, NULL, &remove_client_array_thread, NULL);
pthread_create(&tid_get_client, NULL, &update_clients_thread, NULL); //pthread_create(&tid_get_client, NULL, &update_clients_thread, NULL);
//pthread_create(&tid_kick_clients, NULL, &kick_clients_thread, NULL); //pthread_create(&tid_kick_clients, NULL, &kick_clients_thread, NULL);
pthread_create(&tid_ap, NULL, &remove_ap_array_thread, NULL); //pthread_create(&tid_ap, NULL, &remove_ap_array_thread, NULL);
//pthread_create(&tid, NULL, &remove_thread, NULL); //pthread_create(&tid, NULL, &remove_thread, NULL);

22
src/utils/ubus.c
View file

@ -131,7 +131,7 @@ blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const uint8_t *addr)
blobmsg_add_string_buffer(buf); blobmsg_add_string_buffer(buf);
} }
/*
static int decide_function(probe_entry *prob_req) { static int decide_function(probe_entry *prob_req) {
// TODO: Refactor... // TODO: Refactor...
//printf("COUNTER: %d\n", prob_req->counter); //printf("COUNTER: %d\n", prob_req->counter);
@ -147,7 +147,7 @@ static int decide_function(probe_entry *prob_req) {
return 1; return 1;
} }
*/
static void hostapd_handle_remove(struct ubus_context *ctx, static void hostapd_handle_remove(struct ubus_context *ctx,
struct ubus_subscriber *s, uint32_t id) { struct ubus_subscriber *s, uint32_t id) {
fprintf(stderr, "Object %08x went away\n", id); fprintf(stderr, "Object %08x went away\n", id);
@ -228,6 +228,8 @@ static int handle_auth_req(struct blob_attr *msg) {
printf("Entry found\n"); printf("Entry found\n");
print_probe_entry(tmp); print_probe_entry(tmp);
/*
// block if entry was not already found in probe database // block if entry was not already found in probe database
if(!(mac_is_equal(tmp.bssid_addr, auth_req.bssid_addr) && mac_is_equal(tmp.client_addr, auth_req.client_addr))) if(!(mac_is_equal(tmp.bssid_addr, auth_req.bssid_addr) && mac_is_equal(tmp.client_addr, auth_req.client_addr)))
{ {
@ -238,7 +240,7 @@ static int handle_auth_req(struct blob_attr *msg) {
if (!decide_function(&tmp)) { if (!decide_function(&tmp)) {
printf("DENY AUTH\n"); printf("DENY AUTH\n");
return UBUS_STATUS_UNKNOWN_ERROR; return UBUS_STATUS_UNKNOWN_ERROR;
} }*/
printf("ALLOW AUTH!\n"); printf("ALLOW AUTH!\n");
return 0; return 0;
@ -256,7 +258,9 @@ static int handle_probe_req(struct blob_attr *msg) {
probe_entry prob_req; probe_entry prob_req;
parse_to_probe_req(msg, &prob_req); parse_to_probe_req(msg, &prob_req);
//insert_to_list(prob_req, 1); //insert_to_list(prob_req, 1);
probe_entry tmp_probe = insert_to_array(prob_req, 1); //probe_entry tmp_probe =
insert_to_array(prob_req, 1);
// send probe via network // send probe via network
char *str; char *str;
@ -265,13 +269,13 @@ static int handle_probe_req(struct blob_attr *msg) {
printf("[WC] Hostapd-Probe: %s : %s\n", "probe", str); printf("[WC] Hostapd-Probe: %s : %s\n", "probe", str);
//print_array(); print_array();
/*
// deny access // deny access
if (!decide_function(&tmp_probe)) { if (!decide_function(&tmp_probe)) {
//printf("MAC WILL BE DECLINED!!!\n"); //printf("MAC WILL BE DECLINED!!!\n");
return UBUS_STATUS_UNKNOWN_ERROR; return UBUS_STATUS_UNKNOWN_ERROR;
} }*/
//printf("MAC WILL BE ACCEPDTED!!!\n"); //printf("MAC WILL BE ACCEPDTED!!!\n");
return 0; return 0;
} }
@ -279,7 +283,7 @@ static int handle_probe_req(struct blob_attr *msg) {
static int hostapd_notify(struct ubus_context *ctx, struct ubus_object *obj, static int hostapd_notify(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method, struct ubus_request_data *req, const char *method,
struct blob_attr *msg) { struct blob_attr *msg) {
//printf("METHOD new: %s\n",method); printf("METHOD new: %s\n",method);
// TODO: Only handle probe request and NOT assoc, ... // TODO: Only handle probe request and NOT assoc, ...
@ -362,7 +366,7 @@ int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir) {
subscribe_to_hostapd_interfaces(hostapd_dir); subscribe_to_hostapd_interfaces(hostapd_dir);
ubus_call_umdns(); //ubus_call_umdns();
uloop_run(); uloop_run();