diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-09-26 13:47:55 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-09-26 13:47:55 -0700 |
| commit | e8cdff3eafd8096da22122eabddf57a09fe2bb90 (patch) | |
| tree | d231aa6d9ccccc8ced6e1ead606ce16ff551cab9 /node/NetworkController.hpp | |
| parent | 53d98343b7b444508259f6f1643e8d6724fb11e9 (diff) | |
| parent | f69454ec9879a0b0a424f743ca144d1123ef7e99 (diff) | |
| download | infinitytier-e8cdff3eafd8096da22122eabddf57a09fe2bb90.tar.gz infinitytier-e8cdff3eafd8096da22122eabddf57a09fe2bb90.zip | |
Merge branch 'adamierymenko-dev' into android-jni-dev
also update for changed function calls that now accept a local address
# Conflicts:
# include/ZeroTierOne.h
# java/CMakeLists.txt
# java/jni/Android.mk
# java/jni/ZT1_jnicache.cpp
# java/jni/ZT1_jnilookup.h
# java/jni/ZT1_jniutils.cpp
# java/jni/com_zerotierone_sdk_Node.cpp
Diffstat (limited to 'node/NetworkController.hpp')
| -rw-r--r-- | node/NetworkController.hpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/node/NetworkController.hpp b/node/NetworkController.hpp index ee481a62..cf327d7e 100644 --- a/node/NetworkController.hpp +++ b/node/NetworkController.hpp @@ -75,7 +75,6 @@ public: * @param identity Originating peer ZeroTier identity * @param nwid 64-bit network ID * @param metaData Meta-data bundled with request (empty if none) - * @param haveRevision Network revision ID sent by requesting peer or 0 if none * @param result Dictionary to receive resulting signed netconf on success * @return Returns NETCONF_QUERY_OK if result dictionary is valid, or an error code on error */ @@ -85,7 +84,6 @@ public: const Identity &identity, uint64_t nwid, const Dictionary &metaData, - uint64_t haveRevision, Dictionary &result) = 0; }; |