Merge commit 'upstream/1.5'

[ap-utils.git] / src / ap-config.c

diff --git a/src/ap-config.c b/src/ap-config.c
index c41525e89b6d640d95ada9b0d585dd4fcff4dd4e..fa82c8c2faccc7ecbb9165c20d4e9cc62dceb1cb 100644 (file)
--- a/src/ap-config.c
+++ b/src/ap-config.c
@@ -27,13 +27,15 @@
 #include <sys/ioctl.h>
 #include "ap-utils.h"
 
+extern short ap_type;
+extern int snmp_quit_by_keypress;
+
 WINDOW *win_for_menu, *sub_for_menu, *win_for_help, *main_win, *main_sub;
 char *community;
-int sockfd, atmel410_filter = 0, wait_mode = WAIT_FOREVER;
+int atmel410_filter = 0, wait_mode = WAIT_FOREVER;
 struct in_addr ap_ip;
 char *prog_title = "Wireless Access Point Configurator";
 char set_oeminfo_allowed = 0;
-extern short ap_type;
 
 void config_menu()
 {
@@ -42,7 +44,7 @@ void config_menu()
         0},
        {_("Wireless"), _("Set wireless options"), atmel_wireless, 0},
        {_("Privacy"), MENU_ENCRYPT, wep, 0},
-       {_("MAC auth"), MENU_MAC, atmel_auth_mac, 0},
+       {_("Auth"), MENU_AUTH, atmel_auth, 0},
        {_("Community"), MENU_COMMUNITY, AuthorizedSettings, 0},
        {_("Radio"), _("Set radio signal power and antenna options"),
         power, 0},
@@ -54,7 +56,7 @@ void config_menu()
         {_("General"), _("Set general options"), nwn_wireless, 0},
         {_("Advanced"), _("Set advanced options"), advanced, 0},
         {_("Privacy"), MENU_ENCRYPT, nwn_wep, 0},
-        {_("MAC auth"), MENU_MAC, nwn_auth_mac, 0},
+        {_("MAC auth"), MENU_AUTH, nwn_auth_mac, 0},
         {_("Community"), MENU_COMMUNITY, AuthorizedSettings, 0},
         {"..", MAIN_MENU, NULL, 0},
         {0, 0, NULL, 0}
@@ -111,6 +113,7 @@ void stat_menu()
        {_("Ethernet"), _("Get ethernet port statistics"), EthStat, 0},
        {_("Wireless"), MENU_WIRELESS, WirelessStat, 0},
        {_("Stations"), MENU_STAS, atmel_stations, 0},
+       {_("AP link"), MENU_APLINK, atmel_aplink, 0},
        {_("KnownAPs"), _("Get info about known Access Points"), APs, 0},
        {"..", MAIN_MENU, NULL, 0},
        {0, 0, NULL, 0}
@@ -150,8 +153,9 @@ void main_menu()
         command_menu, 1},
        {_("Connect"), MENU_CONNECT, _auth, 0},
        {_("Search"), MENU_SEARCH, ap_search, 0},
-       {_("About"), MENU_ABOUT, about, 0},
+       {_("Polling"), MENU_POLLING, polling_interval, 0},
        {_("Shell"), MENU_SHELL, exit_shell, 0},
+       {_("About"), MENU_ABOUT, about, 0},
        {_("Exit"), MENU_EXIT, exit_program, 0},
        {0, 0, NULL, 0}
     };
@@ -177,10 +181,19 @@ int main( /*int argc, char **argv */ )
     initscr();
     if (has_colors()) {
        start_color();
-       init_pair(1, COLOR_BLACK, COLOR_CYAN);
-       init_pair(2, COLOR_BLACK, COLOR_WHITE);
-       init_pair(3, COLOR_BLACK, COLOR_GREEN);
-       init_pair(4, COLOR_WHITE, COLOR_RED);
+
+       /* Never trust that these are defined by default. */
+       init_pair (COLOR_RED, COLOR_RED, COLOR_BLACK );
+       init_pair (COLOR_GREEN, COLOR_GREEN, COLOR_BLACK);
+       init_pair (COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
+       init_pair (COLOR_BLUE, COLOR_BLUE, COLOR_BLACK);
+       init_pair (COLOR_MAGENTA, COLOR_MAGENTA, COLOR_BLACK);
+       init_pair (COLOR_CYAN, COLOR_CYAN, COLOR_BLACK);
+
+       init_pair(11, COLOR_BLACK, COLOR_CYAN);
+       init_pair(12, COLOR_BLACK, COLOR_WHITE);
+       init_pair(13, COLOR_BLACK, COLOR_GREEN);
+       init_pair(14, COLOR_WHITE, COLOR_RED);
     }
 
     noraw();
@@ -189,16 +202,17 @@ int main( /*int argc, char **argv */ )
     scrollok(stdscr, TRUE);
     idlok(stdscr, TRUE);
     keypad(stdscr, TRUE);
+    snmp_quit_by_keypress = 1;
     refresh();
 
 /* draw help win */
     win_for_help = newwin(1, COLS, LINES - 1, 0);
-    wattrset(win_for_help, COLOR_PAIR(1));
+    wattrset(win_for_help, COLOR_PAIR(11));
     print_help("");
 
 /* draw title win */
     win_for_title = newwin(1, COLS, 0, 0);
-    wattrset(win_for_title, COLOR_PAIR(1));
+    wattrset(win_for_title, COLOR_PAIR(11));
     for (i = 0; i < COLS; i++)
        waddch(win_for_title, ' ');
     sprintf(message, _("Wireless Access Point Configurator ver. %s"),
@@ -211,7 +225,7 @@ int main( /*int argc, char **argv */ )
     sub_for_menu = derwin(win_for_menu, LINES - 5, MCOLS - 2, 2, 1);
     set_menu_win(NULL, win_for_menu);
     set_menu_sub(NULL, sub_for_menu);
-    attrset(COLOR_PAIR(1));
+    attrset(COLOR_PAIR(11));
 
     /* íÁÌÀÀ ÒÁÍËÕ */
     waddch(win_for_menu, ACS_BSSB);
@@ -253,4 +267,3 @@ int main( /*int argc, char **argv */ )
 /* Not reachable */
     return 0;
 }
-