Changeset 1429

Timestamp:

11/04/09 09:21:07 (4 years ago)

Author:

gbastien

Message:

• Fix #625, does not display failure notice when quiet is set to true
• Fix #587, change index and rindex to strchr and strrchr
• Fix #548, trim leading spaces of the config file's options

Location:

trunk/wifidog

Files:

• ChangeLog (modified) (1 diff)
• libhttpd/api.c (modified) (11 diffs)
• libhttpd/ip_acl.c (modified) (1 diff)
• libhttpd/protocol.c (modified) (1 diff)
• src/conf.c (modified) (2 diffs)
• src/fw_iptables.c (modified) (1 diff)
• src/util.c (modified) (1 diff)

trunk/wifidog/ChangeLog

@@ -1 +1 @@
 # $Id$
+2009-11-03
+    * Fix #625, does not display failure notice when quiet is set to true
+    * Fix #587, change index and rindex to strchr and strrchr
+    * Fix #548, trim leading spaces of the config file's options
+
 2009-09-28 Benoit Grégoire  <benoitg@coeus.ca>
         * Fix #471, patch by  wichert

trunk/wifidog/libhttpd/api.c

@@ -472 +472 @@
                                         *end;
 
-                                var = index(buf,':');
+                                var = strchr(buf,':');
                                 while(var)
                                 {
                                         var++;
-                                        val = index(var, '=');
+                                        val = strchr(var, '=');
                                         *val = 0;
                                         val++;
-                                        end = index(val,';');
+                                        end = strchr(val,';');
                                         if(end)
                                                 *end = 0;
@@ -490 +490 @@
                         if (strncasecmp(buf,"Authorization: ",15) == 0)
                         {
-                                cp = index(buf,':') + 2;
+                                cp = strchr(buf,':') + 2;
                                 if (strncmp(cp,"Basic ", 6) != 0)
                                 {
@@ -499 +499 @@
                                         char    authBuf[100];
 
-                                        cp = index(cp,' ') + 1;
+                                        cp = strchr(cp,' ') + 1;
                                         _httpd_decode(cp, authBuf, 100);
                                         r->request.authLength = 
                                                 strlen(authBuf);
-                                        cp = index(authBuf,':');
+                                        cp = strchr(authBuf,':');
                                         if (cp)
                                         {
@@ -520 +520 @@
                         if (strncasecmp(buf,"Referer: ",9) == 0)
                         {
-                                cp = index(buf,':') + 2;
+                                cp = strchr(buf,':') + 2;
                                 if(cp)
                                 {
@@ -533 +533 @@
                         if (strncasecmp(buf,"Host: ",6) == 0)
                         {
-                                cp = index(buf,':');
+                                cp = strchr(buf,':');
                                 if(cp)
                                 {
@@ -546 +546 @@
                         if (strncasecmp(buf,"If-Modified-Since: ",19) == 0)
                         {
-                                cp = index(buf,':') + 2;
+                                cp = strchr(buf,':') + 2;
                                 if(cp)
                                 {
@@ -552 +552 @@
                                                 HTTP_MAX_URL);
                                         r->request.ifModified[HTTP_MAX_URL-1]=0;
-                                        cp = index(r->request.ifModified,
+                                        cp = strchr(r->request.ifModified,
                                                 ';');
                                         if (cp)
@@ -560 +560 @@
                         if (strncasecmp(buf,"Content-Type: ",14) == 0)
                         {
-                                cp = index(buf,':') + 2;
+                                cp = strchr(buf,':') + 2;
                                 if(cp)
                                 {
@@ -570 +570 @@
                         if (strncasecmp(buf,"Content-Length: ",16) == 0)
                         {
-                                cp = index(buf,':') + 2;
+                                cp = strchr(buf,':') + 2;
                                 if(cp)
                                         r->request.contentLength=atoi(cp);
@@ -599 +599 @@
         ** Process any URL data
         */
-        cp = index(r->request.path,'?');
+        cp = strchr(r->request.path,'?');
         if (cp != NULL)
         {
@@ -958 +958 @@
         strncpy(dirName, httpdRequestPath(r), HTTP_MAX_URL);
         dirName[HTTP_MAX_URL-1]=0;
-        cp = rindex(dirName, '/');
+        cp = strrchr(dirName, '/');
         if (cp == NULL)
         {

trunk/wifidog/libhttpd/ip_acl.c

@@ -53 +53 @@
         cp = val;
         res1 = atoi(cp);
-        cp = index(cp,'.');
+        cp = strchr(cp,'.');
         if (!cp)
                 return(-1);
         cp++;
         res2 = atoi(cp);
-        cp = index(cp,'.');
+        cp = strchr(cp,'.');
         if (!cp)
                 return(-1);
         cp++;
         res3 = atoi(cp);
-        cp = index(cp,'.');
+        cp = strchr(cp,'.');
         if (!cp)
                 return(-1);
         cp++;
         res4 = atoi(cp);
-        cp = index(cp,'/');
+        cp = strchr(cp,'/');
         if (!cp)
         {

trunk/wifidog/libhttpd/protocol.c

@@ -608 +608 @@
         struct  stat sbuf;
 
-        suffix = rindex(path, '.');
+        suffix = strrchr(path, '.');
         if (suffix != NULL)
         {

trunk/wifidog/src/conf.c

@@ -634 +634 @@
         FILE *fd;
         char line[MAX_BUF], *s, *p1, *p2;
-        int linenum = 0, opcode, value;
+        int linenum = 0, opcode, value, len;
 
         debug(LOG_INFO, "Reading configuration file '%s'", filename);
@@ -659 +659 @@
                 if (p1) {
                         p1++;
+
+                        // Trim leading spaces
+                        len = strlen(p1);
+                        while (*p1 && len) {
+                                if (*p1 == ' ')
+                                        p1++;
+                                else
+                                        break;
+                                len = strlen(p1);
+                        }
+
 
                         if ((p2 = strchr(p1, ' '))) {

trunk/wifidog/src/fw_iptables.c

@@ -113 +113 @@
         rc = execute(cmd, fw_quiet);
 
-        if (rc!=0)
-                debug(LOG_ERR, "iptables command failed(%d): %s", rc, cmd);
+        if (rc!=0) {
+                // If quiet, do not display the error
+                if (fw_quiet == 0)
+                        debug(LOG_ERR, "iptables command failed(%d): %s", rc, cmd);
+                else if (fw_quiet == 1)
+                        debug(LOG_DEBUG, "iptables command failed(%d): %s", rc, cmd);
+        }
 
         free(cmd);

trunk/wifidog/src/util.c

@@ -115 +115 @@
                 } else {
                         debug(LOG_ERR, "execvp() failed");
-                }
-                exit(1);
+                }
+                exit(1);
         }