diff options
| author | Joseph Henry <josephjah@gmail.com> | 2015-12-14 14:45:40 -0800 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2015-12-14 14:45:40 -0800 |
| commit | b92884a0adff67abead968faff7146b83b6ca908 (patch) | |
| tree | 1533c0a214fa157d9313ebe7af069311663d0881 /node/Packet.cpp | |
| parent | a421e31dd5bfdece693092a0b6fb7a204b5fba42 (diff) | |
| parent | c0df1169eebd8b12caac073e6c100faed586004d (diff) | |
| download | infinitytier-b92884a0adff67abead968faff7146b83b6ca908.tar.gz infinitytier-b92884a0adff67abead968faff7146b83b6ca908.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/zerotierone into edge
Diffstat (limited to 'node/Packet.cpp')
| -rw-r--r-- | node/Packet.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node/Packet.cpp b/node/Packet.cpp index f11ae1b8..60321275 100644 --- a/node/Packet.cpp +++ b/node/Packet.cpp @@ -52,7 +52,6 @@ const char *Packet::verbString(Verb v) case VERB_NETWORK_CONFIG_REFRESH: return "NETWORK_CONFIG_REFRESH"; case VERB_MULTICAST_GATHER: return "MULTICAST_GATHER"; case VERB_MULTICAST_FRAME: return "MULTICAST_FRAME"; - case VERB_SET_EPHEMERAL_KEY: return "SET_EPHEMERAL_KEY"; case VERB_PUSH_DIRECT_PATHS: return "PUSH_DIRECT_PATHS"; case VERB_CIRCUIT_TEST: return "CIRCUIT_TEST"; case VERB_CIRCUIT_TEST_REPORT: return "CIRCUIT_TEST_REPORT"; |