diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-28 19:18:33 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-28 19:18:33 -0700 |
| commit | 508d31513a0848236258542930cf577d95afda99 (patch) | |
| tree | 453b31d874e6ec0dee3105191142efc8a326a30d /node/Switch.hpp | |
| parent | bc0954381ccdca065987512a45d5dd6ace6cca9d (diff) | |
| parent | 7578b5629849f6c286c353dce713b0816b1cc4a9 (diff) | |
| download | infinitytier-508d31513a0848236258542930cf577d95afda99.tar.gz infinitytier-508d31513a0848236258542930cf577d95afda99.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Switch.hpp')
| -rw-r--r-- | node/Switch.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node/Switch.hpp b/node/Switch.hpp index e7f1523a..ac85606e 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -136,12 +136,12 @@ public: bool unite(const Address &p1,const Address &p2,bool force); /** - * Send NAT traversal messages to peer at the given candidate address + * Attempt NAT traversal to peer at a given physical address * * @param peer Peer to contact * @param atAddr Address of peer */ - void contact(const SharedPtr<Peer> &peer,const InetAddress &atAddr); + void rendezvous(const SharedPtr<Peer> &peer,const InetAddress &atAddr); /** * Request WHOIS on a given address |