X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=udp.c;h=97b92a6017b81677b9c50f2be3db6ee282d1fde2;hp=c83e618fb6ca91876dcb1307c2bac516ba35a06a;hb=c22c3541042ff7907144945abace305350297806;hpb=bf28fc736c33aa8b26b3c3267cf4c3b33e69c4a5

diff --git a/udp.c b/udp.c
index c83e618..97b92a6 100644
--- a/udp.c
+++ b/udp.c
@@ -19,6 +19,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include "util.h"
+#include "magic.h"
 #include "unaligned.h"
 #include "ipaddr.h"
 #include "magic.h"
@@ -102,6 +103,7 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 	    fromlen=sizeof(from);
 	    BUF_ASSERT_FREE(st->rbuf);
 	    BUF_ALLOC(st->rbuf,"udp_afterpoll");
+	    buffer_init(st->rbuf,calculate_max_start_pad());
 	    rv=recvfrom(st->fd, st->rbuf->start, st->rbuf->len, 0,
 			(struct sockaddr *)&from, &fromlen);
 	    if (rv>0) {
@@ -121,12 +123,12 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 		    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) {
-		    struct comm_addr ca;
-		    FILLZERO(ca);
-		    ca.comm=&st->ops;
-		    ca.sin=from;
 		    if (n->fn(n->state, st->rbuf, &ca)) {
 			done=True;
 			break;
@@ -141,17 +143,7 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
 			/* 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, peer %s):"
-				" %08"PRIx32"<-%08"PRIx32": %08"PRIx32":"
-				" unwanted/incorrect, sending NAK\n",
-				st->port, saddr_to_string(&from),
-				dest, source, msgtype);
-			buffer_init(st->rbuf,0);
-			buf_append_uint32(st->rbuf,dest);
-			buf_append_uint32(st->rbuf,source);
-			buf_append_uint32(st->rbuf,LABEL_NAK);
-			sendto(st->fd, st->rbuf->start, st->rbuf->size, 0,
-			       (struct sockaddr *)&from, sizeof(from));
+			send_nak(&ca,source,dest,msgtype,st->rbuf,"unwanted");
 		    }
 		    BUF_FREE(st->rbuf);
 		}
@@ -203,12 +195,13 @@ static bool_t udp_sendmsg(void *commst, struct buffer_if *buf,
     uint8_t *sa;
 
     if (st->use_proxy) {
-	sa=buf->start-8;
+	sa=buf_prepend(buf,8);
 	memcpy(sa,&dest->sin.sin_addr,4);
 	memset(sa+4,0,4);
 	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->sin, sizeof(dest->sin));
@@ -298,8 +291,6 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
     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;
@@ -334,9 +325,10 @@ static list_t *udp_apply(closure_t *self, struct cloc loc, dict_t *context,
 	    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);