diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-21 12:29:33 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-06-21 12:29:33 -0400 |
| commit | aead1050fbed65c690190efeed09ff544defa1ec (patch) | |
| tree | edab5811d512da8c77f7416b9d4e3515209592e9 /node | |
| parent | 6e485833ef77abdb3c5d655952b34853fbc7940a (diff) | |
| download | infinitytier-aead1050fbed65c690190efeed09ff544defa1ec.tar.gz infinitytier-aead1050fbed65c690190efeed09ff544defa1ec.zip | |
Bridging (GitHub issue #68) does indeed work! Just needed to fix a packet size thinko.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Packet.hpp | 2 | ||||
| -rw-r--r-- | node/Switch.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/node/Packet.hpp b/node/Packet.hpp index 0664d026..a569cde3 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -496,7 +496,7 @@ public: */ VERB_RENDEZVOUS = 5, - /* A ZT-to-ZT unicast ethernet frame: + /* A ZT-to-ZT unicast ethernet frame (shortened EXT_FRAME): * <[8] 64-bit network ID> * <[2] 16-bit ethertype> * <[...] ethernet payload> diff --git a/node/Switch.cpp b/node/Switch.cpp index 3918c856..0f868553 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -259,10 +259,8 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c bridges[0] = network->findBridgeTo(to); if ((bridges[0])&&(bridges[0] != _r->identity.address())&&(network->isAllowed(bridges[0]))&&(network->permitsBridging(bridges[0]))) { - printf("got known bridge for %s at %s\n",to.toString().c_str(),bridges[0].toString().c_str()); ++numBridges; } else if (!nconf->activeBridges().empty()) { - printf("bridge spamming for %s\n",to.toString().c_str()); // If there is no known route, spam to up to ZT_MAX_BRIDGE_SPAM active bridges std::set<Address>::const_iterator ab(nconf->activeBridges().begin()); if (nconf->activeBridges().size() <= ZT_MAX_BRIDGE_SPAM) { |