diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-30 11:05:35 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-09-30 11:05:35 -0400 |
| commit | 4ecb9369b56c7aa507c9c0c9fa8381ec6772a0ea (patch) | |
| tree | e3770731f0c6ca9b7e78911bc11df18881fc13f7 /node/Packet.hpp | |
| parent | 141b85873731db10060677e1135b8c04a1dc8613 (diff) | |
| download | infinitytier-4ecb9369b56c7aa507c9c0c9fa8381ec6772a0ea.tar.gz infinitytier-4ecb9369b56c7aa507c9c0c9fa8381ec6772a0ea.zip | |
Fix for multicast propagation -- supernodes must always keep propagating. Also fix mac-tap build on new version of Xcode CL tools. Must use old llvm-g++ instead of clang for i686 -mkernel.
Diffstat (limited to 'node/Packet.hpp')
| -rw-r--r-- | node/Packet.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Packet.hpp b/node/Packet.hpp index 821d617a..899b2517 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -175,7 +175,7 @@ #define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_PROPAGATION_PREFIX_BITS (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_PROPAGATION_BLOOM_NONCE + ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_BLOOM_NONCE) #define ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_PREFIX_BITS 1 #define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_PROPAGATION_PREFIX (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_PROPAGATION_PREFIX_BITS + ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_PREFIX_BITS) -#define ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_PREFIX 2 +#define ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_PREFIX 1 #define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ORIGIN (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_PROPAGATION_PREFIX + ZT_PROTO_VERB_MULTICAST_FRAME_LEN_PROPAGATION_PREFIX) #define ZT_PROTO_VERB_MULTICAST_FRAME_LEN_ORIGIN 5 #define ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ORIGIN_MCID (ZT_PROTO_VERB_MULTICAST_FRAME_IDX_ORIGIN + ZT_PROTO_VERB_MULTICAST_FRAME_LEN_ORIGIN) @@ -477,7 +477,7 @@ public: VERB_PROXY_FRAME = 7, /* A multicast frame: - * <[2] 16-bit propagation depth> + * <[2] 16-bit propagation depth or 0xffff for "do not forward"> * <[320] propagation FIFO> * <[1024] propagation bloom filter> * [... begin signed portion ...] @@ -485,7 +485,7 @@ public: * <[8] 64-bit network ID> * <[2] 16-bit random propagation bloom filter nonce> * <[1] number of significant bits in propagation restrict prefix> - * <[2] 16-bit propagation restriction prefix (sig bits right to left)> + * <[1] propagation restriction prefix (sig bits right to left)> * <[5] ZeroTier address of node of origin> * <[3] 24-bit multicast ID, together with origin forms GUID> * <[6] source MAC address> |