From 2ae35e4ce06ad6dbcf95cd2f6a1cc0f95ee2c866 Mon Sep 17 00:00:00 2001
From: Andre Puschmann <andre@softwareradiosystems.com>
Date: Sat, 13 Jul 2019 17:31:37 +0200
Subject: [PATCH] make sure status PDU doens't exceed grant size

---
 lib/src/upper/rlc_am.cc       | 16 ++++++++++++++--
 lib/test/upper/rlc_am_test.cc |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/src/upper/rlc_am.cc b/lib/src/upper/rlc_am.cc
index 7690a557b..cf188cb92 100644
--- a/lib/src/upper/rlc_am.cc
+++ b/lib/src/upper/rlc_am.cc
@@ -1614,15 +1614,27 @@ int rlc_am::rlc_am_rx::get_status_pdu(rlc_status_pdu_t* status, const uint32_t m
 {
   pthread_mutex_lock(&mutex);
   status->N_nack = 0;
-  status->ack_sn = vr_ms;
+  status->ack_sn = vr_r; // start with lower edge of the rx window
 
   // We don't use segment NACKs - just NACK the full PDU
   uint32_t i = vr_r;
   while (RX_MOD_BASE(i) < RX_MOD_BASE(vr_ms) && status->N_nack < RLC_AM_WINDOW_SIZE) {
-    status->ack_sn = i;
     if (rx_window.find(i) == rx_window.end()) {
       status->nacks[status->N_nack].nack_sn = i;
       status->N_nack++;
+    } else {
+      // only update ACK_SN if this SN has been received
+      status->ack_sn = i;
+    }
+
+    // make sure we don't exceed grant size
+    if (rlc_am_packed_length(status) > max_pdu_size) {
+      log->debug("Status PDU too big (%d > %d)\n", rlc_am_packed_length(status), max_pdu_size);
+      if (status->N_nack >= 1) {
+        log->debug("Removing last NACK SN=%d\n", status->nacks[status->N_nack].nack_sn);
+        status->N_nack--;
+      }
+      break;
     }
     i = (i + 1) % MOD;
   }
diff --git a/lib/test/upper/rlc_am_test.cc b/lib/test/upper/rlc_am_test.cc
index 5d498030f..ea4ec4c09 100644
--- a/lib/test/upper/rlc_am_test.cc
+++ b/lib/test/upper/rlc_am_test.cc
@@ -1642,7 +1642,7 @@ bool status_pdu_test()
   // Write status PDU to RLC1
   rlc1.write_pdu(status_buf.msg, status_buf.N_bytes);
 
-  // to retransmission of remaining PDUs
+  // retransmission of remaining PDUs
   for (int i = 0; i < 3; i++) {
     retx.clear();
     len          = rlc1.read_pdu(retx.msg, 3);
@@ -1652,7 +1652,7 @@ bool status_pdu_test()
     rlc2.write_pdu(retx.msg, retx.N_bytes);
   }
 
-  assert(tester.n_sdus == 5);
+  assert(tester.n_sdus == NBUFS);
   for (int i = 0; i < tester.n_sdus; i++) {
     if (tester.sdus[i]->N_bytes != 1)
       return -1;