#include <sys/ioctl.h>
#include "ap-utils.h"
-char *ap_types[3] = {
- "ATMEL410",
- "NWN",
- "ATMEL12350"
-};
+extern short ap_type;
+extern int snmp_quit_by_keypress;
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 atmel410_filter = 0, wait_mode = WAIT_FOREVER;
struct in_addr ap_ip;
char *prog_title = "Wireless Access Point Configurator";
-
-extern char IS_ATMEL410_SBRIDGES;
-extern char IS_ATMEL12350_TELLUS;
-extern char IS_ATMEL12350_VERNET;
+char set_oeminfo_allowed = 0;
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},
{_("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}
switch (ap_type) {
case ATMEL410:
case ATMEL12350:
+ 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]));
void command_menu()
{
struct umitems command_umenu_atmel[] = {
- {_("Upload"), _("Make current configuration active"), upload, 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}
{_("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},
+ {_("AP link"), MENU_APLINK, atmel_aplink, 0},
{_("KnownAPs"), _("Get info about known Access Points"), APs, 0},
{"..", MAIN_MENU, NULL, 0},
{0, 0, NULL, 0}
{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]));
void _auth()
{
- if(get_opts() == 0)
+ if (get_opts() == 0)
connect_options((unsigned long) NULL, (int) NULL);
}
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}
};
+
uni_menu(config_umenu, sizeof(config_umenu) / sizeof(config_umenu[0]));
}
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();
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"),
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);
/* Not reachable */
return 0;
}
-