From ab0325ae7906230f1ea82f08b27c72b075e9a13d Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Tue, 23 May 2017 17:28:12 +0200 Subject: build fixed; added lib util --- code/test/Makefile | 15 +++---- code/test/basic.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++ code/test/server.c | 113 ----------------------------------------------------- code/test/stress.c | 2 +- 4 files changed, 122 insertions(+), 121 deletions(-) create mode 100644 code/test/basic.c delete mode 100644 code/test/server.c (limited to 'code/test') diff --git a/code/test/Makefile b/code/test/Makefile index 5c25b5e..ddfc095 100644 --- a/code/test/Makefile +++ b/code/test/Makefile @@ -1,18 +1,19 @@ CFLAGS=-I../core -O3 -Wno-int-to-void-pointer-cast LDFLAGS=-lm -pthread -dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../core/posix/libecptr.a ../core/posix/libecptm.a init.o + +dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../core/posix/libecptr.a ../core/posix/libecptm.a %.o: %.c $(CC) $(CFLAGS) -c $< -all: server stress +all: basic stress -server: server.o $(dep) - $(CC) $< $(dep) $(LDFLAGS) -o $@ +basic: basic.o init.o $(dep) + $(CC) -o $@ $(LDFLAGS) $< init.o $(dep) -stress: stress.o $(dep) - $(CC) $< $(dep) $(LDFLAGS) -o $@ +stress: stress.o init.o $(dep) + $(CC) -o $@ $(LDFLAGS) $< init.o $(dep) clean: rm -f *.o - rm -f server stress + rm -f basic stress diff --git a/code/test/basic.c b/code/test/basic.c new file mode 100644 index 0000000..bcd65bc --- /dev/null +++ b/code/test/basic.c @@ -0,0 +1,113 @@ +#include +#include +#include + +#include + +ECPContext ctx_s; +ECPSocket sock_s; +ECPDHKey key_perma_s; +ECPConnHandler handler_s; + +ECPContext ctx_c; +ECPSocket sock_c; +ECPDHKey key_perma_c; +ECPConnHandler handler_c; + +ECPNode node; +ECPConnection conn; + +#define CTYPE_TEST 0 +#define MTYPE_MSG 8 + +ssize_t handle_open_c(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { + uint32_t seq = 0; + + ecp_conn_handle_open(conn, t, p, s); + if (s < 0) { + printf("OPEN ERR:%ld\n", s); + return 0; + } + + unsigned char payload[ECP_SIZE_PLD(1000)]; + unsigned char *buf = ecp_pld_get_buf(payload); + char *msg = "PERA JE CAR!"; + + ecp_pld_set_type(payload, MTYPE_MSG); + strcpy((char *)buf, msg); + ssize_t _rv = ecp_send(conn, payload, sizeof(payload)); + return 0; +} + +ssize_t handle_msg_c(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { + printf("MSG C:%s size:%ld\n", p, s); + return s; +} + +ssize_t handle_msg_s(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { + printf("MSG S:%s size:%ld\n", p, s); + + unsigned char payload[ECP_SIZE_PLD(1000)]; + unsigned char *buf = ecp_pld_get_buf(payload); + char *msg = "VAISTINU JE CAR!"; + + ecp_pld_set_type(payload, MTYPE_MSG); + strcpy((char *)buf, msg); + ssize_t _rv = ecp_send(conn, payload, sizeof(payload)); + + return s; +} + +int main(int argc, char *argv[]) { + int rv; + + 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; + + rv = ecp_dhkey_generate(&ctx_s, &key_perma_s); + printf("ecp_dhkey_generate 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); + + rv = ecp_start_receiver(&sock_s); + printf("ecp_start_receiver RV:%d\n", rv); + + 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; + + rv = ecp_dhkey_generate(&ctx_c, &key_perma_c); + printf("ecp_dhkey_generate 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); + + rv = ecp_start_receiver(&sock_c); + printf("ecp_start_receiver RV:%d\n", rv); + + rv = ecp_node_init(&ctx_c, &node, &key_perma_s.public, "127.0.0.1:3000"); + printf("ecp_node_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); + + while (1) sleep(1); +} \ No newline at end of file diff --git a/code/test/server.c b/code/test/server.c deleted file mode 100644 index 5bb36ef..0000000 --- a/code/test/server.c +++ /dev/null @@ -1,113 +0,0 @@ -#include -#include -#include - -#include - -ECPContext ctx_s; -ECPSocket sock_s; -ECPDHKey key_perma_s; -ECPConnHandler handler_s; - -ECPContext ctx_c; -ECPSocket sock_c; -ECPDHKey key_perma_c; -ECPConnHandler handler_c; - -ECPNode node; -ECPConnection conn; - -#define CTYPE_TEST 0 -#define MTYPE_MSG 8 - -ssize_t handle_open_c(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { - uint32_t seq = 0; - - ecp_conn_handle_open(conn, t, p, s); - if (s < 0) { - printf("OPEN ERR:%ld\n", s); - return 0; - } - - unsigned char payload[ECP_SIZE_PLD(1000)]; - unsigned char *buf = ecp_pld_get_buf(payload); - char *msg = "PERA JE CAR!"; - - ecp_pld_set_type(payload, MTYPE_MSG); - strcpy((char *)buf, msg); - ssize_t _rv = ecp_send(conn, payload, sizeof(payload)); - return 0; -} - -ssize_t handle_msg_c(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { - printf("MSG C:%s size:%ld\n", p, s); - return s; -} - -ssize_t handle_msg_s(ECPConnection *conn, unsigned char t, unsigned char *p, ssize_t s) { - printf("MSG S:%s size:%ld\n", p, s); - - unsigned char payload[ECP_SIZE_PLD(1000)]; - unsigned char *buf = ecp_pld_get_buf(payload); - char *msg = "VAISTINU JE CAR!"; - - ecp_pld_set_type(payload, MTYPE_MSG); - strcpy((char *)buf, msg); - ssize_t _rv = ecp_send(conn, payload, sizeof(payload)); - - return s; -} - -int main(int argc, char *argv[]) { - int rv; - - 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; - - rv = ecp_dhkey_generate(&ctx_s, &key_perma_s); - printf("ecp_dhkey_generate 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); - - rv = ecp_start_receiver(&sock_s); - printf("ecp_start_receiver RV:%d\n", rv); - - 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; - - rv = ecp_dhkey_generate(&ctx_c, &key_perma_c); - printf("ecp_dhkey_generate 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); - - rv = ecp_start_receiver(&sock_c); - printf("ecp_start_receiver RV:%d\n", rv); - - rv = ecp_node_init(&ctx_c, &node, "127.0.0.1:3000", &key_perma_s.public); - printf("ecp_node_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); - - while (1) sleep(1); -} \ No newline at end of file diff --git a/code/test/stress.c b/code/test/stress.c index 808611e..41883c2 100644 --- a/code/test/stress.c +++ b/code/test/stress.c @@ -209,7 +209,7 @@ int main(int argc, char *argv[]) { strcpy(addr, "127.0.0.1:"); sprintf(addr+strlen(addr), "%d", 3000 + (i % num_s)); - if (!rv) rv = ecp_node_init(&ctx_c[i], &node[i], addr, &key_perma_s.public); + if (!rv) rv = ecp_node_init(&ctx_c[i], &node[i], &key_perma_s.public, addr); if (!rv) rv = ecp_conn_create(&conn[i], &sock_c[i], CTYPE_TEST); conn[i].conn_data = (void *)i; -- cgit v1.2.3