X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=udp.c;h=bbf8c64163dbd8815001493c90a12d8f8cac30c9;hp=add7d8d726c5392267a99cce92d5697e4c890aaa;hb=92a7d254975db245c3320855515bffc1aebda9e4;hpb=fe5e9cc422cd72526ccfceffbc7e5af8ac83b407 diff --git a/udp.c b/udp.c index add7d8d..bbf8c64 100644 --- a/udp.c +++ b/udp.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include "util.h" #include "unaligned.h" #include "ipaddr.h" @@ -36,6 +38,7 @@ struct udp { closure_t cl; struct comm_if ops; struct cloc loc; + uint32_t addr; uint16_t port; int fd; string_t authbind; @@ -45,9 +48,32 @@ struct udp { struct sockaddr_in proxy; }; +static const char *saddr_to_string(const struct sockaddr_in *sin) { + static char bufs[2][100]; + static int b; + + b ^= 1; + snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d", + inet_ntoa(sin->sin_addr), + ntohs(sin->sin_port)); + return bufs[b]; +} + +static const char *addr_to_string(void *commst, const struct comm_addr *ca) { + struct udp *st=commst; + static char sbuf[100]; + + struct sockaddr_in la; + la.sin_addr.s_addr=htonl(st->addr); + la.sin_port=htons(st->port); + + snprintf(sbuf, sizeof(sbuf), "udp:%s-%s", + saddr_to_string(&la), saddr_to_string(&ca->sin)); + return sbuf; +} + static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io, - int *timeout_io, const struct timeval *tv, - uint64_t *now) + int *timeout_io) { struct udp *st=state; if (*nfds_io<1) { @@ -60,18 +86,18 @@ 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, - const struct timeval *tv, uint64_t *now) +static void udp_afterpoll(void *state, struct pollfd *fds, int nfds) { struct udp *st=state; struct sockaddr_in from; - int fromlen; + socklen_t fromlen; struct notify_list *n; bool_t done; int rv; if (nfds && (fds->revents & POLLIN)) { do { + FILLZERO(from); fromlen=sizeof(from); BUF_ASSERT_FREE(st->rbuf); BUF_ALLOC(st->rbuf,"udp_afterpoll"); @@ -96,7 +122,11 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds, } done=False; for (n=st->notify; n; n=n->next) { - if (n->fn(n->state, st->rbuf, &from)) { + struct comm_addr ca; + FILLZERO(ca); + ca.comm=&st->ops; + ca.sin=from; + if (n->fn(n->state, st->rbuf, &ca)) { done=True; break; } @@ -157,21 +187,21 @@ static void release_notify(void *commst, void *nst, comm_notify_fn *fn) } static bool_t udp_sendmsg(void *commst, struct buffer_if *buf, - struct sockaddr_in *dest) + const struct comm_addr *dest) { struct udp *st=commst; uint8_t *sa; if (st->use_proxy) { sa=buf->start-8; - memcpy(sa,&dest->sin_addr,4); + memcpy(sa,&dest->sin.sin_addr,4); memset(sa+4,0,4); - memcpy(sa+6,&dest->sin_port,2); + memcpy(sa+6,&dest->sin.sin_port,2); sendto(st->fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy, sizeof(st->proxy)); } else { sendto(st->fd, buf->start, buf->size, 0, - (struct sockaddr *)dest, sizeof(*dest)); + (struct sockaddr *)&dest->sin, sizeof(dest->sin)); } return True; @@ -182,7 +212,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase) struct udp *st=sst; struct sockaddr_in addr; - st->fd=socket(AF_INET, SOCK_DGRAM, 0); + st->fd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); if (st->fd<0) { fatal_perror("udp (%s:%d): socket",st->loc.file,st->loc.line); } @@ -195,8 +225,9 @@ static void udp_phase_hook(void *sst, uint32_t new_phase) st->loc.file,st->loc.line); } - memset(&addr, 0, sizeof(addr)); + FILLZERO(addr); addr.sin_family=AF_INET; + addr.sin_addr.s_addr=htonl(st->addr); addr.sin_port=htons(st->port); if (st->authbind) { pid_t c; @@ -209,23 +240,29 @@ static void udp_phase_hook(void *sst, uint32_t new_phase) fatal_perror("udp_phase_hook: fork() for authbind"); } if (c==0) { - char *argv[4]; + char *argv[4], addrstr[9], portstr[5]; + sprintf(addrstr,"%08lX",(long)addr.sin_addr.s_addr); + sprintf(portstr,"%04X",addr.sin_port); argv[0]=st->authbind; - argv[1]=strdup("00000000"); - if (!argv[1]) exit(ENOMEM); - argv[2]=alloca(8); - if (!argv[2]) exit(ENOMEM); - sprintf(argv[2],"%04X",htons(st->port)); + argv[1]=addrstr; + argv[2]=portstr; argv[3]=NULL; dup2(st->fd,0); execvp(st->authbind,argv); - exit(ENOEXEC); + _exit(255); } - waitpid(c,&status,0); - if (WEXITSTATUS(status)!=0) { - errno=WEXITSTATUS(status); + while (waitpid(c,&status,0)==-1) { + if (errno==EINTR) continue; fatal_perror("udp (%s:%d): authbind",st->loc.file,st->loc.line); } + if (WIFSIGNALED(status)) { + fatal("udp (%s:%d): authbind died on signal %d",st->loc.file, + st->loc.line, WTERMSIG(status)); + } + if (WIFEXITED(status) && WEXITSTATUS(status)!=0) { + fatal("udp (%s:%d): authbind died with status %d",st->loc.file, + st->loc.line, WEXITSTATUS(status)); + } } else { if (bind(st->fd, (struct sockaddr *)&addr, sizeof(addr))!=0) { fatal_perror("udp (%s:%d): bind",st->loc.file,st->loc.line); @@ -239,7 +276,7 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, list_t *args) { struct udp *st; - item_t *i; + item_t *i,*j; dict_t *d; list_t *l; uint32_t a; @@ -256,6 +293,7 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, st->ops.request_notify=request_notify; st->ops.release_notify=release_notify; st->ops.sendmsg=udp_sendmsg; + st->ops.addr_to_string=addr_to_string; st->port=0; st->use_proxy=False; @@ -265,13 +303,15 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, } d=i->data.dict; + j=dict_find_item(d,"address",False,"udp",st->loc); + st->addr=j?string_item_to_ipaddr(j, "udp"):INADDR_ANY; st->port=dict_read_number(d,"port",True,"udp",st->loc,0); st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc); st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc); l=dict_lookup(d,"proxy"); if (l) { st->use_proxy=True; - memset(&st->proxy,0,sizeof(st->proxy)); + FILLZERO(st->proxy); st->proxy.sin_family=AF_INET; i=list_elem(l,0); if (!i || i->type!=t_string) { @@ -292,7 +332,6 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context, return new_closure(&st->cl); } -init_module udp_module; void udp_module(dict_t *dict) { add_closure(dict,"udp",udp_apply);