X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ap-utils.git;a=blobdiff_plain;f=lib%2Fap-utils.h;h=0936d4012cd125caf68c99b4eeb04f2799e54e3f;hp=94e256a9747e6a07e58a37cd2d4db42e86546f4c;hb=db905ff22705494136f504425cf0c75bb94cb81c;hpb=67fc54773e1504698e80c9cb83977bde32665350

diff --git a/lib/ap-utils.h b/lib/ap-utils.h
index 94e256a..0936d40 100644
--- a/lib/ap-utils.h
+++ b/lib/ap-utils.h
@@ -38,7 +38,10 @@ typedef unsigned int uint32_t;
 #endif /* ifdef OS_SOLARIS */
 #endif /* ifdef OS_BSD */
 
+#include "ap-curses.h"
+
 #define TITLE "Wireless Access Point Utilites for Unix"
+#define VIEW "View: "
 
 #define minimum(x, y)	x <= y ? x : y
 
@@ -57,13 +60,15 @@ typedef unsigned int uint32_t;
 
 
 #ifdef WORDS_BIGENDIAN
-/* a quick-and-dirty macro to unconditionally swap bytes in 4-byte integers
- * between big-endian and little-endian ordering */
+/*
+ * a quick-and-dirty macros to unconditionally swap bytes in 2 and 4-byte
+ * integers between big-endian and little-endian ordering
+ */
 #define swap2(d) ((((d) >> 8) & 0x00ff) | (((d) << 8) & 0xff00))
 #define swap4(d) ((((d) >> 24) & 0x000000ff) | (((d) >>  8) & 0x0000ff00) | (((d) <<  8) & 0x00ff0000) | (((d) << 24) & 0xff000000))
 #else
 #define swap2(d) d
-#define swap4(n) n
+#define swap4(d) d
 #endif
 
 #define rlong(a)	((a) = swap4(a))
@@ -95,17 +100,19 @@ typedef unsigned int uint32_t;
 #define BASIC _("Basic")
 
 #define ANY_KEY _("Press any key to continue.")
+#define QT_HELP _("Q - quit to menu. T - toggle polling mode, Other key - force update.")
 
 #define ERR_SET _("Unable to write data to AP. Press any key to continue.")
 #define ERR_RET _("Unable to retrieve (valid) data from AP. Press any key to continue.")
-#define WAIT_RET _("Retrieving data from AP. Please wait...")
+#define WAIT_RET _("Trying to retrieve data from AP. Please wait...")
 #define WAIT_SET _("Writing data to AP. Please wait...")
 #define DONE_SET _("Configuration written to the AP. Press any key to continue.")
+#define SELECT _("select() function error. Press any key.")
 
 #define CREATE_SOCKET_ERROR _("Create socket error. Press any key.")
 #define BIND_SOCKET_ERROR _("Bind socket error. Press any key.")
 
-#define MAIN_MENU  _("Back to main menu")
+#define MAIN_MENU _("Back to main menu")
 #define MENU_EXIT _("Exit program")
 #define MENU_SHELL _("Run subshell. To return type 'exit'.")
 #define MENU_ABOUT _("Short info about program")
@@ -118,8 +125,12 @@ typedef unsigned int uint32_t;
 #define MENU_WIRELESS _("Get wireless port statistics")
 #define MENU_STAS _("Get list of currently associated stations (Access Point clients)")
 #define MENU_INFO _("Get info and statistics from AP")
-#define MENU_CONFIG  _("Set various configuration options")
+#define MENU_CONFIG _("Set various configuration options")
 
+#define TITLE_STAS _("Associated stations")
+
+#define POLL_ON _("Polling: on")
+#define POLL_OFF _("Polling: off")
 
 #define INT_VALUE	0x02
 #define STRING_VALUE	0x04
@@ -145,12 +156,23 @@ typedef unsigned int uint32_t;
 #define MCOLS 15 /* width of menu window */
 #define LAST_ROW LINES-5
 
+#define WAIT_TIMEOUT 1
+#define WAIT_FOREVER 0
+
 /* Basic distinguished MIB (and AP) types */
+/* Numbering with respect to order in ap_types */
 #define ATMEL410 0
 #define NWN 1
 #define ATMEL12350 2
 
-typedef struct VarBind {
+/* Vendor distinguished MIB subtypes */
+/* Numbering with respect to order in ap_vendorexts */
+#define NONE 0
+#define SBRIDGES 1
+#define TELLUS 1
+#define VERNET 2
+
+typedef struct {
     unsigned char *oid;
     int len_oid;
     unsigned char *value;
@@ -158,6 +180,13 @@ typedef struct VarBind {
     unsigned char type;
 } varbind;
 
+typedef struct {
+    char code;
+    char *desc;
+    unsigned short first_ch;
+    unsigned short chans;
+} rdprops;
+
 struct umitems {
 	char *item;
 	char *help;
@@ -231,12 +260,12 @@ struct WirelessStatistics {
 	uint32_t TransmittedPackets_1Mbps;
 };
 
-struct SysDeviceInfo_ATMEL410 {
+struct sysDeviceInfo_ATMEL410 {
     /* sysDeviceInfo OID struct for ATMEL 410 */
     uint32_t StructVersion;
     unsigned char MacAddress[6];
     unsigned short Reserved;
-    uint32_t RegulationDomain;
+    uint32_t RegulatoryDomain;
     uint32_t ProductType;
     unsigned char OEMName[32];
     uint32_t OEMID;
@@ -244,19 +273,18 @@ struct SysDeviceInfo_ATMEL410 {
     uint32_t HardwareRevision;
 };
 
-struct SysDeviceInfo_ATMEL12350 {
+struct sysDeviceInfo_ATMEL12350 {
     /* sysDeviceInfo OID struct for ATMEL 12350 */
     uint32_t StructVersion;
     unsigned char MacAddress[6];
     unsigned char Channel;
-    unsigned char RegulationDomain;
+    unsigned char RegulatoryDomain;
     uint32_t ProductType;
     unsigned char OEMName[32];
     uint32_t OEMID;
     unsigned char ProductName[32];
     uint32_t HardwareRevision;
-    /* The rest is actually dormant. */
-    /*
+    /* The rest is mostly dormant. */
     unsigned char PID_VID[4];
     uint32_t sysOIDSize;
     uint16_t sysOID[16];
@@ -266,7 +294,6 @@ struct SysDeviceInfo_ATMEL12350 {
     unsigned char Reserved2[2];
     unsigned char TxPower[14];
     unsigned char Reserved3[10];
-    */
 };
 
 struct MacListStat {
@@ -285,17 +312,18 @@ struct MacListStat {
 
 /* service */
 extern char * oui2manufacturer(char *);
-extern int ch_list(int, char **);
+extern int  regdom_idx(char);
+extern int  ch_list(int, char **);
 extern void connect_options(unsigned long int, int);
-extern int get_mib_details(void);
+extern int  get_mib_details(void);
 extern void about(void);
 extern void draw_menu_win(void);
 extern void main_menu(void);
-extern void print_title(char *);
-extern void print_viewtype(char *);
-extern void print_viewtype_rssi(void);
+extern void print_bold(WINDOW *, char *);
 extern void print_menusel(int, int, char *, char *);
 extern void print_bottom(char *);
+extern void print_top(char *, char *);
+extern void print_top_rssi(char *);
 extern void print_help(char *);
 extern void print_helperr(char *);
 extern void clear_main(int);
@@ -304,11 +332,14 @@ extern int  conv_rssi(int);
 extern void get_mac(char *, int, int);
 extern void get_ip(struct in_addr *, int, int, char *);
 extern void get_mask(struct in_addr *, int, int, char *);
-extern void get_value(char *, int, int, int, char, int, int, char *);
+extern void get_value(char *, int, int, int, char, unsigned int, unsigned int,
+		      char *);
 extern void get_pass(char *, int, int, int);
-extern int  menu_choose(int, int, char **, unsigned int);
 extern int  yes_no(int, int);
 extern int  on_off(int, int);
+extern int  menu_choose(int, int, char **, unsigned int);
+extern int  wait_key(void);
+extern int  help_ysn(void);
 extern void scroll_rows(struct MacListStat *, int, int, int, int);
 extern void exit_shell(void);
 extern void exit_program(void);
@@ -321,13 +352,15 @@ extern void AuthorizedSettings(void);
 extern void bridging(void);
 extern void wep(void);
 extern void WirelessStat(void);
-extern void stations(void);
+extern void atmel_stations(void);
 extern void atmel_sysinfo(void);
+extern void atmel_set_oeminfo(void);
 extern void ap_search(void);
 
 /* snmp engine*/
 extern int snmp(varbind *, int, int);
 extern int ber(char *, varbind *, int, int);
+/* extern unsigned int ber_decode_uint(unsigned char *, int); */
 
 /* function prototypes specific for ATMEL utility */
 extern void reset(void);