mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-07 13:03:45 +02:00
.
This commit is contained in:
parent
ccec49e444
commit
933404b1dd
1 changed files with 68 additions and 56 deletions
|
@ -195,7 +195,8 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
|
||||||
peer->lastReceive = now;
|
peer->lastReceive = now;
|
||||||
|
|
||||||
switch(pkt.verb()) {
|
switch(pkt.verb()) {
|
||||||
case Packet::VERB_HELLO: {
|
case Packet::VERB_HELLO:
|
||||||
|
try {
|
||||||
const uint64_t origId = pkt.packetId();
|
const uint64_t origId = pkt.packetId();
|
||||||
const uint64_t ts = pkt.template at<uint64_t>(ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP);
|
const uint64_t ts = pkt.template at<uint64_t>(ZT_PROTO_VERB_HELLO_IDX_TIMESTAMP);
|
||||||
pkt.reset(pkt.source(),self.address(),Packet::VERB_OK);
|
pkt.reset(pkt.source(),self.address(),Packet::VERB_OK);
|
||||||
|
@ -210,9 +211,13 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
|
||||||
pkt.armor(peer->key,true);
|
pkt.armor(peer->key,true);
|
||||||
sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)ip,(socklen_t)((ip->ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)));
|
sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)ip,(socklen_t)((ip->ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)));
|
||||||
//printf("%s <- OK(HELLO)" ZT_EOL_S,ip->toString(ipstr));
|
//printf("%s <- OK(HELLO)" ZT_EOL_S,ip->toString(ipstr));
|
||||||
} break;
|
} catch ( ... ) {
|
||||||
|
printf("* unexpected exception handling HELLO from %s" ZT_EOL_S,ip->toString(ipstr));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case Packet::VERB_MULTICAST_LIKE: {
|
case Packet::VERB_MULTICAST_LIKE:
|
||||||
|
try {
|
||||||
std::lock_guard<std::mutex> l(multicastSubscriptions_l);
|
std::lock_guard<std::mutex> l(multicastSubscriptions_l);
|
||||||
for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;(ptr+18)<=pkt.size();ptr+=18) {
|
for(unsigned int ptr=ZT_PACKET_IDX_PAYLOAD;(ptr+18)<=pkt.size();ptr+=18) {
|
||||||
const uint64_t nwid = pkt.template at<uint64_t>(ptr);
|
const uint64_t nwid = pkt.template at<uint64_t>(ptr);
|
||||||
|
@ -220,9 +225,13 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
|
||||||
multicastSubscriptions[nwid][mg][peer->id.address()] = now;
|
multicastSubscriptions[nwid][mg][peer->id.address()] = now;
|
||||||
//printf("%s subscribes to %s/%.8lx on network %.16llx" ZT_EOL_S,ip->toString(ipstr),mg.mac().toString(tmpstr),(unsigned long)mg.adi(),(unsigned long long)nwid);
|
//printf("%s subscribes to %s/%.8lx on network %.16llx" ZT_EOL_S,ip->toString(ipstr),mg.mac().toString(tmpstr),(unsigned long)mg.adi(),(unsigned long long)nwid);
|
||||||
}
|
}
|
||||||
} break;
|
} catch ( ... ) {
|
||||||
|
printf("* unexpected exception handling MULTICAST_LIKE from %s" ZT_EOL_S,ip->toString(ipstr));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case Packet::VERB_MULTICAST_GATHER: {
|
case Packet::VERB_MULTICAST_GATHER:
|
||||||
|
try {
|
||||||
const uint64_t nwid = pkt.template at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID);
|
const uint64_t nwid = pkt.template at<uint64_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_NETWORK_ID);
|
||||||
const unsigned int flags = pkt[ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS];
|
const unsigned int flags = pkt[ZT_PROTO_VERB_MULTICAST_GATHER_IDX_FLAGS];
|
||||||
const MulticastGroup mg(MAC(pkt.field(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC,6),6),pkt.template at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI));
|
const MulticastGroup mg(MAC(pkt.field(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_MAC,6),6),pkt.template at<uint32_t>(ZT_PROTO_VERB_MULTICAST_GATHER_IDX_ADI));
|
||||||
|
@ -252,12 +261,15 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
|
||||||
g->first.appendTo(pkt);
|
g->first.appendTo(pkt);
|
||||||
if (l > 0) {
|
if (l > 0) {
|
||||||
sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)ip,(socklen_t)((ip->ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)));
|
sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)ip,(socklen_t)((ip->ss_family == AF_INET) ? sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6)));
|
||||||
printf("%s gathered %u subscribers to %s/%.8lx on network %.16llx" ZT_EOL_S,ip->toString(ipstr),l,mg.mac().toString(tmpstr),(unsigned long)mg.adi(),(unsigned long long)nwid);
|
//printf("%s gathered %u subscribers to %s/%.8lx on network %.16llx" ZT_EOL_S,ip->toString(ipstr),l,mg.mac().toString(tmpstr),(unsigned long)mg.adi(),(unsigned long long)nwid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} break;
|
} catch ( ... ) {
|
||||||
|
printf("* unexpected exception handling MULTICAST_GATHER from %s" ZT_EOL_S,ip->toString(ipstr));
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue