diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-10-05 10:12:16 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-10-05 10:12:16 -0700 |
| commit | f1c8706485bf0c6b63b677c79109e93bb769824a (patch) | |
| tree | 97d9c7e5d50b21e5380dbd992e7c1904145833fd /osdep | |
| parent | d5f4d381d01a4428558627feb42cea70fa7a90e2 (diff) | |
| parent | 69c59767752c405859471f40694a8c2539ce8c44 (diff) | |
| download | infinitytier-f1c8706485bf0c6b63b677c79109e93bb769824a.tar.gz infinitytier-f1c8706485bf0c6b63b677c79109e93bb769824a.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/NeighborDiscovery.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osdep/NeighborDiscovery.cpp b/osdep/NeighborDiscovery.cpp index dbb8b5ba..ee4cb5b1 100644 --- a/osdep/NeighborDiscovery.cpp +++ b/osdep/NeighborDiscovery.cpp @@ -180,7 +180,7 @@ void NeighborDiscovery::remove(const sockaddr_storage &address) sockaddr_storage NeighborDiscovery::processIncomingND(const uint8_t *nd, unsigned int len, const sockaddr_storage &localIp, uint8_t *response, unsigned int &responseLen, MAC &responseDest) { assert(sizeof(_neighbor_solicitation) == 28); - assert(sizeof(_neighbor_advertisement) == 30); + assert(sizeof(_neighbor_advertisement) == 32); const uint64_t now = OSUtils::now(); sockaddr_storage ip = ZT_SOCKADDR_NULL; |