treewide: code and documentation cleanup

Tidy up a few bits of code - nothing very significant.
Documentation fixes and updates

[cleanup commit message]
Signed-off-by: Nick Hainke <vincent@systemli.org>
This commit is contained in:
Ian Clowes 2022-04-02 17:33:45 +01:00 committed by Nick Hainke
parent 8290138179
commit 5d8df44a3a
7 changed files with 18 additions and 20 deletions

View file

@ -286,4 +286,3 @@ grep 'CONFIG-H:' `find . -type f -name "*.[ch]"`|sed 's/^.*CONFIG-.: *\(.*\)$/|\
|Parameter|Purpose|Notes [Default is bracketed]| |Parameter|Purpose|Notes [Default is bracketed]|
|---------|-------|-----| |---------|-------|-----|
|hostapd_dir|Path to hostapd runtime information|[/var/run/hostapd]| |hostapd_dir|Path to hostapd runtime information|[/var/run/hostapd]|

View file

@ -7,8 +7,7 @@ DAWN collects and shares information about the APs and clients in the
network by using several standard components. The below assumes it is network by using several standard components. The below assumes it is
running on an OpenWrt device. running on an OpenWrt device.
![OpenWrtInANuthshell](https://raw.githubusercontent.com/PolynomialDivision ![OpenWrtInANuthshell](https://raw.githubusercontent.com/PolynomialDivision/upload_stuff/master/dawn_pictures/openwrt_in_a_nutshell_dawn.png)
/upload_stuff/master/dawn_pictures/openwrt_in_a_nutshell_dawn.png)
Information about capability of the AP and current clients is discovered Information about capability of the AP and current clients is discovered
via the hostapd and iwinfo. The task to do this is scheduled by a timer. via the hostapd and iwinfo. The task to do this is scheduled by a timer.
@ -105,7 +104,7 @@ Now you need to clone DAWN, e.g. into your home directory
You must then add a symlink. In the OpenWrt branch do something like You must then add a symlink. In the OpenWrt branch do something like
ln -s ~/DAWN/.git/ ~openwrt/feeds/packages/net/dawn/git-src ln -s ~/DAWN/.git/ ~/openwrt/feeds/packages/net/dawn/git-src
Now compile dawn Now compile dawn
@ -179,4 +178,3 @@ algorithms to ensure that expected behaviour occurs. At the time of
writing a number of *.script files exist that can be passed to writing a number of *.script files exist that can be passed to
test_storage, but these haven't necessarily been maintained as the code test_storage, but these haven't necessarily been maintained as the code
has evolved from when they were originally written. has evolved from when they were originally written.

View file

@ -147,4 +147,3 @@ kicking_threshold parameter.
} }
} }
} }

View file

@ -73,4 +73,3 @@ recently, so may not be working as well as you might like.
If you want to use versions of DAWN that are not fully packaged yet or to If you want to use versions of DAWN that are not fully packaged yet or to
work on a fork of the code yourself then see the [Developer work on a fork of the code yourself then see the [Developer
Guide](DEVELOPER.md). Guide](DEVELOPER.md).

View file

@ -16,8 +16,6 @@ struct network_config_s network_config;
struct time_config_s timeout_config; struct time_config_s timeout_config;
struct local_config_s local_config; struct local_config_s local_config;
#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
static client* client_array_get_client_for_bssid(struct dawn_mac bssid_mac, struct dawn_mac client_mac); static client* client_array_get_client_for_bssid(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);

View file

@ -5,8 +5,6 @@
#include "datastorage.h" #include "datastorage.h"
#include "dawn_iwinfo.h" #include "dawn_iwinfo.h"
#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
char hostapd_dir_glob[HOSTAPD_DIR_LEN]; char hostapd_dir_glob[HOSTAPD_DIR_LEN];
int call_iwinfo(char *client_addr); int call_iwinfo(char *client_addr);
@ -182,7 +180,7 @@ int get_rssi(const char *ifname, struct dawn_mac client_addr) {
iwinfo_finish(); iwinfo_finish();
return INT_MIN; return INT_MIN;
} else if (len <= 0) { } else if (len <= 0) {
dawnlog_warning("No station connected\n"); dawnlog_trace("No station connected to %s\n", ifname);
iwinfo_finish(); iwinfo_finish();
return INT_MIN; return INT_MIN;
} }
@ -238,7 +236,7 @@ int get_expected_throughput(const char *ifname, struct dawn_mac client_addr) {
iwinfo_finish(); iwinfo_finish();
return INT_MIN; return INT_MIN;
} else if (len <= 0) { } else if (len <= 0) {
dawnlog_warning("No station connected\n"); dawnlog_trace("No station connected to %s\n", ifname);
iwinfo_finish(); iwinfo_finish();
return INT_MIN; return INT_MIN;
} }

View file

@ -707,11 +707,11 @@ static int hostapd_notify(struct ubus_context* ctx_local, struct ubus_object* ob
dawnlog_debug_func("Entering..."); dawnlog_debug_func("Entering...");
if (dawnlog_showing(DAWNLOG_DEBUG)) if (dawnlog_showing(DAWNLOG_TRACE))
{ {
char* str = blobmsg_format_json(msg, true); char* str = blobmsg_format_json(msg, true);
dawn_regmem(str); dawn_regmem(str);
dawnlog_info("hostapd sent %s = %s\n", method, str); dawnlog_trace("hostapd sent %s = %s\n", method, str);
dawn_free(str); dawn_free(str);
str = NULL; str = NULL;
} }
@ -1572,7 +1572,15 @@ static int get_network(struct ubus_context *ctx_local, struct ubus_object *obj,
blob_buf_init(&b, 0); blob_buf_init(&b, 0);
dawn_regmem(&b); dawn_regmem(&b);
dawn_mutex_lock(&ap_array_mutex);
dawn_mutex_lock(&client_array_mutex);
build_network_overview(&b); build_network_overview(&b);
dawn_mutex_unlock(&client_array_mutex);
dawn_mutex_unlock(&ap_array_mutex);
ret = ubus_send_reply(ctx_local, req, b.head); ret = ubus_send_reply(ctx_local, req, b.head);
if (ret) if (ret)
dawnlog_error("Failed to send network overview: %s\n", ubus_strerror(ret)); dawnlog_error("Failed to send network overview: %s\n", ubus_strerror(ret));
@ -2061,7 +2069,6 @@ int build_hearing_map_sort_client(struct blob_buf *b) {
} }
// FIXME: Should we have more mutex protection while accessing these lists?
int build_network_overview(struct blob_buf *b) { int build_network_overview(struct blob_buf *b) {
dawnlog_debug_func("Entering..."); dawnlog_debug_func("Entering...");