Better encapsulation of the ipaccess filter.

diff --git a/lib/ipaccess.c b/lib/ipaccess.c
index 8a4841695fd8cce56187748fbd6120ea6aae4826..18b1383ae6e25b5024a7b4a651a927eb9d0fa6a7 100644 (file)
--- a/lib/ipaccess.c
+++ b/lib/ipaccess.c
@@ -5,22 +5,31 @@
  */
 
 #include "lib/lib.h"
+#include "lib/lists.h"
 #include "lib/conf.h"
 #include "lib/chartype.h"
 #include "lib/ipaccess.h"
 
 #include <string.h>
 
+struct ipaccess_list {
+  list l;
+};
+
 struct ipaccess_entry {
   node n;
   uns allow;
   u32 addr, mask;
 };
 
-void
-ipaccess_init(ipaccess_list *l)
+struct ipaccess_list *
+ipaccess_init(void)
 {
-  init_list(l);
+  /* Cannot use cfg_malloc() here as the pool can be uninitialized now */
+  struct ipaccess_list *l = malloc(sizeof(*l));
+
+  init_list(&l->l);
+  return l;
 }
 
 static byte *
@@ -47,7 +56,7 @@ parse_ip(byte *x, u32 *a)
 }
 
 byte *
-ipaccess_parse(ipaccess_list *l, byte *c, int is_allow)
+ipaccess_parse(struct ipaccess_list *l, byte *c, int is_allow)
 {
   byte *p = strchr(c, '/');
   byte *q;
@@ -62,16 +71,16 @@ ipaccess_parse(ipaccess_list *l, byte *c, int is_allow)
     }
   else
     a->mask = ~0;
-  add_tail(l, &a->n);
+  add_tail(&l->l, &a->n);
   return parse_ip(c, &a->addr);
 }
 
 int
-ipaccess_check(ipaccess_list *l, u32 ip)
+ipaccess_check(struct ipaccess_list *l, u32 ip)
 {
   struct ipaccess_entry *a;
 
-  DO_FOR_ALL(a, *l)
+  DO_FOR_ALL(a, l->l)
     if (! ((ip ^ a->addr) & a->mask))
       return a->allow;
   return 0;

diff --git a/lib/ipaccess.h b/lib/ipaccess.h
index fefd34a8b78f657738ccc8283054106c99dd7eaa..e9c85b2ad4cb1645a9686af7da8c4b5dd2d525bf 100644 (file)
--- a/lib/ipaccess.h
+++ b/lib/ipaccess.h
@@ -4,10 +4,8 @@
  *     (c) 1997--2001 Martin Mares <mj@ucw.cz>
  */
 
-#include "lib/lists.h"
+struct ipaccess_list;
 
-typedef list ipaccess_list;
-
-void ipaccess_init(ipaccess_list *l);
-byte *ipaccess_parse(ipaccess_list *l, byte *c, int is_allow);
-int ipaccess_check(ipaccess_list *l, u32 ip);
+struct ipaccess_list *ipaccess_init(void);
+byte *ipaccess_parse(struct ipaccess_list *l, byte *c, int is_allow);
+int ipaccess_check(struct ipaccess_list *l, u32 ip);