Imported Upstream version 1.5~pre1

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

diff --git a/src/ap-config.c b/src/ap-config.c
index 7865e51532757c6d73ad3ed02327aea7843ae7c0..c41525e89b6d640d95ada9b0d585dd4fcff4dd4e 100644 (file)
--- a/src/ap-config.c
+++ b/src/ap-config.c
@@ -27,18 +27,13 @@
 #include <sys/ioctl.h>
 #include "ap-utils.h"
 
-char *ap_types[3] = {
-    "ATMEL410",
-    "NWN",
-    "ATMEL12350"
-};
-
 WINDOW *win_for_menu, *sub_for_menu, *win_for_help, *main_win, *main_sub;
-short ap_type;
 char *community;
-int sockfd, atmel410_filter=0;
+int sockfd, 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()
 {
@@ -66,13 +61,15 @@ void config_menu()
     };
     
     switch (ap_type) {
-        case ATMEL410:
+       case ATMEL410:
        case ATMEL12350:
-               uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
-              break;
+           set_oeminfo_allowed++;
+           uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
+           set_oeminfo_allowed--;
+           break;
        case NWN:
-              uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
-              break;
+           uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
+           break;
     }
 }
 
@@ -80,12 +77,10 @@ void config_menu()
 void command_menu()
 {
     struct umitems command_umenu_atmel[] = {
-       {_("Upload"), _("Make current configuration active"), upload, 0},
-       {_("Defaults"), _("Restore factory default settings"), defaults,
-        0},
+       {_("Upload"), _("Activate current configuration"), upload, 0},
+       {_("Defaults"), _("Restore factory default settings"), defaults, 0},
        {_("Reset"),
-        _("Reset AP. All not uploaded configuration will be lost"),
-        reset, 0},
+        _("Reset AP. All not uploaded configuration will be lost"), reset, 0},
        {_("TestMode"), _("Put Access Point in test mode"), test, 0},
        {"..", MAIN_MENU, NULL, 0},
        {0, 0, NULL, 0}
@@ -106,18 +101,16 @@ void command_menu()
            uni_menu(command_umenu_nwn,
                sizeof(command_umenu_nwn) / sizeof(command_umenu_nwn[0]));
            break;
-       }    
+    }    
 }
 
-
 void stat_menu()
 {
     struct umitems umenu_atmel[] = {
        {_("SysInfo"), MENU_SYSINFO, atmel_sysinfo, 0},
        {_("Ethernet"), _("Get ethernet port statistics"), EthStat, 0},
        {_("Wireless"), MENU_WIRELESS, WirelessStat, 0},
-       {_("Stations"), MENU_STAS, stations,
-        0},
+       {_("Stations"), MENU_STAS, atmel_stations, 0},
        {_("KnownAPs"), _("Get info about known Access Points"), APs, 0},
        {"..", MAIN_MENU, NULL, 0},
        {0, 0, NULL, 0}
@@ -131,7 +124,7 @@ void stat_menu()
         {0, 0, NULL, 0}
     };
     
-     switch (ap_type) {
+    switch (ap_type) {
        case ATMEL410:
        case ATMEL12350:
            uni_menu(umenu_atmel, sizeof(umenu_atmel) / sizeof(umenu_atmel[0]));
@@ -139,13 +132,13 @@ void stat_menu()
        case NWN:
            uni_menu(umenu_nwn, sizeof(umenu_nwn) / sizeof(umenu_nwn[0]));
            break;
-       }    
+    }    
 }
 
 void _auth()
 {
-       if(get_opts() == 0)
-               connect_options((unsigned long) NULL, (int) NULL);
+    if (get_opts() == 0)
+       connect_options((unsigned long) NULL, (int) NULL);
 }
 
 void main_menu()
@@ -162,6 +155,7 @@ void main_menu()
        {_("Exit"), MENU_EXIT, exit_program, 0},
        {0, 0, NULL, 0}
     };
+
     uni_menu(config_umenu, sizeof(config_umenu) / sizeof(config_umenu[0]));
 }
 
@@ -173,7 +167,6 @@ int main( /*int argc, char **argv */ )
     WINDOW *win_for_title;
     char message[100];
 
-
 #ifdef HAVE_GETTEXT
     /* locale support init */
     setlocale(LC_ALL, "");
@@ -251,10 +244,9 @@ int main( /*int argc, char **argv */ )
     wrefresh(main_win);
 
     about();
-    if (get_opts() == 0) {
-               connect_options((unsigned long) NULL, (int) NULL);
+    if (get_opts() == 0)
+       connect_options((unsigned long) NULL, (int) NULL);
 
-    }
     while (1)
        main_menu();