diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /include | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to 'include')
| -rw-r--r-- | include/ZeroTierOne.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index dd7ccfa1..9b82c8d6 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -723,14 +723,14 @@ typedef int (*ZT1_DataStorePutFunction)(ZT1_Node *,void *,const char *,const voi /** * Function to send a ZeroTier packet out over the wire * - * Parameters: (1) node, (2) user ptr, (3) address, (4) link desperation, - * (5) packet data, (6) packet data length. + * Parameters: (1) node, (2) user ptr, (3) address, (4) packet data, + * (5) packet data length. * * The function must return zero on success and may return any error code * on failure. Note that success does not (of course) guarantee packet * delivery. It only means that the packet appears to have been sent. */ -typedef int (*ZT1_WirePacketSendFunction)(ZT1_Node *,void *,const struct sockaddr_storage *,unsigned int,const void *,unsigned int); +typedef int (*ZT1_WirePacketSendFunction)(ZT1_Node *,void *,const struct sockaddr_storage *,const void *,unsigned int); /****************************************************************************/ /* C Node API */ @@ -780,7 +780,6 @@ void ZT1_Node_delete(ZT1_Node *node); * @param node Node instance * @param now Current clock in milliseconds * @param remoteAddress Origin of packet - * @param linkDesperation Link desperation metric for link or protocol over which packet arrived * @param packetData Packet data * @param packetLength Packet length * @param nextBackgroundTaskDeadline Value/result: set to deadline for next call to processBackgroundTasks() @@ -790,7 +789,6 @@ enum ZT1_ResultCode ZT1_Node_processWirePacket( ZT1_Node *node, uint64_t now, const struct sockaddr_storage *remoteAddress, - unsigned int linkDesperation, const void *packetData, unsigned int packetLength, volatile uint64_t *nextBackgroundTaskDeadline); |