diff options
| author | Uros Majstorovic <majstor@majstor.org> | 2024-05-14 22:59:12 +0200 |
|---|---|---|
| committer | Uros Majstorovic <majstor@majstor.org> | 2024-05-14 22:59:12 +0200 |
| commit | 5903b0819664f473d1279de57e8b00d60d76ae0e (patch) | |
| tree | 40b5b7b9dc9bf5f2399e8720ff43d357dc19cf57 /ecp/server/dir.c | |
| parent | 7de54ce67127e010fde241089f262421818ea7be (diff) | |
dir protocol improvement
Diffstat (limited to 'ecp/server/dir.c')
| -rw-r--r-- | ecp/server/dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ecp/server/dir.c b/ecp/server/dir.c index 149d14d..91d364f 100644 --- a/ecp/server/dir.c +++ b/ecp/server/dir.c @@ -182,10 +182,10 @@ ssize_t dir_send_shadow(ECPConnection *conn) { pthread_mutex_lock(&node->mutex); if (node->verified || node->ann_local) { - if (count < MAX_DIR_ITEM_IN_MSG) { + if (count < ECP_MAX_DIR_ITEM_IN_MSG) { size_t rv_ser; - rv_ser = ecp_dir_item_serialize(&node->dir_item, _msg); + rv_ser = ecp_dir_serialize_item(&node->dir_item, _msg); _msg += rv_ser; _msg_size += rv_ser; count++; @@ -332,7 +332,7 @@ ssize_t dir_handle_shadow(ECPConnection *conn, unsigned char *msg, size_t msg_si ECPDirItem dir_item; size_t rv; - rv = ecp_dir_item_parse(&dir_item, msg); + rv = ecp_dir_parse_item(&dir_item, msg); msg += rv; if (dir_item.region >= MAX_REGION) { @@ -606,11 +606,11 @@ void dir_online_switch(ECPSocket *sock, int inc_serial) { if (dir_online) { size_t rv_ser; - rv_ser = ecp_dir_item_serialize(&node->dir_item, msg[0]); + rv_ser = ecp_dir_serialize_item(&node->dir_item, msg[0]); msg[0] += rv_ser; count[0]++; if (region) { - rv_ser = ecp_dir_item_serialize(&node->dir_item, msg[region]); + rv_ser = ecp_dir_serialize_item(&node->dir_item, msg[region]); msg[region] += rv_ser; count[region]++; } @@ -642,13 +642,13 @@ void dir_online_switch(ECPSocket *sock, int inc_serial) { if (node->conn) ecp_conn_set_uflags(node->conn, DIR_UFLAG_RECONNECT); if (dir_online && verified) { - if (count[0] == MAX_DIR_ITEM_IN_MSG) { + if (count[0] == ECP_MAX_DIR_ITEM_IN_MSG) { dir_online->list[0].msg[msg_count[0]].count = count[0]; msg_count[0]++; msg[0] = dir_online->list[0].msg[msg_count[0]].buffer; count[0] = 0; } - if (region && count[region] == MAX_DIR_ITEM_IN_MSG) { + if (region && count[region] == ECP_MAX_DIR_ITEM_IN_MSG) { dir_online->list[region].msg[msg_count[region]].count = count[region]; msg_count[region]++; msg[region] = dir_online->list[region].msg[msg_count[region]].buffer; |