diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-08 13:26:43 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-08 13:26:43 -0700 |
| commit | 558775d544014dca0c8f24c35b82f3dd5e67b439 (patch) | |
| tree | b0e2ebd4ab6a3ebfd7e38ffadcee3c9607f14259 /include | |
| parent | a3876353ca1cb07213c5e1c5208b531caeda5523 (diff) | |
| parent | 9347d6c866f6cae357448762f064a481fb765c00 (diff) | |
| download | infinitytier-558775d544014dca0c8f24c35b82f3dd5e67b439.tar.gz infinitytier-558775d544014dca0c8f24c35b82f3dd5e67b439.zip | |
Merge branch 'adamierymenko-dev' of http://10.6.6.2/zerotier/ZeroTierOne into adamierymenko-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index 990f682d..175cedc5 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1255,7 +1255,7 @@ void ZT_Node_freeQueryResult(ZT_Node *node,void *qr); * @param trust How much do you trust the local network under this interface? * @return Boolean: non-zero if address was accepted and added */ -int ZT_Node_addLocalInterfaceAddress(ZT_Node *node,const struct sockaddr_storage *addr,int metric,ZT_LocalInterfaceAddressTrust trust); +int ZT_Node_addLocalInterfaceAddress(ZT_Node *node,const struct sockaddr_storage *addr,int metric, enum ZT_LocalInterfaceAddressTrust trust); /** * Clear local interface addresses @@ -1296,7 +1296,7 @@ void ZT_Node_setNetconfMaster(ZT_Node *node,void *networkConfigMasterInstance); * @param reportCallback Function to call each time a report is received * @return OK or error if, for example, test is too big for a packet or support isn't compiled in */ -ZT_ResultCode ZT_Node_circuitTestBegin(ZT_Node *node,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *,ZT_CircuitTest *,const ZT_CircuitTestReport *)); +enum ZT_ResultCode ZT_Node_circuitTestBegin(ZT_Node *node,ZT_CircuitTest *test,void (*reportCallback)(ZT_Node *, ZT_CircuitTest *,const ZT_CircuitTestReport *)); /** * Stop listening for results to a given circuit test |