diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-07 11:55:55 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-07 11:55:55 -0400 |
| commit | f5717f44272fcfe79f813f1f1180534e22601e85 (patch) | |
| tree | d393464914f464de3d89a25196c10be8695d9cf8 | |
| parent | 5f8a3f4a7f2eaae3e3091bc4e0dc8977ec597744 (diff) | |
| download | infinitytier-f5717f44272fcfe79f813f1f1180534e22601e85.tar.gz infinitytier-f5717f44272fcfe79f813f1f1180534e22601e85.zip | |
Fix a bug and wow, it works.
| -rw-r--r-- | node/Switch.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index bb10b412..0b3cdf6d 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -144,7 +144,7 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c } } else if (to.isZeroTier()) { // Simple unicast frame from us to another node - Address toZT(to); + Address toZT(to.data + 1,ZT_ADDRESS_LENGTH); if (network->isAllowed(toZT)) { Packet outp(toZT,_r->identity.address(),Packet::VERB_FRAME); outp.append(network->id()); @@ -167,7 +167,8 @@ void Switch::send(const Packet &packet,bool encrypt) return; } - //TRACE("%.16llx %s -> %s (size: %u) (enc: %s)",packet.packetId(),Packet::verbString(packet.verb()),packet.destination().toString().c_str(),packet.size(),(encrypt ? "yes" : "no")); + //TRACE(">> %.16llx %s -> %s (size: %u) (enc: %s)",(unsigned long long)packet.packetId(),packet.source().toString().c_str(),packet.destination().toString().c_str(),packet.size(),(encrypt ? "yes" : "no")); + if (!_trySend(packet,encrypt)) { Mutex::Lock _l(_txQueue_m); _txQueue.insert(std::pair< Address,TXQueueEntry >(packet.destination(),TXQueueEntry(Utils::now(),packet,encrypt))); @@ -520,6 +521,8 @@ void Switch::_handleRemotePacketHead(Demarc::Port localPort,const InetAddress &f Address source(packet->source()); Address destination(packet->destination()); + //TRACE("<< %.16llx %s -> %s (size: %u)",(unsigned long long)packet->packetId(),source.toString().c_str(),destination.toString().c_str(),packet->size()); + if (destination != _r->identity.address()) { // Packet is not for us, so try to relay it if (packet->hops() < ZT_RELAY_MAX_HOPS) { |