#include "magic.h"
#include "comm-common.h"
-static beforepoll_fn udp_beforepoll;
-static afterpoll_fn udp_afterpoll;
static comm_sendmsg_fn udp_sendmsg;
-#define UDP_MAX_SOCKETS 3 /* 2 ought to do really */
-
-struct udpsock {
- union iaddr addr;
- int fd;
-};
-
struct udp {
- struct commcommon cc;
- int n_socks;
- struct udpsock socks[UDP_MAX_SOCKETS];
- string_t authbind;
- bool_t use_proxy;
- union iaddr proxy;
+ struct udpcommon uc;
+ struct udpsocks socks;
};
/*
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)
+static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
{
- struct udp *st=state;
- struct commcommon *cc=&st->cc;
- struct udp *socks=st; /* for now */
- struct udp *uc=st; /* for now */
+ struct udpsocks *socks=state;
+ struct udpcommon *uc=socks->uc;
union iaddr from;
socklen_t fromlen;
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++) {
if (i>=nfds) continue;
if (!(fds[i].revents & POLLIN)) continue;
assert(fds[i].fd == socks->socks[i].fd);
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) {
return True;
}
-static void udp_make_socket(struct udp *st, struct udpsock *us)
+bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
+ int failmsgclass)
{
const union iaddr *addr=&us->addr;
- struct commcommon *cc=&st->cc; /* 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)
+
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");
+ if (fcntl(us->fd, F_SETFL, fcntl(us->fd, F_GETFL)|O_NONBLOCK)==-1)
+ FAIL("fcntl(set O_NONBLOCK)");
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;
}
while (waitpid(c,&status,0)==-1) {
if (errno==EINTR) continue;
- fatal_perror("udp (%s:%d): authbind",cc->loc.file,cc->loc.line);
+ FAIL("waitpid for authbind");
}
- if (WIFSIGNALED(status)) {
- fatal("udp (%s:%d): authbind died on signal %d",cc->loc.file,
- cc->loc.line, WTERMSIG(status));
- }
- 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) {
+ 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:
+ if (us->fd>=0) {
+ close(us->fd);
+ us->fd=-1;
+ }
+ 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);
}
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);
- register_for_poll(st,udp_beforepoll,udp_afterpoll,"udp");
+ udp_socks_register(uc,socks);
}
static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
uint32_t a;
int i;
- COMM_APPLY(st,&st->cc,udp_,"udp",loc);
- struct commcommon *cc=&st->cc; /* for now */
- struct udp *uc=st; /* for now */
- struct udp *socks=st; /* for now */
-
- uc->use_proxy=False;
-
- COMM_APPLY_STANDARD(st,&st->cc,"udp",args);
+ 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;
}
- uc->authbind=dict_read_string(d,"authbind",False,"udp",cc->loc);
l=dict_lookup(d,"proxy");
if (l) {
uc->use_proxy=True;
~mdw / secnet / blobdiff