diff options
| author | Joseph Henry <josephjah@gmail.com> | 2015-12-18 15:09:18 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2015-12-18 15:09:18 -0800 |
| commit | 81203b20b84b30d8aa1f1083d60b71a4777b7e26 (patch) | |
| tree | 9a49dd096cdc7a0d33b5cd7a3581c4b915f9a843 /node | |
| parent | 91bc32fe51d4d2f4df26cbb75f8b5a63e0c647b1 (diff) | |
| parent | d3dacf5c2a441ca0f76d0cffe68e6e64113edd80 (diff) | |
| download | infinitytier-81203b20b84b30d8aa1f1083d60b71a4777b7e26.tar.gz infinitytier-81203b20b84b30d8aa1f1083d60b71a4777b7e26.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/zerotierone into edge
Diffstat (limited to 'node')
| -rw-r--r-- | node/Peer.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp index 891827b4..340f0c10 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -312,21 +312,7 @@ void Peer::pushDirectPaths(const RuntimeEnvironment *RR,Path *path,uint64_t now, continue; } - uint8_t flags = 0; - /* TODO: path trust is not implemented yet - switch(p->trust()) { - default: - break; - case Path::TRUST_PRIVACY: - flags |= 0x04; // no encryption - break; - case Path::TRUST_ULTIMATE: - flags |= (0x04 | 0x08); // no encryption, no authentication (redundant but go ahead and set both) - break; - } - */ - - outp.append(flags); + outp.append((uint8_t)0); // no flags outp.append((uint16_t)0); // no extensions outp.append(addressType); outp.append((uint8_t)((addressType == 4) ? 6 : 18)); |