diff options
Diffstat (limited to 'ecp/test/vc_server.c')
-rw-r--r-- | ecp/test/vc_server.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/ecp/test/vc_server.c b/ecp/test/vc_server.c index a1a1c51..5157c84 100644 --- a/ecp/test/vc_server.c +++ b/ecp/test/vc_server.c @@ -16,7 +16,7 @@ ECPConnHandler handler; ECPConnHandler vconn_handler; ECPConnHandler vlink_handler; ECPConnection conn; -ECPVConnOutb vconn[3]; +ECPVConnOutb vconn[ECP_MAX_PARENT]; #define CTYPE_TEST 0 #define MTYPE_MSG 0 @@ -44,11 +44,11 @@ static void usage(char *arg) { int main(int argc, char *argv[]) { ECPDHKey key_perma; - ECPNode node; - ecp_ecdh_public_t node_pub; + ecp_tr_addr_t addr; + ecp_ecdh_public_t vconn_pub[ECP_MAX_PARENT]; int rv, i; - if ((argc < 4) || (argc > 7)) usage(argv[0]); + if ((argc < 4) || (argc > 3 + ECP_MAX_PARENT)) usage(argv[0]); rv = ecp_init(&ctx, &vconn_handler, &vlink_handler); LOG("ecp_init", rv); @@ -64,7 +64,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_sock_open(&sock, NULL); LOG("ecp_sock_open", rv); @@ -72,27 +72,21 @@ int main(int argc, char *argv[]) { rv = ecp_start_receiver(&sock); LOG("ecp_start_receiver", rv); - rv = ecp_util_load_key(argv[argc-1], &node_pub, NULL); - LOG("ecp_util_load_key", rv); + rv = ecp_addr_init(&addr, argv[2]); + LOG("ecp_addr_init", rv); - ecp_node_init(&node, &node_pub, NULL); - rv = ecp_node_set_addr(&node, argv[2]); - LOG("ecp_node_set_addr", rv); + for (i=3; i<argc; i++) { + rv = ecp_util_load_key(argv[i], &vconn_pub[i-3], NULL); + LOG("ecp_util_load_key", rv); + } - ecp_vlink_init(&conn, &sock); if (argc > 4) { - ecp_ecdh_public_t vconn_pub[3]; - - for (i=3; i<argc-1; i++) { - rv = ecp_util_load_key(argv[i], &vconn_pub[i-3], NULL); - LOG("ecp_util_load_key", rv); - } - ecp_vconn_init(vconn, vconn_pub, argc-4, &sock); - - rv = ecp_vconn_open(vconn, &conn, &node); - LOG("ecp_vconn_open", rv); + ecp_vconn_init_vlink(vconn, argc-3, &sock); + rv = ecp_vconn_open_vlink(vconn, vconn_pub, &addr); + LOG("ecp_vconn_open_vlink", rv); } else { - rv = ecp_conn_open(&conn, &node); + ecp_vlink_init(&conn, &sock); + rv = ecp_conn_open(&conn, &vconn_pub[0], &addr); LOG("ecp_conn_open", rv); } |