summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrant Limberg <grant.limberg@zerotier.com>2017-07-11 15:45:36 -0700
committerGrant Limberg <grant.limberg@zerotier.com>2017-07-11 15:45:36 -0700
commit0a11dd2d24680d4ee56a6343ba0b276be528d40b (patch)
tree244c6512e64f688304411f9ac300a46be35fbef1
parentdab0fb9e05677bdc6294f196fcf8234892c582c1 (diff)
downloadinfinitytier-0a11dd2d24680d4ee56a6343ba0b276be528d40b.tar.gz
infinitytier-0a11dd2d24680d4ee56a6343ba0b276be528d40b.zip
Fix NeighborDiscovery code now that ZT_SOCKADDR_NULL doesn’t exist
-rw-r--r--osdep/NeighborDiscovery.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/osdep/NeighborDiscovery.cpp b/osdep/NeighborDiscovery.cpp
index cd8b9b91..ac95748b 100644
--- a/osdep/NeighborDiscovery.cpp
+++ b/osdep/NeighborDiscovery.cpp
@@ -32,7 +32,7 @@
#include <assert.h>
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