#include "unaligned.h"
#include "ipaddr.h"
#include "magic.h"
+#include "comm-common.h"
-static beforepoll_fn udp_beforepoll;
-static afterpoll_fn udp_afterpoll;
-static comm_request_notify_fn request_notify;
-static comm_release_notify_fn release_notify;
static comm_sendmsg_fn udp_sendmsg;
-struct comm_notify_entry {
- comm_notify_fn *fn;
- void *state;
- LIST_ENTRY(comm_notify_entry) entry;
-};
-LIST_HEAD(comm_notify_list, comm_notify_entry) notify;
-
-#define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
-
-struct udpsock {
- union iaddr addr;
- int fd;
-};
-
struct udp {
- closure_t cl;
- struct comm_if ops;
- struct cloc loc;
- int n_socks;
- struct udpsock socks[UDP_MAX_SOCKETS];
- string_t authbind;
- struct buffer_if *rbuf;
- struct comm_notify_list notify;
- bool_t use_proxy;
- union iaddr proxy;
+ struct udpcommon uc;
+ struct udpsocks socks;
};
/*
* description of the source of an incoming packet.
*/
-static const char *addr_to_string(void *commst, const struct comm_addr *ca) {
+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;
return sbuf;
}
-static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
- int *timeout_io)
+static int udp_socks_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
+ int *timeout_io)
{
+ struct udpsocks *socks=state;
int i;
- struct udp *st=state;
- struct udp *socks=st; /* for now */
BEFOREPOLL_WANT_FDS(socks->n_socks);
for (i=0; i<socks->n_socks; i++) {
fds[i].fd=socks->socks[i].fd;
return 0;
}
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
+const char *af_name(int af)
+{
+ switch (af) {
+ case AF_INET6: return "IPv6";
+ case AF_INET: return "IPv4";
+ case 0: return "(any)";
+ default: abort();
+ }
+}
+
+void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
+ const char *socksdesc, struct udpsock *us,
+ bool_t recvsend, int af,
+ int r, int errnoval)
+{
+ bool_t success=r>=0;
+ if (us->experienced[recvsend][af][success]++)
+ return;
+ lg_perror(lg, uc->cc.cl.description, &uc->cc.loc,
+ success ? M_INFO : M_WARNING,
+ success ? 0 : errnoval,
+ "%s %s experiencing some %s %s%s%s",
+ socksdesc,iaddr_to_string(&us->addr),
+ success?"success":"trouble",
+ recvsend?"transmitting":"receiving",
+ af?" ":"", af?af_name(af):"");
+}
+
+static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
{
- struct udp *st=state;
- struct udp *socks=st; /* for now */
- struct udp *cc=st; /* for now */
- struct udp *uc=st; /* for now */
+ struct udpsocks *socks=state;
+ struct udpcommon *uc=socks->uc;
union iaddr from;
socklen_t fromlen;
- struct comm_notify_entry *n;
bool_t done;
int rv;
int i;
- for (i=0; i<st->n_socks; i++) {
+ struct commcommon *cc=&uc->cc;
+
+ for (i=0; i<socks->n_socks; i++) {
+ struct udpsock *us=&socks->socks[i];
if (i>=nfds) continue;
if (!(fds[i].revents & POLLIN)) continue;
- assert(fds[i].fd == socks->socks[i].fd);
- int fd=socks->socks[i].fd;
+ assert(fds[i].fd == us->fd);
+ int fd=us->fd;
do {
fromlen=sizeof(from);
BUF_ASSERT_FREE(cc->rbuf);
ca.comm=&cc->ops;
ca.ia=from;
ca.ix=i;
- done=False;
- LIST_FOREACH(n, &cc->notify, entry) {
- if (n->fn(n->state, cc->rbuf, &ca)) {
- done=True;
- break;
- }
- }
+ done=comm_notify(&cc->notify, cc->rbuf, &ca);
if (!done) {
uint32_t msgtype;
if (cc->rbuf->size>12 /* prevents traffic amplification */
BUF_FREE(cc->rbuf);
}
BUF_ASSERT_FREE(cc->rbuf);
- } else {
+ } else { /* rv<=0 */
+ if (errno!=EINTR && !iswouldblock(errno))
+ udp_sock_experienced(0,uc, "socket",us, 0,0, rv,errno);
BUF_FREE(cc->rbuf);
}
} while (rv>=0);
}
}
-static void request_notify(void *commst, void *nst, comm_notify_fn *fn)
-{
- struct udp *st=commst;
- struct udp *cc=st; /* for now */
- struct comm_notify_entry *n;
-
- n=safe_malloc(sizeof(*n),"request_notify");
- n->fn=fn;
- n->state=nst;
- LIST_INSERT_HEAD(&cc->notify, n, entry);
-}
-
-static void release_notify(void *commst, void *nst, comm_notify_fn *fn)
-{
- struct udp *st=commst;
- struct udp *cc=st; /* for now */
- struct comm_notify_entry *n, *t;
-
- /* XXX untested */
- LIST_FOREACH_SAFE(n, &cc->notify, entry, t) {
- if (n->state==nst && n->fn==fn) {
- LIST_REMOVE(n, entry);
- free(n);
- }
- }
-}
-
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) {
+ struct udpsock *us=&socks->socks[0];
sa=buf_prepend(buf,8);
if (dest->ia.sa.sa_family != AF_INET) {
Message(M_INFO,
memcpy(sa,&dest->ia.sin.sin_addr,4);
memset(sa+4,0,4);
memcpy(sa+6,&dest->ia.sin.sin_port,2);
- sendto(socks->socks[0].fd,sa,buf->size+8,0,&uc->proxy.sa,
+ int r=sendto(us->fd,sa,buf->size+8,0,&uc->proxy.sa,
iaddr_socklen(&uc->proxy));
+ udp_sock_experienced(0,uc, "proxy",us, 1,0, r,errno);
buf_unprepend(buf,8);
} else {
int i,r;
bool_t allunsupported=True;
+ int af=dest->ia.sa.sa_family;
for (i=0; i<socks->n_socks; i++) {
- if (dest->ia.sa.sa_family != socks->socks[i].addr.sa.sa_family)
+ struct udpsock *us=&socks->socks[i];
+ if (us->addr.sa.sa_family != af)
/* no point even trying */
continue;
- r=sendto(socks->socks[i].fd, buf->start, buf->size, 0,
+ r=sendto(us->fd, buf->start, buf->size, 0,
&dest->ia.sa, iaddr_socklen(&dest->ia));
+ udp_sock_experienced(0,uc, "socket",us, 1,af, r,errno);
if (r>=0) return True;
if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
/* who knows what that error means? */
return True;
}
-static void udp_make_socket(struct udp *st, struct udpsock *us)
+void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us)
+{
+ if (us->fd>=0) {
+ close(us->fd);
+ us->fd=-1;
+ }
+}
+
+bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
+ int failmsgclass)
{
const union iaddr *addr=&us->addr;
- struct udp *cc=st; /* for now */
- struct udp *uc=st; /* for now */
+ struct commcommon *cc=&uc->cc;
+ us->fd=-1;
+
+#define FAIL_LG 0, cc->cl.description, &cc->loc, failmsgclass
+#define FAIL(...) do{ \
+ lg_perror(FAIL_LG,errno,__VA_ARGS__); \
+ goto failed; \
+ }while(0)
+
+ FILLZERO(us->experienced);
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);
- }
- if (fcntl(us->fd, F_SETFL, fcntl(us->fd, F_GETFL)|O_NONBLOCK)==-1) {
- fatal_perror("udp (%s:%d): fcntl(set O_NONBLOCK)",
- cc->loc.file,cc->loc.line);
- }
+ if (us->fd<0) FAIL("socket");
+ setnonblock(us->fd);
setcloexec(us->fd);
#ifdef CONFIG_IPV6
if (addr->sa.sa_family==AF_INET6) {
int optval=1;
socklen_t optlen=sizeof(optval);
r=setsockopt(us->fd,IPPROTO_IPV6,IPV6_V6ONLY,&optval,optlen);
- if (r) fatal_perror("udp (%s:%d): setsockopt(,IPV6_V6ONLY,&1,)",
- cc->loc.file,cc->loc.line);
+ if (r) FAIL("setsockopt(,IPV6_V6ONLY,&1,)");
}
#endif
/* XXX this fork() and waitpid() business needs to be hidden
in some system-specific library functions. */
c=fork();
- if (c==-1) {
- fatal_perror("udp_phase_hook: fork() for authbind");
- }
+ if (c==-1)
+ FAIL("fork() for authbind");
if (c==0) {
char *argv[5], addrstr[33], portstr[5];
const char *addrfam;
int port;
+ afterfork();
switch (addr->sa.sa_family) {
case AF_INET:
sprintf(addrstr,"%08lX",(long)addr->sin.sin_addr.s_addr);
}
while (waitpid(c,&status,0)==-1) {
if (errno==EINTR) continue;
- fatal_perror("udp (%s:%d): authbind",cc->loc.file,cc->loc.line);
- }
- if (WIFSIGNALED(status)) {
- fatal("udp (%s:%d): authbind died on signal %d",cc->loc.file,
- cc->loc.line, WTERMSIG(status));
+ FAIL("waitpid for authbind");
}
- if (WIFEXITED(status) && WEXITSTATUS(status)!=0) {
- fatal("udp (%s:%d): authbind died with status %d",cc->loc.file,
- cc->loc.line, WEXITSTATUS(status));
+ if (status) {
+ if (WIFEXITED(status) && WEXITSTATUS(status)<127) {
+ int es=WEXITSTATUS(status);
+ lg_perror(FAIL_LG,es,
+ "authbind exited with error exit status %d;"
+ " indicates error",es);
+ } else {
+ lg_exitstatus(FAIL_LG,status,"authbind");
+ }
+ goto failed;
}
} else {
- if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0) {
- fatal_perror("udp (%s:%d): bind",cc->loc.file,cc->loc.line);
- }
+ if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0)
+ FAIL("bind (%s)",iaddr_to_string(addr));
}
+ return True;
+
+failed:
+ udp_destroy_socket(uc,us);
+ return False;
+
+#undef FAIL
+}
+
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
+{
+ socks->uc=uc;
+ socks->interest=
+ register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
+}
+
+void udp_socks_deregister(struct udpcommon *uc, struct udpsocks *socks)
+{
+ socks->uc=uc;
+ deregister_for_poll(socks->interest);
+}
+
+void udp_socks_childpersist(struct udpcommon *uc, struct udpsocks *socks)
+{
+ int i;
+ for (i=0; i<socks->n_socks; i++)
+ udp_destroy_socket(uc,&socks->socks[i]);
+}
+
+static void udp_childpersist_hook(void *sst, uint32_t new_phase)
+{
+ struct udp *st=sst;
+ udp_socks_childpersist(&st->uc,&st->socks);
}
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;
+ struct udpcommon *uc=&st->uc;
int i;
for (i=0; i<socks->n_socks; i++)
- udp_make_socket(st,&socks->socks[i]);
+ udp_make_socket(uc,&socks->socks[i],M_FATAL);
+
+ udp_socks_register(uc,socks);
- register_for_poll(st,udp_beforepoll,udp_afterpoll,"udp");
+ add_hook(PHASE_CHILDPERSIST,udp_childpersist_hook,st);
}
static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
list_t *args)
{
struct udp *st;
- item_t *item;
list_t *caddrl;
- dict_t *d;
list_t *l;
uint32_t a;
int i;
- st=safe_malloc(sizeof(*st),"udp_apply(st)");
- struct udp *cc=st; /* for now */
- struct udp *uc=st; /* for now */
- struct udp *socks=st; /* for now */
- cc->loc=loc;
- cc->cl.description="udp";
- cc->cl.type=CL_COMM;
- cc->cl.apply=NULL;
- cc->cl.interface=&cc->ops;
- cc->ops.st=st;
- cc->ops.request_notify=request_notify;
- cc->ops.release_notify=release_notify;
- cc->ops.sendmsg=udp_sendmsg;
- cc->ops.addr_to_string=addr_to_string;
- uc->use_proxy=False;
- LIST_INIT(&cc->notify);
-
- item=list_elem(args,0);
- if (!item || item->type!=t_dict) {
- cfgfatal(cc->loc,"udp","first argument must be a dictionary\n");
- }
- d=item->data.dict;
+ 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 } } }
};
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;
}
- cc->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",cc->loc);
- uc->authbind=dict_read_string(d,"authbind",False,"udp",cc->loc);
l=dict_lookup(d,"proxy");
if (l) {
uc->use_proxy=True;
~ian / secnet.git / blobdiff