From 2a46bdf517eb5fcb8ba59c398a32859c6496475d Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Tue, 31 Aug 2021 11:14:41 +0200
Subject: transient messages added; code cleanup

---
 ecp/src/rbuf.c | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'ecp/src/rbuf.c')

diff --git a/ecp/src/rbuf.c b/ecp/src/rbuf.c
index 05eb5ae..9a5bd8c 100644
--- a/ecp/src/rbuf.c
+++ b/ecp/src/rbuf.c
@@ -1,19 +1,32 @@
 #include "core.h"
 
+int ecp_rbuf_init(ECPRBuffer *rbuf, ECPRBMessage *msg, unsigned int msg_size) {
+    rbuf->msg = msg;
+    if (msg_size) {
+        if (msg == NULL) return ECP_ERR;
+        rbuf->msg_size = msg_size;
+        memset(rbuf->msg, 0, sizeof(ECPRBMessage) * msg_size);
+    } else {
+        rbuf->msg_size = ECP_SEQ_HALF;
+    }
+
+    return ECP_OK;
+}
+
 int ecp_rbuf_create(ECPConnection *conn, ECPRBSend *buf_s, ECPRBMessage *msg_s, unsigned int msg_s_size, ECPRBRecv *buf_r, ECPRBMessage *msg_r, unsigned int msg_r_size) {
     int rv;
-    
+
     if (buf_s) {
         rv = ecp_rbuf_send_create(conn, buf_s, msg_s, msg_s_size);
         if (rv) return rv;
-        
+
         rv = ecp_rbuf_send_start(conn);
         if (rv) {
             ecp_rbuf_send_destroy(conn);
             return rv;
         }
     }
-    
+
     if (buf_r) {
         rv = ecp_rbuf_recv_create(conn, buf_r, msg_r, msg_r_size);
         if (rv) {
@@ -21,7 +34,7 @@ int ecp_rbuf_create(ECPConnection *conn, ECPRBSend *buf_s, ECPRBMessage *msg_s,
             return rv;
         }
     }
-    
+
     return ECP_OK;
 }
 
@@ -30,19 +43,6 @@ void ecp_rbuf_destroy(ECPConnection *conn) {
     ecp_rbuf_recv_destroy(conn);
 }
 
-int ecp_rbuf_init(ECPRBuffer *rbuf, ECPRBMessage *msg, unsigned int msg_size) {
-    rbuf->msg = msg;
-    if (msg_size) {
-        if (msg == NULL) return ECP_ERR;
-        rbuf->msg_size = msg_size;
-        memset(rbuf->msg, 0, sizeof(ECPRBMessage) * msg_size);
-    } else {
-        rbuf->msg_size = ECP_SEQ_HALF;
-    }
-
-    return ECP_OK;
-}
-
 int ecp_rbuf_start(ECPRBuffer *rbuf, ecp_seq_t seq) {
     rbuf->seq_max = seq;
     rbuf->seq_start = seq + 1;
@@ -64,7 +64,7 @@ ssize_t ecp_rbuf_msg_store(ECPRBuffer *rbuf, ecp_seq_t seq, int idx, unsigned ch
 
     if (rbuf->msg == NULL) return 0;
     if (test_flags && (test_flags & rbuf->msg[idx].flags)) return ECP_ERR_RBUF_DUP;
-    
+
     if (msg_size) memcpy(rbuf->msg[idx].msg, msg, msg_size);
     rbuf->msg[idx].size = msg_size;
     rbuf->msg[idx].flags = set_flags;
@@ -78,16 +78,16 @@ ssize_t ecp_rbuf_pld_send(ECPConnection *conn, ECPBuffer *packet, ECPBuffer *pay
     ECPNetAddr addr;
     ECPSeqItem seq_item;
     ssize_t rv;
-    int _rv;    
-    
+    int _rv;
+
     _rv = ecp_seq_item_init(&seq_item);
     if (_rv) return _rv;
-    
+
     seq_item.seq = seq;
     seq_item.seq_w = 1;
     seq_item.rb_pass = 1;
 
-    rv = ecp_pack(conn, packet, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, payload, pld_size, &seq_item, &addr);
+    rv = ecp_pack_conn(conn, packet, ECP_ECDH_IDX_INV, ECP_ECDH_IDX_INV, &seq_item, payload, pld_size, &addr);
     if (rv < 0) return rv;
 
     rv = ecp_pkt_send(sock, &addr, packet, rv, flags);
-- 
cgit v1.2.3