diff options
Diffstat (limited to 'ecp/test/vc_client.c')
-rw-r--r-- | ecp/test/vc_client.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/ecp/test/vc_client.c b/ecp/test/vc_client.c index f46824b..a32b22a 100644 --- a/ecp/test/vc_client.c +++ b/ecp/test/vc_client.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 @@ -25,7 +25,9 @@ static int handle_open(ECPConnection *conn, ECP2Buffer *b) { char *_msg = "PERA JE CAR!"; ssize_t rv; - printf("OPEN\n"); + printf("Press ENTER key to start\n"); + while(getchar()!='\n'); + rv = ecp_msg_send(conn, MTYPE_MSG, (unsigned char *)_msg, strlen(_msg)+1); return ECP_OK; @@ -44,12 +46,12 @@ static void usage(char *arg) { int main(int argc, char *argv[]) { ECPDHKey key_perma; - ECPNode node; - ecp_ecdh_public_t node_pub; - ecp_ecdh_public_t vconn_pub[3]; + ecp_tr_addr_t addr; + ecp_ecdh_public_t public; + ecp_ecdh_public_t vconn_pub[ECP_MAX_PARENT]; int rv, i; - if ((argc < 4) || (argc > 6)) 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 +66,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,12 +74,11 @@ int main(int argc, char *argv[]) { rv = ecp_start_receiver(&sock); LOG("ecp_start_receiver", rv); - rv = ecp_util_load_key(argv[1], &node_pub, NULL); + rv = ecp_util_load_key(argv[1], &public, NULL); LOG("ecp_util_load_key", rv); - ecp_node_init(&node, &node_pub, NULL); - rv = ecp_node_set_addr(&node, argv[2]); - LOG("ecp_node_set_addr", rv); + rv = ecp_addr_init(&addr, argv[2]); + LOG("ecp_addr_init", rv); for (i=3; i<argc; i++) { rv = ecp_util_load_key(argv[i], &vconn_pub[i-3], NULL); @@ -85,8 +86,8 @@ int main(int argc, char *argv[]) { } ecp_conn_init(&conn, &sock, CTYPE_TEST); - ecp_vconn_init(vconn, vconn_pub, argc-3, &sock); - rv = ecp_vconn_open(vconn, &conn, &node); + ecp_vconn_init(vconn, argc-3, &conn, &sock); + rv = ecp_vconn_open(vconn, vconn_pub, &addr, &public); LOG("ecp_vconn_open", rv); while (1) sleep(1); |