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

treewide: fix bugs from Coverity Scan

Browse source 
- Fix a couple of bugs in hardly ever (never?) used code paths that Coverity spotted
- Add comments for things that look a bit odd, but not sure if they are bugs

[cleanup commit message]
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Ian Clowes 2022-01-31 11:28:21 +00:00 • committed by Nick Hainke
parent 4a88222722
commit 5b1eddc6f4
6 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/utils/mac_utils.c
View file

@ -70,7 +70,8 @@ void write_mac_to_file(char* path, struct dawn_mac addr) {
if (f == NULL)
dawnlog_error("Error opening mac file!\n");
else
{
fprintf(f, MACSTR "\n", MAC2STR(addr.u8));
fclose(f);
fclose(f);
}
}

3
src/utils/msghandler.c
View file

@ -225,6 +225,7 @@ probe_entry *parse_to_probe_req(struct blob_attr* msg) {
int handle_deauth_req(struct blob_attr* msg) {
dawnlog_debug_func("Entering...");
hostapd_notify_entry notify_req;
parse_to_hostapd_notify(msg, &notify_req);
@ -330,7 +331,7 @@ int handle_network_msg(char* msg) {
else if (strncmp(method, "macfile", 5) == 0) {
parse_add_mac_to_file(data_buf.head);
}
else if (strncmp(method, "uci", 2) == 0) {
else if (strncmp(method, "uci", 2) == 0) { // TODO: Should this be 3 or is something special happening?
dawnlog_debug("HANDLING UCI!\n");
handle_uci_config(data_buf.head);
}

14
src/utils/ubus.c
View file

@ -87,7 +87,7 @@ struct hostapd_sock_entry {
uint64_t last_channel_time_busy;
int chan_util_samples_sum;
int chan_util_num_sample_periods;
int chan_util_average; //TODO: Never evaluated?
int chan_util_average;
int band;
// add neighbor report string
@ -684,11 +684,11 @@ static int hostapd_notify(struct ubus_context* ctx_local, struct ubus_object* ob
}
int dawn_init_ubus(const char *ubus_socket, const char *hostapd_dir) {
dawnlog_debug_func("Entering...");
uloop_init();
signal(SIGPIPE, SIG_IGN);
dawnlog_debug_func("Entering...");
ctx = ubus_connect(ubus_socket);
if (!ctx) {
dawnlog_error("Failed to connect to ubus\n");
@ -1170,7 +1170,7 @@ static void ubus_umdns_cb(struct ubus_request *req, int type, struct blob_attr *
dawnlog_debug("IPV4: %s\n", blobmsg_get_string(tb_dawn[DAWN_UMDNS_IPV4]));
dawnlog_debug("Port: %d\n", blobmsg_get_u32(tb_dawn[DAWN_UMDNS_PORT]));
} else {
return;
return; // TODO: We're in a loop. Should this be return or continue?
}
add_tcp_connection(blobmsg_get_string(tb_dawn[DAWN_UMDNS_IPV4]), blobmsg_get_u32(tb_dawn[DAWN_UMDNS_PORT]));
}
@ -1460,7 +1460,6 @@ static void hostapd_handle_remove(struct ubus_context *ctx_local,
struct ubus_subscriber *s, uint32_t id) {
dawnlog_debug_func("HOSTAPD: Object %08x went away\n", id);
struct hostapd_sock_entry *hostapd_sock = container_of(s,
struct hostapd_sock_entry, subscriber);
@ -1592,6 +1591,7 @@ void subscribe_to_new_interfaces(const char *hostapd_sock_path) {
dawnlog_error("[SUBSCRIBING] No hostapd sockets!\n");
return;
}
while ((entry = readdir(dirp)) != NULL) {
if (entry->d_type == DT_SOCK) {
bool do_subscribe = true;
@ -2064,8 +2064,6 @@ void remove_probe_array_cb(struct uloop_timeout* t) {
uloop_timeout_set(&probe_timeout, timeout_config.remove_probe * 1000);
}
void remove_client_array_cb(struct uloop_timeout* t) {
dawnlog_debug_func("[ULOOP] : Removing old client entries!\n");
@ -2076,8 +2074,6 @@ void remove_client_array_cb(struct uloop_timeout* t) {
uloop_timeout_set(&client_timeout, timeout_config.remove_client * 1000);
}
void remove_ap_array_cb(struct uloop_timeout* t) {
dawnlog_debug_func("[ULOOP] : Removing old ap entries!\n");