util: Use BSD queue.h for phase hook lists

We are about to touch this code and would like something clearer to
work with.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/secnet.c b/secnet.c
index 024744c55e5c0ecdf84d0fc67381664ded27f67c..30db8e1878a66065cf97ba6e7d1c0aa0d0d379f2 100644 (file)
--- a/secnet.c
+++ b/secnet.c
@@ -475,6 +475,8 @@ int main(int argc, char **argv)
 {
     dict_t *config;
 
 {
     dict_t *config;
 

+    phase_hooks_init();
+

     enter_phase(PHASE_GETOPTS);
     parse_options(argc,argv);
 
     enter_phase(PHASE_GETOPTS);
     parse_options(argc,argv);
 

diff --git a/secnet.h b/secnet.h
index 7fbe157cfd1e231d4c0e00c16aa2ffc130c9f58b..54f5d073b8f27f8e3f6cccf62e6b016a883b5d51 100644 (file)
--- a/secnet.h
+++ b/secnet.h
@@ -268,6 +268,8 @@ bool_t remove_hook(uint32_t phase, hook_fn *f, void *state);
 extern uint32_t current_phase;
 extern void enter_phase(uint32_t new_phase);
 
 extern uint32_t current_phase;
 extern void enter_phase(uint32_t new_phase);
 

+void phase_hooks_init(void); /* for main() only */
+

 /* Some features (like netlink 'soft' routes) require that secnet
    retain root privileges.  They should indicate that here when
    appropriate. */
 /* Some features (like netlink 'soft' routes) require that secnet
    retain root privileges.  They should indicate that here when
    appropriate. */

diff --git a/util.c b/util.c
index 3ae5ff4612447e4388a31e2222ac2340c6327cbb..0f24282e772d17904092e5c5c7c9d1d465284fea 100644 (file)
--- a/util.c
+++ b/util.c
@@ -53,10 +53,10 @@ uint32_t current_phase=0;
 struct phase_hook {
     hook_fn *fn;
     void *state;
 struct phase_hook {
     hook_fn *fn;
     void *state;

-    struct phase_hook *next;
+    LIST_ENTRY(phase_hook) entry;

 };
 
 };
 

-static struct phase_hook *hooks[NR_PHASES]={NULL,};
+static LIST_HEAD(, phase_hook) hooks[NR_PHASES];

 
 char *safe_strdup(const char *s, const char *message)
 {
 
 char *safe_strdup(const char *s, const char *message)
 {


@@ -211,15 +211,22 @@ void enter_phase(uint32_t new_phase)
 {
     struct phase_hook *i;
 
 {
     struct phase_hook *i;
 

-    if (hooks[new_phase])
+    if (!LIST_EMPTY(&hooks[new_phase]))

        Message(M_DEBUG_PHASE,"Running hooks for %s...\n", phases[new_phase]);
     current_phase=new_phase;
 
        Message(M_DEBUG_PHASE,"Running hooks for %s...\n", phases[new_phase]);
     current_phase=new_phase;
 

-    for (i=hooks[new_phase]; i; i=i->next)
+    LIST_FOREACH(i, &hooks[new_phase], entry)

        i->fn(i->state, new_phase);
     Message(M_DEBUG_PHASE,"Now in %s\n",phases[new_phase]);
 }
 
        i->fn(i->state, new_phase);
     Message(M_DEBUG_PHASE,"Now in %s\n",phases[new_phase]);
 }
 

+void phase_hooks_init(void)
+{
+    int i;
+    for (i=0; i<NR_PHASES; i++)
+       LIST_INIT(&hooks[i]);
+}
+

 bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
 {
     struct phase_hook *h;
 bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
 {
     struct phase_hook *h;


@@ -227,8 +234,7 @@ bool_t add_hook(uint32_t phase, hook_fn *fn, void *state)
     h=safe_malloc(sizeof(*h),"add_hook");
     h->fn=fn;
     h->state=state;
     h=safe_malloc(sizeof(*h),"add_hook");
     h->fn=fn;
     h->state=state;

-    h->next=hooks[phase];
-    hooks[phase]=h;
+    LIST_INSERT_HEAD(&hooks[phase],h,entry);

     return True;
 }
 
     return True;
 }