Diff: GSwifi/GSwifi.h

Revision:

15:086d1a33a197

Parent:

14:1e89a3f0282d

Child:

16:105b56570533

--- a/GSwifi/GSwifi.h	Fri Jan 10 14:23:33 2014 +0000
+++ b/GSwifi/GSwifi.h	Thu Jan 30 15:10:14 2014 +0000
@@ -209,9 +209,10 @@
      * @param ip my ip address (dhcp start address)
      * @param netmask subnet mask
      * @param gateway default gateway
-     * @param dns my host name (default NULL)
+     * @param dns name server (default NULL)
+     * @param name my host name (default NULL)
      */
-    int setAddress (const char *ip, const char *netmask, const char *gateway, const char *name = NULL);
+    int setAddress (const char *ip, const char *netmask, const char *gateway, const char *dns = NULL, const char *name = NULL);
     /** get IP address
      */
     int getAddress (char *ip, char *netmask, char *gateway);
@@ -371,7 +372,10 @@
     int httpdAttach (const char *uri, const char *dir);
     /** attach uri to cgi handler
      */
-    int httpdAttach (const char *uri, void (*funcCgi)(int));
+    int httpdAttach (const char *uri, void (*funcCgi)(int), int type = 0);
+    
+    const char *httpdGetFilename (int cid);
+    const char *httpdGetQuerystring (int cid);
 #endif
 
 #ifdef CFG_ENABLE_WEBSOCKET
@@ -498,6 +502,7 @@
         HTTPDMODE_BODY,
         HTTPDMODE_ENTER,
         HTTPDMODE_ERROR,
+        HTTPDMODE_WEBSOCKET_BEGIN,
         HTTPDMODE_WEBSOCKET,
         HTTPDMODE_WEBSOCKET_MASK,
         HTTPDMODE_WEBSOCKET_BODY,
@@ -534,6 +539,7 @@
         char *uri;
         char *dir;
         void (*func)(int);
+        int ws;
     } _httpd_handler[CFG_HTTPD_HANDLER_NUM];
 
     int _httpd_cid;