1 files changed, 70 insertions, 56 deletions

diff --git a/ecp/src/ecp/ext/frag.c b/ecp/src/ecp/ext/frag.c
index 58941ba..8795470 100644
--- a/ecp/src/ecp/ext/frag.c
+++ b/ecp/src/ecp/ext/frag.c
@@ -1,12 +1,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <core.h>
+#include <ecp/core.h>
 
-#include "rbuf.h"
 #include "frag.h"
 
-int ecp_frag_iter_init(ECPRBConn *conn, ECPFragIter *iter, unsigned char *buffer, size_t buf_size) {
+int ecp_frag_iter_init(ECPConnection *conn, ECPFragIter *iter, unsigned char *buffer, size_t buf_size) {
     memset(iter, 0, sizeof(ECPFragIter));
     iter->buffer = buffer;
     iter->buf_size = buf_size;
@@ -15,17 +14,64 @@ int ecp_frag_iter_init(ECPRBConn *conn, ECPFragIter *iter, unsigned char *buffer
     return ECP_OK;
 }
 
-ECPFragIter *ecp_frag_iter_get(ECPRBConn *conn) {
-    return conn->iter;
-}
-
 void ecp_frag_iter_reset(ECPFragIter *iter) {
     iter->seq = 0;
     iter->frag_cnt = 0;
     iter->pld_size = 0;
 }
 
-ssize_t ecp_msg_frag(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECPBuffer *packet, ECPBuffer *payload) {
+ssize_t ecp_pld_defrag(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *payload, size_t pld_size) {
+    ECPFragIter *iter = conn->iter;
+    unsigned char *msg;
+    unsigned char frag_cnt, frag_tot;
+    uint16_t frag_size;
+    size_t hdr_size, msg_size;
+    size_t buf_offset;
+    int rv;
+
+    rv = ecp_pld_get_frag(payload, pld_size, &frag_cnt, &frag_tot, &frag_size);
+    if (rv) return ECP_ERR;
+
+    msg = ecp_pld_get_msg(payload, pld_size);
+    if (msg == NULL) return ECP_ERR;
+    hdr_size = msg - payload;
+
+    msg_size = pld_size - hdr_size;
+    if (msg_size == 0) return ECP_ERR;
+
+    if (iter->pld_size && (iter->seq + frag_cnt != seq)) ecp_frag_iter_reset(iter);
+
+    if (iter->pld_size == 0) {
+        iter->seq = seq - frag_cnt;
+        iter->frag_cnt = 0;
+    }
+
+    mtype &= ~ECP_MTYPE_FLAG_FRAG;
+    buf_offset = ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype) + frag_size * frag_cnt;
+    if (buf_offset + msg_size > iter->buf_size) return ECP_ERR_SIZE;
+    memcpy(iter->buffer + buf_offset, msg, msg_size);
+
+    if (frag_cnt == 0) {
+        if (ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype) > iter->buf_size) return ECP_ERR_SIZE;
+
+        iter->buffer[0] = mtype;
+        if (ECP_SIZE_MT_FLAG(mtype)) {
+            memcpy(iter->buffer + ECP_SIZE_MTYPE, payload + ECP_SIZE_MTYPE, ECP_SIZE_MT_FLAG(mtype));
+        }
+        msg_size += ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype);
+    }
+
+    iter->frag_cnt++;
+    iter->pld_size += msg_size;
+    if (iter->frag_cnt == frag_tot) {
+        ecp_pld_handle_one(conn, iter->seq, iter->buffer, iter->pld_size, NULL);
+        ecp_frag_iter_reset(iter);
+    }
+
+    return pld_size;
+}
+
+ssize_t ecp_msg_send_wfrag(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECPBuffer *packet, ECPBuffer *payload) {
     unsigned char *msg_buf;
     unsigned char *pld_buf;
     size_t pld_size;
@@ -72,58 +118,26 @@ ssize_t ecp_msg_frag(ECPConnection *conn, unsigned char mtype, unsigned char *ms
     return msg_size;
 }
 
-ssize_t ecp_pld_defrag(ECPConnection *conn, ecp_seq_t seq, unsigned char mtype, unsigned char *payload, size_t pld_size) {
-    ECPRBConn *_conn = NULL;
-    ECPFragIter *iter = NULL;
-    unsigned char *msg;
-    unsigned char frag_cnt, frag_tot;
-    uint16_t frag_size;
-    size_t hdr_size, msg_size;
-    size_t buf_offset;
-    int rv;
-
-    _conn = ecp_rbuf_get_rbconn(conn);
-    if (_conn) iter = ecp_frag_iter_get(_conn);
-    if (iter == NULL) ECP_ERR;
-
-    rv = ecp_pld_get_frag(payload, pld_size, &frag_cnt, &frag_tot, &frag_size);
-    if (rv) return ECP_ERR;
-
-    msg = ecp_pld_get_msg(payload, pld_size);
-    if (msg == NULL) return ECP_ERR;
-    hdr_size = msg - payload;
-
-    msg_size = pld_size - hdr_size;
-    if (msg_size == 0) return ECP_ERR;
-
-    if (iter->pld_size && (iter->seq + frag_cnt != seq)) ecp_frag_iter_reset(iter);
-
-    if (iter->pld_size == 0) {
-        iter->seq = seq - frag_cnt;
-        iter->frag_cnt = 0;
-    }
-
-    mtype &= ~ECP_MTYPE_FLAG_FRAG;
-    buf_offset = ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype) + frag_size * frag_cnt;
-    if (buf_offset + msg_size > iter->buf_size) return ECP_ERR_SIZE;
-    memcpy(iter->buffer + buf_offset, msg, msg_size);
+ssize_t ecp_ext_pld_handle_one(ECPConnection *conn, ecp_seq_t seq, unsigned char *payload, size_t pld_size, ECP2Buffer *bufs) {
+    if (conn->iter) {
+        unsigned char mtype;
+        int rv;
 
-    if (frag_cnt == 0) {
-        if (ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype) > iter->buf_size) return ECP_ERR_SIZE;
+        rv = ecp_pld_get_type(payload, pld_size, &mtype);
+        if (rv) return rv;
 
-        iter->buffer[0] = mtype;
-        if (ECP_SIZE_MT_FLAG(mtype)) {
-            memcpy(iter->buffer + ECP_SIZE_MTYPE, payload + ECP_SIZE_MTYPE, ECP_SIZE_MT_FLAG(mtype));
+        if (mtype & ECP_MTYPE_FLAG_FRAG) {
+            return ecp_pld_defrag(conn, seq, mtype, payload, pld_size);
         }
-        msg_size += ECP_SIZE_MTYPE + ECP_SIZE_MT_FLAG(mtype);
     }
 
-    iter->frag_cnt++;
-    iter->pld_size += msg_size;
-    if (iter->frag_cnt == frag_tot) {
-        ecp_pld_handle_one(conn, iter->seq, iter->buffer, iter->pld_size, NULL);
-        ecp_frag_iter_reset(iter);
-    }
+    return 0;
+}
 
-    return pld_size;
+ssize_t ecp_ext_msg_send(ECPConnection *conn, unsigned char mtype, unsigned char *msg, size_t msg_size, ECPBuffer *packet, ECPBuffer *payload) {
+    if (ECP_SIZE_PKT_BUF(msg_size, mtype, conn) > ECP_MAX_PKT) {
+        return ecp_msg_send_wfrag(conn, mtype, msg, msg_size, packet, payload);
+    } else {
+        return 0;
+    }
 }