ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-30 17:56:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Adam Ierymenko 2019-08-28 13:59:23 -07:00
parent b1c8e6ad59
commit b974ece24f
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
root/root.cpp
View File

@ -102,9 +102,8 @@ static std::mutex peersByIdentity_l;
static std::mutex peersByVirtAddr_l; static std::mutex peersByVirtAddr_l;
static std::mutex peersByPhysAddr_l; static std::mutex peersByPhysAddr_l;
static void handlePacket(const int sock,const InetAddress *const ip,const Packet *const inpkt) static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
{ {
Packet pkt(*inpkt);
char ipstr[128],ipstr2[128],astr[32],tmpstr[256]; char ipstr[128],ipstr2[128],astr[32],tmpstr[256];
const bool fragment = pkt[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR; const bool fragment = pkt[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR;
@ -171,8 +170,6 @@ static void handlePacket(const int sock,const InetAddress *const ip,const Packet
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 {
pkt = *inpkt; // dearmor() destroys contents of pkt
} }
} }
} }
@ -239,7 +236,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,const Packet
std::vector<InetAddress> toAddrs; std::vector<InetAddress> toAddrs;
{ {
std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l); std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l);
auto peers = peersByVirtAddr.find(inpkt->destination()); auto peers = peersByVirtAddr.find(pkt.destination());
if (peers != peersByVirtAddr.end()) { if (peers != peersByVirtAddr.end()) {
for(auto p=peers->second.begin();p!=peers->second.end();++p) { for(auto p=peers->second.begin();p!=peers->second.end();++p) {
if ((*p)->ip6) if ((*p)->ip6)
@ -379,8 +376,9 @@ int main(int argc,char **argv)
if (pl > 0) { if (pl > 0) {
try { try {
pkt.setSize((unsigned int)pl); pkt.setSize((unsigned int)pl);
handlePacket(s6,reinterpret_cast<const InetAddress *>(&in6),&pkt); handlePacket(s6,reinterpret_cast<const InetAddress *>(&in6),pkt);
} catch ( ... ) { } catch ( ... ) {
printf("* unexpected exception" ZT_EOL_S);
} }
} else { } else {
break; break;
@ -398,8 +396,9 @@ int main(int argc,char **argv)
if (pl > 0) { if (pl > 0) {
try { try {
pkt.setSize((unsigned int)pl); pkt.setSize((unsigned int)pl);
handlePacket(s4,reinterpret_cast<const InetAddress *>(&in4),&pkt); handlePacket(s4,reinterpret_cast<const InetAddress *>(&in4),pkt);
} catch ( ... ) { } catch ( ... ) {
printf("* unexpected exception" ZT_EOL_S);
} }
} else { } else {
break; break;