diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-31 11:18:40 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-12-31 11:18:40 -0800 |
| commit | cc2a1444ae9a732fc5f480af06237ceb29507ea6 (patch) | |
| tree | beaef7fd1a34ee7726cdfb5c427c1d19a90feb15 /node | |
| parent | 10df5dcf707e76d4f66daef8dfb4a51df27abce1 (diff) | |
| download | infinitytier-cc2a1444ae9a732fc5f480af06237ceb29507ea6.tar.gz infinitytier-cc2a1444ae9a732fc5f480af06237ceb29507ea6.zip | |
TRACE output improvements and compile fix.
Diffstat (limited to 'node')
| -rw-r--r-- | node/PacketDecoder.cpp | 4 | ||||
| -rw-r--r-- | node/Peer.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/node/PacketDecoder.cpp b/node/PacketDecoder.cpp index be4650f9..cf1b5ff5 100644 --- a/node/PacketDecoder.cpp +++ b/node/PacketDecoder.cpp @@ -112,7 +112,7 @@ bool PacketDecoder::tryDecode(const RuntimeEnvironment *_r) // This might be something from a new or old version of the protocol. // Technically it passed MAC so the packet is still valid, but we // ignore it. - TRACE("ignored unrecognized verb %.2x from %s(%s)",(unsigned int)v,source().toString().c_str(),_remoteAddress.toString().c_str()); + TRACE("ignored unrecognized verb %.2x from %s(%s)",(unsigned int)verb(),source().toString().c_str(),_remoteAddress.toString().c_str()); return true; } } else { @@ -277,7 +277,7 @@ bool PacketDecoder::_doOK(const RuntimeEnvironment *_r,const SharedPtr<Peer> &pe Packet::Verb inReVerb = (Packet::Verb)(*this)[ZT_PROTO_VERB_OK_IDX_IN_RE_VERB]; uint64_t inRePacketId = at<uint64_t>(ZT_PROTO_VERB_OK_IDX_IN_RE_PACKET_ID); - //TRACE("%s(%s): OK(%s)",source().toString().c_str(),_remoteAddress.toString().c_str(),Packet::verbString(inReVerb)); + TRACE("%s(%s): OK(%s)",source().toString().c_str(),_remoteAddress.toString().c_str(),Packet::verbString(inReVerb)); switch(inReVerb) { case Packet::VERB_HELLO: { diff --git a/node/Peer.cpp b/node/Peer.cpp index 6e5e5175..106b4350 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -97,8 +97,10 @@ void Peer::onReceive( // Only learn paths on replies to packets we have sent, otherwise // this introduces both an asymmetry problem in NAT-t and a potential // reply DOS attack. - if (!wp->fixed) + if (!wp->fixed) { wp->addr = remoteAddr; + TRACE("peer %s learned endpoint %s from %s(%s)",address().toString().c_str(),remoteAddr.toString().c_str(),Packet::verbString(verb),Packet::verbString(inReVerb)); + } _requestHistory[p].timestamp = 0; break; |