From fbb5a477eaed7a4dc0a8adf2785c20653f064af7 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Tue, 15 Mar 2022 04:34:50 +0100 Subject: basic test passed --- ecp/test/basic.c | 73 ++++++++++++++++++++++++-------------------------------- 1 file changed, 31 insertions(+), 42 deletions(-) (limited to 'ecp/test/basic.c') diff --git a/ecp/test/basic.c b/ecp/test/basic.c index 0f4e322..2edb174 100644 --- a/ecp/test/basic.c +++ b/ecp/test/basic.c @@ -2,7 +2,7 @@ #include #include -#include "core.h" +#include ECPContext ctx_s; ECPSocket sock_s; @@ -18,58 +18,48 @@ ECPNode node; ECPConnection conn; #define CTYPE_TEST 0 -#define MTYPE_MSG 8 +#define MTYPE_MSG 0 -ssize_t handle_open_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s, ECP2Buffer *b) { - uint32_t seq = 0; +int handle_open_c(ECPConnection *conn, ECP2Buffer *b) { + char *_msg = "PERA JE CAR!"; + ssize_t rv; - ecp_conn_handle_open(conn, sq, t, p, s, b); - if (s < 0) { - printf("OPEN ERR:%ld\n", s); - return s; - } + printf("OPEN\n"); + rv = ecp_msg_send(conn, MTYPE_MSG, (unsigned char *)_msg, strlen(_msg)+1); - char *msg = "PERA JE CAR!"; - unsigned char buf[1000]; - - strcpy((char *)buf, msg); - ssize_t _rv = ecp_send(conn, MTYPE_MSG, buf, 1000); - - return s; + return ECP_OK; } -ssize_t handle_msg_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s, ECP2Buffer *b) { - printf("MSG C:%s size:%ld\n", p, s); - return s; +ssize_t handle_msg_c(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { + printf("MSG C:%s size:%ld\n", msg, msg_size); + return msg_size; } -ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s, ECP2Buffer *b) { - printf("MSG S:%s size:%ld\n", p, s); - - char *msg = "VAISTINU JE CAR!"; - unsigned char buf[1000]; +ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *msg, size_t msg_size, ECP2Buffer *b) { + char *_msg = "VAISTINU JE CAR!"; + ssize_t rv; - strcpy((char *)buf, msg); - ssize_t _rv = ecp_send(conn, MTYPE_MSG, buf, 1000); + printf("MSG S:%s size:%ld\n", msg, msg_size); + rv = ecp_msg_send(conn, MTYPE_MSG, (unsigned char *)_msg, strlen(_msg)+1); - return s; + return msg_size; } int main(int argc, char *argv[]) { int rv; + /* server */ rv = ecp_init(&ctx_s); printf("ecp_init RV:%d\n", rv); - rv = ecp_conn_handler_init(&handler_s); - handler_s.msg[MTYPE_MSG] = handle_msg_s; - ctx_s.handler[CTYPE_TEST] = &handler_s; + ecp_conn_handler_init(&handler_s, handle_msg_s, NULL, NULL, NULL); + ecp_ctx_set_handler(&ctx_s, &handler_s, CTYPE_TEST); - rv = ecp_dhkey_gen(&ctx_s, &key_perma_s); + rv = ecp_dhkey_gen(&key_perma_s); printf("ecp_dhkey_gen RV:%d\n", rv); - rv = ecp_sock_init(&sock_s, &ctx_s, &key_perma_s); - printf("ecp_sock_init RV:%d\n", rv); + rv = ecp_sock_create(&sock_s, &ctx_s, &key_perma_s); + printf("ecp_sock_create RV:%d\n", rv); rv = ecp_sock_open(&sock_s, "0.0.0.0:3000"); printf("ecp_sock_open RV:%d\n", rv); @@ -77,19 +67,18 @@ int main(int argc, char *argv[]) { rv = ecp_start_receiver(&sock_s); printf("ecp_start_receiver RV:%d\n", rv); + /* client */ rv = ecp_init(&ctx_c); printf("ecp_init RV:%d\n", rv); - rv = ecp_conn_handler_init(&handler_c); - handler_c.msg[ECP_MTYPE_OPEN] = handle_open_c; - handler_c.msg[MTYPE_MSG] = handle_msg_c; - ctx_c.handler[CTYPE_TEST] = &handler_c; + ecp_conn_handler_init(&handler_c, handle_msg_c, handle_open_c, NULL, NULL); + ecp_ctx_set_handler(&ctx_c, &handler_c, CTYPE_TEST); - rv = ecp_dhkey_gen(&ctx_c, &key_perma_c); + rv = ecp_dhkey_gen(&key_perma_c); printf("ecp_dhkey_gen RV:%d\n", rv); - rv = ecp_sock_init(&sock_c, &ctx_c, &key_perma_c); - printf("ecp_sock_init RV:%d\n", rv); + rv = ecp_sock_create(&sock_c, &ctx_c, &key_perma_c); + printf("ecp_sock_create RV:%d\n", rv); rv = ecp_sock_open(&sock_c, NULL); printf("ecp_sock_open RV:%d\n", rv); @@ -100,8 +89,8 @@ int main(int argc, char *argv[]) { rv = ecp_node_init(&node, &key_perma_s.public, "127.0.0.1:3000"); printf("ecp_node_init RV:%d\n", rv); - rv = ecp_conn_init(&conn, &sock_c, CTYPE_TEST); - printf("ecp_conn_init RV:%d\n", rv); + rv = ecp_conn_create(&conn, &sock_c, CTYPE_TEST); + printf("ecp_conn_create RV:%d\n", rv); rv = ecp_conn_open(&conn, &node); printf("ecp_conn_open RV:%d\n", rv); -- cgit v1.2.3