Imported Upstream version 1.5.1~pre3

[ap-utils.git] / lib / aps.c

diff --git a/lib/aps.c b/lib/aps.c
index 585b2477c675e69d5d8b8fa7fa47371f3983b3c4..b893666c0e9a6075292e495a93e094f11c9448d5 100644 (file)
--- a/lib/aps.c
+++ b/lib/aps.c
@@ -2,6 +2,7 @@
  *      aps.c from Access Point SNMP Utils for Linux
  *
  * Copyright (c) 2002 Roman Festchook <roma at polesye dot net>
+ * Copyright (c) 2004 Jan Rafaj <jr-aputils at cedric dot unob dot cz>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 from
@@ -29,7 +30,7 @@
 #define KNOWN_APS _("Known Access Points")
 
 extern WINDOW *main_win, *main_sub /* *win_for_menu */;
-extern short ap_type;
+extern short ap_type, ap_vendorext;
 extern int sockfd, atmel410_filter;
 extern struct in_addr ap_ip;
 
@@ -194,7 +195,7 @@ get_stats:
 show_stats:
     /* display column info in main_sub */
     mvwin(main_sub, 0, 0);
-    wattrset(main_sub, COLOR_PAIR(3));
+    wattrset(main_sub, COLOR_PAIR(13));
     for (i = 0; i < 64; i++)
        waddch(main_sub, ' ');
     switch (ap_viewtype) {
@@ -316,7 +317,7 @@ show_stats:
                }
                break;
            case 2:
-               sprintf(message, "%3d", -96 + app->q1);
+               sprintf(message, "%3d", dbmconv(app->q1));
                mvwaddstr(main_sub, aps_num+1, 56, message);
                if (ap_type == ATMEL410) {
                    sprintf(message, "%3d%%",
@@ -340,7 +341,7 @@ show_stats:
     switch (ap_viewtype) {
        case 1:
            mvwaddstr(main_sub, LINES - 6, 0,
-               _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+               _("CN: Channel Name; P: Preamble Type (S: Short; L: Long);"));
            mvwaddstr(main_sub, LINES - 5, 0,
                _("RSSI: Radio Signal Strength Indicator [%]"));
            if (ap_type == ATMEL410)
@@ -348,7 +349,7 @@ show_stats:
            break;
        case 2:
            mvwaddstr(main_sub, LINES - 6, 0,
-               _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+               _("CN: Channel Name; P: Preamble Type (S: Short; L: Long);"));
            mvwaddstr(main_sub, LINES - 5, 0,
                _("RSSI: Radio Signal Strength Indicator [dBm]"));
            if (ap_type == ATMEL410)
@@ -356,7 +357,7 @@ show_stats:
            break;
        case 3:
            mvwaddstr(main_sub, LINES - 6, 0,
-               _("CN: Channel Name; P: Preambule Type (S: Short; L: Long);"));
+               _("CN: Channel Name; P: Preamble Type (S: Short; L: Long);"));
            mvwaddstr(main_sub, LINES - 5, 0,
                _("RSSI: Radio Signal Strength Indicator [raw]"));
            if (ap_type == ATMEL410)