diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-07-06 13:34:35 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-07-06 13:34:35 -0400 |
| commit | cfef114c31f4edfa55d9c36eabd3fd319a94d307 (patch) | |
| tree | 8307be48adf265c25405d8d5c607027528b47d25 /node/Packet.hpp | |
| parent | 118247e8b580efab3243a9aa7bbf610c192d5b45 (diff) | |
| download | infinitytier-cfef114c31f4edfa55d9c36eabd3fd319a94d307.tar.gz infinitytier-cfef114c31f4edfa55d9c36eabd3fd319a94d307.zip | |
Possible fix for issue #4 - segfault in ___removeIp helper function in EthernetTap on OSX -- I think the problem may have been that I was using set::erase(key) while also using an iterator, so now it uses erase(iterator). See if it happens again, cause I could not duplicate the issue. Possible minor difference in STL version.
Diffstat (limited to 'node/Packet.hpp')
| -rw-r--r-- | node/Packet.hpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/node/Packet.hpp b/node/Packet.hpp index 3fade674..f8f340b8 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -333,40 +333,40 @@ public: VERB_NOP = 0, /* Announcement of a node's existence: - * <[1] protocol version> + * <[1] protocol version> * <[1] software major version> * <[1] software minor version> * <[2] software revision> - * <[8] timestamp (ms since epoch)> - * <[...] binary serialized identity (see Identity)> + * <[8] timestamp (ms since epoch)> + * <[...] binary serialized identity (see Identity)> * * OK payload: - * <[8] timestamp (echoed from original HELLO)> + * <[8] timestamp (echoed from original HELLO)> * * ERROR has no payload. */ VERB_HELLO = 1, /* Error response: - * <[1] in-re verb> - * <[8] in-re packet ID> - * <[1] error code> - * <[...] error-dependent payload> + * <[1] in-re verb> + * <[8] in-re packet ID> + * <[1] error code> + * <[...] error-dependent payload> */ VERB_ERROR = 2, /* Success response: - * <[1] in-re verb> - * <[8] in-re packet ID> - * <[...] request-specific payload> + * <[1] in-re verb> + * <[8] in-re packet ID> + * <[...] request-specific payload> */ VERB_OK = 3, /* Query an identity by address: - * <[5] address to look up> + * <[5] address to look up> * * OK response payload: - * <[...] binary serialized identity> + * <[...] binary serialized identity> * * Error payload will be address queried. */ @@ -400,8 +400,8 @@ public: /* A ZT-to-ZT unicast ethernet frame: * <[8] 64-bit network ID> - * <[2] 16-bit ethertype> - * <[...] ethernet payload> + * <[2] 16-bit ethertype> + * <[...] ethernet payload> * * MAC addresses are derived from the packet's source and destination * ZeroTier addresses. ZeroTier does not support VLANs or other extensions |