diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-13 10:51:19 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-13 10:51:19 -0700 |
| commit | 54893c35c113b2a1f2fab2fcbefed258c755c75e (patch) | |
| tree | 1ed6eca0319e24713624f1d95f46a020e53f60ad /osdep | |
| parent | 495c5ce81ddb245e21f21325927236d0f666f6cf (diff) | |
| parent | 4cc773ec1bd768e8bc318135c548f94ae270e959 (diff) | |
| download | infinitytier-54893c35c113b2a1f2fab2fcbefed258c755c75e.tar.gz infinitytier-54893c35c113b2a1f2fab2fcbefed258c755c75e.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/NeighborDiscovery.cpp | 4 |
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 |