diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-16 18:09:57 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-16 18:09:57 -0700 |
| commit | 1e8ead441c90b731573d7949152643e0082bdb2e (patch) | |
| tree | 80f15238fc0b3543f880bcd03564fe6e2ee95731 /include | |
| parent | e45475c5b5bcee4fb88e797a50eb38b6ad3d6923 (diff) | |
| parent | 0db7c94c9004ac488b6163905d80f7515141d9c6 (diff) | |
| download | infinitytier-1e8ead441c90b731573d7949152643e0082bdb2e.tar.gz infinitytier-1e8ead441c90b731573d7949152643e0082bdb2e.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 446bbc77..7ae524a8 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -73,7 +73,7 @@ extern "C" { * * If this does change, also change it in tap.h in the tuntaposx code under * mac-tap. - * + * * Overhead for a normal frame split into two packets: * * 1414 = 1444 (typical UDP MTU) - 28 (packet header) - 2 (ethertype) @@ -987,10 +987,9 @@ void ZT1_Node_freeQueryResult(ZT1_Node *node,void *qr); * @param addr Local interface address * @param metric Local interface metric * @param trust How much do you trust the local network under this interface? - * @param reliable If nonzero, this interface doesn't link to anything behind a NAT or stateful firewall * @return Boolean: non-zero if address was accepted and added */ -int ZT1_Node_addLocalInterfaceAddress(ZT1_Node *node,const struct sockaddr_storage *addr,int metric,ZT1_LocalInterfaceAddressTrust trust,int reliable); +int ZT1_Node_addLocalInterfaceAddress(ZT1_Node *node,const struct sockaddr_storage *addr,int metric,ZT1_LocalInterfaceAddressTrust trust); /** * Clear local interface addresses |