From e07a0196155f7c2a5b4c839bc9c72c396fe3fe89 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Wed, 28 Aug 2019 14:47:05 -0700
Subject: [PATCH] .

---
 node/IncomingPacket.cpp | 2 +-
 root/root.cpp           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp
index da30e95f6..95c561449 100644
--- a/node/IncomingPacket.cpp
+++ b/node/IncomingPacket.cpp
@@ -655,7 +655,7 @@ bool IncomingPacket::_doMULTICAST_LIKE(const RuntimeEnvironment *RR,void *tPtr,c
 	uint64_t lastNwid = 0;
 
 	// Packet contains a series of 18-byte network,MAC,ADI tuples
-	for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;ptr<size();ptr+=18) {
+	for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;(ptr+18)<=size();ptr+=18) {
 		const uint64_t nwid = at<uint64_t>(ptr);
 		if (nwid != lastNwid) {
 			lastNwid = nwid;
diff --git a/root/root.cpp b/root/root.cpp
index bd07f3148..f421cc1ea 100644
--- a/root/root.cpp
+++ b/root/root.cpp
@@ -212,13 +212,14 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
 						ip->serialize(pkt);
 						pkt.armor(peer->key,true);
 						sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)ip,(socklen_t)((ip->ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)));
+						printf("%s <- OK(HELLO)" ZT_EOL_S,ip->toString(ipstr));
 					}
 				}	break;
 
 				case Packet::VERB_MULTICAST_LIKE: {
 					printf("LIKE\n");
 					Mutex::Lock l(peer->multicastGroups_l);
-					for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;ptr<pkt.size();ptr+=18) {
+					for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;(ptr+18)<=pkt.size();ptr+=18) {
 						const uint64_t nwid = pkt.template at<uint64_t>(ptr);
 						const MulticastGroup mg(MAC(pkt.field(ptr + 8,6),6),pkt.template at<uint32_t>(ptr + 14));
 						peer->multicastGroups[nwid][mg] = now;