fixed transport interface; risc-v transport updated to support eos sock interface

3 files changed, 45 insertions, 45 deletions

diff --git a/code/test/basic.c b/code/test/basic.c
index 85c4f31..8268599 100644
--- a/code/test/basic.c
+++ b/code/test/basic.c
@@ -22,13 +22,13 @@ ECPConnection conn;
 
 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;
-    
+
     ecp_conn_handle_open(conn, sq, t, p, s, b);
     if (s < 0) {
         printf("OPEN ERR:%ld\n", s);
         return s;
     }
-    
+
     char *msg = "PERA JE CAR!";
     unsigned char buf[1000];
 
@@ -57,23 +57,23 @@ ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigne
 
 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);
 
@@ -84,20 +84,20 @@ int main(int argc, char *argv[]) {
     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");
+    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_create(&conn, &sock_c, CTYPE_TEST);
@@ -105,6 +105,6 @@ int main(int argc, char *argv[]) {
 
     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/frag.c b/code/test/frag.c
index 6e7f6be..2bba856 100644
--- a/code/test/frag.c
+++ b/code/test/frag.c
@@ -27,13 +27,13 @@ unsigned char frag_buffer[8192];
 
 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;
-    
+
     ecp_conn_handle_open(conn, sq, t, p, s, b);
     if (s < 0) {
         printf("OPEN ERR:%ld\n", s);
         return s;
     }
-    
+
     unsigned char content[1000];
     char *msg = "PERA JE CAR!";
 
@@ -44,7 +44,7 @@ ssize_t handle_open_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsign
 
 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);
-    
+
     ECPRBuffer *rbuf = &conn->rbuf.recv->rbuf;
     printf("RBUF: %d %d %d %d\n", rbuf->seq_start, rbuf->seq_max, rbuf->msg_start, rbuf->msg_size);
     return s;
@@ -63,23 +63,23 @@ ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigne
 
 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);
 
@@ -90,20 +90,20 @@ int main(int argc, char *argv[]) {
     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");
+    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_create(&conn, &sock_c, CTYPE_TEST);
@@ -111,12 +111,12 @@ int main(int argc, char *argv[]) {
 
     rv = ecp_rbuf_create(&conn, NULL, NULL, 0, &rbuf_recv, rbuf_r_msg, 128);
     printf("ecp_rbuf_create RV:%d\n", rv);
-    
+
     ecp_frag_iter_init(&frag_iter, frag_buffer, 8192);
     rbuf_recv.frag_iter = &frag_iter;
-    
+
     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 6bc5a64..73c511e 100644
--- a/code/test/stress.c
+++ b/code/test/stress.c
@@ -42,7 +42,7 @@ int c_start = 0;
 
 int num_s = NUM_S, num_c = NUM_C;
 int msg_rate = MSG_RATE;
-    
+
 static void display(void) {
     int i, s = 0, r = 0;
 
@@ -81,12 +81,12 @@ void *sender(ECPConnection *c) {
     ECPBuffer payload;
     unsigned char pkt_buf[ECP_MAX_PKT];
     unsigned char pld_buf[ECP_MAX_PLD];
-    
+
     packet.buffer = pkt_buf;
     packet.size = ECP_MAX_PKT;
     payload.buffer = pld_buf;
     payload.size = ECP_MAX_PLD;
-    
+
     printf("OPEN:%d\n", idx);
     while(1) {
         uint32_t rnd;
@@ -108,7 +108,7 @@ void *sender(ECPConnection *c) {
 ssize_t handle_open_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s, ECP2Buffer *b) {
     int idx = (int)(conn->conn_data);
     int rv = 0;
-    
+
     ecp_conn_handle_open(conn, sq, t, p, s, b);
     rv = pthread_create(&s_thd[idx], NULL, (void *(*)(void *))sender, (void *)conn);
     if (rv) {
@@ -126,7 +126,7 @@ ssize_t handle_msg_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigne
     ECPBuffer payload;
     unsigned char pkt_buf[ECP_MAX_PKT];
     unsigned char pld_buf[ECP_MAX_PLD];
-    
+
     packet.buffer = pkt_buf;
     packet.size = ECP_MAX_PKT;
     payload.buffer = pld_buf;
@@ -137,7 +137,7 @@ ssize_t handle_msg_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigne
         t_rcvd[idx]++;
         pthread_mutex_unlock(&t_mtx[idx]);
     }
-    
+
     // ecp_pld_set_type(payload, MTYPE_MSG);
     // ssize_t _rv = ecp_pld_send(c, &packet, &payload, ECP_SIZE_PLD(1000, 0));
     return s;
@@ -148,7 +148,7 @@ ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigne
     ECPBuffer payload;
     unsigned char pkt_buf[ECP_MAX_PKT];
     unsigned char pld_buf[ECP_MAX_PLD];
-    
+
     packet.buffer = pkt_buf;
     packet.size = ECP_MAX_PKT;
     payload.buffer = pld_buf;
@@ -164,7 +164,7 @@ int main(int argc, char *argv[]) {
     char addr[256];
     int rv;
     int i;
-    
+
     ECPConnHandler handler_c;
 
     ECPContext *ctx_c;
@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
 
     ECPNode *node;
     ECPConnection *conn;
-    
+
     sock_s = malloc(num_s * sizeof(ECPSocket));
     ctx_c = malloc(num_c * sizeof(ECPContext));
     sock_c = malloc(num_c * sizeof(ECPSocket));
@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) {
     t_rcvd = malloc(num_c * sizeof(int));
     memset(t_rcvd, 0, num_c * sizeof(int));
     memset(t_sent, 0, num_c * sizeof(int));
-    
+
     struct sigaction actINFO;
     memset(&actINFO, 0, sizeof(actINFO));
     actINFO.sa_handler = &catchINFO;
@@ -222,13 +222,13 @@ int main(int argc, char *argv[]) {
 
     handler_c.msg[ECP_MTYPE_OPEN] = handle_open_c;
     handler_c.msg[MTYPE_MSG] = handle_msg_c;
-    
+
     for (i=0; i<num_c; i++) {
         pthread_mutex_init(&t_mtx[i], NULL);
-        
+
         if (!rv) rv = ecp_init(&ctx_c[i]);
         ctx_c[i].handler[CTYPE_TEST] = &handler_c;
-        
+
         if (!rv) rv = ecp_dhkey_generate(&ctx_c[i], &key_perma_c[i]);
         if (!rv) rv = ecp_sock_create(&sock_c[i], &ctx_c[i], &key_perma_c[i]);
         if (!rv) rv = ecp_sock_open(&sock_c[i], NULL);
@@ -237,20 +237,20 @@ 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], &key_perma_s.public, addr);
-        
+        if (!rv) rv = ecp_node_init(&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;
-        
+
         if (!rv) rv = ecp_conn_open(&conn[i], &node[i]);
-        
+
         if (rv) {
             char msg[256];
             sprintf(msg, "CLIENT %d CREATE:%d\n", i, rv);
             perror(msg);
             exit(1);
         }
-        
+
     }
     while (1) sleep(1);
 }
\ No newline at end of file