comm: Break out some common udp parts

Provide a section in comm-common.h which allows other comms to share
some of the work done in udp.c.  Specifically, we provide the new
concepts of `udpsocks' and `udpcommon'.

The port configuration parameter is lifted into the udp struct.

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

diff --git a/comm-common.h b/comm-common.h
index 2c2d26ab42e058c9d23abb9846c73fcc32a5c6ee..714a536b91e56c0a260be677ebc77149feaeb685 100644 (file)
--- a/comm-common.h
+++ b/comm-common.h
@@ -4,6 +4,8 @@
 
 #include "secnet.h"
 
+/*----- for all comms -----*/
+
 struct comm_notify_entry {
     comm_notify_fn *fn;
     void *state;
@@ -47,4 +49,39 @@ void comm_apply(struct commcommon *cc);
     dict_t *d=item->data.dict;                                         \
     (cc)->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,desc,(cc)->loc)
 
+/*----- for udp-based comms -----*/
+
+#define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
+
+struct udpsock {
+    union iaddr addr;
+    int fd;
+};
+
+struct udpsocks {
+    int n_socks;
+    struct udpsock socks[UDP_MAX_SOCKETS];
+};
+
+struct udpcommon {
+    struct commcommon cc;
+    int port;
+    string_t authbind;
+    bool_t use_proxy;
+    union iaddr proxy;
+};
+
+int udp_socks_beforepoll(struct udpsocks *s,
+                        struct pollfd *fds, int *nfds_io,
+                        int *timeout_io);
+
+void udp_socks_afterpoll(struct udpcommon *u, struct udpsocks *s,
+                        struct pollfd *fds, int nfds);
+
+#define UDP_APPLY_STANDARD(st,uc,desc)                                 \
+    (uc)->use_proxy=False;                                             \
+    (uc)->authbind=NULL;                                               \
+    (uc)->port=dict_read_number(d,"port",True,"udp",(uc)->cc.loc,0)
+    /* Expects in scope:  dict_t *d=...; */
+
 #endif /*COMM_COMMON_H*/

diff --git a/udp.c b/udp.c
index 318c9f40184e71e1710527cdb3a27eed971daf0b..dd80f8cfc54ea115bf3009cac10ba9667b09561f 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -29,26 +29,15 @@ static beforepoll_fn udp_beforepoll;
 static afterpoll_fn udp_afterpoll;
 static comm_sendmsg_fn udp_sendmsg;
 
-#define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
-
-struct udpsock {
-    union iaddr addr;
-    int fd;
-};
-
 struct udp {
-    struct commcommon cc;
-    int n_socks;
-    struct udpsock socks[UDP_MAX_SOCKETS];
-    string_t authbind;
-    bool_t use_proxy;
-    union iaddr proxy;
+    struct udpcommon uc;
+    struct udpsocks socks;
 };
 
 static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
 {
     struct udp *st=commst;
-    struct udp *socks=st; /* for now */
+    struct udpsocks *socks=&st->socks;
     static char sbuf[100];
     int ix=ca->ix>=0 ? ca->ix : 0;
 
@@ -60,12 +49,11 @@ static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
     return sbuf;
 }
 
-static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
-                         int *timeout_io)
+int udp_socks_beforepoll(struct udpsocks *socks,
+                        struct pollfd *fds, int *nfds_io,
+                        int *timeout_io)
 {
     int i;
-    struct udp *st=state;
-    struct udp *socks=st; /* for now */
     BEFOREPOLL_WANT_FDS(socks->n_socks);
     for (i=0; i<socks->n_socks; i++) {
        fds[i].fd=socks->socks[i].fd;
@@ -74,19 +62,25 @@ static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
     return 0;
 }
 
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
+static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
+                         int *timeout_io)
 {
     struct udp *st=state;
-    struct commcommon *cc=&st->cc;
-    struct udp *socks=st; /* for now */
-    struct udp *uc=st; /* for now */
+    return udp_socks_beforepoll(&st->socks,fds,nfds_io,timeout_io);
+}
+
+void udp_socks_afterpoll(struct udpcommon *uc, struct udpsocks *socks,
+                        struct pollfd *fds, int nfds)
+{
     union iaddr from;
     socklen_t fromlen;
     bool_t done;
     int rv;
     int i;
 
-    for (i=0; i<st->n_socks; i++) {
+    struct commcommon *cc=&uc->cc;
+
+    for (i=0; i<socks->n_socks; i++) {
        if (i>=nfds) continue;
        if (!(fds[i].revents & POLLIN)) continue;
        assert(fds[i].fd == socks->socks[i].fd);
@@ -146,12 +140,18 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
     }
 }
 
+static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
+{
+    struct udp *st=state;
+    return udp_socks_afterpoll(&st->uc,&st->socks,fds,nfds);
+}
+
 static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
                          const struct comm_addr *dest)
 {
     struct udp *st=commst;
-    struct udp *uc=st; /* for now */
-    struct udp *socks=st; /* for now */
+    struct udpcommon *uc=&st->uc;
+    struct udpsocks *socks=&st->socks;
     uint8_t *sa;
 
     if (uc->use_proxy) {
@@ -191,8 +191,9 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
 static void udp_make_socket(struct udp *st, struct udpsock *us)
 {
     const union iaddr *addr=&us->addr;
-    struct commcommon *cc=&st->cc; /* for now */
-    struct udp *uc=st; /* for now */
+    struct udpcommon *uc=&st->uc;
+    struct commcommon *cc=&uc->cc;
+
     us->fd=socket(addr->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
     if (us->fd<0) {
        fatal_perror("udp (%s:%d): socket",cc->loc.file,cc->loc.line);
@@ -279,7 +280,7 @@ static void udp_make_socket(struct udp *st, struct udpsock *us)
 static void udp_phase_hook(void *sst, uint32_t new_phase)
 {
     struct udp *st=sst;
-    struct udp *socks=st; /* for now */
+    struct udpsocks *socks=&st->socks;
     int i;
     for (i=0; i<socks->n_socks; i++)
        udp_make_socket(st,&socks->socks[i]);
@@ -291,35 +292,27 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
                         list_t *args)
 {
     struct udp *st;
-    item_t *item;
     list_t *caddrl;
-    dict_t *d;
     list_t *l;
     uint32_t a;
     int i;
 
-    COMM_APPLY(st,&st->cc,udp_,"udp",loc);
-    struct commcommon *cc=&st->cc; /* for now */
-    struct udp *uc=st; /* for now */
-    struct udp *socks=st; /* for now */
-    uc->use_proxy=False;
-
-    item=list_elem(args,0);
-    if (!item || item->type!=t_dict) {
-       cfgfatal(cc->loc,"udp","first argument must be a dictionary\n");
-    }
-    d=item->data.dict;
+    COMM_APPLY(st,&st->uc.cc,udp_,"udp",loc);
+    COMM_APPLY_STANDARD(st,&st->uc.cc,"udp",args);
+    UDP_APPLY_STANDARD(st,&st->uc,"udp");
 
-    int port=dict_read_number(d,"port",True,"udp",cc->loc,0);
+    struct udpcommon *uc=&st->uc;
+    struct udpsocks *socks=&st->socks;
+    struct commcommon *cc=&uc->cc;
 
     union iaddr defaultaddrs[] = {
 #ifdef CONFIG_IPV6
        { .sin6 = { .sin6_family=AF_INET6,
-                   .sin6_port=htons(port),
+                   .sin6_port=htons(uc->port),
                    .sin6_addr=IN6ADDR_ANY_INIT } },
 #endif
        { .sin = { .sin_family=AF_INET,
-                  .sin_port=htons(port),
+                  .sin_port=htons(uc->port),
                   .sin_addr= { .s_addr=INADDR_ANY } } }
     };
 
@@ -335,13 +328,12 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
        if (!list_length(caddrl)) {
            us->addr=defaultaddrs[i];
        } else {
-           text2iaddr(list_elem(caddrl,i),port,
+           text2iaddr(list_elem(caddrl,i),uc->port,
                       &us->addr,"udp");
        }
        us->fd=-1;
     }
 
-    cc->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",cc->loc);
     uc->authbind=dict_read_string(d,"authbind",False,"udp",cc->loc);
     l=dict_lookup(d,"proxy");
     if (l) {