X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/32654a316b5925914f5e5f481971d47f9728edab..656df7e2c9b688150ebe991d79a64ac096bb5f8e:/udp.c

diff --git a/udp.c b/udp.c
index e62f5c1..70928a8 100644
--- a/udp.c
+++ b/udp.c
@@ -54,7 +54,7 @@ static const char *udp_addr_to_string(void *commst, const struct comm_addr *ca)
     assert(ix>=0 && ix<socks->n_socks);
     snprintf(sbuf, sizeof(sbuf), "udp:%s%s-%s",
 	     iaddr_to_string(&socks->socks[ix].addr),
-	     ca->ix<0 ? "&" : "",
+	     ca->ix<0 && socks->n_socks>1 ? "&" : "",
 	     iaddr_to_string(&ca->ia));
     return sbuf;
 }
@@ -83,7 +83,7 @@ const char *af_name(int af)
 }
 
 void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
-			  const char *socksdesc, struct udpsock *us,
+			  struct udpsocks *socks, struct udpsock *us,
 			  bool_t recvsend, int af,
 			  int r, int errnoval)
 {
@@ -94,7 +94,7 @@ void udp_sock_experienced(struct log_if *lg, struct udpcommon *uc,
 	      success ? M_INFO : M_WARNING,
 	      success ? 0 : errnoval,
 	      "%s %s experiencing some %s %s%s%s",
-	      socksdesc,iaddr_to_string(&us->addr),
+	      socks->desc,iaddr_to_string(&us->addr),
 	      success?"success":"trouble",
 	      recvsend?"transmitting":"receiving",
 	      af?" ":"", af?af_name(af):"");
@@ -132,7 +132,7 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 		    /* 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 (!iaddr_equal(&from,&uc->proxy)) {
+		    if (!iaddr_equal(&from,&uc->proxy,False)) {
 			Message(M_INFO,"udp: received packet that's not "
 				"from the proxy\n");
 			BUF_FREE(cc->rbuf);
@@ -149,7 +149,10 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 		ca.ia=from;
 		ca.ix=i;
 		done=comm_notify(&cc->notify, cc->rbuf, &ca);
-		if (!done) {
+		if (done) {
+		    udp_sock_experienced(0,uc,socks,us,0,
+					 from.sa.sa_family,0,0);
+		} else {
 		    uint32_t msgtype;
 		    if (cc->rbuf->size>12 /* prevents traffic amplification */
 			&& ((msgtype=get_uint32(cc->rbuf->start+8))
@@ -165,7 +168,7 @@ static void udp_socks_afterpoll(void *state, struct pollfd *fds, int nfds)
 		BUF_ASSERT_FREE(cc->rbuf);
 	    } else { /* rv<=0 */
 		if (errno!=EINTR && !iswouldblock(errno))
-		    udp_sock_experienced(0,uc, "socket",us, 0,0, rv,errno);
+		    udp_sock_experienced(0,uc,socks,us, 0,0, rv,errno);
 		BUF_FREE(cc->rbuf);
 	    }
 	} while (rv>=0);
@@ -194,7 +197,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));
-	udp_sock_experienced(0,uc, "proxy",us, 1,0, r,errno);
+	udp_sock_experienced(0,uc,socks,us, 1,0, r,errno);
 	buf_unprepend(buf,8);
     } else {
 	int i,r;
@@ -207,7 +210,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));
-	    udp_sock_experienced(0,uc, "socket",us, 1,af, r,errno);
+	    udp_sock_experienced(0,uc,socks,us, 1,af, r,errno);
 	    if (r>=0) return True;
 	    if (!(errno==EAFNOSUPPORT || errno==ENETUNREACH))
 		/* who knows what that error means? */
@@ -227,6 +230,34 @@ void udp_destroy_socket(struct udpcommon *uc, struct udpsock *us)
     }
 }
 
+#define FAIL_LG 0, cc->cl.description, &cc->loc, failmsgclass
+#define FAIL(...) do{						\
+        lg_perror(FAIL_LG,errno,__VA_ARGS__);	\
+	goto failed;						\
+    }while(0)
+
+static bool_t record_socket_gotaddr(struct udpcommon *uc, struct udpsock *us,
+				    int failmsgclass)
+{
+    struct commcommon *cc=&uc->cc;
+    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"); }
+    return True;
+
+ failed:
+    return False;
+}
+
+bool_t udp_import_socket(struct udpcommon *uc, struct udpsock *us,
+			 int failmsgclass, int fd)
+{
+    FILLZERO(us->experienced);
+    us->fd=fd;
+    return record_socket_gotaddr(uc,us,failmsgclass);
+}
+
 bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
 		       int failmsgclass)
 {
@@ -234,12 +265,6 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
     struct commcommon *cc=&uc->cc;
     us->fd=-1;
 
-#define FAIL_LG 0, cc->cl.description, &cc->loc, failmsgclass
-#define FAIL(...) do{						\
-        lg_perror(FAIL_LG,errno,__VA_ARGS__);	\
-	goto failed;						\
-    }while(0)
-
     FILLZERO(us->experienced);
     us->fd=socket(addr->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
     if (us->fd<0) FAIL("socket");
@@ -318,18 +343,24 @@ bool_t udp_make_socket(struct udpcommon *uc, struct udpsock *us,
 	if (bind(us->fd, &addr->sa, iaddr_socklen(addr))!=0)
 	    FAIL("bind (%s)",iaddr_to_string(addr));
     }
+
+    bool_t ok=record_socket_gotaddr(uc,us,failmsgclass);
+    if (!ok) goto failed;
+
     return True;
 
 failed:
     udp_destroy_socket(uc,us);
     return False;
+}
 
 #undef FAIL
-}
 
-void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks)
+void udp_socks_register(struct udpcommon *uc, struct udpsocks *socks,
+			const char *desc)
 {
     socks->uc=uc;
+    socks->desc=desc;
     socks->interest=
 	register_for_poll(socks,udp_socks_beforepoll,udp_socks_afterpoll,"udp");
 }
@@ -362,7 +393,7 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
     for (i=0; i<socks->n_socks; i++)
 	udp_make_socket(uc,&socks->socks[i],M_FATAL);
 
-    udp_socks_register(uc,socks);
+    udp_socks_register(uc,socks, uc->use_proxy ? "proxy" : "socket");
 
     add_hook(PHASE_CHILDPERSIST,udp_childpersist_hook,st);
 }