Changeset 729 for branches/ithildin-1.1

Timestamp:

05/12/06 01:42:19 (6 years ago)

Author:

wd

Message:

ACLs should use lists, not tailqs. This is old bogus stuff from a previous
incarnation of this code that never got fixed...

Location:

branches/ithildin-1.1/modules/ircd/addons

Files:

• acl.c (modified) (13 diffs)
• acl.h (modified) (1 diff)

branches/ithildin-1.1/modules/ircd/addons/acl.c

@@ -45 +45 @@
     acl_t *ap, *ap2;
     char *at, hostcopy[USERLEN + HOSTLEN + 2];
-    struct acl_tq *list;
+    struct acl_list *list;
     
     if ((ap = find_acl(stage, host, type, NULL, NULL)) != NULL) {
@@ -90 +90 @@
         list = acl.stage3_list;
 
-    if (TAILQ_EMPTY(list))
-        TAILQ_INSERT_HEAD(list, ap, intlp);
+    if (LIST_EMPTY(list))
+        LIST_INSERT_HEAD(list, ap, intlp);
     else {
-        TAILQ_FOREACH(ap2, list, intlp) {
+        LIST_FOREACH(ap2, list, intlp) {
             if (ap2->rule > ap->rule) {
-                TAILQ_INSERT_BEFORE(ap2, ap, intlp);
+                LIST_INSERT_BEFORE(ap2, ap, intlp);
                 break;
-            }
-        }
-        if (ap2 == NULL)
-            TAILQ_INSERT_TAIL(list, ap, intlp);
+            } else if (LIST_NEXT(ap2, intlp) == NULL)
+                LIST_INSERT_AFTER(ap2, ap, intlp);
+        }
     }
 
@@ -155 +154 @@
 acl_t *find_acl(int stage, char *hostmask, const char *type, char *pass,
         char *info) {
-    struct acl_tq *list;
+    struct acl_list *list;
     char *at, hostcopy[USERLEN + HOSTLEN + 2], user[USERLEN + 1];
     char host[HOSTLEN + 1];
@@ -180 +179 @@
 
     /* now try and find them in the bucket. */
-    TAILQ_FOREACH(ap, list, intlp) {
+    LIST_FOREACH(ap, list, intlp) {
         if (!strcasecmp(ap->user, user) && !strcasecmp(ap->host, host) &&
                 !strcasecmp(ap->type, type) &&
@@ -202 +201 @@
     /* and remove it from whatever list it's in */
     if (ap->stage == ACL_STAGE_CONNECT)
-        TAILQ_REMOVE(acl.stage1_list, ap, intlp);
+        LIST_REMOVE(ap, intlp);
     else if (ap->stage == ACL_STAGE_PREREG)
-        TAILQ_REMOVE(acl.stage2_list, ap, intlp);
+        LIST_REMOVE(ap, intlp);
     else
-        TAILQ_REMOVE(acl.stage3_list, ap, intlp);
+        LIST_REMOVE(ap, intlp);
 
     /* now free the memory */
@@ -310 +309 @@
     /* now match.  skip over any entries that aren't the default hash or our
      * hash. */
-    TAILQ_FOREACH(ap, acl.stage1_list, intlp) {
+    LIST_FOREACH(ap, acl.stage1_list, intlp) {
         if (ap->hash != hash && ap->hash != ACL_DEFAULT_HASH)
             continue;
@@ -349 +348 @@
      * and the ip (using hostmatch and ipmatch).  All together that is four
      * calls.  Also, our hash space is expanded. */
-    TAILQ_FOREACH(ap, acl.stage2_list, intlp) {
+    LIST_FOREACH(ap, acl.stage2_list, intlp) {
         if (ap->hash != hash && ap->hash != iphash &&
                 ap->hash != ACL_DEFAULT_HASH)
@@ -395 +394 @@
      * aren't allowed because of a class being full we actually have to keep on
      * looking to see if they fit in somewhere else. blechhh. */
-    TAILQ_FOREACH(ap, acl.stage3_list, intlp) {
+    LIST_FOREACH(ap, acl.stage3_list, intlp) {
         if (ap->hash != hash && ap->hash != iphash &&
                 ap->hash != ACL_DEFAULT_HASH)
@@ -442 +441 @@
     }
 
-    if (ret == NULL && !TAILQ_EMPTY(acl.stage3_list))
+    if (ret == NULL && !LIST_EMPTY(acl.stage3_list))
         return "You are not authorised to use this server.";
     return ret;
@@ -611 +610 @@
      * for ACLs based on four parameters: mask, stage, access, and type. */
     acl_t *ap;
-    struct acl_tq *list;
+    struct acl_list *list;
     char rpl[XINFO_LEN];
     char *mask = NULL, *type = NULL;
@@ -684 +683 @@
     }
     while (list != NULL) {
-        TAILQ_FOREACH(ap, list, intlp) {
+        LIST_FOREACH(ap, list, intlp) {
             if (acc != -1 && ap->access != acc)
                 continue;
@@ -733 +732 @@
 
     LIST_ALLOC(acl.list);
-    TAILQ_ALLOC(acl.stage1_list);
-    TAILQ_ALLOC(acl.stage2_list);
-    TAILQ_ALLOC(acl.stage3_list);
+    LIST_ALLOC(acl.stage1_list);
+    LIST_ALLOC(acl.stage2_list);
+    LIST_ALLOC(acl.stage3_list);
 
     add_xinfo_handler(xinfo_acl_handler, "ACL", XINFO_HANDLER_OPER, NULL,
@@ -755 +754 @@
         destroy_acl(LIST_FIRST(acl.list));
     LIST_FREE(acl.list);
-    TAILQ_FREE(acl.stage1_list);
-    TAILQ_FREE(acl.stage2_list);
-    TAILQ_FREE(acl.stage3_list);
+    LIST_FREE(acl.stage1_list);
+    LIST_FREE(acl.stage2_list);
+    LIST_FREE(acl.stage3_list);
 
     remove_xinfo_handler(xinfo_acl_handler);

branches/ithildin-1.1/modules/ircd/addons/acl.h

@@ -47 +47 @@
                                        NULL otherwise. */
 
-    TAILQ_ENTRY(acl) intlp;         /* list pointers.  intlp is for internal */
-    LIST_ENTRY(acl) lp;             /* use.  lp is part of 'the big list'. */
+    LIST_ENTRY(acl) intlp;          /* list pointers.  intlp is for internal
+                                       (stage-segregated) lists */
+    LIST_ENTRY(acl) lp;             /* lp is for the 'big list'. */
 } acl_t;
 
-TAILQ_HEAD(acl_tq, acl);
+LIST_HEAD(acl_list, acl);
 
 extern struct acl_module_data {
-    struct acl_tq *stage1_list;
-    struct acl_tq *stage2_list;
-    struct acl_tq *stage3_list;
-    LIST_HEAD(, acl) *list;
+    struct acl_list *stage1_list;
+    struct acl_list *stage2_list;
+    struct acl_list *stage3_list;
+    struct acl_list *list;
 
     unsigned short default_rule;