diff options
| author | Joseph Henry <josephjah@gmail.com> | 2018-01-09 10:00:01 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2018-01-09 10:00:01 -0800 |
| commit | 09e4ab9aa180bb84208878292be7b178e67786ce (patch) | |
| tree | 4d7834b69a489351e1e2e954b8905bdc61a0a236 /service | |
| parent | 2e1bc6e500be4b7bdec3304245c8d19ab186a97c (diff) | |
| parent | 1aea096b631cbd7734834f43c3beefeff3939b4e (diff) | |
| download | infinitytier-09e4ab9aa180bb84208878292be7b178e67786ce.tar.gz infinitytier-09e4ab9aa180bb84208878292be7b178e67786ce.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 92b78a8c..8aeecd5e 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -585,7 +585,7 @@ public: } else break; ++fno; } - if ( (trustedPathId != 0) && ((trustedPathNetwork.ss_family == AF_INET)||(trustedPathNetwork.ss_family == AF_INET6)) && (trustedPathNetwork.ipScope() != InetAddress::IP_SCOPE_GLOBAL) && (trustedPathNetwork.netmaskBits() > 0) ) { + if ( (trustedPathId != 0) && ((trustedPathNetwork.ss_family == AF_INET)||(trustedPathNetwork.ss_family == AF_INET6)) && (trustedPathNetwork.netmaskBits() > 0) ) { ppc[trustedPathNetwork].trustedPathId = trustedPathId; ppc[trustedPathNetwork].mtu = 0; // use default } |