/* UDP send/receive module for secnet */
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
/* This module enables sites to communicate by sending UDP
* packets. When an instance of the module is created we can
* optionally bind to a particular local IP address (not implemented
struct udp {
struct udpcommon uc;
struct udpsocks socks;
+ bool_t addr_configured;
+ unsigned counter;
};
/*
int ix=ca->ix>=0 ? ca->ix : 0;
assert(ix>=0 && ix<socks->n_socks);
- snprintf(sbuf, sizeof(sbuf), "udp:%s%s-%s",
+ snprintf(sbuf, sizeof(sbuf), "udp#%u@l%d:%s%s-%s",
+ st->counter, st->uc.cc.loc.line,
iaddr_to_string(&socks->socks[ix].addr),
ca->ix<0 && socks->n_socks>1 ? "&" : "",
iaddr_to_string(&ca->ia));
void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
struct udpsocks *socks, struct udpsock *us,
- bool_t recvsend, int af,
+ const union iaddr *dest, int af,
int r, int errnoval)
{
bool_t success=r>=0;
- if (us->experienced[recvsend][af][success]++)
+ if (us->experienced[!!dest][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",
+ "%s %s experiencing some %s %s%s%s%s%s%s",
socks->desc,iaddr_to_string(&us->addr),
success?"success":"trouble",
- recvsend?"transmitting":"receiving",
- af?" ":"", af?af_name(af):"");
+ dest?"transmitting":"receiving",
+ af?" ":"", af?af_name(af):"",
+ dest?" (to ":"",
+ dest?iaddr_to_string(dest):"",
+ dest?")":"");
}
static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
ca.comm=&cc->ops;
ca.ia=from;
ca.ix=i;
- done=comm_notify(&cc->notify, cc->rbuf, &ca);
+ done=comm_notify(cc, cc->rbuf, &ca);
if (done) {
udp_sock_experienced(0,uc,socks,us,0,
from.sa.sa_family,0,0);
/* Manufacture and send NAK packet */
source=get_uint32(cc->rbuf->start); /* Us */
dest=get_uint32(cc->rbuf->start+4); /* Them */
- send_nak(&ca,source,dest,msgtype,cc->rbuf,"unwanted");
+ send_nak(&ca,source,dest,msgtype,cc->rbuf,
+ priomsg_getmessage(&cc->why_unwanted,
+ "unwanted"));
}
BUF_FREE(cc->rbuf);
}
}
static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
- const struct comm_addr *dest)
+ const struct comm_addr *dest,
+ struct comm_clientinfo *clientinfo)
{
struct udp *st=commst;
struct udpcommon *uc=&st->uc;
memcpy(sa+6,&dest->ia.sin.sin_port,2);
int r=sendto(us->fd,sa,buf->size+8,0,&uc->proxy.sa,
iaddr_socklen(&uc->proxy));
- udp_sock_experienced(0,uc,socks,us, 1,0, r,errno);
+ udp_sock_experienced(0,uc,socks,us, &dest->ia,0, r,errno);
buf_unprepend(buf,8);
} else {
int i,r;
continue;
r=sendto(us->fd, buf->start, buf->size, 0,
&dest->ia.sa, iaddr_socklen(&dest->ia));
- udp_sock_experienced(0,uc,socks,us, 1,af, r,errno);
+ udp_sock_experienced(0,uc,socks,us, &dest->ia,af, r,errno);
if (r>=0) return True;
if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
/* who knows what that error means? */
socklen_t salen=sizeof(us->addr);
int r=getsockname(us->fd,&us->addr.sa,&salen);
if (r) FAIL("getsockname()");
- if (salen>sizeof(us->addr)) { errno=0; FAIL("getsockname() length"); }
+ if ((size_t)salen>sizeof(us->addr)) /* cast squashes clang warning */
+ { errno=0; FAIL("getsockname() length"); }
return True;
failed:
struct udpsocks *socks=&st->socks;
struct udpcommon *uc=&st->uc;
int i;
- for (i=0; i<socks->n_socks; i++)
- udp_make_socket(uc,&socks->socks[i],M_FATAL);
+ bool_t anydone=0;
+
+ for (i=0; i<socks->n_socks; i++) {
+ bool_t required=st->addr_configured
+ || (!anydone && i==socks->n_socks-1);
+ anydone += udp_make_socket(uc,&socks->socks[i],
+ required ? M_FATAL : M_WARNING);
+ }
udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
list_t *args)
{
+ static unsigned counter;
+
struct udp *st;
list_t *caddrl;
list_t *l;
struct udpsocks *socks=&st->socks;
struct commcommon *cc=&uc->cc;
+ st->counter=counter++;
+
union iaddr defaultaddrs[] = {
#ifdef CONFIG_IPV6
{ .sin6 = { .sin6_family=AF_INET6,
};
caddrl=dict_lookup(d,"address");
- socks->n_socks=caddrl ? list_length(caddrl) : (int)ARRAY_SIZE(defaultaddrs);
+ st->addr_configured=!!caddrl;
+ socks->n_socks=st->addr_configured ? list_length(caddrl)
+ : (int)ARRAY_SIZE(defaultaddrs);
if (socks->n_socks<=0 || socks->n_socks>UDP_MAX_SOCKETS)
cfgfatal(cc->loc,"udp","`address' must be 1..%d addresses",
UDP_MAX_SOCKETS);
for (i=0; i<socks->n_socks; i++) {
struct udpsock *us=&socks->socks[i];
- if (!list_length(caddrl)) {
+ if (!st->addr_configured) {
us->addr=defaultaddrs[i];
} else {
string_item_to_iaddr(list_elem(caddrl,i),uc->port,&us->addr,"udp");
~ianmdlvl / secnet.git / blobdiff