pre postira

1 files changed, 34 insertions, 30 deletions

diff --git a/code/core/rbuf_send.c b/code/core/rbuf_send.c
index 8f0cc38..7ae5aca 100644
--- a/code/core/rbuf_send.c
+++ b/code/core/rbuf_send.c
@@ -12,48 +12,44 @@ static ssize_t handle_ack(ECPConnection *conn, ecp_seq_t seq, unsigned char mtyp
     ECPRBSend *buf = conn->rbuf.send;
     ECPRBuffer *rbuf = &buf->rbuf;
     
+    idx = ecp_rbuf_msg_idx(rbuf, seq_ack);
+    if (idx < 0) return idx;
+    
+    seq_ack++;
+    buf->in_transit -= seq_ack - rbuf->seq_start;
+
     if (ack_map != ECP_RBUF_ACK_FULL) {
         int i;
         int nack = 0;
-        ecp_win_t ack_cnt = 0;
+        ecp_win_t nack_cnt = 0;
         
-        seq_ack -= ECP_RBUF_ACK_SIZE - 1;
-
-        idx = ecp_rbuf_msg_idx(rbuf, seq_ack);
-        if (idx < 0) return idx;
-
-        if (buf->reliable) buf->in_transit -= seq_ack - rbuf->seq_start;
+        seq_ack -= ECP_RBUF_ACK_SIZE;
         for (i=0; i<ECP_RBUF_ACK_SIZE; i++) {
-            if (ack_map & ((ecp_ack_t)1 << (ECP_RBUF_ACK_SIZE - i - 1))) {
-                ack_cnt++;
-            } else if (buf->reliable) {
-                // if resend packet (seq_ack + i)
-                if (!nack) {
-                    nack = 1;
-                    
-                    rbuf->seq_start = seq_ack + i;
-                    rbuf->msg_start = ECP_RBUF_IDX_MASK(idx + i, rbuf->msg_size);
+            if ((ack_map & ((ecp_ack_t)1 << (ECP_RBUF_ACK_SIZE - i - 1))) == 0) {
+                nack_cnt++;
+                if (buf->reliable) {
+                    idx = ecp_rbuf_msg_idx(rbuf, seq_ack + i);
+                    // resend packet 
+                    // ecp_pkt_send(conn->sock, &conn->node.addr, packet, rv);
+                    if (!nack) {
+                        nack = 1;
+                
+                        rbuf->seq_start = seq_ack + i;
+                        rbuf->msg_start = idx;
+                    }
                 }
             }
         }
-        if (buf->reliable) {
-            buf->in_transit -= ack_cnt;
-        } else {
+        buf->in_transit += nack_cnt;
+        buf->nack_rate = (buf->nack_rate * 7 + ((ECP_RBUF_ACK_SIZE - nack_cnt) * ACK_RATE_UNIT) / ECP_RBUF_ACK_SIZE) / 8;
+        if (!buf->reliable) {
             rbuf->seq_start = seq_ack + ECP_RBUF_ACK_SIZE;
-            buf->nack_rate = (buf->nack_rate * 7 + ((ECP_RBUF_ACK_SIZE - ack_cnt) * ACK_RATE_UNIT) / ECP_RBUF_ACK_SIZE) / 8;
         }
     } else {
-        seq_ack++;
-
-        idx = ecp_rbuf_msg_idx(rbuf, seq_ack);
-        if (idx < 0) return idx;
-        
         rbuf->seq_start = seq_ack;
+        buf->nack_rate = (buf->nack_rate * 7) / 8;
         if (buf->reliable) {
-            buf->in_transit -= seq_ack - rbuf->seq_start;
-            rbuf->msg_start = idx;
-        } else {
-            buf->nack_rate = (buf->nack_rate * 7) / 8;
+            rbuf->msg_start = ECP_RBUF_IDX_MASK(idx + 1, rbuf->msg_size);
         }
     }
     return size;
@@ -63,11 +59,19 @@ int ecp_rbuf_send_create(ECPRBSend *buf, ECPRBMessage *msg, unsigned int msg_siz
     memset(buf, 0, sizeof(ECPRBRecv));
     memset(msg, 0, sizeof(ECPRBMessage) * msg_size);
     ecp_rbuf_init(&buf->rbuf, msg, msg_size);
+
+    return ECP_OK;
+}
+
+int ecp_rbuf_send_start(ECPRBSend *buf, ecp_seq_t seq) {
+    buf->rbuf.seq_start = seq + 1;
+
     return ECP_OK;
 }
 
 ssize_t ecp_rbuf_send_store(ECPConnection *conn, ecp_seq_t seq, unsigned char *msg, size_t msg_size) {
     ECPRBSend *buf = conn->rbuf.send;
-    if (buf->reliable) buf->in_transit++;
+    
+    buf->in_transit++;
     return ecp_rbuf_msg_store(&buf->rbuf, seq, msg, msg_size, 0, 0);
 }
\ No newline at end of file