StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Added function to help calculate size of packet nodes.

Browse Source
This commit is contained in:
irungentoo 2015-07-15 23:31:35 -04:00
parent f15cb89a95
commit 17af629d1f
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toxcore/DHT.c
View File

@ -180,6 +180,25 @@ int to_host_family(IP *ip)
#define PACKED_NODE_SIZE_IP4 (1 + SIZE_IP4 + sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES) #define PACKED_NODE_SIZE_IP4 (1 + SIZE_IP4 + sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES)
#define PACKED_NODE_SIZE_IP6 (1 + SIZE_IP6 + sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES) #define PACKED_NODE_SIZE_IP6 (1 + SIZE_IP6 + sizeof(uint16_t) + crypto_box_PUBLICKEYBYTES)
/* Return packet size of packed node with ip_family on success.
* Return -1 on failure.
*/
int packed_node_size(uint8_t ip_family)
{
if (ip_family == AF_INET) {
return PACKED_NODE_SIZE_IP4;
} else if (ip_family == TCP_INET) {
return PACKED_NODE_SIZE_IP4;
} else if (ip_family == AF_INET6) {
return PACKED_NODE_SIZE_IP6;
} else if (ip_family == TCP_INET6) {
return PACKED_NODE_SIZE_IP6;
} else {
return -1;
}
}
/* Pack number of nodes into data of maxlength length. /* Pack number of nodes into data of maxlength length.
* *
* return length of packed nodes on success. * return length of packed nodes on success.
@ -2292,7 +2311,7 @@ uint32_t DHT_size(const DHT *dht)
uint32_t size32 = sizeof(uint32_t), sizesubhead = size32 * 2; uint32_t size32 = sizeof(uint32_t), sizesubhead = size32 * 2;
return size32 + sizesubhead + (PACKED_NODE_SIZE_IP4 * numv4) + (PACKED_NODE_SIZE_IP6 * numv6); return size32 + sizesubhead + (packed_node_size(AF_INET) * numv4) + (packed_node_size(AF_INET6) * numv6);
} }
static uint8_t *z_state_save_subheader(uint8_t *data, uint32_t len, uint16_t type) static uint8_t *z_state_save_subheader(uint8_t *data, uint32_t len, uint16_t type)

5
toxcore/DHT.h
View File

@ -153,6 +153,11 @@ typedef struct {
} }
Node_format; Node_format;
/* Return packet size of packed node with ip_family on success.
* Return -1 on failure.
*/
int packed_node_size(uint8_t ip_family);
/* Pack number of nodes into data of maxlength length. /* Pack number of nodes into data of maxlength length.
* *
* return length of packed nodes on success. * return length of packed nodes on success.