diff options
| author | Jonathan McCrohan <jmccrohan@gmail.com> | 2016-01-30 17:08:40 +0000 |
|---|---|---|
| committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2016-01-30 17:08:40 +0000 |
| commit | 947da597663e60b0a214d96bfcadc0cd042a49ff (patch) | |
| tree | f4d3df7b9f3e41ee4beed2e049d9b52031404b8e /wavemon.h | |
| parent | cec92f1a82b9f29ec16a4c03c37487c7cb019acf (diff) | |
| parent | 0b0aac6ce21bcb38d7e03dc2b3ff419861476a24 (diff) | |
| download | wavemon-947da597663e60b0a214d96bfcadc0cd042a49ff.tar.gz | |
Merge tag 'upstream/0.8.0'
Upstream version 0.8.0
Diffstat (limited to 'wavemon.h')
| -rw-r--r-- | wavemon.h | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -48,9 +48,9 @@ */ enum info_screen_geometry { WH_IFACE = 2, /* 'Interface' area at the top */ - WH_LEVEL = 9, /* Level meters (signal/noise/SNR) */ + WH_LEVEL = 9, /* Level meters */ WH_STATS = 3, /* WiFi statistics area */ - WH_INFO_MIN = 6, /* WiFi information area */ + WH_INFO_MIN = 8, /* WiFi information area */ WH_NET_MIN = 3, /* Network interface information area */ WH_NET_MAX = 5, /* Network interface information area */ WH_MENU = 1 /* Menu bar at the bottom */ @@ -78,7 +78,7 @@ enum info_screen_geometry { #define MAXYLEN (WAV_HEIGHT - 2) /* Number of seconds to display a warning message outside ncurses mode */ -#define WARN_DISPLAY_DELAY 3 +#define WARN_DISPLAY_DELAY 1 /* Minimum SSID length */ #define MAX_ESSID_LEN 16 @@ -108,6 +108,7 @@ static inline void threshold_action(enum threshold_action action) enum scan_sort_order { SO_CHAN, SO_SIGNAL, + SO_MAC, SO_ESSID, SO_OPEN, SO_CHAN_SIG, @@ -135,7 +136,6 @@ extern struct wavemon_conf { /* Boolean values */ int check_geometry, /* ensure window is large enough */ cisco_mac, /* Cisco-style MAC addresses */ - random, /* random signals */ override_bounds, /* override autodetection */ scan_sort_asc; /* direction of @scan_sort_order */ @@ -237,9 +237,9 @@ extern void waddstr_center(WINDOW * win, int y, const char *s); extern const char *curtail(const char *str, const char *sep, int len); extern void waddbar(WINDOW *win, int y, float v, float min, float max, - char *cscale, bool rev); + int8_t *cscale, bool rev); extern void waddthreshold(WINDOW *win, int y, float v, float tv, - float minv, float maxv, char *cscale, chtype tch); + float minv, float maxv, int8_t *cscale, chtype tch); enum colour_pair { CP_STANDARD = 1, CP_SCALEHI, @@ -262,7 +262,7 @@ enum colour_pair { CP_SCAN_NON_AP }; -static inline int cp_from_scale(float value, const char *cscale, bool reverse) +static inline int cp_from_scale(float value, int8_t const *cscale, bool reverse) { enum colour_pair cp; @@ -279,11 +279,9 @@ static inline int cp_from_scale(float value, const char *cscale, bool reverse) /* * Wireless interfaces */ -extern const char *we_version(void); extern const char *conf_ifname(void); -extern void conf_get_interface_list(bool init); -extern char **iw_get_interface_list(void); -extern void dump_parameters(void); +extern void conf_get_interface_list(void); +extern void iw_get_interface_list(char** if_list, size_t max_entries); /* * Timers |