external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-02-12 08:41:51 +00:00
Code Issues Releases Wiki Activity

ubus/datastorage: remove kick function

Browse source 
Removed decide_function() which made some logic hard to follow
Removed kick_client() function to streamline code
This commit is contained in:
Ian Clowes 2022-01-05 16:37:39 +01:00 committed by Nick Hainke
parent 4df81328d1
commit 7b10c612b9
2 changed files with 145 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/storage/datastorage.c
View file

@ -20,8 +20,6 @@ struct time_config_s timeout_config;
static int probe_compare(probe_entry *probe1, probe_entry *probe2); static int probe_compare(probe_entry *probe1, probe_entry *probe2);
static int kick_client(ap* kicking_ap, struct client_s *client_entry, struct kicking_nr** neighbor_report);
static int is_connected(struct dawn_mac bssid_mac, struct dawn_mac client_mac); static int is_connected(struct dawn_mac bssid_mac, struct dawn_mac client_mac);
static int compare_station_count(ap* ap_entry_own, ap* ap_entry_to_compare, struct dawn_mac client_addr); static int compare_station_count(ap* ap_entry_own, ap* ap_entry_to_compare, struct dawn_mac client_addr);
@ -89,7 +87,7 @@ static const struct dawn_mac dawn_mac_null = { .u8 = {0,0,0,0,0,0} };
** then the target element does not exist, but can be inserted by using the returned reference. ** then the target element does not exist, but can be inserted by using the returned reference.
*/ */
static struct probe_entry_s** probe_skip_array_find_first_entry(struct dawn_mac client_mac, struct dawn_mac bssid_mac, int do_bssid) static struct probe_entry_s** probe_skip_array_find_first_entry(struct dawn_mac client_mac, struct dawn_mac bssid_mac, bool do_bssid)
{ {
int lo = 0; int lo = 0;
struct probe_entry_s** lo_ptr = &probe_skip_set; struct probe_entry_s** lo_ptr = &probe_skip_set;

208
src/utils/ubus.c
View file

@ -241,38 +241,6 @@ void blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const struct da
blobmsg_add_string_buffer(buf); blobmsg_add_string_buffer(buf);
} }
// TODO: Is it worth having this function? Just inline the right bits at each caller?
static int decide_function(probe_entry *prob_req, int req_type) {
if (mac_in_maclist(prob_req->client_addr)) {
return 1;
}
if (prob_req->counter < dawn_metric.min_probe_count) {
return 0;
}
if (req_type == REQ_TYPE_PROBE && dawn_metric.eval_probe_req <= 0) {
return 1;
}
if (req_type == REQ_TYPE_AUTH && dawn_metric.eval_auth_req <= 0) {
return 1;
}
if (req_type == REQ_TYPE_ASSOC && dawn_metric.eval_assoc_req <= 0) {
return 1;
}
// TODO: Bug? This results in copious "Neigbor-Report is NULL" messages!
// find own probe entry and calculate score
ap* this_ap = ap_array_get_ap(prob_req->bssid_addr, prob_req->ssid);
if (this_ap != NULL && better_ap_available(this_ap, prob_req->client_addr, NULL)) {
return 0;
}
return 1;
}
int parse_to_auth_req(struct blob_attr *msg, auth_entry *auth_req) { int parse_to_auth_req(struct blob_attr *msg, auth_entry *auth_req) {
struct blob_attr *tb[__AUTH_MAX]; struct blob_attr *tb[__AUTH_MAX];
@ -383,29 +351,61 @@ int handle_auth_req(struct blob_attr* msg) {
int ret = WLAN_STATUS_SUCCESS; int ret = WLAN_STATUS_SUCCESS;
bool discard_entry = true; bool discard_entry = true;
#ifndef DAWN_NO_OUTPUT
print_probe_array();
#endif
auth_entry *auth_req = dawn_malloc(sizeof(struct auth_entry_s)); auth_entry *auth_req = dawn_malloc(sizeof(struct auth_entry_s));
if (auth_req == NULL) if (auth_req == NULL)
return -1; {
fprintf(stderr,"Memory allocation of auth req failed!");
return ret; // Allow if we can't evalute a reason to deny
}
parse_to_auth_req(msg, auth_req); parse_to_auth_req(msg, auth_req);
#ifndef DAWN_NO_OUTPUT if (dawn_metric.eval_auth_req <= 0) {
printf("Auth entry: "); printf("Allow authentication due to not evaluating requests");
print_auth_entry(auth_req); }
#endif else if (mac_in_maclist(auth_req->client_addr)) {
printf("Allow authentication due to mac_in_maclist()");
if (!mac_in_maclist(auth_req->client_addr)) { }
else {
pthread_mutex_lock(&probe_array_mutex); pthread_mutex_lock(&probe_array_mutex);
probe_entry *tmp = probe_array_get_entry(auth_req->bssid_addr, auth_req->client_addr); probe_entry *tmp = probe_array_get_entry(auth_req->bssid_addr, auth_req->client_addr);
pthread_mutex_unlock(&probe_array_mutex); pthread_mutex_unlock(&probe_array_mutex);
/*** Deprecated function decide_function() removed here ***/
int deny_request = 0;
// block if entry was not already found in probe database // block if entry was not already found in probe database
if (tmp == NULL || !decide_function(tmp, REQ_TYPE_AUTH)) { if (tmp == NULL) {
printf("Deny authentication due to no probe entry");
deny_request = 1;
}
#if 0
// Already know this is false from outer test above
else if (mac_in_maclist(probe_req_updated->client_addr)) {
printf("Short cut due to mac_in_maclist()");
}
#endif
else if (tmp->counter < dawn_metric.min_probe_count) {
printf("Deny authentication due to low probe count");
deny_request = 1;
}
else
{
// find own probe entry and calculate score
ap* this_ap = ap_array_get_ap(tmp->bssid_addr, tmp->ssid);
if (this_ap != NULL && better_ap_available(this_ap, tmp->client_addr, NULL) > 0) {
printf("Deny authentication due to better AP available");
deny_request = 1;
}
else
// maybe send here that the client is connected?
printf("Allow authentication!\n");
}
/*** End of decide_function() rework ***/
if (deny_request) {
if (dawn_metric.use_driver_recog) { if (dawn_metric.use_driver_recog) {
if (auth_req == insert_to_denied_req_array(auth_req, 1, time(0))) if (auth_req == insert_to_denied_req_array(auth_req, 1, time(0)))
discard_entry = false; discard_entry = false;
@ -415,7 +415,10 @@ bool discard_entry = true;
} }
if (discard_entry) if (discard_entry)
{
dawn_free(auth_req); dawn_free(auth_req);
auth_req = NULL;
}
return ret; return ret;
} }
@ -424,58 +427,135 @@ static int handle_assoc_req(struct blob_attr *msg) {
int ret = WLAN_STATUS_SUCCESS; int ret = WLAN_STATUS_SUCCESS;
int discard_entry = true; int discard_entry = true;
#ifndef DAWN_NO_OUTPUT printf("Entering...");
print_probe_array();
#endif
auth_entry* auth_req = dawn_malloc(sizeof(struct auth_entry_s));
if (auth_req == NULL)
return -1;
parse_to_assoc_req(msg, auth_req); auth_entry* assoc_req = dawn_malloc(sizeof(struct auth_entry_s));
#ifndef DAWN_NO_OUTPUT if (assoc_req == NULL)
{
printf("Memory allocation of assoc req failed!");
return ret; // Allow if we can't evalute a reason to deny
}
parse_to_assoc_req(msg, assoc_req);
printf("Association entry: "); printf("Association entry: ");
print_auth_entry(auth_req);
#endif
if (!mac_in_maclist(auth_req->client_addr)) { if (dawn_metric.eval_assoc_req <= 0) {
printf("Allow association due to not evaluating requests");
}
else if (mac_in_maclist(assoc_req->client_addr)) {
printf("Allow association due to mac_in_maclist()");
} else {
pthread_mutex_lock(&probe_array_mutex); pthread_mutex_lock(&probe_array_mutex);
probe_entry *tmp = probe_array_get_entry(auth_req->bssid_addr, auth_req->client_addr); probe_entry *tmp = probe_array_get_entry(assoc_req->bssid_addr, assoc_req->client_addr);
pthread_mutex_unlock(&probe_array_mutex); pthread_mutex_unlock(&probe_array_mutex);
/*** Deprecated function decide_function() removed here ***/
int deny_request = 0;
// block if entry was not already found in probe database // block if entry was not already found in probe database
if (tmp == NULL || !decide_function(tmp, REQ_TYPE_ASSOC)) { if (tmp == NULL) {
printf("Deny association due to no probe entry found");
deny_request = 1;
}
#if 0
// Already know this is false from outer test above
else if (mac_in_maclist(tmp->client_addr)) {
printf("Allow due to mac_in_maclist()");
}
#endif
else if (tmp->counter < dawn_metric.min_probe_count) {
printf("Deny association due to low probe count");
deny_request = 1;
}
else
{
// find own probe entry and calculate score
ap* this_ap = ap_array_get_ap(tmp->bssid_addr, tmp->ssid);
if (this_ap != NULL && better_ap_available(this_ap, tmp->client_addr, NULL) > 0) {
printf("Deny association due to better AP available");
deny_request = 1;
}
else
printf("Allow association!\n");
}
/*** End of decide_function() rework ***/
if (deny_request) {
if (dawn_metric.use_driver_recog) { if (dawn_metric.use_driver_recog) {
if (auth_req == insert_to_denied_req_array(auth_req, 1, time(0))) if (assoc_req == insert_to_denied_req_array(assoc_req, 1, time(0)))
discard_entry = false; discard_entry = false;
} }
return dawn_metric.deny_assoc_reason; ret = dawn_metric.deny_assoc_reason;
} }
} }
if (discard_entry) if (discard_entry)
dawn_free(auth_req); {
dawn_free(assoc_req);
assoc_req = NULL;
}
return ret; return ret;
} }
static int handle_probe_req(struct blob_attr *msg) { static int handle_probe_req(struct blob_attr* msg) {
// MUSTDO: Untangle dawn_malloc() and linking of probe_entry // MUSTDO: Untangle dawn_malloc() and linking of probe_entry
probe_entry* probe_req = parse_to_probe_req(msg); probe_entry* probe_req = parse_to_probe_req(msg);
probe_entry* probe_req_updated = NULL;
if (probe_req != NULL) { printf("Entering...");
probe_req_updated = insert_to_array(probe_req, true, true, false, time(0));
if (probe_req == NULL)
{
printf("Parse of probe req failed!");
return WLAN_STATUS_SUCCESS; // Allow if we can't evalute a reason to deny
}
else
{
probe_entry* probe_req_updated = insert_to_array(probe_req, true, true, false, time(0));
// If insert finds an existing entry, rather than linking in our new one, // If insert finds an existing entry, rather than linking in our new one,
// send new probe req because we want to stay synced. // send new probe req because we want to stay synced.
// If not, probe_req and probe_req_updated should be equivalent // If not, probe_req and probe_req_updated should be equivalent
if (probe_req != probe_req_updated) if (probe_req != probe_req_updated)
{
dawn_free(probe_req); dawn_free(probe_req);
probe_req = NULL;
}
ubus_send_probe_via_network(probe_req_updated); ubus_send_probe_via_network(probe_req_updated);
if (!decide_function(probe_req_updated, REQ_TYPE_PROBE)) { /*** Deprecated function decide_function() removed here ***/
int deny_request = 0;
if (dawn_metric.eval_probe_req <= 0) {
printf("Allow probe due to not evaluating requests");
}
else if (mac_in_maclist(probe_req_updated->client_addr)) {
printf("Allow probe due to mac_in_maclist()");
}
else if (probe_req_updated->counter < dawn_metric.min_probe_count) {
printf("Deny probe due to low probe count");
deny_request = 1;
}
else
{
// find own probe entry and calculate score
ap* this_ap = ap_array_get_ap(probe_req_updated->bssid_addr, probe_req_updated->ssid);
if (this_ap != NULL && better_ap_available(this_ap, probe_req_updated->client_addr, NULL) > 0) {
printf("Deny probe due to better AP available");
deny_request = 1;
}
else
{
printf("Allow probe request!");
}
}
/*** End of decide_function() rework ***/
if (deny_request) {
return WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA; // no reason needed... return WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA; // no reason needed...
} }
} }