From 763e458ff3a1cb4f9d11226db91f17069f7b8f7a Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 21 Sep 2014 16:11:16 +0100 Subject: [PATCH] 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 --- comm-common.h | 40 ++++++++++++++++++++++++++ udp.c | 79 +++++++++++++++++++++++++-------------------------- 2 files changed, 78 insertions(+), 41 deletions(-) diff --git a/comm-common.h b/comm-common.h index 77ac840..ba49254 100644 --- 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; @@ -56,4 +58,42 @@ void comm_apply(struct commcommon *cc, void *st); * // dict_t *dict = ; */ +/*----- 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=dict_read_string(d,"authbind",False,"udp",(uc)->cc.loc); \ + (uc)->port=dict_read_number(d,"port",True,"udp",(uc)->cc.loc,0) + /* void UDP_APPLY_STANDARD(SOMETHING *st, struct udpcommon *uc, + * const char *desc); + * // Expects in scope: dict_t *d=...; as from COMM_APPLY_STANDARD + */ + #endif /*COMM_COMMON_H*/ diff --git a/udp.c b/udp.c index 63851fe..9101e49 100644 --- a/udp.c +++ b/udp.c @@ -29,20 +29,9 @@ 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; }; /* @@ -60,7 +49,7 @@ struct udp { 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; @@ -72,12 +61,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; in_socks; i++) { fds[i].fd=socks->socks[i].fd; @@ -86,19 +74,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; in_socks; i++) { + struct commcommon *cc=&uc->cc; + + for (i=0; in_socks; i++) { if (i>=nfds) continue; if (!(fds[i].revents & POLLIN)) continue; assert(fds[i].fd == socks->socks[i].fd); @@ -155,12 +149,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) { @@ -200,8 +200,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); @@ -288,7 +289,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; in_socks; i++) udp_make_socket(st,&socks->socks[i]); @@ -305,25 +306,22 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, 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; - - COMM_APPLY_STANDARD(st,&st->cc,"udp",args); + 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 } } } }; @@ -338,12 +336,11 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, if (!list_length(caddrl)) { us->addr=defaultaddrs[i]; } else { - string_item_to_iaddr(list_elem(caddrl,i),port,&us->addr,"udp"); + string_item_to_iaddr(list_elem(caddrl,i),uc->port,&us->addr,"udp"); } us->fd=-1; } - uc->authbind=dict_read_string(d,"authbind",False,"udp",cc->loc); l=dict_lookup(d,"proxy"); if (l) { uc->use_proxy=True; -- 2.30.2