X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=util.c;h=2299f724e7cdf66bc4483f8f88f7cd735aecf041;hp=8c23485c059581cbb2aef2c1d8c40628dbaeecaa;hb=44db09d60d8f3a3427c35c9269d6ac085812912d;hpb=3abd18e85781e00e2b7fc641f29c99e130238abf diff --git a/util.c b/util.c index 8c23485..2299f72 100644 --- a/util.c +++ b/util.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "util.h" #include "unaligned.h" #include "magic.h" @@ -162,6 +163,21 @@ 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 |= FD_CLOEXEC; + r=fcntl(fd, F_SETFD, r|FD_CLOEXEC); + if (r<0) fatal_perror("fcntl(,F_SETFD,|FD_CLOEXEC) failed"); +} + +void pipe_cloexec(int fd[2]) { + int r=pipe(fd); + if (r) fatal_perror("pipe"); + setcloexec(fd[0]); + setcloexec(fd[1]); +} + static const char *phases[NR_PHASES]={ "PHASE_INIT", "PHASE_GETOPTS", @@ -247,14 +263,14 @@ void buffer_assert_used(struct buffer_if *buffer, cstring_t file, void buffer_init(struct buffer_if *buffer, int32_t max_start_pad) { - assert(max_start_pad<=buffer->len); + assert(max_start_pad<=buffer->alloclen); buffer->start=buffer->base+max_start_pad; buffer->size=0; } void *buf_append(struct buffer_if *buf, int32_t amount) { void *p; - assert(buf->size <= buf->len - amount); + assert(amount <= buf_remaining_space(buf)); p=buf->start + buf->size; buf->size+=amount; return p; @@ -300,7 +316,7 @@ void buffer_new(struct buffer_if *buf, int32_t len) buf->loc.file=NULL; buf->loc.line=0; buf->size=0; - buf->len=len; + buf->alloclen=len; buf->start=NULL; buf->base=safe_malloc(len,"buffer_new"); } @@ -312,7 +328,7 @@ void buffer_readonly_view(struct buffer_if *buf, const void *data, int32_t len) buf->flags=0; buf->loc.file=NULL; buf->loc.line=0; - buf->size=buf->len=len; + buf->size=buf->alloclen=len; buf->base=buf->start=(uint8_t*)data; } @@ -323,10 +339,10 @@ void buffer_readonly_clone(struct buffer_if *out, const struct buffer_if *in) void buffer_copy(struct buffer_if *dst, const struct buffer_if *src) { - if (dst->len < src->len) { - dst->base=realloc(dst->base,src->len); + if (dst->alloclen < src->alloclen) { + dst->base=realloc(dst->base,src->alloclen); if (!dst->base) fatal_perror("buffer_copy"); - dst->len = src->len; + dst->alloclen = src->alloclen; } dst->start = dst->base + (src->start - src->base); dst->size = src->size; @@ -394,7 +410,7 @@ void send_nak(const struct comm_addr *dest, uint32_t our_index, if (logwhy) Message(M_INFO,"%s: %08"PRIx32"<-%08"PRIx32": %08"PRIx32":" " %s; sending NAK\n", - dest->comm->addr_to_string(dest->comm->st,dest), + comm_addr_to_string(dest), our_index, their_index, msgtype, logwhy); dest->comm->sendmsg(dest->comm->st, buf, dest); } @@ -435,3 +451,110 @@ int32_t calculate_max_start_pad(void) transform_max_start_pad + comm_max_start_pad; } + +void vslilog_part(struct log_if *lf, int priority, const char *message, va_list ap) +{ + char *buff=lf->buff; + size_t bp; + char *nlp; + + bp=strlen(buff); + assert(bp < LOG_MESSAGE_BUFLEN); + vsnprintf(buff+bp,LOG_MESSAGE_BUFLEN-bp,message,ap); + buff[LOG_MESSAGE_BUFLEN-1] = '\n'; + buff[LOG_MESSAGE_BUFLEN] = '\0'; + /* Each line is sent separately */ + while ((nlp=strchr(buff,'\n'))) { + *nlp=0; + slilog(lf,priority,"%s",buff); + memmove(buff,nlp+1,strlen(nlp+1)+1); + } +} + +extern void slilog_part(struct log_if *lf, int priority, const char *message, ...) +{ + va_list ap; + va_start(ap,message); + vslilog_part(lf,priority,message,ap); + va_end(ap); +} + +#define IADDR_NBUFS_SHIFT 3 +#define IADDR_NBUFS (1 << IADDR_NBUFS_SHIFT) + +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]; + + assert(ia->sa.sa_family == AF_INET); + + snprintf(bufs[b], sizeof(bufs[b]), "[%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]; + + int port; + + char *addrbuf = bufs[b]; + *addrbuf++ = '['; + int addrbuflen = ADNS_ADDR2TEXT_BUFLEN; + + int r = adns_addr2text(&ia->sa, 0, addrbuf, &addrbuflen, &port); + if (r) { + const char fmt[]= "scoped IPv6 addr, error: %.*s"; + sprintf(addrbuf, fmt, + ADNS_ADDR2TEXT_BUFLEN - sizeof(fmt) /* underestimate */, + strerror(r)); + } + + char *portbuf = addrbuf; + int addrl = strlen(addrbuf); + portbuf += addrl; + + snprintf(portbuf, sizeof(bufs[b])-addrl, "]:%d", port); + +#endif /* CONFIG_IPV6 */ + + return bufs[b]; +} + +bool_t iaddr_equal(const union iaddr *ia, const union iaddr *ib) +{ + 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; +#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 + /* we ignore the flowinfo field */; +#endif /* CONFIG_IPV6 */ + default: + abort(); + } +} + +int iaddr_socklen(const union iaddr *ia) +{ + switch (ia->sa.sa_family) { + case AF_INET: return sizeof(ia->sin); +#ifdef CONFIG_IPV6 + case AF_INET6: return sizeof(ia->sin6); +#endif /* CONFIG_IPV6 */ + default: abort(); + } +}