#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"
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)
{
if (nfds && (fds->revents & POLLIN)) {
do {
+ FILLZERO(from);
fromlen=sizeof(from);
BUF_ASSERT_FREE(st->rbuf);
BUF_ALLOC(st->rbuf,"udp_afterpoll");
}
done=False;
for (n=st->notify; n; n=n->next) {
- if (n->fn(n->state, st->rbuf, &from)) {
+ struct comm_addr ca;
+ FILLZERO(ca);
+ ca.comm=&st->ops;
+ ca.sin=from;
+ if (n->fn(n->state, st->rbuf, &ca)) {
done=True;
break;
}
}
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);
+ 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));
} else {
sendto(st->fd, buf->start, buf->size, 0,
- (struct sockaddr *)dest, sizeof(*dest));
+ (struct sockaddr *)&dest->sin, sizeof(dest->sin));
}
return True;
}
if (c==0) {
char *argv[4], addrstr[9], portstr[5];
- sprintf(addrstr,"%08lX",(long)st->addr);
- sprintf(portstr,"%04X",st->port);
+ sprintf(addrstr,"%08lX",(long)addr.sin_addr.s_addr);
+ sprintf(portstr,"%04X",addr.sin_port);
argv[0]=st->authbind;
argv[1]=addrstr;
argv[2]=portstr;
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;