rbuffer almost implemented

1 files changed, 48 insertions, 24 deletions

diff --git a/code/core/rbuf.h b/code/core/rbuf.h
index 4340707..9e9e53d 100644
--- a/code/core/rbuf.h
+++ b/code/core/rbuf.h
@@ -1,21 +1,38 @@
-#define ECP_RBUF_FLAG_PRESENT        1
+#define ECP_RBUF_FLAG_RECEIVED      0x01
+#define ECP_RBUF_FLAG_DELIVERED     0x02
 
-#define ECP_ERR_RBUF_FLAG   -100
-#define ECP_ERR_RBUF_IDX    -101
-#define ECP_ERR_RBUF_DUP    -102
+#define ECP_RBUF_FLAG_RELIABLE      0x01
+#define ECP_RBUF_FLAG_MSGQ          0x02
+
+#define ECP_MTYPE_RBOPEN            0x04
+#define ECP_MTYPE_RBCLOSE           0x05
+#define ECP_MTYPE_RBFLUSH           0x06
+#define ECP_MTYPE_RBACK             0x07
+
+#define ECP_MTYPE_RBOPEN_REQ        (ECP_MTYPE_RBOPEN)
+#define ECP_MTYPE_RBOPEN_REP        (ECP_MTYPE_RBOPEN | ECP_MTYPE_FLAG_REP)
+#define ECP_MTYPE_RBCLOSE_REQ       (ECP_MTYPE_RBCLOSE)
+#define ECP_MTYPE_RBCLOSE_REP       (ECP_MTYPE_RBCLOSE | ECP_MTYPE_FLAG_REP)
+#define ECP_MTYPE_RBFLUSH_REQ       (ECP_MTYPE_RBFLUSH)
+#define ECP_MTYPE_RBFLUSH_REP       (ECP_MTYPE_RBFLUSH | ECP_MTYPE_FLAG_REP)
+
+#define ECP_ERR_RBUF_FLAG           -100
+#define ECP_ERR_RBUF_IDX            -101
+#define ECP_ERR_RBUF_DUP            -102
+#define ECP_ERR_RBUF_FULL           -103
 
 typedef uint32_t ecp_ack_t;
 typedef uint32_t ecp_win_t;
 
-#define ECP_RBUF_SEQ_HALF            ((ecp_seq_t)1 << (sizeof(ecp_seq_t)*8-1))
+#define ECP_RBUF_SEQ_HALF               ((ecp_seq_t)1 << (sizeof(ecp_seq_t)*8-1))
 
-#define ECP_RBUF_ACK_FULL            (~(ecp_ack_t)0)
-#define ECP_RBUF_ACK_SIZE            (sizeof(ecp_ack_t)*8)
+#define ECP_RBUF_ACK_FULL               (~(ecp_ack_t)0)
+#define ECP_RBUF_ACK_SIZE               (sizeof(ecp_ack_t)*8)
 
-#define ECP_RBUF_SEQ_LT(a,b)         ((ecp_seq_t)((ecp_seq_t)(a) - (ecp_seq_t)(b)) > ECP_RBUF_SEQ_HALF)
-#define ECP_RBUF_SEQ_LTE(a,b)        ((ecp_seq_t)((ecp_seq_t)(b) - (ecp_seq_t)(a)) < ECP_RBUF_SEQ_HALF)
+#define ECP_RBUF_SEQ_LT(a,b)            ((ecp_seq_t)((ecp_seq_t)(a) - (ecp_seq_t)(b)) > ECP_RBUF_SEQ_HALF)
+#define ECP_RBUF_SEQ_LTE(a,b)           ((ecp_seq_t)((ecp_seq_t)(b) - (ecp_seq_t)(a)) < ECP_RBUF_SEQ_HALF)
 
-#define ECP_RBUF_IDX_MASK(idx, size) ((idx) & ((size) - 1))
+#define ECP_RBUF_IDX_MASK(idx, size)    ((idx) & ((size) - 1))
 /* If size not 2^x:
 #define ECP_RBUF_IDX_MASK(idx, size) ((idx) % (size))
 */
@@ -35,8 +52,8 @@ typedef struct ECPRBuffer {
 } ECPRBuffer;
 
 typedef struct ECPRBRecv {
-    unsigned char open;
-    unsigned char reliable;
+    unsigned char flags;
+    unsigned char flush;
     unsigned short deliver_delay;
     unsigned short hole_max;
     unsigned short ack_rate;
@@ -50,12 +67,16 @@ typedef struct ECPRBRecv {
 } ECPRBRecv;
 
 typedef struct ECPRBSend {
-    unsigned char open;
-    unsigned char reliable;
+    unsigned char flags;
+    unsigned char flush;
     ecp_win_t win_size;
     ecp_win_t in_transit;
+    ecp_seq_t seq_flush;
     unsigned int nack_rate;
     ECPRBuffer rbuf;
+#ifdef ECP_WITH_PTHREAD
+    pthread_mutex_t mutex;
+#endif
 } ECPRBSend;
 
 typedef struct ECPConnRBuffer {
@@ -66,14 +87,17 @@ typedef struct ECPConnRBuffer {
 
 int ecp_rbuf_init(ECPRBuffer *rbuf, ECPRBMessage *msg, unsigned int msg_size);
 int ecp_rbuf_msg_idx(ECPRBuffer *rbuf, ecp_seq_t seq);
-ssize_t ecp_rbuf_msg_store(ECPRBuffer *rbuf, ecp_seq_t seq, unsigned char *msg, size_t msg_size, unsigned char test_flags, unsigned char set_flags);
-
-int ecp_rbuf_recv_create(ECPRBRecv *buf, ECPRBMessage *msg, unsigned int msg_size);
-int ecp_rbuf_recv_start(ECPRBRecv *buf, ecp_seq_t seq);
-int ecp_rbuf_recv_set_hole(ECPRBRecv *buf, unsigned short hole_max);
-int ecp_rbuf_recv_set_delay(ECPRBRecv *buf, unsigned short delay);
-ssize_t ecp_rbuf_recv_store(struct ECPConnection *conn, ecp_seq_t seq, unsigned char *msg, size_t msg_size);
-
-
-ssize_t ecp_rbuf_send_store(struct ECPConnection *conn, ecp_seq_t seq, unsigned char *msg, size_t msg_size);
+ssize_t ecp_rbuf_msg_store(ECPRBuffer *rbuf, ecp_seq_t seq, int idx, unsigned char *msg, size_t msg_size, unsigned char test_flags, unsigned char set_flags);
+int ecp_conn_rbuf_start(struct ECPConnection *conn, ecp_seq_t seq);
+ssize_t ecp_conn_rbuf_pkt_send(struct ECPConnection *conn, ECPNetAddr *addr, unsigned char *packet, size_t pkt_size, ecp_seq_t seq, int idx);
+
+int ecp_conn_rbuf_recv_create(struct ECPConnection *conn, ECPRBRecv *buf, ECPRBMessage *msg, unsigned int msg_size);
+int ecp_conn_rbuf_recv_start(struct ECPConnection *conn, ecp_seq_t seq);
+ssize_t ecp_conn_rbuf_recv_store(struct ECPConnection *conn, ecp_seq_t seq, unsigned char *msg, size_t msg_size);
+
+int ecp_conn_rbuf_send_create(struct ECPConnection *conn, ECPRBSend *buf, ECPRBMessage *msg, unsigned int msg_size);
+int ecp_conn_rbuf_send_start(struct ECPConnection *conn);
+int ecp_conn_rbuf_recv_set_hole(struct ECPConnection *conn, unsigned short hole_max);
+int ecp_conn_rbuf_recv_set_delay(struct ECPConnection *conn, unsigned short delay);
+ssize_t ecp_conn_rbuf_send_store(struct ECPConnection *conn, ecp_seq_t seq, int idx, unsigned char *msg, size_t msg_size);