This commit is contained in:
Adam Ierymenko 2019-08-28 13:40:49 -07:00
parent 0adf306dd4
commit 807cc9afc3
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3

View file

@ -118,7 +118,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,const Packet
auto pById = peersByIdentity.find(id); auto pById = peersByIdentity.find(id);
if (pById != peersByIdentity.end()) { if (pById != peersByIdentity.end()) {
peer = pById->second; peer = pById->second;
printf("%s has %s (known (1))" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr)); //printf("%s has %s (known (1))" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr));
} }
} }
if (peer) { if (peer) {
@ -140,7 +140,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,const Packet
std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l); std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l);
peersByVirtAddr[id.address()].emplace(peer); peersByVirtAddr[id.address()].emplace(peer);
} }
printf("%s has %s (new)" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr)); //printf("%s has %s (new)" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr));
} else { } else {
printf("%s HELLO rejected: invalid identity (locallyValidate() failed)" ZT_EOL_S,ip->toString(ipstr)); printf("%s HELLO rejected: invalid identity (locallyValidate() failed)" ZT_EOL_S,ip->toString(ipstr));
return; return;
@ -166,7 +166,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,const Packet
for(auto p=peers->second.begin();p!=peers->second.end();++p) { for(auto p=peers->second.begin();p!=peers->second.end();++p) {
if (pkt.dearmor((*p)->key)) { if (pkt.dearmor((*p)->key)) {
peer = (*p); peer = (*p);
printf("%s has %s (known (2))" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr)); //printf("%s has %s (known (2))" ZT_EOL_S,ip->toString(ipstr),pkt.source().toString(astr));
break; break;
} else { } else {
pkt = *inpkt; // dearmor() destroys contents of pkt pkt = *inpkt; // dearmor() destroys contents of pkt