From d7ca0c3e555ef0b5250873ddce48ccf2326b017a Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Sat, 25 Jan 2014 00:07:30 +0000 Subject: Imported Upstream version 0.7.6 --- conf.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'conf.c') diff --git a/conf.c b/conf.c index 473209a..376569e 100644 --- a/conf.c +++ b/conf.c @@ -36,12 +36,11 @@ static char *action_items[] = { static char *sort_order[] = { [SO_CHAN] = "Channel", - [SO_CHAN_REV] = "Rev Channel", [SO_SIGNAL] = "Signal", + [SO_ESSID] = "Essid", [SO_OPEN] = "Open", [SO_CHAN_SIG] = "Chan/Sig", [SO_OPEN_SIG] = "Open/Sig", - [SO_OPEN_CH_SI] = "Open/Chan/Sig", NULL }; @@ -70,7 +69,8 @@ struct wavemon_conf conf = { .noise_min = -102, .noise_max = 10, - .scan_sort_order = SO_CHAN, + .scan_sort_order = SO_CHAN_SIG, + .scan_sort_asc = false, .lthreshold_action = TA_DISABLED, .lthreshold = -80, .hthreshold_action = TA_DISABLED, @@ -326,13 +326,21 @@ static void init_conf_items(void) ll_push(conf_items, "*", item); item = calloc(1, sizeof(*item)); - item->name = strdup("Scan sort order"); + item->name = strdup("Scan sort type"); item->cfname = strdup("sort_order"); item->type = t_list; item->v.i = &conf.scan_sort_order; item->list = sort_order; ll_push(conf_items, "*", item); + item = calloc(1, sizeof(*item)); + item->name = strdup("Scan sort in ascending order"); + item->cfname = strdup("sort_ascending"); + item->type = t_list; + item->v.i = &conf.scan_sort_asc; + item->list = on_off_names; + ll_push(conf_items, "*", item); + item = calloc(1, sizeof(*item)); item->name = strdup("Statistics updates"); item->cfname = strdup("stat_updates"); @@ -561,7 +569,8 @@ void getconf(int argc, char *argv[]) } if (version) { - printf("wavemon wireless monitor %s\n", PACKAGE_VERSION); + printf("wavemon %s", PACKAGE_VERSION); + printf(" with %s and %s.\n", we_version(), curses_version()); printf("Distributed under the terms of the GPLv3.\n%s", help ? "\n" : ""); } if (help) { -- cgit v1.2.3