aboutsummaryrefslogtreecommitdiffstats
path: root/scan_scr.c
diff options
context:
space:
mode:
Diffstat (limited to 'scan_scr.c')
-rw-r--r--scan_scr.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/scan_scr.c b/scan_scr.c
index ab6b433..e125f22 100644
--- a/scan_scr.c
+++ b/scan_scr.c
@@ -52,8 +52,11 @@ static char *fmt_scan_result(struct scan_result *cur, struct iw_range *iw_range,
if (cur->freq < 1e3)
len += snprintf(buf + len, buflen - len, ", Chan %2.0f",
cur->freq);
+ else if (channel >= 0 && cur->freq < 5e9)
+ len += snprintf(buf + len, buflen - len, ", ch %2d, %g MHz",
+ channel, cur->freq / 1e6);
else if (channel >= 0)
- len += snprintf(buf + len, buflen - len, ", Ch %2d, %g MHz",
+ len += snprintf(buf + len, buflen - len, ", CH %3d, %g MHz",
channel, cur->freq / 1e6);
else
len += snprintf(buf + len, buflen - len, ", %g GHz",
@@ -84,7 +87,7 @@ static void display_aplist(WINDOW *w_aplst)
iw_getinf_range(conf_ifname(), &range);
head = get_scan_list(skfd, conf_ifname(),
- range.we_version_compiled, cmp_freq_sig);
+ range.we_version_compiled);
if (head) {
;
} else if (errno == EPERM || !has_net_admin_capability()) {
@@ -168,8 +171,8 @@ void scr_aplst_init(void)
{
w_aplst = newwin_title(0, WAV_HEIGHT, "Scan window", false);
/*
- * Both parent and child process write to the terminal, updating
- * different areas of the screen. Suspending wavemon brings the
+ * Both parent and child process write to the terminal, updating
+ * different areas of the screen. Suspending wavemon brings the
* terminal state out of order, messing up the screen. The choice
* is between a more complicated (sophisticated) handling of
* signals, and to keep it simple by not allowing to suspend.
2-1/+4 2012-02-26Clean up rules file.Jonathan McCrohan2-25/+12 2012-02-26Revert "Clean up debian/rules"Jonathan McCrohan2-14/+24 This reverts commit c6ac7aec24ec3a425e012031d94fea837758850e. 2012-02-26Use inheritance in package descriptions in debian/controlJonathan McCrohan1-2/+0 2012-02-22Clean up debian/rulesJonathan McCrohan2-24/+14 Enable hardened buildflags. 2012-02-15Upload to experimental.debian/1.4.8-1_exp1Jonathan McCrohan1-1/+1 2012-02-12Nitpicky typos.Jonathan McCrohan2-3/+3 2012-02-12Make changes as per JCristau's advice.Jonathan McCrohan1-9/+3 2012-02-11Remove unused entries from debian/rulesJonathan McCrohan1-2/+0 2012-02-11Fix typo in bugclose changelogJonathan McCrohan1-1/+1 2012-02-11Fix typo in libconfig++dev.examplesJonathan McCrohan1-3/+3 2012-02-11Update changelog.Jonathan McCrohan1-2/+5 2012-02-11Remove forced install of examples in rules.Jonathan McCrohan1-2/+2 2012-02-11Fix Examples.Jonathan McCrohan6-34/+17 2012-02-11Remove makefile.Jonathan McCrohan1-7/+0 2012-02-11Move *.docs, *.install and *.examples to -dev.Jonathan McCrohan7-2/+2 2012-02-11Move to single -dev package.Jonathan McCrohan2-14/+12 2012-02-08Update package changelog.Jonathan McCrohan1-1/+1 Bump release date. 2012-02-08Partial manual revert of move to libconfig*8.Jonathan McCrohan4-12/+12 Move back to libconfig*9, with libconfig*8-dev remaining. 2012-02-08Add my name to debian copyright.Jonathan McCrohan1-2/+3 2012-02-08Atomic commit. Rollback to libconfig8 packaging names.Jonathan McCrohan10-8/+8 2012-02-07Rename libconfig9 to libconfig8 to aid release teamJonathan McCrohan1-14/+14 2012-02-07Fix "closes typo"Jonathan McCrohan1-1/+1 2012-02-07Revert "Add symbols"Jonathan McCrohan3-739/+1 This reverts commit 5184275a78a65864e1c7c0c609f945fdb0dd2d26. 2012-02-07Revert "Fix b0rked symbol file."Jonathan McCrohan1-1/+1 This reverts commit da589e0b2ee111a61807c057cd4608b7bb278cca. 2012-02-07Revert "Second attempt"Jonathan McCrohan2-0/+194 This reverts commit 1c5de5f3d1287cdf6994bb3451b8a8e18a62b8ec. 2012-01-29Second attemptJonathan McCrohan2-194/+0 2012-01-29Fix b0rked symbol file.Jonathan McCrohan1-1/+1 2012-01-29Add symbolsJonathan McCrohan3-1/+739 2012-01-26add examples properlyJonathan McCrohan1-0/+2 2012-01-26Update changelogJonathan McCrohan1-3/+6 2012-01-26fix typoJonathan McCrohan1-1/+1 2012-01-26fix accidental description changesJonathan McCrohan1-2/+2 2012-01-26more fucking around to please lintianJonathan McCrohan1-5/+2 2012-01-25Linitan fixesJonathan McCrohan2-3/+2 2012-01-25Split out debug packagesJonathan McCrohan2-1/+6 2011-12-31Fix debian/rulesJonathan McCrohan1-1/+1 2011-12-31Remove shlibsJonathan McCrohan1-2/+0 2011-12-31Remove NMU from changelogJonathan McCrohan1-1/+0 2011-12-31Lintian FixesJonathan McCrohan1-2/+4 2011-12-31Remove Makefile patchJonathan McCrohan1-1/+0 2011-12-31Update MakefilesJonathan McCrohan10-248/+8222 2011-12-31Updated makefilesJonathan McCrohan1-0/+1