diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-24 11:00:22 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-24 11:00:22 -0700 |
| commit | fbde40d1fc8767e4b6e9fcf0b078a8a4eb0646bd (patch) | |
| tree | e6776e96db9f90e985ac86c9967d7d945033328a /node/Peer.hpp | |
| parent | 557c0c29b0781ff6190189fc080075b1c773f382 (diff) | |
| parent | 0e5aac6a117c28fde63f4cdb94e6c9fc415ca098 (diff) | |
| download | infinitytier-fbde40d1fc8767e4b6e9fcf0b078a8a4eb0646bd.tar.gz infinitytier-fbde40d1fc8767e4b6e9fcf0b078a8a4eb0646bd.zip | |
Merge branch 'adamierymenko-dev' into netcon
Diffstat (limited to 'node/Peer.hpp')
| -rw-r--r-- | node/Peer.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/node/Peer.hpp b/node/Peer.hpp index ef436cd9..b0f2b4e2 100644 --- a/node/Peer.hpp +++ b/node/Peer.hpp @@ -105,6 +105,7 @@ public: * and appears to be valid. * * @param RR Runtime environment + * @param localInterfaceId Local interface ID or -1 if unspecified * @param remoteAddr Internet address of sender * @param hops ZeroTier (not IP) hops * @param packetId Packet ID @@ -114,6 +115,7 @@ public: */ void received( const RuntimeEnvironment *RR, + int localInterfaceId, const InetAddress &remoteAddr, unsigned int hops, uint64_t packetId, @@ -155,10 +157,11 @@ public: * for NAT traversal and path verification. * * @param RR Runtime environment + * @param localInterfaceId Local interface ID or -1 for unspecified * @param atAddress Destination address * @param now Current time */ - void attemptToContactAt(const RuntimeEnvironment *RR,const InetAddress &atAddress,uint64_t now); + void attemptToContactAt(const RuntimeEnvironment *RR,int localInterfaceId,const InetAddress &atAddress,uint64_t now); /** * Send pings or keepalives depending on configured timeouts |