void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 13:03:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

RENDEZVOUS works now

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-29 08:00:54 -07:00
parent ee7361ee2e
commit da19da0360
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/Identity.hpp
View file

@ -428,7 +428,7 @@ public:
ZT_ALWAYS_INLINE bool operator<=(const Identity &id) const { return !(id < *this); } ZT_ALWAYS_INLINE bool operator<=(const Identity &id) const { return !(id < *this); }
ZT_ALWAYS_INLINE bool operator>=(const Identity &id) const { return !(*this < id); } ZT_ALWAYS_INLINE bool operator>=(const Identity &id) const { return !(*this < id); }
ZT_ALWAYS_INLINE unsigned long hashCode() const { return ((unsigned long)(_address.toInt() << 8) + (unsigned long)_pub.c25519[0] + (unsigned long)_pub.c25519[1] + (unsigned long)_pub.c25519[2]); } ZT_ALWAYS_INLINE unsigned long hashCode() const { return ((unsigned long)_address.toInt() + (unsigned long)_pub.c25519[0] + (unsigned long)_pub.c25519[1] + (unsigned long)_pub.c25519[2]); }
private: private:
Address _address; Address _address;

25
root/root.cpp
View file

@ -76,7 +76,7 @@ struct MulticastGroupHasher { ZT_ALWAYS_INLINE std::size_t operator()(const Mult
struct RendezvousKey struct RendezvousKey
{ {
RendezvousKey(const Address aa,const Address bb) RendezvousKey(const Address &aa,const Address &bb)
{ {
if (aa > bb) { if (aa > bb) {
a = aa; a = aa;
@ -120,6 +120,8 @@ static std::mutex peersByVirtAddr_l;
static std::mutex peersByPhysAddr_l; static std::mutex peersByPhysAddr_l;
static std::mutex lastRendezvous_l; static std::mutex lastRendezvous_l;
//////////////////////////////////////////////////////////////////////////////
static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt) static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
{ {
char ipstr[128],ipstr2[128],astr[32],astr2[32],tmpstr[256]; char ipstr[128],ipstr2[128],astr[32],astr2[32],tmpstr[256];
@ -136,10 +138,12 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
// If this is an un-encrypted HELLO, either learn a new peer or verify // If this is an un-encrypted HELLO, either learn a new peer or verify
// that this is a peer we already know. // that this is a peer we already know.
if ((pkt.cipher() == ZT_PROTO_CIPHER_SUITE__POLY1305_NONE)&&(pkt.verb() == Packet::VERB_HELLO)) { if ((pkt.cipher() == ZT_PROTO_CIPHER_SUITE__POLY1305_NONE)&&(pkt.verb() == Packet::VERB_HELLO)) {
std::lock_guard<std::mutex> pbi_l(peersByIdentity_l);
std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l);
Identity id; Identity id;
if (id.deserialize(pkt,ZT_PROTO_VERB_HELLO_IDX_IDENTITY)) { if (id.deserialize(pkt,ZT_PROTO_VERB_HELLO_IDX_IDENTITY)) {
{ {
std::lock_guard<std::mutex> pbi_l(peersByIdentity_l);
auto pById = peersByIdentity.find(id); auto pById = peersByIdentity.find(id);
if (pById != peersByIdentity.end()) { if (pById != peersByIdentity.end()) {
peer = pById->second; peer = pById->second;
@ -157,14 +161,8 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
if (pkt.dearmor(peer->key)) { if (pkt.dearmor(peer->key)) {
peer->id = id; peer->id = id;
peer->lastSync = 0; peer->lastSync = 0;
{
std::lock_guard<std::mutex> pbi_l(peersByIdentity_l);
peersByIdentity.emplace(id,peer); peersByIdentity.emplace(id,peer);
}
{
std::lock_guard<std::mutex> pbv_l(peersByVirtAddr_l);
peersByVirtAddr[id.address()].emplace(peer); peersByVirtAddr[id.address()].emplace(peer);
}
} else { } else {
printf("%s HELLO rejected: packet authentication failed" ZT_EOL_S,ip->toString(ipstr)); printf("%s HELLO rejected: packet authentication failed" ZT_EOL_S,ip->toString(ipstr));
return; return;
@ -340,7 +338,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
for(auto a=sources->second.begin();a!=sources->second.end();++a) { for(auto a=sources->second.begin();a!=sources->second.end();++a) {
for(auto b=toAddrs.begin();b!=toAddrs.end();++b) { for(auto b=toAddrs.begin();b!=toAddrs.end();++b) {
if (((*a)->ip6 == *ip)&&(b->second->ip6)) { if (((*a)->ip6 == *ip)&&(b->second->ip6)) {
printf("* introducing %s(%s) to %s(%s)" ZT_EOL_S,ip->toString(ipstr),source.toString(astr),b->second->ip6.toString(ipstr2),dest.toString(astr2)); //printf("* introducing %s(%s) to %s(%s)" ZT_EOL_S,ip->toString(ipstr),source.toString(astr),b->second->ip6.toString(ipstr2),dest.toString(astr2));
Packet outp(source,self.address(),Packet::VERB_RENDEZVOUS); Packet outp(source,self.address(),Packet::VERB_RENDEZVOUS);
outp.append((uint8_t)0); outp.append((uint8_t)0);
@ -360,7 +358,7 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
outp.armor(b->second->key,true); outp.armor(b->second->key,true);
sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)&(b->second->ip6),(socklen_t)sizeof(struct sockaddr_in6)); sendto(sock,pkt.data(),pkt.size(),0,(const struct sockaddr *)&(b->second->ip6),(socklen_t)sizeof(struct sockaddr_in6));
} else if (((*a)->ip4 == *ip)&&(b->second->ip4)) { } else if (((*a)->ip4 == *ip)&&(b->second->ip4)) {
printf("* introducing %s(%s) to %s(%s)" ZT_EOL_S,ip->toString(ipstr),source.toString(astr),b->second->ip4.toString(ipstr2),dest.toString(astr2)); //printf("* introducing %s(%s) to %s(%s)" ZT_EOL_S,ip->toString(ipstr),source.toString(astr),b->second->ip4.toString(ipstr2),dest.toString(astr2));
Packet outp(source,self.address(),Packet::VERB_RENDEZVOUS); Packet outp(source,self.address(),Packet::VERB_RENDEZVOUS);
outp.append((uint8_t)0); outp.append((uint8_t)0);
@ -403,6 +401,8 @@ static void handlePacket(const int sock,const InetAddress *const ip,Packet &pkt)
} }
} }
//////////////////////////////////////////////////////////////////////////////
static int bindSocket(struct sockaddr *bindAddr) static int bindSocket(struct sockaddr *bindAddr)
{ {
int s = socket(bindAddr->sa_family,SOCK_DGRAM,0); int s = socket(bindAddr->sa_family,SOCK_DGRAM,0);
@ -448,10 +448,7 @@ static int bindSocket(struct sockaddr *bindAddr)
return s; return s;
} }
void shutdownSigHandler(int sig) void shutdownSigHandler(int sig) { run = false; }
{
run = false;
}
int main(int argc,char **argv) int main(int argc,char **argv)
{ {