X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=6742dad52de4d000b3b2476040c1dd2cca148aaa;hp=e34336c77e4cc171f69555ad87b00d1e6f762e5d;hb=94ca562bb14422940ff1986ce8dfca87c222cb59;hpb=6f146b5d44db84d647d18805ca58586e1555a0a4 diff --git a/util.c b/util.c index e34336c..6742dad 100644 --- 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 *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) { @@ -177,13 +177,17 @@ int32_t write_mpbin(MP_INT *a, uint8_t *buffer, int32_t buflen) return i; } -void setcloexec(int fd) { - int r=fcntl(fd, F_GETFD); - if (r<0) fatal_perror("fcntl(,F_GETFD) failed"); - r=fcntl(fd, F_SETFD, r|FD_CLOEXEC); - if (r<0) fatal_perror("fcntl(,F_SETFD,|FD_CLOEXEC) failed"); +#define DEFINE_SETFDFLAG(fn,FL,FLAG) \ +void fn(int fd) { \ + int r=fcntl(fd, F_GET##FL); \ + if (r<0) fatal_perror("fcntl(,F_GET" #FL ") failed"); \ + r=fcntl(fd, F_SET##FL, r|FLAG); \ + if (r<0) fatal_perror("fcntl(,F_SET" #FL ",|" #FLAG ") failed"); \ } +DEFINE_SETFDFLAG(setcloexec,FD,FD_CLOEXEC); +DEFINE_SETFDFLAG(setnonblock,FL,O_NONBLOCK); + void pipe_cloexec(int fd[2]) { int r=pipe(fd); if (r) fatal_perror("pipe"); @@ -200,31 +204,46 @@ static const char *phases[NR_PHASES]={ "PHASE_GETRESOURCES", "PHASE_DROPPRIV", "PHASE_RUN", - "PHASE_SHUTDOWN" + "PHASE_SHUTDOWN", + "PHASE_CHILDPERSIST" }; void enter_phase(uint32_t new_phase) { 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; - 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]); } +void phase_hooks_init(void) +{ + int i; + for (i=0; ifn=fn; h->state=state; - h->next=hooks[phase]; - hooks[phase]=h; + LIST_INSERT_HEAD(&hooks[phase],h,entry); return True; } @@ -281,6 +300,14 @@ void buffer_init(struct buffer_if *buffer, int32_t max_start_pad) 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)); @@ -371,7 +398,7 @@ static list_t *buffer_apply(closure_t *self, struct cloc loc, dict_t *context, bool_t lockdown=False; uint32_t len=DEFAULT_BUFFER_SIZE; - st=safe_malloc(sizeof(*st),"buffer_apply"); + NEW(st); st->cl.description="buffer"; st->cl.type=CL_BUFFER; st->cl.apply=NULL; @@ -499,6 +526,7 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia, ia->sin.sin_family=AF_INET; ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc); + ia->sin.sin_port=htons(port); #else /* CONFIG_IPV6 => we have adns_text2addr */ @@ -515,33 +543,27 @@ void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia, #endif /* CONFIG_IPV6 */ } -#define IADDR_NBUFS_SHIFT 3 -#define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT) +#define IADDR_NBUFS 8 const char *iaddr_to_string(const union iaddr *ia) { - static int b; - - b++; - b &= IADDR_NBUFS-1; - #ifndef CONFIG_IPV6 - static char bufs[IADDR_NBUFS][100]; + SBUF_DEFINE(IADDR_NBUFS, 100); assert(ia->sa.sa_family == AF_INET); - snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d", + snprintf(SBUF, sizeof(SBUF), "[%s]:%d", inet_ntoa(ia->sin.sin_addr), ntohs(ia->sin.sin_port)); #else /* CONFIG_IPV6 => we have adns_addr2text */ - static char bufs[IADDR_NBUFS][1+ADNS_ADDR2TEXT_BUFLEN+20]; + SBUF_DEFINE(IADDR_NBUFS, 1+ADNS_ADDR2TEXT_BUFLEN+20); int port; - char *addrbuf = bufs[b]; + char *addrbuf = SBUF; *addrbuf++ = '['; int addrbuflen = ADNS_ADDR2TEXT_BUFLEN; @@ -549,7 +571,7 @@ const char *iaddr_to_string(const union iaddr *ia) if (r) { const char fmt[]= "scoped IPv6 addr, error: %.*s"; sprintf(addrbuf, fmt, - ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt) /* underestimate */, + (int)(ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt)) /* underestimate */, strerror(r)); } @@ -557,26 +579,29 @@ const char *iaddr_to_string(const union iaddr *ia) int addrl = strlen(addrbuf); portbuf += addrl; - snprintf(portbuf, sizeof(bufs[b])-addrl, "]:%d", port); + snprintf(portbuf, sizeof(SBUF)-addrl, "]:%d", port); #endif /* CONFIG_IPV6 */ - return bufs[b]; + return SBUF; } -bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib) +bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib, + bool_t ignoreport) { if (ia->sa.sa_family != ib->sa.sa_family) return 0; switch (ia->sa.sa_family) { case AF_INET: return ia->sin.sin_addr.s_addr == ib->sin.sin_addr.s_addr - && ia->sin.sin_port == ib->sin.sin_port; + && (ignoreport || + ia->sin.sin_port == ib->sin.sin_port); #ifdef CONFIG_IPV6 case AF_INET6: return !memcmp(&ia->sin6.sin6_addr, &ib->sin6.sin6_addr, 16) - && ia->sin6.sin6_scope_id == ib->sin6.sin6_scope_id - && ia->sin6.sin6_port == ib->sin6.sin6_port + && ia->sin6.sin6_scope_id == ib->sin6.sin6_scope_id + && (ignoreport || + ia->sin6.sin6_port == ib->sin6.sin6_port) /* we ignore the flowinfo field */; #endif /* CONFIG_IPV6 */ default: @@ -594,3 +619,97 @@ int iaddr_socklen(const union iaddr *ia) default: abort(); } } + +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) +{ + int revents=pfd->revents; + +#define BAD(m) do{ *emsg_out=(m); return async_linebuf_broken; }while(0) + + const char *badbit=pollbadbit(revents); + if (badbit) BAD(badbit); + + if (!(revents & POLLIN)) + return async_linebuf_nothing; + + /* + * Data structure: A line which has been returned to the user is + * stored in buf at base before start. But we retain the usual + * buffer meaning of size. So: + * + * | returned : | input read, | unused | + * | to user : \0 | awaiting | buffer | + * | : | processing | space | + * | : | | | + * ^base ^start ^start+size ^base+alloclen + */ + + BUF_ASSERT_USED(buf); + + /* firstly, eat any previous */ + if (buf->start != buf->base) { + memmove(buf->base,buf->start,buf->size); + buf->start=buf->base; + } + + uint8_t *searched=buf->base; + + /* + * During the workings here we do not use start. We set start + * when we return some actual data. So we have this: + * + * | searched | read, might | unused | + * | for \n | contain \n | buffer | + * | none found | but not \0 | space | + * | | | | + * ^base ^searched ^base+size ^base+alloclen + * [^start] ^dataend + * + */ + for (;;) { + uint8_t *dataend=buf->base+buf->size; + char *newline=memchr(searched,'\n',dataend-searched); + if (newline) { + *newline=0; + buf->start=newline+1; + buf->size=dataend-buf->start; + return async_linebuf_ok; + } + searched=dataend; + ssize_t space=(buf->base+buf->alloclen)-dataend; + if (!space) BAD("input line too long"); + ssize_t r=read(pfd->fd,searched,space); + if (r==0) { + *searched=0; + *emsg_out=buf->size?"no newline at eof":0; + buf->start=searched+1; + buf->size=0; + return async_linebuf_eof; + } + if (r<0) { + if (errno==EINTR) + continue; + if (iswouldblock(errno)) + return async_linebuf_nothing; + BAD(strerror(errno)); + } + assert(r<=space); + if (memchr(searched,0,r)) BAD("nul in input data"); + buf->size+=r; + } + +#undef BAD +}