fragments test added

6 files changed, 141 insertions, 13 deletions

diff --git a/code/core/msgq.c b/code/core/msgq.c
index 743478f..45df608 100644
--- a/code/core/msgq.c
+++ b/code/core/msgq.c
@@ -21,9 +21,7 @@ static struct timespec *abstime_ts(struct timespec *ts, ecp_cts_t msec) {
     return ts;
 }
 
-int ecp_conn_msgq_create(ECPConnection *conn) {
-    ECPRBRecv *buf = conn->rbuf.recv;
-    ECPConnMsgQ *msgq = buf ? &buf->msgq : NULL;
+int ecp_conn_msgq_create(ECPConnMsgQ *msgq) {
     int i;
     int rv;
 
@@ -50,9 +48,7 @@ int ecp_conn_msgq_create(ECPConnection *conn) {
     return ECP_OK;
 }
 
-void ecp_conn_msgq_destroy(ECPConnection *conn) {
-    ECPRBRecv *buf = conn->rbuf.recv;
-    ECPConnMsgQ *msgq = buf ? &buf->msgq : NULL;
+void ecp_conn_msgq_destroy(ECPConnMsgQ *msgq) {
     int i;
     
     if (msgq == NULL) return;
diff --git a/code/core/msgq.h b/code/core/msgq.h
index dd0b9a8..a98ae18 100644
--- a/code/core/msgq.h
+++ b/code/core/msgq.h
@@ -16,8 +16,8 @@ typedef struct ECPConnMsgQ {
     pthread_mutex_t mutex;
 } ECPConnMsgQ;
 
-int ecp_conn_msgq_create(struct ECPConnection *conn);
-void ecp_conn_msgq_destroy(struct ECPConnection *conn);
+int ecp_conn_msgq_create(ECPConnMsgQ *msgq);
+void ecp_conn_msgq_destroy(ECPConnMsgQ *msgq);
 int ecp_conn_msgq_start(struct ECPConnection *conn, ecp_seq_t seq);
 
 int ecp_conn_msgq_push(struct ECPConnection *conn, ecp_seq_t seq, unsigned char mtype);
diff --git a/code/core/rbuf_recv.c b/code/core/rbuf_recv.c
index 5b8568e..fc2b6ab 100644
--- a/code/core/rbuf_recv.c
+++ b/code/core/rbuf_recv.c
@@ -219,7 +219,7 @@ int ecp_rbuf_recv_create(ECPConnection *conn, ECPRBRecv *buf, ECPRBMessage *msg,
     buf->ack_rate = ACK_RATE;
 
 #ifdef ECP_WITH_MSGQ
-    rv = ecp_conn_msgq_create(conn);
+    rv = ecp_conn_msgq_create(&buf->msgq);
     if (rv) return rv;
 #endif
 
@@ -228,9 +228,14 @@ int ecp_rbuf_recv_create(ECPConnection *conn, ECPRBRecv *buf, ECPRBMessage *msg,
 }
 
 void ecp_rbuf_recv_destroy(ECPConnection *conn) {
+    ECPRBRecv *buf = conn->rbuf.recv;
+    
+    if (buf == NULL) return;
 #ifdef ECP_WITH_MSGQ
-    ecp_conn_msgq_destroy(conn);
-#endif    
+    ecp_conn_msgq_destroy(&buf->msgq);
+#endif
+
+    conn->rbuf.recv = NULL;
 }
 
 int ecp_rbuf_recv_set_hole(ECPConnection *conn, unsigned short hole_max) {
diff --git a/code/core/rbuf_send.c b/code/core/rbuf_send.c
index 685280d..323596f 100644
--- a/code/core/rbuf_send.c
+++ b/code/core/rbuf_send.c
@@ -204,6 +204,8 @@ void ecp_rbuf_send_destroy(ECPConnection *conn) {
 #ifdef ECP_WITH_PTHREAD
     pthread_mutex_destroy(&buf->mutex);
 #endif
+    
+    conn->rbuf.send = NULL;
 }
 
 int ecp_rbuf_send_set_wsize(ECPConnection *conn, ecp_win_t size) {
diff --git a/code/test/Makefile b/code/test/Makefile
index 997f77e..ec9730f 100644
--- a/code/test/Makefile
+++ b/code/test/Makefile
@@ -6,7 +6,7 @@ dep=../core/libecpcore.a ../core/crypto/libecpcr.a ../core/htable/libecpht.a ../
 %.o: %.c
 	$(CC) $(CFLAGS) -c $<
 
-all: basic client server echo stress vcs vc_server vc_client
+all: basic client server echo frag stress vcs vc_server vc_client
 
 basic: basic.o init.o $(dep)
 	$(CC) -o $@ $< init.o $(dep) $(LDFLAGS)
@@ -20,6 +20,9 @@ server: server.o init.o $(dep)
 echo: echo.o init.o $(dep)
 	$(CC) -o $@ $< init.o $(dep) $(LDFLAGS)
 
+frag: frag.o init.o $(dep)
+	$(CC) -o $@ $< init.o $(dep) $(LDFLAGS)
+
 stress: stress.o init.o $(dep)
 	$(CC) -o $@ $< init.o $(dep) $(LDFLAGS)
 
@@ -42,4 +45,4 @@ voip: voip.o init.o $(dep)
 
 clean:
 	rm -f *.o
-	rm -f basic client server echo stress vcs vc_server vc_client voip
+	rm -f basic client server echo frag stress vcs vc_server vc_client voip
diff --git a/code/test/frag.c b/code/test/frag.c
new file mode 100644
index 0000000..cbc8cdf
--- /dev/null
+++ b/code/test/frag.c
@@ -0,0 +1,122 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "core.h"
+
+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;
+
+ECPRBRecv rbuf_recv;
+ECPRBMessage rbuf_r_msg[128];
+ECPFragIter frag_iter;
+unsigned char frag_buffer[8192];
+
+#define CTYPE_TEST  0
+#define MTYPE_MSG   8
+
+ssize_t handle_open_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s) {
+    uint32_t seq = 0;
+    
+    ecp_conn_handle_open(conn, sq, t, p, s);
+    if (s < 0) {
+        printf("OPEN ERR:%ld\n", s);
+        return s;
+    }
+    
+    unsigned char content[1000];
+    char *msg = "PERA JE CAR!";
+
+    strcpy((char *)content, msg);
+    ssize_t _rv = ecp_send(conn, MTYPE_MSG, content, sizeof(content));
+    return s;
+}
+
+ssize_t handle_msg_c(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s) {
+    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;
+}
+
+ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s) {
+    printf("MSG S:%s size:%ld\n", p, s);
+
+    unsigned char content[5000];
+    char *msg = "VAISTINU JE CAR!";
+
+    strcpy((char *)content, msg);
+    ssize_t _rv = ecp_send(conn, MTYPE_MSG, content, sizeof(content));
+    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_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