polypath: Provide polypath comm module

[secnet] / util.c

diff --git a/util.c b/util.c
index 3ae5ff4612447e4388a31e2222ac2340c6327cbb..c459f1340a6d406caf528eebf2f777e173ed3a76 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;
 }
 


@@ -285,6 +291,14 @@ void buffer_init(struct buffer_if *buffer, int32_t max_start_pad)
     buffer->size=0;
 }
 
     buffer->size=0;
 }
 

+void buffer_destroy(struct buffer_if *buf)
+{
+    BUF_ASSERT_FREE(buf);
+    free(buf->base);
+    buf->start=buf->base=0;
+    buf->size=buf->alloclen=0;
+}
+

 void *buf_append(struct buffer_if *buf, int32_t amount) {
     void *p;
     assert(amount <= buf_remaining_space(buf));
 void *buf_append(struct buffer_if *buf, int32_t amount) {
     void *p;
     assert(amount <= buf_remaining_space(buf));


@@ -599,6 +613,17 @@ int iaddr_socklen(const union iaddr *ia)
     }
 }
 
     }
 }
 

+const char *pollbadbit(int revents)
+{
+#define BADBIT(b) \
+    if ((revents & b)) return #b
+    BADBIT(POLLERR);
+    BADBIT(POLLHUP);
+    /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
+#undef BADBIT
+    return 0;
+}
+

 enum async_linebuf_result
 async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
                   const char **emsg_out)
 enum async_linebuf_result
 async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
                   const char **emsg_out)


@@ -606,12 +631,9 @@ async_linebuf_read(struct pollfd *pfd, struct buffer_if *buf,
     int revents=pfd->revents;
 
 #define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0)
     int revents=pfd->revents;
 
 #define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0)

-#define BADBIT(b) \
-    if (!(revents & b)) ; else BAD(#b)
-    BADBIT(POLLERR);
-    BADBIT(POLLHUP);
-    /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
-#undef BADBIT
+
+    const char *badbit=pollbadbit(revents);
+    if (badbit) BAD(badbit);

 
     if (!(revents & POLLIN))
        return async_linebuf_nothing;
 
     if (!(revents & POLLIN))
        return async_linebuf_nothing;