Merged with v3.8

[libucw.git] / lib / ipaccess.c

diff --git a/lib/ipaccess.c b/lib/ipaccess.c
index dec639209390a6b59cfb2b814313c970789b7ef3..51d9eb586fe8e1859394b19ea02f78ec2d4b7193 100644 (file)
--- a/lib/ipaccess.c
+++ b/lib/ipaccess.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- IP address access lists
+ *     UCW Library -- IP address access lists
  *
  *     (c) 1997--2001 Martin Mares <mj@ucw.cz>
  *
@@ -14,6 +14,7 @@
 #include "lib/ipaccess.h"
 
 #include <string.h>
+#include <stdlib.h>
 
 struct ipaccess_list {
   list l;
@@ -61,19 +62,25 @@ parse_ip(byte *x, u32 *a)
 byte *
 ipaccess_parse(struct ipaccess_list *l, byte *c, int is_allow)
 {
-  byte *p = strchr(c, '/');
-  byte *q;
+  char *p = strchr(c, '/');
+  char *q;
   struct ipaccess_entry *a = cfg_malloc(sizeof(struct ipaccess_entry));
+  unsigned long pxlen;
 
   a->allow = is_allow;
+  a->mask = ~0U;
   if (p)
     {
       *p++ = 0;
-      if (q = parse_ip(p, &a->mask))
+      pxlen = strtoul(p, &q, 10);
+      if ((!q || !*q) && pxlen <= 32)
+       {
+         if (pxlen != 32)
+           a->mask = ~(~0U >> (uns) pxlen);
+       }
+      else if (q = parse_ip(p, &a->mask))
        return q;
     }
-  else
-    a->mask = ~0;
   add_tail(&l->l, &a->n);
   return parse_ip(c, &a->addr);
 }