summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-01-05 15:52:02 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-01-05 15:52:02 -0800
commit87c599df5c7de170d87c70adbcf94b536dac10f4 (patch)
treee48854d02dfb62ba9e36ebd7eeb9efdc0abd9855 /node
parent56cfe1d603104784ec40d94d8ac689391ef2e0eb (diff)
downloadinfinitytier-87c599df5c7de170d87c70adbcf94b536dac10f4.tar.gz
infinitytier-87c599df5c7de170d87c70adbcf94b536dac10f4.zip
Back out service message type -- YAGNI violation.
Diffstat (limited to 'node')
-rw-r--r--node/Packet.cpp1
-rw-r--r--node/Packet.hpp35
2 files changed, 1 insertions, 35 deletions
diff --git a/node/Packet.cpp b/node/Packet.cpp
index c20fac42..e7870a98 100644
--- a/node/Packet.cpp
+++ b/node/Packet.cpp
@@ -50,7 +50,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_SERVICE_MESSAGE: return "SERVICE_MESSAGE";
}
return "(unknown)";
}
diff --git a/node/Packet.hpp b/node/Packet.hpp
index 9b400976..37fd1e0c 100644
--- a/node/Packet.hpp
+++ b/node/Packet.hpp
@@ -802,40 +802,7 @@ public:
* <[6] multicast group MAC>
* <[4] 32-bit multicast group ADI>
*/
- VERB_MULTICAST_FRAME = 14,
-
- /* Message or query to a service:
- * <[8] 64-bit service identifier>
- * <[1] flags>
- * [<[...] payload to service>]
- *
- * Flags are currently unused and must be zero.
- *
- * Services allow out-of-band extensions to be added to the
- * ZeroTier peer-to-peer network without having to mix them
- * with the Ethernet virtualization layer. Right now this
- * includes the network configuration (netconf) service, and
- * in the future could include things like DHTs, caching,
- * mesh net functionality, extensions to cryptographic or
- * authentication services, remote administration, remote
- * debugging, etc.
- *
- * Service identifiers less than or equal to 0xffff (65535)
- * are reserved for use by ZeroTier Networks, with ID 0 being
- * the netconf service that provisions and configures virtual
- * networks. These IDs should not be used by third party
- * developers. IDs above 65535 can be used, and should be
- * assigned using something like a cryptographic random number
- * generator to minimize the potential for collisions.
- *
- * OK responses to this message contain the same fields as
- * above, and their meaning is service-dependent.
- *
- * ERROR_UNSUPPORTED_OPERATION may optionally be returned if
- * the queried service ID is not available on this node.
- * Payload consists of the 64-bit service ID queried.
- */
- VERB_SERVICE_MESSAGE = 15
+ VERB_MULTICAST_FRAME = 14
};
/**