~mdw
/
secnet
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
site: When reporting resolution complete, print only iaddr
[secnet]
/
udp.c
diff --git
a/udp.c
b/udp.c
index
a2bb907
..
dde73ef
100644
(file)
--- a/
udp.c
+++ b/
udp.c
@@
-30,6
+30,7
@@
static comm_sendmsg_fn udp_sendmsg;
struct udp {
struct udpcommon uc;
struct udpsocks socks;
struct udp {
struct udpcommon uc;
struct udpsocks socks;
+ bool_t addr_configured;
};
/*
};
/*
@@
-84,20
+85,23
@@
const char *af_name(int af)
void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
struct udpsocks *socks, struct udpsock *us,
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;
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,
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",
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)
}
static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
@@
-197,7
+201,7
@@
static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
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));
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;
buf_unprepend(buf,8);
} else {
int i,r;
@@
-210,7
+214,7
@@
static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
continue;
r=sendto(us->fd, buf->start, buf->size, 0,
&dest->ia.sa, iaddr_socklen(&dest->ia));
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? */
if (r>=0) return True;
if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
/* who knows what that error means? */
@@
-393,8
+397,14
@@
static void udp_phase_hook(void *sst, uint32_t new_phase)
struct udpsocks *socks=&st->socks;
struct udpcommon *uc=&st->uc;
int i;
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");
udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
@@
-430,14
+440,16
@@
static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
};
caddrl=dict_lookup(d,"address");
};
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 (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");
us->addr=defaultaddrs[i];
} else {
string_item_to_iaddr(list_elem(caddrl,i),uc->port,&us->addr,"udp");