1 files changed, 13 insertions, 13 deletions

diff --git a/code/test/server.c b/code/test/server.c
index e2001eb..f70cc79 100644
--- a/code/test/server.c
+++ b/code/test/server.c
@@ -6,15 +6,15 @@
 #include "core.h"
 #include "util.h"
 
-ECPContext ctx_s;
-ECPSocket sock_s;
-ECPDHKey key_perma_s;
-ECPConnHandler handler_s;
+ECPContext ctx;
+ECPSocket sock;
+ECPDHKey key_perma;
+ECPConnHandler handler;
 
 #define CTYPE_TEST  0
 #define MTYPE_MSG   8
 
-ssize_t handle_msg_s(ECPConnection *conn, ecp_seq_t sq, unsigned char t, unsigned char *p, ssize_t s, ECP2Buffer *b) {
+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);
 
     char *msg = "VAISTINU JE CAR!";
@@ -36,23 +36,23 @@ int main(int argc, char *argv[]) {
     
     if (argc != 3) usage(argv[0]);
     
-    rv = ecp_init(&ctx_s);
+    rv = ecp_init(&ctx);
     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_conn_handler_init(&handler);
+    handler.msg[MTYPE_MSG] = handle_msg;
+    ctx.handler[CTYPE_TEST] = &handler;
     
-    rv = ecp_util_key_load(&ctx_s, &key_perma_s, argv[2]);
+    rv = ecp_util_key_load(&ctx, &key_perma, argv[2]);
     printf("ecp_util_key_load RV:%d\n", rv);
     
-    rv = ecp_sock_create(&sock_s, &ctx_s, &key_perma_s);
+    rv = ecp_sock_create(&sock, &ctx, &key_perma);
     printf("ecp_sock_create RV:%d\n", rv);
 
-    rv = ecp_sock_open(&sock_s, argv[1]);
+    rv = ecp_sock_open(&sock, argv[1]);
     printf("ecp_sock_open RV:%d\n", rv);
     
-    rv = ecp_start_receiver(&sock_s);
+    rv = ecp_start_receiver(&sock);
     printf("ecp_start_receiver RV:%d\n", rv);
 
     while (1) sleep(1);