From f2bc5ddbeca144fa79208a5ac6a029da6ed5c10c Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Thu, 31 Mar 2022 13:09:12 +0200
Subject: vconn bugfix

---
 ecp/test/server.c | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'ecp/test/server.c')

diff --git a/ecp/test/server.c b/ecp/test/server.c
index fabaf4e..228dbea 100644
--- a/ecp/test/server.c
+++ b/ecp/test/server.c
@@ -1,10 +1,11 @@
-#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <stdlib.h>
+#include <stdio.h>
 
-#include "core.h"
-#include "util.h"
+#include <core.h>
+
+#include <util.h>
 
 ECPContext ctx;
 ECPSocket sock;
@@ -12,18 +13,16 @@ ECPDHKey key_perma;
 ECPConnHandler handler;
 
 #define CTYPE_TEST  0
-#define MTYPE_MSG   8
-
-ssize_t handle_msg(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);
+#define MTYPE_MSG   0
 
-    char *msg = "VAISTINU JE CAR!";
-    unsigned char buf[1000];
+static ssize_t handle_msg(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;
 }
 
 static void usage(char *arg) {
@@ -32,28 +31,30 @@ static void usage(char *arg) {
 }
 
 int main(int argc, char *argv[]) {
+    ECPDHKey key_perma;
     int rv;
-    
+
+    /* server */
     if (argc != 3) usage(argv[0]);
-    
+
     rv = ecp_init(&ctx);
     printf("ecp_init RV:%d\n", rv);
-    
-    rv = ecp_conn_handler_init(&handler);
-    handler.msg[MTYPE_MSG] = handle_msg;
-    ctx.handler[CTYPE_TEST] = &handler;
-    
-    rv = ecp_util_key_load(&ctx, &key_perma, argv[2]);
-    printf("ecp_util_key_load RV:%d\n", rv);
-    
-    rv = ecp_sock_init(&sock, &ctx, &key_perma);
-    printf("ecp_sock_init RV:%d\n", rv);
+
+    ecp_conn_handler_init(&handler, handle_msg, NULL, NULL, NULL);
+    ecp_ctx_set_handler(&ctx, &handler, CTYPE_TEST);
+
+    rv = ecp_util_load_key(&key_perma.public, &key_perma.private, argv[2]);
+    printf("ecp_util_load_key RV:%d\n", rv);
+    key_perma.valid = 1;
+
+    rv = ecp_sock_create(&sock, &ctx, &key_perma);
+    printf("ecp_sock_create RV:%d\n", rv);
 
     rv = ecp_sock_open(&sock, argv[1]);
     printf("ecp_sock_open RV:%d\n", rv);
-    
+
     rv = ecp_start_receiver(&sock);
     printf("ecp_start_receiver RV:%d\n", rv);
 
     while (1) sleep(1);
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3