udp.c: Do not send NAKs in response to NAKs

[secnet.git] / udp.c

diff --git a/udp.c b/udp.c
index f4206642fc15f44f1de6606bd970c6e2449797f4..c83e618fb6ca91876dcb1307c2bac516ba35a06a 100644 (file)
--- a/udp.c
+++ b/udp.c
@@ -21,6 +21,7 @@
 #include "util.h"
 #include "unaligned.h"
 #include "ipaddr.h"
+#include "magic.h"
 
 static beforepoll_fn udp_beforepoll;
 static afterpoll_fn udp_afterpoll;
@@ -132,17 +133,26 @@ static void udp_afterpoll(void *state, struct pollfd *fds, int nfds)
                    }
                }
                if (!done) {
-                   uint32_t source,dest;
-                   /* 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): sending NAK\n",st->port);
-                   buffer_init(st->rbuf,0);
-                   buf_append_uint32(st->rbuf,dest);
-                   buf_append_uint32(st->rbuf,source);
-                   buf_append_uint32(st->rbuf,0); /* NAK is msg type 0 */
-                   sendto(st->fd, st->rbuf->start, st->rbuf->size, 0,
-                          (struct sockaddr *)&from, sizeof(from));
+                   uint32_t msgtype;
+                   if (st->rbuf->size>12 /* prevents traffic amplification */
+                       && ((msgtype=get_uint32(st->rbuf->start+8))
+                           != LABEL_NAK)) {
+                       uint32_t source,dest;
+                       /* 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));
+                   }
                    BUF_FREE(st->rbuf);
                }
                BUF_ASSERT_FREE(st->rbuf);
@@ -241,8 +251,8 @@ static void udp_phase_hook(void *sst, uint32_t new_phase)
        }
        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;