Changeset 1236

Timestamp:

05/24/07 16:16:48 (5 years ago)

Author:

benoitg

Message:

• wdctl_thread.c: Fix #324, again. Credit goes to Medea, I misunderstood his instructons.
• From David Bird <david@…> libhttpd/: Fix #266 - don't process query string parameters and keep them in that request.path.

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• libhttpd/api.c (modified) (3 diffs)
• libhttpd/httpd.h (modified) (1 diff)
• src/fw_iptables.c (modified) (1 diff)
• src/wdctl_thread.c (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Id$
+2007-05-24 Benoit Gr�goire  <bock@step.polymtl.ca>
+        * wdctl_thread.c:  Fix #324, again.  Credit goes to Medea, I misunderstood his instructons.
+        * From David Bird <david@coova.com> libhttpd/: Fix #266 - don't process query string parameters and keep them in that request.path.
+
 2007-05-18 Benoit Gr�goire  <bock@step.polymtl.ca>
         * wdctl_thread.c:  Fix #324

trunk/wifidog/libhttpd/api.c

@@ -572 +572 @@
         }
 
+
+#if 0
+        /* XXX: For WifiDog, we do not need to process any of the 
+           post or query string parameters. So, lets keep the GET variables
+           in the request.path too!
+        */
         /*
         ** Process and POST data
         */
-#if 0
         if (r->request.contentLength > 0)
         {
@@ -583 +588 @@
                 
         }
-#endif
         
         /*
@@ -595 +599 @@
                 _httpd_storeData(r, cp);
         }
+#endif
+
         return(0);
 }

trunk/wifidog/libhttpd/httpd.h

@@ -99 +99 @@
                 authLength;
         char    path[HTTP_MAX_URL],
-                host[HTTP_MAX_URL], /* acv@acv.ca/wifidog: Added decoding
+                host[HTTP_MAX_URL], /* acv@acv.ca/wifidog: Added decoding
                                        of host: header if present. */
+                ifModified[HTTP_MAX_URL];
+#if(0)
                 userAgent[HTTP_MAX_URL],
                 referer[HTTP_MAX_URL],
-                ifModified[HTTP_MAX_URL],
                 contentType[HTTP_MAX_URL],
                 authUser[HTTP_MAX_AUTH],
                 authPassword[HTTP_MAX_AUTH];
+#endif
 } httpReq;
 

trunk/wifidog/src/fw_iptables.c

@@ -277 +277 @@
             /* TCPMSS rule for PPPoE */
                         iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m state --state INVALID -j DROP");
-                        iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m state --state RELATED,ESTABLISHED -j ACCEPT");
+
+                        /* XXX: Why this? it means that connections setup after authentication
+                           stay open even after the connection is done... 
+                           iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -m state --state RELATED,ESTABLISHED -j ACCEPT");*/
+
+
             if (ext_interface != NULL) {
                             iptables_do_command("-t filter -A " TABLE_WIFIDOG_WIFI_TO_INTERNET " -i %s -m state --state NEW,INVALID -j DROP", ext_interface);

trunk/wifidog/src/wdctl_thread.c

@@ -123 +123 @@
 
         while (1) {
-                memset(&sa_un, 0, sizeof(sa_un));
+                len = sizeof(sa_un); 
+                memset(&sa_un, 0, len);
                 if ((fd = accept(sock, (struct sockaddr *)&sa_un, &len)) == -1){
                         debug(LOG_ERR, "Accept failed on control socket: %s",