From c89dc584ab267b34871fa9c5b004808e25d07dc1 Mon Sep 17 00:00:00 2001
From: Logan oos Even <46396513+Logan007@users.noreply.github.com>
Date: Mon, 16 Nov 2020 21:38:37 +0100
Subject: [PATCH] send gratuitous arp only upon first registration (#502)

---
 src/edge_utils.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/edge_utils.c b/src/edge_utils.c
index bb40a74..88f7d76 100644
--- a/src/edge_utils.c
+++ b/src/edge_utils.c
@@ -1022,8 +1022,6 @@ void update_supernode_reg(n2n_edge_t * eee, time_t nowTime) {
 
   eee->sn_wait=1;
 
-  send_grat_arps(eee);
-
   eee->last_register_req = nowTime;
 }
 
@@ -1769,6 +1767,12 @@ void edge_read_from_tap(n2n_edge_t * eee) {
 	    len = tmp_len;
 	  }
 
+          if (!eee->last_sup) {
+            // drop packets before first registration with supernode
+            traceEvent(TRACE_DEBUG, "DROP packet before first registration with supernode");
+            return;
+          }
+
 	  edge_send_packet2net(eee, eth_pkt, len);
         }
     }
@@ -1880,6 +1884,12 @@ void readFromIPSocket(n2n_edge_t * eee, int in_sock) {
 	  }
 	}
 
+        if (!eee->last_sup) {
+          // drop packets received before first registration with supernode
+          traceEvent(TRACE_DEBUG, "readFromIPSocket dropped PACKET recevied before first registration with supernode.");
+          return;
+        }
+
 	if(is_valid_peer_sock(&pkt.sock))
 	  orig_sender = &(pkt.sock);
 
@@ -2056,9 +2066,6 @@ void readFromIPSocket(n2n_edge_t * eee, int in_sock) {
                   payload++;
 		}
 
-		eee->last_sup = now;
-		eee->sn_wait=0;
-		eee->sup_attempts = N2N_EDGE_SUP_ATTEMPTS; /* refresh because we got a response */
 		if (eee->conf.tuntap_ip_mode == TUNTAP_IP_MODE_SN_ASSIGN) {
 		  if ((ra.dev_addr.net_addr != 0) && (ra.dev_addr.net_bitlen != 0)) {
 		    net = htonl(ra.dev_addr.net_addr);
@@ -2074,6 +2081,13 @@ void readFromIPSocket(n2n_edge_t * eee, int in_sock) {
 		  }
 		}
 
+                if (!eee->last_sup) // send gratuitous ARP only upon first registration with supernode
+                  send_grat_arps(eee);
+
+		eee->last_sup = now;
+		eee->sn_wait=0;
+		eee->sup_attempts = N2N_EDGE_SUP_ATTEMPTS; /* refresh because we got a response */
+
 		if(eee->cb.sn_registration_updated)
 		  eee->cb.sn_registration_updated(eee, now, &sender);