#include <limits.h>
#include <assert.h>
#include <sys/wait.h>
+#include <adns.h>
#include "util.h"
#include "unaligned.h"
#include "magic.h"
+#include "ipaddr.h"
#define MIN_BUFFER_SIZE 64
#define DEFAULT_BUFFER_SIZE 4096
void *safe_malloc(size_t size, const char *message)
{
void *r;
+ if (!size)
+ return 0;
r=malloc(size);
if (!r) {
fatal_perror("%s",message);
}
return r;
}
-void *safe_malloc_ary(size_t size, size_t count, const char *message) {
+void *safe_realloc_ary(void *p, size_t size, size_t count,
+ const char *message) {
if (count >= INT_MAX/size) {
fatal("array allocation overflow: %s", message);
}
- return safe_malloc(size*count, message);
+ assert(size && count);
+ p = realloc(p, size*count);
+ if (!p)
+ fatal_perror("%s", message);
+ return p;
+}
+
+void *safe_malloc_ary(size_t size, size_t count, const char *message) {
+ if (!size || !count)
+ return 0;
+ return safe_realloc_ary(0,size,count,message);
}
/* Convert a buffer into its MP_INT representation */
return i;
}
+#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");
+ setcloexec(fd[0]);
+ setcloexec(fd[1]);
+}
+
static const char *phases[NR_PHASES]={
"PHASE_INIT",
"PHASE_GETOPTS",
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;
len=strlen(s);
/* fixme: if string is longer than 65535, result is a corrupted packet */
buf_append_uint16(buf,len);
- memcpy(buf_append(buf,len),s,len);
+ BUF_ADD_BYTES(append,buf,s,len);
}
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");
}
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;
}
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;
vslilog_part(lf,priority,message,ap);
va_end(ap);
}
+
+void string_item_to_iaddr(const item_t *item, uint16_t port, union iaddr *ia,
+ const char *desc)
+{
+#ifndef CONFIG_IPV6
+
+ ia->sin.sin_family=AF_INET;
+ ia->sin.sin_addr.s_addr=string_item_to_ipaddr(item,desc);
+
+#else /* CONFIG_IPV6 => we have adns_text2addr */
+
+ if (item->type!=t_string)
+ cfgfatal(item->loc,desc,"expecting a string IP (v4 or v6) address\n");
+ socklen_t salen=sizeof(*ia);
+ int r=adns_text2addr(item->data.string, port,
+ adns_qf_addrlit_ipv4_quadonly,
+ &ia->sa, &salen);
+ assert(r!=ENOSPC);
+ if (r) cfgfatal(item->loc,desc,"invalid IP (v4 or v6) address: %s\n",
+ strerror(r));
+
+#endif /* CONFIG_IPV6 */
+}
+
+#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();
+ }
+}
+
+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)
+#define BADBIT(b) \
+ if (!(revents & b)) ; else BAD(#b)
+ BADBIT(POLLERR);
+ BADBIT(POLLHUP);
+ /* POLLNVAL is handled by the event loop - see afterpoll_fn comment */
+#undef 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
+}
~ian / secnet.git / blobdiff