Imported Upstream version 1.5.1~pre3

[ap-utils.git] / ap-gl / stations.c

diff --git a/ap-gl/stations.c b/ap-gl/stations.c
index 9d47e0eab4618efa22f561ec415dac994e69a4af..100d26200adfa795f50580f229e8fdd1214f8f25 100644 (file)
--- a/ap-gl/stations.c
+++ b/ap-gl/stations.c
@@ -60,7 +60,7 @@ void atmel_stations()
     int mac_num, begin, end, total_mac;
     varbind varbinds[1];
 
-    print_top(NULL, TITLE_STAS);
+    print_top(NULL, ST_TITLE);
 
     varbinds[0].oid = bridgeOperationalMode;
     varbinds[0].len_oid = sizeof(bridgeOperationalMode);
@@ -97,9 +97,12 @@ void atmel_stations()
     total_mac = *(varbinds[0].value);
     mac_num = 1;
 
-    sprintf(message, "%s: %d", TITLE_STAS, total_mac);
+    sprintf(message, "%s: %d", ST_TITLE, total_mac);
     print_top(NULL, message);
-    mvwaddstr(main_sub, 0, 1, _("#     MAC       LQ    RSSI   Status Port IP"));
+    wattrset(main_sub, COLOR_PAIR(13));
+    mvwaddstr(main_sub, 0, 0,
+       _("  #     MAC       Parent MAC  RSSI   LQ Sts MACn      IP        "));
+    wattrset(main_sub, A_NORMAL);
     noecho();
 
     while (mac_num <= total_mac) {
@@ -143,7 +146,7 @@ void atmel_stations()
        memcpy(curr->addr, mac->MacAddress, 6);
 //     memcpy(curr->ParentMacAddress, mac->ParentMacAddress, 6);
        memcpy(&(curr->IP.s_addr), mac->IP, 4);
-       curr->quality = 100 - (minimum(mac->LinkQuality, 40)*2.5);
+       curr->quality = 100 - (minimum(mac->LinkQuality, 40))*2.5;
 //     curr->rssi = - 96 + mac->RSSI;
 //     curr->quality = mac->LinkQuality;
        curr->rssi = mac->RSSI;
@@ -154,7 +157,7 @@ void atmel_stations()
        mac_num++;
     }
     begin = 1;
-    end = (MAX_LINES < mac_num) ? MAX_LINES : mac_num;
+    end = (mac_num > MAX_LINES) ? MAX_LINES : mac_num;
     scroll_rows(first, begin, end, 1, 2);
     while (1) {
        print_help(_("Arrows - scroll; S - save to file; Q - quit to menu."));