MEDIUM: stream interface: move the peers' ptr into the applet context

A long time ago when peers were introduced, there was no applet nor
applet context. Applet contexts were introduced but the peers still
did not make use of them and the "ptr" pointer remains present in
every stream interface in addition to the other contexts.

Simply move this pointer to its own location in the context.

Note that this pointer is still a void* because its type and contents
varies depending on the peers session state. Probably that this could
be cleaned up in the future given that all other contexts already store
much more than a single pointer.

diff --git a/include/types/stream_interface.h b/include/types/stream_interface.h
index 9f8afefa980b1c3dfd97ae1b6a10d14d5929c862..84fec07651e7c443c659a513bbb0d6ab17524702 100644 (file)
--- a/include/types/stream_interface.h
+++ b/include/types/stream_interface.h
@@ -122,7 +122,6 @@ struct stream_interface {
                unsigned int st0;     /* CLI state for stats, session state for peers */
                unsigned int st1;     /* prompt for stats, session error for peers */
                unsigned int st2;     /* output state for stats, unused by peers  */
-               void *ptr;            /* struct peer for peers */
 
                union {
                        struct {
@@ -162,6 +161,9 @@ struct stream_interface {
                        struct {
                                const char *msg;        /* pointer to a persistent message to be returned in PRINT state */
                        } cli;
+                       struct {
+                               void *ptr;              /* multi-purpose pointer for peers */
+                       } peers;
                } ctx;                                  /* used by stats I/O handlers to dump the stats */
        } applet;
 };

diff --git a/src/peers.c b/src/peers.c
index 8a474ad429f6c99d172c1ebb4712862263c846f0..6ef4aa53d7abb80739a7cf526d2a17c6194af379 100644 (file)
--- a/src/peers.c
+++ b/src/peers.c
@@ -184,9 +184,9 @@ static int peer_prepare_datamsg(struct stksess *ts, struct peer_session *ps, cha
 static void peer_session_release(struct stream_interface *si)
 {
        struct session *s = session_from_task(si->owner);
-       struct peer_session *ps = (struct peer_session *)si->applet.ptr;
+       struct peer_session *ps = (struct peer_session *)si->applet.ctx.peers.ptr;
 
-       /* si->applet.ptr is not a peer session */
+       /* si->applet.ctx.peers.ptr is not a peer session */
        if (si->applet.st0 < PEER_SESSION_SENDSUCCESS)
                return;
 
@@ -225,7 +225,7 @@ static void peer_io_handler(struct stream_interface *si)
 switchstate:
                switch(si->applet.st0) {
                        case PEER_SESSION_ACCEPT:
-                               si->applet.ptr = NULL;
+                               si->applet.ctx.peers.ptr = NULL;
                                si->applet.st0 = PEER_SESSION_GETVERSION;
                                /* fall through */
                        case PEER_SESSION_GETVERSION:
@@ -331,12 +331,12 @@ switchstate:
                                        goto switchstate;
                                }
 
-                               si->applet.ptr = curpeer;
+                               si->applet.ctx.peers.ptr = curpeer;
                                si->applet.st0 = PEER_SESSION_GETTABLE;
                                /* fall through */
                        }
                        case PEER_SESSION_GETTABLE: {
-                               struct peer *curpeer = (struct peer *)si->applet.ptr;
+                               struct peer *curpeer = (struct peer *)si->applet.ctx.peers.ptr;
                                struct shared_table *st;
                                struct peer_session *ps = NULL;
                                unsigned long key_type;
@@ -347,12 +347,12 @@ switchstate:
                                if (reql <= 0) { /* closed or EOL not found */
                                        if (reql == 0)
                                                goto out;
-                                       si->applet.ptr = NULL;
+                                       si->applet.ctx.peers.ptr = NULL;
                                        si->applet.st0 = PEER_SESSION_END;
                                        goto switchstate;
                                }
-                               /* Re init si->applet.ptr to null, to handle correctly a release case */
-                               si->applet.ptr = NULL;
+                               /* Re init si->applet.ctx.peers.ptr to null, to handle correctly a release case */
+                               si->applet.ctx.peers.ptr = NULL;
 
                                if (trash.str[reql-1] != '\n') {
                                        /* Incomplete line, we quit */
@@ -378,7 +378,7 @@ switchstate:
 
                                p = strchr(p+1, ' ');
                                if (!p) {
-                                       si->applet.ptr = NULL;
+                                       si->applet.ctx.peers.ptr = NULL;
                                        si->applet.st0 = PEER_SESSION_EXIT;
                                        si->applet.st1 = PEER_SESSION_ERRPROTO;
                                        goto switchstate;
@@ -442,12 +442,12 @@ switchstate:
                                        goto switchstate;
                                }
 
-                               si->applet.ptr = ps;
+                               si->applet.ctx.peers.ptr = ps;
                                si->applet.st0 = PEER_SESSION_SENDSUCCESS;
                                /* fall through */
                        }
                        case PEER_SESSION_SENDSUCCESS:{
-                               struct peer_session *ps = (struct peer_session *)si->applet.ptr;
+                               struct peer_session *ps = (struct peer_session *)si->applet.ctx.peers.ptr;
 
                                repl = snprintf(trash.str, trash.size, "%d\n", PEER_SESSION_SUCCESSCODE);
                                repl = bi_putblk(si->ib, trash.str, repl);
@@ -497,7 +497,7 @@ switchstate:
                                goto switchstate;
                        }
                        case PEER_SESSION_CONNECT: {
-                               struct peer_session *ps = (struct peer_session *)si->applet.ptr;
+                               struct peer_session *ps = (struct peer_session *)si->applet.ctx.peers.ptr;
 
                                /* Send headers */
                                repl = snprintf(trash.str, trash.size,
@@ -527,7 +527,7 @@ switchstate:
                                /* fall through */
                        }
                        case PEER_SESSION_GETSTATUS: {
-                               struct peer_session *ps = (struct peer_session *)si->applet.ptr;
+                               struct peer_session *ps = (struct peer_session *)si->applet.ctx.peers.ptr;
 
                                if (si->ib->flags & CF_WRITE_PARTIAL)
                                        ps->statuscode = PEER_SESSION_CONNECTEDCODE;
@@ -598,7 +598,7 @@ switchstate:
                                /* fall through */
                        }
                        case PEER_SESSION_WAITMSG: {
-                               struct peer_session *ps = (struct peer_session *)si->applet.ptr;
+                               struct peer_session *ps = (struct peer_session *)si->applet.ctx.peers.ptr;
                                struct stksess *ts, *newts = NULL;
                                char c;
                                int totl = 0;
@@ -1072,7 +1072,7 @@ static void peer_session_forceshutdown(struct session * session)
        /* call release to reinit resync states if needed */
        peer_session_release(oldsi);
        oldsi->applet.st0 = PEER_SESSION_END;
-       oldsi->applet.ptr = NULL;
+       oldsi->applet.ctx.peers.ptr = NULL;
        task_wakeup(session->task, TASK_WOKEN_MSG);
 }
 
@@ -1087,7 +1087,7 @@ int peer_accept(struct session *s)
         /* we have a dedicated I/O handler for the stats */
        stream_int_register_handler(&s->si[1], &peer_applet);
        s->target = s->si[1].conn->target; // for logging only
-       s->si[1].applet.ptr = s;
+       s->si[1].applet.ctx.peers.ptr = s;
        s->si[1].applet.st0 = PEER_SESSION_ACCEPT;
 
        tv_zero(&s->logs.tv_request);
@@ -1179,7 +1179,7 @@ static struct session *peer_session_create(struct peer *peer, struct peer_sessio
 
        stream_int_register_handler(&s->si[0], &peer_applet);
        s->si[0].applet.st0 = PEER_SESSION_CONNECT;
-       s->si[0].applet.ptr = (void *)ps;
+       s->si[0].applet.ctx.peers.ptr = (void *)ps;
 
        s->si[1].conn->obj_type = OBJ_TYPE_CONN;
        s->si[1].conn->t.sock.fd = -1; /* just to help with debugging */