From 109f39e09630409a30a9f4e8183f539c499f07ba Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Mon, 3 Jun 2024 04:06:21 +0200 Subject: improved (v)conn init / open / init vlink / open vlink API; implemented randezvous hashing --- ecp/test/vcs.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'ecp/test/vcs.c') diff --git a/ecp/test/vcs.c b/ecp/test/vcs.c index 1260f2b..48bab41 100644 --- a/ecp/test/vcs.c +++ b/ecp/test/vcs.c @@ -26,16 +26,13 @@ static int vlink_handle_open(ECPConnection *_conn, ECP2Buffer *bufs) { /* open return connection */ if ((_conn->parent == NULL) && ecp_conn_is_inb(_conn) && (memcmp(&_conn->remote.key_perma.public, &conn.remote.key_perma.public, sizeof(conn.remote.key_perma.public)) != 0)) { - ECPNode node; ECPConnection *conn_r; - ecp_node_init(&node, &_conn->remote.key_perma.public, &_conn->remote.addr); - conn_r = malloc(sizeof(ECPConnection)); if (conn_r == NULL) return ECP_ERR_ALLOC; ecp_vlink_init(conn_r, _conn->sock); - rv = ecp_conn_open(conn_r, &node); + rv = ecp_conn_open(conn_r, &_conn->remote.key_perma.public, &_conn->remote.addr); printf("open return connection: ecp_conn_open RV:%d\n", rv); if (rv) return rv; } @@ -63,7 +60,7 @@ int main(int argc, char *argv[]) { LOG("ecp_sock_create", rv); rv = ecp_vconn_sock_create(&sock); - LOG("ecp_vconn_htable_init", rv); + LOG("ecp_vconn_sock_create", rv); rv = ecp_addr_init(&addr, argv[1]); LOG("ecp_addr_init", rv); @@ -75,18 +72,16 @@ int main(int argc, char *argv[]) { LOG("ecp_start_receiver", rv); if (argc == 5) { - ECPNode node; - ecp_ecdh_public_t node_pub; + ecp_ecdh_public_t public; - rv = ecp_util_load_key(argv[4], &node_pub, NULL); - LOG("ecp_util_load_key", rv); + rv = ecp_addr_init(&addr, argv[3]); + LOG("ecp_addr_init", rv); - ecp_node_init(&node, &node_pub, NULL); - rv = ecp_node_set_addr(&node, argv[3]); - LOG("ecp_node_set_addr", rv); + rv = ecp_util_load_key(argv[4], &public, NULL); + LOG("ecp_util_load_key", rv); ecp_vlink_init(&conn, &sock); - rv = ecp_conn_open(&conn, &node); + rv = ecp_conn_open(&conn, &public, &addr); LOG("ecp_conn_open", rv); } else { memset(&conn, 0, sizeof(conn)); -- cgit v1.2.3