struct notify_list *next;
};
+#define 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;
- uint32_t addr;
- uint16_t port;
- int fd;
+ int n_socks;
+ struct udpsock socks[MAX_SOCKETS];
string_t authbind;
struct buffer_if *rbuf;
struct notify_list *notify;
bool_t use_proxy;
- struct sockaddr_in proxy;
+ union iaddr proxy;
};
-static const char *saddr_to_string(const struct sockaddr_in *sin) {
- static char bufs[2][100];
- static int b;
-
- b ^= 1;
- snprintf(bufs[b], sizeof(bufs[b]), "[%s]:%d",
- inet_ntoa(sin->sin_addr),
- ntohs(sin->sin_port));
- return bufs[b];
-}
-
static const char *addr_to_string(void *commst, const struct comm_addr *ca) {
struct udp *st=commst;
static char sbuf[100];
+ int ix=ca->ix>=0 ? ca->ix : 0;
- struct sockaddr_in la;
- la.sin_addr.s_addr=htonl(st->addr);
- la.sin_port=htons(st->port);
-
- snprintf(sbuf, sizeof(sbuf), "udp:%s-%s",
- saddr_to_string(&la), saddr_to_string(&ca->sin));
+ assert(ix>=0 && ix<st->n_socks);
+ snprintf(sbuf, sizeof(sbuf), "udp:%d:%s-%s",
+ ca->ix,
+ iaddr_to_string(&st->socks[ix].addr),
+ iaddr_to_string(&ca->ia));
return sbuf;
}
static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
int *timeout_io)
{
+ int i;
struct udp *st=state;
- if (*nfds_io<1) {
- *nfds_io=1;
+ if (*nfds_io<st->n_socks) {
+ *nfds_io=st->n_socks;
return ERANGE;
}
- *nfds_io=1;
- fds->fd=st->fd;
- fds->events=POLLIN;
+ *nfds_io=st->n_socks;
+ for (i=0; i<st->n_socks; i++) {
+ fds[i].fd=st->socks[i].fd;
+ fds[i].events=POLLIN;
+ }
return 0;
}
static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
{
struct udp *st=state;
- struct sockaddr_in from;
+ union iaddr from;
socklen_t fromlen;
struct notify_list *n;
bool_t done;
int rv;
+ int i;
- if (nfds && (fds->revents & POLLIN)) {
+ for (i=0; i<st->n_socks; i++) {
+ if (i>=nfds) continue;
+ if (!(fds[i].revents & POLLIN)) continue;
+ assert(fds[i].fd == st->socks[i].fd);
+ int fd=st->socks[i].fd;
do {
FILLZERO(from);
fromlen=sizeof(from);
BUF_ASSERT_FREE(st->rbuf);
BUF_ALLOC(st->rbuf,"udp_afterpoll");
buffer_init(st->rbuf,calculate_max_start_pad());
- rv=recvfrom(st->fd, st->rbuf->start,
- (st->rbuf->base + st->rbuf->len) - st->rbuf->start,
+ rv=recvfrom(fd, st->rbuf->start,
+ buf_remaining_space(st->rbuf),
0, (struct sockaddr *)&from, &fromlen);
if (rv>0) {
st->rbuf->size=rv;
/* Check that the packet came from our poxy server;
we shouldn't be contacted directly by anybody else
(since they can trivially forge source addresses) */
- if (memcmp(&from.sin_addr,&st->proxy.sin_addr,4)!=0 ||
- memcmp(&from.sin_port,&st->proxy.sin_port,2)!=0) {
+ if (!iaddr_equal(&from,&st->proxy)) {
Message(M_INFO,"udp: received packet that's not "
"from the proxy\n");
BUF_FREE(st->rbuf);
continue;
}
- memcpy(&from.sin_addr,buf_unprepend(st->rbuf,4),4);
+ /* proxy protocol supports ipv4 transport only */
+ FILLZERO(from);
+ from.sa.sa_family=AF_INET;
+ memcpy(&from.sin.sin_addr,buf_unprepend(st->rbuf,4),4);
buf_unprepend(st->rbuf,2);
- memcpy(&from.sin_port,buf_unprepend(st->rbuf,2),2);
+ memcpy(&from.sin.sin_port,buf_unprepend(st->rbuf,2),2);
}
struct comm_addr ca;
FILLZERO(ca);
ca.comm=&st->ops;
- ca.sin=from;
+ ca.ia=from;
+ ca.ix=i;
done=False;
for (n=st->notify; n; n=n->next) {
if (n->fn(n->state, st->rbuf, &ca)) {
if (st->use_proxy) {
sa=buf_prepend(buf,8);
- memcpy(sa,&dest->sin.sin_addr,4);
+ if (dest->ia.sa.sa_family != AF_INET) {
+ Message(M_INFO,
+ "udp: proxy means dropping outgoing non-IPv4 packet to %s\n",
+ iaddr_to_string(&dest->ia));
+ return False;
+ }
+ memcpy(sa,&dest->ia.sin.sin_addr,4);
memset(sa+4,0,4);
- memcpy(sa+6,&dest->sin.sin_port,2);
- sendto(st->fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy,
+ memcpy(sa+6,&dest->ia.sin.sin_port,2);
+ sendto(st->socks[0].fd,sa,buf->size+8,0,(struct sockaddr *)&st->proxy,
sizeof(st->proxy));
buf_unprepend(buf,8);
} else {
- sendto(st->fd, buf->start, buf->size, 0,
- (struct sockaddr *)&dest->sin, sizeof(dest->sin));
+ int i,r;
+ bool_t allunsupported=True;
+ for (i=0; i<st->n_socks; i++) {
+ if (dest->ia.sa.sa_family != st->socks[i].addr.sa.sa_family)
+ /* no point even trying */
+ continue;
+ r=sendto(st->socks[i].fd, buf->start, buf->size, 0,
+ &dest->ia.sa, iaddr_socklen(&dest->ia));
+ if (!r) return True;
+ if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
+ /* who knows what that error means? */
+ allunsupported=False;
+ }
+ return !allunsupported; /* see doc for comm_sendmsg_fn in secnet.h */
}
return True;
}
-static void udp_phase_hook(void *sst, uint32_t new_phase)
+static void udp_make_socket(struct udp *st, struct udpsock *us)
{
- struct udp *st=sst;
- struct sockaddr_in addr;
-
- st->fd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
- if (st->fd<0) {
+ const union iaddr *addr=&us->addr;
+ us->fd=socket(addr->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
+ if (us->fd<0) {
fatal_perror("udp (%s:%d): socket",st->loc.file,st->loc.line);
}
- if (fcntl(st->fd, F_SETFL, fcntl(st->fd, F_GETFL)|O_NONBLOCK)==-1) {
+ if (fcntl(us->fd, F_SETFL, fcntl(us->fd, F_GETFL)|O_NONBLOCK)==-1) {
fatal_perror("udp (%s:%d): fcntl(set O_NONBLOCK)",
st->loc.file,st->loc.line);
}
- if (fcntl(st->fd, F_SETFD, FD_CLOEXEC)==-1) {
- fatal_perror("udp (%s:%d): fcntl(set FD_CLOEXEC)",
- st->loc.file,st->loc.line);
+ setcloexec(us->fd);
+#ifdef CONFIG_IPV6
+ if (addr->sa.sa_family==AF_INET6) {
+ int r;
+ 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,)",
+ st->loc.file,st->loc.line);
}
+#endif
- FILLZERO(addr);
- addr.sin_family=AF_INET;
- addr.sin_addr.s_addr=htonl(st->addr);
- addr.sin_port=htons(st->port);
if (st->authbind) {
pid_t c;
int status;
fatal_perror("udp_phase_hook: fork() for authbind");
}
if (c==0) {
- char *argv[4], addrstr[9], portstr[5];
- sprintf(addrstr,"%08lX",(long)addr.sin_addr.s_addr);
- sprintf(portstr,"%04X",addr.sin_port);
+ char *argv[5], addrstr[33], portstr[5];
+ const char *addrfam;
+ int port;
+ switch (addr->sa.sa_family) {
+ case AF_INET:
+ sprintf(addrstr,"%08lX",(long)addr->sin.sin_addr.s_addr);
+ port=addr->sin.sin_port;
+ addrfam=NULL;
+ break;
+#ifdef CONFIG_IPV6
+ case AF_INET6: {
+ int i;
+ for (i=0; i<16; i++)
+ sprintf(addrstr+i*2,"%02X",addr->sin6.sin6_addr.s6_addr[i]);
+ port=addr->sin6.sin6_port;
+ addrfam="6";
+ break;
+ }
+#endif /*CONFIG_IPV6*/
+ default:
+ fatal("udp (%s:%d): unsupported address family for authbind",
+ st->loc.file,st->loc.line);
+ }
+ sprintf(portstr,"%04X",port);
argv[0]=st->authbind;
argv[1]=addrstr;
argv[2]=portstr;
- argv[3]=NULL;
- dup2(st->fd,0);
+ argv[3]=(char*)addrfam;
+ argv[4]=NULL;
+ dup2(us->fd,0);
execvp(st->authbind,argv);
_exit(255);
}
st->loc.line, WEXITSTATUS(status));
}
} else {
- if (bind(st->fd, (struct sockaddr *)&addr, sizeof(addr))!=0) {
+ if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0) {
fatal_perror("udp (%s:%d): bind",st->loc.file,st->loc.line);
}
}
+}
- register_for_poll(st,udp_beforepoll,udp_afterpoll,1,"udp");
+static void udp_phase_hook(void *sst, uint32_t new_phase)
+{
+ struct udp *st=sst;
+ int i;
+ for (i=0; i<st->n_socks; i++)
+ udp_make_socket(st,&st->socks[i]);
+
+ register_for_poll(st,udp_beforepoll,udp_afterpoll,MAX_SOCKETS,"udp");
}
static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
list_t *args)
{
struct udp *st;
- item_t *i,*j;
+ 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)");
st->loc=loc;
st->ops.release_notify=release_notify;
st->ops.sendmsg=udp_sendmsg;
st->ops.addr_to_string=addr_to_string;
- st->port=0;
st->use_proxy=False;
- i=list_elem(args,0);
- if (!i || i->type!=t_dict) {
+ item=list_elem(args,0);
+ if (!item || item->type!=t_dict) {
cfgfatal(st->loc,"udp","first argument must be a dictionary\n");
}
- d=i->data.dict;
+ d=item->data.dict;
+
+ int port=dict_read_number(d,"port",True,"udp",st->loc,0);
+
+ union iaddr defaultaddrs[] = {
+#ifdef CONFIG_IPV6
+ { .sin6 = { .sin6_family=AF_INET6,
+ .sin6_port=htons(port),
+ .sin6_addr=IN6ADDR_ANY_INIT } },
+#endif
+ { .sin = { .sin_family=AF_INET,
+ .sin_port=htons(port),
+ .sin_addr= { .s_addr=INADDR_ANY } } }
+ };
+
+ caddrl=dict_lookup(d,"address");
+ st->n_socks=caddrl ? list_length(caddrl) : (int)ARRAY_SIZE(defaultaddrs);
+ if (st->n_socks<=0 || st->n_socks>MAX_SOCKETS)
+ cfgfatal(st->loc,"udp","`address' must be 1..%d addresses",
+ MAX_SOCKETS);
+
+ for (i=0; i<st->n_socks; i++) {
+ struct udpsock *us=&st->socks[i];
+ FILLZERO(us->addr);
+ if (!list_length(caddrl)) {
+ us->addr=defaultaddrs[i];
+ } else {
+ text2iaddr(list_elem(caddrl,i),port,
+ &us->addr,"udp");
+ }
+ us->fd=-1;
+ }
- j=dict_find_item(d,"address",False,"udp",st->loc);
- st->addr=j?string_item_to_ipaddr(j, "udp"):INADDR_ANY;
- st->port=dict_read_number(d,"port",True,"udp",st->loc,0);
st->rbuf=find_cl_if(d,"buffer",CL_BUFFER,True,"udp",st->loc);
st->authbind=dict_read_string(d,"authbind",False,"udp",st->loc);
l=dict_lookup(d,"proxy");
if (l) {
st->use_proxy=True;
FILLZERO(st->proxy);
- st->proxy.sin_family=AF_INET;
- i=list_elem(l,0);
- if (!i || i->type!=t_string) {
+ st->proxy.sa.sa_family=AF_INET;
+ item=list_elem(l,0);
+ if (!item || item->type!=t_string) {
cfgfatal(st->loc,"udp","proxy must supply ""addr"",port\n");
}
- a=string_item_to_ipaddr(i,"proxy");
- st->proxy.sin_addr.s_addr=htonl(a);
- i=list_elem(l,1);
- if (!i || i->type!=t_number) {
+ a=string_item_to_ipaddr(item,"proxy");
+ st->proxy.sin.sin_addr.s_addr=htonl(a);
+ item=list_elem(l,1);
+ if (!item || item->type!=t_number) {
cfgfatal(st->loc,"udp","proxy must supply ""addr"",port\n");
}
- st->proxy.sin_port=htons(i->data.number);
+ st->proxy.sin.sin_port=htons(item->data.number);
}
update_max_start_pad(&comm_max_start_pad, st->use_proxy ? 8 : 0);
~ian / secnet.git / blobdiff