(1) Make ZT_ naming convention consistent (get rid of ZT1_), (2) Make local interface a full sockaddr_storage instead of an int identifier, which turns out to be better for multi-homing and other uses.

This commit is contained in:
Adam Ierymenko 2015-09-24 16:21:36 -07:00
parent 0e5aac6a11
commit f69454ec98
29 changed files with 622 additions and 622 deletions

View file

@ -105,7 +105,7 @@ public:
* and appears to be valid.
*
* @param RR Runtime environment
* @param localInterfaceId Local interface ID or -1 if unspecified
* @param localAddr Local address
* @param remoteAddr Internet address of sender
* @param hops ZeroTier (not IP) hops
* @param packetId Packet ID
@ -115,7 +115,7 @@ public:
*/
void received(
const RuntimeEnvironment *RR,
int localInterfaceId,
const InetAddress &localAddr,
const InetAddress &remoteAddr,
unsigned int hops,
uint64_t packetId,
@ -157,11 +157,11 @@ public:
* for NAT traversal and path verification.
*
* @param RR Runtime environment
* @param localInterfaceId Local interface ID or -1 for unspecified
* @param localAddr Local address
* @param atAddress Destination address
* @param now Current time
*/
void attemptToContactAt(const RuntimeEnvironment *RR,int localInterfaceId,const InetAddress &atAddress,uint64_t now);
void attemptToContactAt(const RuntimeEnvironment *RR,const InetAddress &localAddr,const InetAddress &atAddress,uint64_t now);
/**
* Send pings or keepalives depending on configured timeouts
@ -417,7 +417,7 @@ private:
uint16_t _vMinor;
uint16_t _vRevision;
Identity _id;
RemotePath _paths[ZT1_MAX_PEER_NETWORK_PATHS];
RemotePath _paths[ZT_MAX_PEER_NETWORK_PATHS];
unsigned int _numPaths;
unsigned int _latency;