Imported Upstream version 1.5

[ap-utils.git] / lib / ap-utils.h

diff --git a/lib/ap-utils.h b/lib/ap-utils.h
index 4436cf86cf3930f93dbe192469f1e6de1ba24ce4..cd9c8c1610a2cb56d6b3a70c0a90329275de072b 100644 (file)
--- a/lib/ap-utils.h
+++ b/lib/ap-utils.h
@@ -76,6 +76,9 @@ typedef unsigned int uint32_t;
 #define rshort(a)      ((a) = swap2(a))
 #define wshort(a)      ((a) = swap2(a))
 
+#define dbmconv(x)     (ap_type == ATMEL410 && ap_vendorext == SBRIDGES) ? \
+                           (int)(-95 + x * (float)2.125) : -96 + x
+
 #define MAC _("MAC address: ")
 #define TRAPS _("[S] SNMP traps: ")
 
@@ -100,17 +103,15 @@ 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 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 _("Trying to retrieve data from AP. Please wait...")
+#define WAIT_RET _("Trying to retrieve data from AP - please wait (or press Q to quit).")
 #define WAIT_SET _("Writing data to AP. Please wait...")
 #define DONE_SET _("Configuration written to the AP. Press any key to continue.")
 #define ERR_SELECT _("select() function error. Press any key.")
-
-#define ERR_CREATING_SOCKET _("Create socket error. Press any key.")
-#define ERR_BINDING_SOCKET _("Bind socket error. Press any key.")
+#define ERR_SOCKET _("socket() or bind() function error. Press any key.")
 
 #define ERR_WRITING_APCONF _("Unable to write AP list file ~/.ap-config. Press any key.")
 #define DONE_WRITING_APCONF _("AP list file ~/.ap-config successfully written. Press any key.")
@@ -118,6 +119,7 @@ typedef unsigned int uint32_t;
 #define MAIN_MENU _("Back to main menu")
 #define MENU_EXIT _("Exit program")
 #define MENU_SHELL _("Run subshell. To return type 'exit'.")
+#define MENU_POLLING _("Change polling mode interval")
 #define MENU_ABOUT _("Short info about program")
 #define MENU_SEARCH _("Find connected Access Points")
 #define MENU_CONNECT _("Set connection options: ip and community")
@@ -277,11 +279,10 @@ struct sysDeviceInfo_128 {
     unsigned char ProductName[32];
     uint32_t HardwareRevision;
     /*
-     * NOTE: Although MIBs claim 92 bytes length, it is not true.
+     * NOTE: Although MIBs claim 92 bytes length, it does not need to be true.
      * 92 bytes seems to be just the 'official' part; the unofficial
-     * (and undocumented) remnant just padds it to the total length of
-     * 128 bytes.
-     * TODO: find out the structure.
+     * (and undocumented) remnant padding the total length to 128 bytes
+     * may or may not eventually appear (resulting in returned length 128 b.).
      */
 };
 
@@ -408,11 +409,12 @@ extern void get_pass(char *, int, int, 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  wait_key(int);
 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);
+extern void polling_interval(void);
 extern int  get_opts(void);
 extern void save_Stations(struct MacListStat *);
 extern void uni_menu(struct umitems *umenu, int num);
@@ -429,6 +431,9 @@ extern void atmel_set_oeminfo(void);
 extern void ap_search(void);
 
 /* snmp engine*/
+extern void close_sockfd(void);
+extern int  open_sockfd(void);
+extern int  reopen_sockfd(void);
 extern int snmp(varbind *, int, int);
 extern int ber(char *, varbind *, int, int);
 /* extern unsigned int ber_decode_uint(unsigned char *, int); */