#include <errno.h>
#include <sys/socket.h>
#include <sys/wait.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
#include "util.h"
#include "unaligned.h"
#include "ipaddr.h"
+#include "magic.h"
static beforepoll_fn udp_beforepoll;
static afterpoll_fn udp_afterpoll;
closure_t cl;
struct comm_if ops;
struct cloc loc;
+ uint32_t addr;
uint16_t port;
int fd;
string_t authbind;
struct sockaddr_in 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];
+
+ 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));
+ return sbuf;
+}
+
static int udp_beforepoll(void *state, struct pollfd *fds, int *nfds_io,
- int *timeout_io, const struct timeval *tv,
- uint64_t *now)
+ int *timeout_io)
{
struct udp *st=state;
if (*nfds_io<1) {
return 0;
}
-static void udp_afterpoll(void *state, struct pollfd *fds, int nfds,
- const struct timeval *tv, uint64_t *now)
+static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
{
struct udp *st=state;
struct sockaddr_in from;
- int fromlen;
+ socklen_t fromlen;
struct notify_list *n;
bool_t done;
int rv;
if (nfds && (fds->revents & POLLIN)) {
do {
+ FILLZERO(from);
fromlen=sizeof(from);
BUF_ASSERT_FREE(st->rbuf);
BUF_ALLOC(st->rbuf,"udp_afterpoll");
buf_unprepend(st->rbuf,2);
memcpy(&from.sin_port,buf_unprepend(st->rbuf,2),2);
}
+ struct comm_addr ca;
+ FILLZERO(ca);
+ ca.comm=&st->ops;
+ ca.sin=from;
done=False;
for (n=st->notify; n; n=n->next) {
- if (n->fn(n->state, st->rbuf, &from)) {
+ if (n->fn(n->state, st->rbuf, &ca)) {
done=True;
break;
}
}
if (!done) {
- uint32_t source,dest;
- /* Manufacture and send NAK packet */
- source=get_uint32(st->rbuf->start); /* Us */
- dest=get_uint32(st->rbuf->start+4); /* Them */
- Message(M_INFO,"udp (port %d): sending NAK\n",st->port);
- buffer_init(st->rbuf,0);
- buf_append_uint32(st->rbuf,dest);
- buf_append_uint32(st->rbuf,source);
- buf_append_uint32(st->rbuf,0); /* NAK is msg type 0 */
- sendto(st->fd, st->rbuf->start, st->rbuf->size, 0,
- (struct sockaddr *)&from, sizeof(from));
+ uint32_t msgtype;
+ if (st->rbuf->size>12 /* prevents traffic amplification */
+ && ((msgtype=get_uint32(st->rbuf->start+8))
+ != LABEL_NAK)) {
+ uint32_t source,dest;
+ /* Manufacture and send NAK packet */
+ source=get_uint32(st->rbuf->start); /* Us */
+ dest=get_uint32(st->rbuf->start+4); /* Them */
+ send_nak(&ca,source,dest,msgtype,st->rbuf,"unwanted");
+ }
BUF_FREE(st->rbuf);
}
BUF_ASSERT_FREE(st->rbuf);
}
static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
- struct sockaddr_in *dest)
+ const struct comm_addr *dest)
{
struct udp *st=commst;
uint8_t *sa;
if (st->use_proxy) {
- sa=buf->start-8;
- memcpy(sa,&dest->sin_addr,4);
+ sa=buf_prepend(buf,8);
+ memcpy(sa,&dest->sin.sin_addr,4);
memset(sa+4,0,4);
- memcpy(sa+6,&dest->sin_port,2);
+ memcpy(sa+6,&dest->sin.sin_port,2);
sendto(st->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, sizeof(*dest));
+ (struct sockaddr *)&dest->sin, sizeof(dest->sin));
}
return True;
struct udp *st=sst;
struct sockaddr_in addr;
- st->fd=socket(AF_INET, SOCK_DGRAM, 0);
+ st->fd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (st->fd<0) {
fatal_perror("udp (%s:%d): socket",st->loc.file,st->loc.line);
}
st->loc.file,st->loc.line);
}
- memset(&addr, 0, sizeof(addr));
+ 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;
fatal_perror("udp_phase_hook: fork() for authbind");
}
if (c==0) {
- char *argv[4];
+ char *argv[4], addrstr[9], portstr[5];
+ sprintf(addrstr,"%08lX",(long)addr.sin_addr.s_addr);
+ sprintf(portstr,"%04X",addr.sin_port);
argv[0]=st->authbind;
- argv[1]=strdup("00000000");
- if (!argv[1]) exit(ENOMEM);
- argv[2]=alloca(8);
- if (!argv[2]) exit(ENOMEM);
- sprintf(argv[2],"%04X",htons(st->port));
+ argv[1]=addrstr;
+ argv[2]=portstr;
argv[3]=NULL;
dup2(st->fd,0);
execvp(st->authbind,argv);
- exit(ENOEXEC);
+ _exit(255);
}
- waitpid(c,&status,0);
- if (WEXITSTATUS(status)!=0) {
- errno=WEXITSTATUS(status);
+ while (waitpid(c,&status,0)==-1) {
+ if (errno==EINTR) continue;
fatal_perror("udp (%s:%d): authbind",st->loc.file,st->loc.line);
}
+ if (WIFSIGNALED(status)) {
+ fatal("udp (%s:%d): authbind died on signal %d",st->loc.file,
+ st->loc.line, WTERMSIG(status));
+ }
+ if (WIFEXITED(status) && WEXITSTATUS(status)!=0) {
+ fatal("udp (%s:%d): authbind died with status %d",st->loc.file,
+ st->loc.line, WEXITSTATUS(status));
+ }
} else {
if (bind(st->fd, (struct sockaddr *)&addr, sizeof(addr))!=0) {
fatal_perror("udp (%s:%d): bind",st->loc.file,st->loc.line);
list_t *args)
{
struct udp *st;
- item_t *i;
+ item_t *i,*j;
dict_t *d;
list_t *l;
uint32_t a;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.min_start_pad=0;
- st->ops.min_end_pad=0;
st->ops.request_notify=request_notify;
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;
}
d=i->data.dict;
+ 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;
- memset(&st->proxy,0,sizeof(st->proxy));
+ FILLZERO(st->proxy);
st->proxy.sin_family=AF_INET;
i=list_elem(l,0);
if (!i || i->type!=t_string) {
cfgfatal(st->loc,"udp","proxy must supply ""addr"",port\n");
}
st->proxy.sin_port=htons(i->data.number);
- st->ops.min_start_pad=8;
}
+ update_max_start_pad(&comm_max_start_pad, st->use_proxy ? 8 : 0);
+
add_hook(PHASE_GETRESOURCES,udp_phase_hook,st);
return new_closure(&st->cl);
}
-init_module udp_module;
void udp_module(dict_t *dict)
{
add_closure(dict,"udp",udp_apply);