From 0a11dd2d24680d4ee56a6343ba0b276be528d40b Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 11 Jul 2017 15:45:36 -0700 Subject: [PATCH] =?UTF-8?q?Fix=20NeighborDiscovery=20code=20now=20that=20Z?= =?UTF-8?q?T=5FSOCKADDR=5FNULL=20doesn=E2=80=99t=20exist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- osdep/NeighborDiscovery.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osdep/NeighborDiscovery.cpp b/osdep/NeighborDiscovery.cpp index cd8b9b919..ac95748bf 100644 --- a/osdep/NeighborDiscovery.cpp +++ b/osdep/NeighborDiscovery.cpp @@ -32,7 +32,7 @@ #include namespace ZeroTier { - + uint16_t calc_checksum (uint16_t *addr, int len) { int count = len; @@ -193,7 +193,7 @@ sockaddr_storage NeighborDiscovery::processIncomingND(const uint8_t *nd, unsigne assert(sizeof(_neighbor_advertisement) == 32); const uint64_t now = OSUtils::now(); - sockaddr_storage ip = ZT_SOCKADDR_NULL; + sockaddr_storage ip = {0}; if (len >= sizeof(_neighbor_solicitation) && nd[0] == 0x87) { // respond to Neighbor Solicitation request for local address