<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25108">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move tbf ul_ack_state to osmocom FSM<br><br>Related: OS#2709<br>Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30<br>---<br>M src/Makefile.am<br>M src/encoding.cpp<br>M src/encoding.h<br>M src/gprs_rlcmac_sched.cpp<br>M src/pdch.cpp<br>M src/tbf.cpp<br>M src/tbf.h<br>M src/tbf_dl.cpp<br>M src/tbf_ul.cpp<br>M src/tbf_ul.h<br>A src/tbf_ul_ack_fsm.c<br>A src/tbf_ul_ack_fsm.h<br>M tests/tbf/TbfTest.cpp<br>M tests/tbf/TbfTest.err<br>M tests/types/TypesTest.cpp<br>M tests/types/TypesTest.err<br>16 files changed, 489 insertions(+), 173 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 1a2ea97..08b3309 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -60,6 +60,7 @@</span><br><span>   tbf.cpp \</span><br><span>    tbf_fsm.c \</span><br><span>  tbf_ul.cpp \</span><br><span style="color: hsl(120, 100%, 40%);">+  tbf_ul_ack_fsm.c \</span><br><span>   tbf_ul_ass_fsm.c \</span><br><span>   tbf_dl.cpp \</span><br><span>         tbf_dl_ass_fsm.c \</span><br><span>@@ -102,6 +103,7 @@</span><br><span>     tbf.h \</span><br><span>      tbf_fsm.h \</span><br><span>  tbf_ul.h \</span><br><span style="color: hsl(120, 100%, 40%);">+    tbf_ul_ack_fsm.h \</span><br><span>   tbf_ul_ass_fsm.h \</span><br><span>   tbf_dl.h \</span><br><span>   tbf_dl_ass_fsm.h \</span><br><span>diff --git a/src/encoding.cpp b/src/encoding.cpp</span><br><span>index f945161..30b0ee1 100644</span><br><span>--- a/src/encoding.cpp</span><br><span>+++ b/src/encoding.cpp</span><br><span>@@ -1106,9 +1106,8 @@</span><br><span>      bitvec_write_field(dest, &wp, 0, 1); // 0: don't have REL 5</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void Encoding::write_packet_uplink_ack(</span><br><span style="color: hsl(0, 100%, 40%);">-    bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span style="color: hsl(0, 100%, 40%);">-   uint8_t rrbp)</span><br><span style="color: hsl(120, 100%, 40%);">+void write_packet_uplink_ack(struct bitvec *dest, struct gprs_rlcmac_ul_tbf *tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                           bool is_final, uint8_t rrbp)</span><br><span> {</span><br><span>       unsigned wp = 0;</span><br><span> </span><br><span>diff --git a/src/encoding.h b/src/encoding.h</span><br><span>index 298a937..998e69a 100644</span><br><span>--- a/src/encoding.h</span><br><span>+++ b/src/encoding.h</span><br><span>@@ -65,10 +65,6 @@</span><br><span> </span><br><span>   static void encode_rbb(const char *show_rbb, bitvec *rbb);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  static void write_packet_uplink_ack(</span><br><span style="color: hsl(0, 100%, 40%);">-                    bitvec * dest, struct gprs_rlcmac_ul_tbf *tbf, bool is_final,</span><br><span style="color: hsl(0, 100%, 40%);">-                   uint8_t rrbp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>       static int write_paging_request(bitvec * dest, const struct osmo_mobile_identity *mi);</span><br><span> </span><br><span>   static unsigned write_repeated_page_info(bitvec * dest, unsigned& wp, uint8_t len,</span><br><span>@@ -119,6 +115,9 @@</span><br><span>                                       int8_t ta_idx, uint8_t ta_ts, bool use_egprs,</span><br><span>                                uint8_t control_ack);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void write_packet_uplink_ack(struct bitvec *dest, struct gprs_rlcmac_ul_tbf *tbf,</span><br><span style="color: hsl(120, 100%, 40%);">+                         bool is_final, uint8_t rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void write_packet_neighbour_cell_data(RlcMacDownlink_t *block,</span><br><span>               bool tfi_is_dl, uint8_t tfi, uint8_t container_id,</span><br><span>           uint8_t container_idx, PNCDContainer_t *container);</span><br><span>diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp</span><br><span>index ed81981..eb163a7 100644</span><br><span>--- a/src/gprs_rlcmac_sched.cpp</span><br><span>+++ b/src/gprs_rlcmac_sched.cpp</span><br><span>@@ -54,7 +54,7 @@</span><br><span>             /* this trx, this ts */</span><br><span>              if (!ul_tbf->is_control_ts(pdch->ts_no))</span><br><span>                       continue;</span><br><span style="color: hsl(0, 100%, 40%);">-               if (ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_SEND_ACK))</span><br><span style="color: hsl(120, 100%, 40%);">+          if (tbf_ul_ack_rts(ul_tbf))</span><br><span>                  tbf_cand->ul_ack = ul_tbf;</span><br><span>                if (tbf_dl_ass_rts(ul_tbf))</span><br><span>                  tbf_cand->dl_ass = ul_tbf;</span><br><span>@@ -173,7 +173,7 @@</span><br><span>                  else if (tbf == tbfs->dl_ass && tbf->direction == GPRS_RLCMAC_UL_TBF)</span><br><span>                          msg = tbf_dl_ass_create_rlcmac_msg(tbfs->dl_ass, fn, ts);</span><br><span>                         else if (tbf == tbfs->ul_ack)</span><br><span style="color: hsl(0, 100%, 40%);">-                                msg = tbfs->ul_ack->create_ul_ack(fn, ts);</span><br><span style="color: hsl(120, 100%, 40%);">+                              msg = tbf_ul_ack_create_rlcmac_msg(tbfs->ul_ack, fn, ts);</span><br><span>                         else if (tbf == tbfs->nacc) {</span><br><span>                             msg = ms_nacc_create_rlcmac_msg(tbf->ms(), tbf, fn, ts);</span><br><span>                  }</span><br><span>diff --git a/src/pdch.cpp b/src/pdch.cpp</span><br><span>index 439759f..da43bdf 100644</span><br><span>--- a/src/pdch.cpp</span><br><span>+++ b/src/pdch.cpp</span><br><span>@@ -344,11 +344,10 @@</span><br><span> </span><br><span>   /* check if this control ack belongs to packet uplink ack */</span><br><span>         ul_tbf = as_ul_tbf(tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (ul_tbf && ul_tbf->handle_ctrl_ack(reason)) {</span><br><span style="color: hsl(120, 100%, 40%);">+   if (ul_tbf && reason == PDCH_ULC_POLL_UL_ACK && tbf_ul_ack_exp_ctrl_ack(ul_tbf, fn, ts_no)) {</span><br><span style="color: hsl(120, 100%, 40%);">+         osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_RX_CTRL_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+            /* We can free since we only set polling on final UL ACK/NACK */</span><br><span>             LOGPTBF(tbf, LOGL_DEBUG, "[UPLINK] END\n");</span><br><span style="color: hsl(0, 100%, 40%);">-           if (ul_tbf->ctrl_ack_to_toggle())</span><br><span style="color: hsl(0, 100%, 40%);">-                    LOGPTBF(tbf, LOGL_NOTICE, "Recovered uplink ack for UL\n");</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>                tbf_free(tbf);</span><br><span>               return;</span><br><span>      }</span><br><span>diff --git a/src/tbf.cpp b/src/tbf.cpp</span><br><span>index 5efbe7f..b43ffde 100644</span><br><span>--- a/src/tbf.cpp</span><br><span>+++ b/src/tbf.cpp</span><br><span>@@ -59,13 +59,6 @@</span><br><span> </span><br><span> unsigned int next_tbf_ctr_group_id = 0; /* Incrementing group id */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gprs_rlcmac_tbf_ul_ack_state_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">-        OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ACK_NONE),</span><br><span style="color: hsl(0, 100%, 40%);">-     OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ACK_SEND_ACK), /* send acknowledge on next RTS */</span><br><span style="color: hsl(0, 100%, 40%);">-      OSMO_VALUE_STRING(GPRS_RLCMAC_UL_ACK_WAIT_ACK), /* wait for PACKET CONTROL ACK */</span><br><span style="color: hsl(0, 100%, 40%);">-       { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static const struct value_string tbf_counters_names[] = {</span><br><span>   OSMO_VALUE_STRING(N3101),</span><br><span>    OSMO_VALUE_STRING(N3103),</span><br><span>@@ -113,7 +106,6 @@</span><br><span>      m_created_ts(0),</span><br><span>     m_ctrs(NULL),</span><br><span>        m_ms(ms),</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_ack_state(GPRS_RLCMAC_UL_ACK_NONE),</span><br><span>       m_egprs_enabled(false)</span><br><span> {</span><br><span>  /* The classes of these members do not have proper constructors yet.</span><br><span>@@ -568,8 +560,6 @@</span><br><span>                     chan, new_poll_fn, ts);</span><br><span>            break;</span><br><span>       case PDCH_ULC_POLL_UL_ACK:</span><br><span style="color: hsl(0, 100%, 40%);">-              ul_ack_state = GPRS_RLCMAC_UL_ACK_WAIT_ACK;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>          LOGPTBFUL(this, LOGL_DEBUG, "Scheduled UL Acknowledgement polling on %s (FN=%d, TS=%d)\n",</span><br><span>                           chan, new_poll_fn, ts);</span><br><span>            break;</span><br><span>@@ -591,12 +581,7 @@</span><br><span>        LOGPTBF(this, LOGL_NOTICE, "poll timeout for FN=%d, TS=%d (curr FN %d)\n",</span><br><span>                 poll_fn, pdch->ts_no, bts_current_frame_number(bts));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    if (ul_tbf && ul_tbf->handle_ctrl_ack(reason)) {</span><br><span style="color: hsl(0, 100%, 40%);">-             if (!ul_tbf->ctrl_ack_to_toggle()) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 LOGPTBF(this, LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">-                              "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                         tbf_rlcmac_diag(this));</span><br><span style="color: hsl(0, 100%, 40%);">-         }</span><br><span style="color: hsl(120, 100%, 40%);">+     if (ul_tbf && reason == PDCH_ULC_POLL_UL_ACK && tbf_ul_ack_exp_ctrl_ack(ul_tbf, poll_fn, pdch->ts_no)) {</span><br><span>          bts_do_rate_ctr_inc(bts, CTR_RLC_ACK_TIMEDOUT);</span><br><span>              bts_do_rate_ctr_inc(bts, CTR_PUAN_POLL_TIMEDOUT);</span><br><span>            if (state_is(TBF_ST_FINISHED)) {</span><br><span>@@ -605,10 +590,8 @@</span><br><span>                              osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_MAX_N3103, NULL);</span><br><span>                               return;</span><br><span>                      }</span><br><span style="color: hsl(0, 100%, 40%);">-                       /* reschedule UL ack */</span><br><span style="color: hsl(0, 100%, 40%);">-                 ul_tbf->ul_ack_state = GPRS_RLCMAC_UL_ACK_SEND_ACK;</span><br><span>               }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+             osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_POLL_TIMEOUT, NULL);</span><br><span>  } else if (ul_ass_state_is(TBF_UL_ASS_WAIT_ACK)) {</span><br><span>           bts_do_rate_ctr_inc(bts, CTR_RLC_ASS_TIMEDOUT);</span><br><span>              bts_do_rate_ctr_inc(bts, CTR_PUA_POLL_TIMEDOUT);</span><br><span>@@ -761,6 +744,12 @@</span><br><span>      osmo_fsm_inst_update_id(tbf->state_fsm.fi, buf);</span><br><span>  osmo_fsm_inst_update_id(tbf->ul_ass_fsm.fi, buf);</span><br><span>         osmo_fsm_inst_update_id(tbf->dl_ass_fsm.fi, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        if (tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF) {</span><br><span style="color: hsl(120, 100%, 40%);">+               struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+           osmo_fsm_inst_update_id(ul_tbf->ul_ack_fsm.fi, buf);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> void gprs_rlcmac_tbf::rotate_in_list()</span><br><span>diff --git a/src/tbf.h b/src/tbf.h</span><br><span>index 358a7ad..ffd6cc2 100644</span><br><span>--- a/src/tbf.h</span><br><span>+++ b/src/tbf.h</span><br><span>@@ -58,14 +58,6 @@</span><br><span>  * TBF instance</span><br><span>  */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum gprs_rlcmac_tbf_ul_ack_state {</span><br><span style="color: hsl(0, 100%, 40%);">-   GPRS_RLCMAC_UL_ACK_NONE = 0,</span><br><span style="color: hsl(0, 100%, 40%);">-    GPRS_RLCMAC_UL_ACK_SEND_ACK, /* send acknowledge on next RTS */</span><br><span style="color: hsl(0, 100%, 40%);">- GPRS_RLCMAC_UL_ACK_WAIT_ACK, /* wait for PACKET CONTROL ACK */</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-extern const struct value_string gprs_rlcmac_tbf_ul_ack_state_names[];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> enum gprs_rlcmac_tbf_direction {</span><br><span>   GPRS_RLCMAC_DL_TBF,</span><br><span>  GPRS_RLCMAC_UL_TBF</span><br><span>@@ -125,12 +117,10 @@</span><br><span> #define GPRS_RLCMAC_FLAG_CCCH             0 /* assignment on CCCH */</span><br><span> #define GPRS_RLCMAC_FLAG_PACCH            1 /* assignment on PACCH */</span><br><span> #define GPRS_RLCMAC_FLAG_DL_ACK          2 /* DL TBF: At least one DL ACK/NACK was recieved since it was assigned */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_TO_UL_ACK   3 /* UL TBF: Failed to receive last polled CTRL ACK confirming our UL ACK/NACK */</span><br><span style="color: hsl(0, 100%, 40%);">-#define GPRS_RLCMAC_FLAG_TO_DL_ACK     4 /* DL TBF: Failed to receive last polled DL ACK/NACK */</span><br><span style="color: hsl(120, 100%, 40%);">+#define GPRS_RLCMAC_FLAG_TO_DL_ACK   3 /* DL TBF: Failed to receive last polled DL ACK/NACK */</span><br><span> #define GPRS_RLCMAC_FLAG_TO_MASK   0xf0 /* timeout bits */</span><br><span> </span><br><span> #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)</span><br><span style="color: hsl(0, 100%, 40%);">-#define TBF_SET_ACK_STATE(t, st) do { t->set_ack_state(st, __FILE__, __LINE__); } while(0)</span><br><span> </span><br><span> #ifdef __cplusplus</span><br><span> extern "C" {</span><br><span>@@ -180,8 +170,6 @@</span><br><span>       bool state_is_not(enum tbf_fsm_states rhs) const;</span><br><span>    bool dl_ass_state_is(enum tbf_dl_ass_fsm_states rhs) const;</span><br><span>  bool ul_ass_state_is(enum tbf_ul_ass_fsm_states rhs) const;</span><br><span style="color: hsl(0, 100%, 40%);">-     bool ul_ack_state_is(enum gprs_rlcmac_tbf_ul_ack_state rhs) const;</span><br><span style="color: hsl(0, 100%, 40%);">-      void set_ack_state(enum gprs_rlcmac_tbf_ul_ack_state new_state, const char *file, int line);</span><br><span>         void poll_sched_set(const char *file, int line);</span><br><span>     void poll_sched_unset(const char *file, int line);</span><br><span>   bool check_n_clear(uint8_t state_flag);</span><br><span>@@ -293,7 +281,6 @@</span><br><span>        struct GprsMs *m_ms;</span><br><span> private:</span><br><span>     void enable_egprs();</span><br><span style="color: hsl(0, 100%, 40%);">-    enum gprs_rlcmac_tbf_ul_ack_state ul_ack_state;</span><br><span>      bool m_egprs_enabled;</span><br><span>        struct osmo_timer_list Tarr[T_MAX];</span><br><span>  uint8_t Narr[N_MAX];</span><br><span>@@ -315,11 +302,6 @@</span><br><span>  return tbf_ul_ass_fi(this)->state == rhs;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline bool gprs_rlcmac_tbf::ul_ack_state_is(enum gprs_rlcmac_tbf_ul_ack_state rhs) const</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return ul_ack_state == rhs;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inline bool gprs_rlcmac_tbf::state_is_not(enum tbf_fsm_states rhs) const</span><br><span> {</span><br><span>        return tbf_state(this) != rhs;</span><br><span>@@ -331,15 +313,6 @@</span><br><span>        return osmo_fsm_inst_state_name(state_fsm.fi);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inline void gprs_rlcmac_tbf::set_ack_state(enum gprs_rlcmac_tbf_ul_ack_state new_state, const char *file, int line)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-     LOGPSRC(DTBF, LOGL_DEBUG, file, line, "%s changes UL ACK state from %s to %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">-              tbf_name(this),</span><br><span style="color: hsl(0, 100%, 40%);">-         get_value_string(gprs_rlcmac_tbf_ul_ack_state_names, ul_ack_state),</span><br><span style="color: hsl(0, 100%, 40%);">-             get_value_string(gprs_rlcmac_tbf_ul_ack_state_names, new_state));</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_ack_state = new_state;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> inline bool gprs_rlcmac_tbf::check_n_clear(uint8_t state_flag)</span><br><span> {</span><br><span>    if ((state_fsm.state_flags & (1 << state_flag))) {</span><br><span>diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp</span><br><span>index 34c5630..905bf05 100644</span><br><span>--- a/src/tbf_dl.cpp</span><br><span>+++ b/src/tbf_dl.cpp</span><br><span>@@ -249,7 +249,7 @@</span><br><span>      * or MULTIPLE TBF DOWNLINK ASSIGNMENT messages before contention resolution is</span><br><span>       * completed on the mobile station side." */</span><br><span>     if (ul_tbf && ul_tbf->m_contention_resolution_done</span><br><span style="color: hsl(0, 100%, 40%);">-    && !ul_tbf->m_final_ack_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+    && !tbf_ul_ack_waiting_cnf_final_ack(ul_tbf)) {</span><br><span>             use_trx = ul_tbf->trx->trx_no;</span><br><span>                 ss = false;</span><br><span>          old_ul_tbf = ul_tbf;</span><br><span>diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp</span><br><span>index c84f373..d4f2093 100644</span><br><span>--- a/src/tbf_ul.cpp</span><br><span>+++ b/src/tbf_ul.cpp</span><br><span>@@ -93,6 +93,9 @@</span><br><span> </span><br><span> gprs_rlcmac_ul_tbf::~gprs_rlcmac_ul_tbf()</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_fsm_inst_free(ul_ack_fsm.fi);</span><br><span style="color: hsl(120, 100%, 40%);">+    ul_ack_fsm.fi = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      rate_ctr_group_free(m_ul_egprs_ctrs);</span><br><span>        rate_ctr_group_free(m_ul_gprs_ctrs);</span><br><span>         /* ~gprs_rlcmac_tbf() is called automatically upon return */</span><br><span>@@ -231,11 +234,15 @@</span><br><span>         gprs_rlcmac_tbf(bts_, ms, GPRS_RLCMAC_UL_TBF),</span><br><span>       m_rx_counter(0),</span><br><span>     m_contention_resolution_done(0),</span><br><span style="color: hsl(0, 100%, 40%);">-        m_final_ack_sent(0),</span><br><span>         m_ul_gprs_ctrs(NULL),</span><br><span>        m_ul_egprs_ctrs(NULL)</span><br><span> {</span><br><span>   memset(&m_usf, USF_INVALID, sizeof(m_usf));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     memset(&ul_ack_fsm, 0, sizeof(ul_ack_fsm));</span><br><span style="color: hsl(120, 100%, 40%);">+       ul_ack_fsm.tbf = this;</span><br><span style="color: hsl(120, 100%, 40%);">+        ul_ack_fsm.fi = osmo_fsm_inst_alloc(&tbf_ul_ack_fsm, this, &ul_ack_fsm, LOGL_INFO, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> /*</span><br><span>@@ -288,26 +295,6 @@</span><br><span>    return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool gprs_rlcmac_ul_tbf::ctrl_ack_to_toggle()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        if (check_n_clear(GPRS_RLCMAC_FLAG_TO_UL_ACK))</span><br><span style="color: hsl(0, 100%, 40%);">-          return true; /* GPRS_RLCMAC_FLAG_TO_UL_ACK was set, now cleared */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">-       return false; /* GPRS_RLCMAC_FLAG_TO_UL_ACK was unset, now set */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool gprs_rlcmac_ul_tbf::handle_ctrl_ack(enum pdch_ulc_tbf_poll_reason reason)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       /* check if this control ack belongs to packet uplink ack */</span><br><span style="color: hsl(0, 100%, 40%);">-    if (reason == PDCH_ULC_POLL_UL_ACK && ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) {</span><br><span style="color: hsl(0, 100%, 40%);">-           TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_NONE);</span><br><span style="color: hsl(0, 100%, 40%);">-               return true;</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       return false;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void gprs_rlcmac_ul_tbf::contention_resolution_start()</span><br><span> {</span><br><span>        /* 3GPP TS 44.018 sec 11.1.2 Timers on the network side: "This timer is</span><br><span>@@ -339,59 +326,6 @@</span><br><span>  m_contention_resolution_done = 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gprs_rlcmac_ul_tbf::create_ul_ack(uint32_t fn, uint8_t ts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      int final = (state_is(TBF_ST_FINISHED));</span><br><span style="color: hsl(0, 100%, 40%);">-        struct msgb *msg;</span><br><span style="color: hsl(0, 100%, 40%);">-       int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int rrbp = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-  uint32_t new_poll_fn = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       if (final) {</span><br><span style="color: hsl(0, 100%, 40%);">-            if (ul_ack_state_is(GPRS_RLCMAC_UL_ACK_WAIT_ACK)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                     LOGPTBFUL(this, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-                               "Polling is already scheduled, so we must wait for the final uplink ack...\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                     return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-            }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-               rc = check_polling(fn, ts, &new_poll_fn, &rrbp);</span><br><span style="color: hsl(0, 100%, 40%);">-                if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                  return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       msg = msgb_alloc(23, "rlcmac_ul_ack");</span><br><span style="color: hsl(0, 100%, 40%);">-        if (!msg)</span><br><span style="color: hsl(0, 100%, 40%);">-               return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    bitvec *ack_vec = bitvec_alloc(23, tall_pcu_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-       if (!ack_vec) {</span><br><span style="color: hsl(0, 100%, 40%);">-         msgb_free(msg);</span><br><span style="color: hsl(0, 100%, 40%);">-         return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(0, 100%, 40%);">-       bitvec_unhex(ack_vec, DUMMY_VEC);</span><br><span style="color: hsl(0, 100%, 40%);">-       Encoding::write_packet_uplink_ack(ack_vec, this, final, rrbp);</span><br><span style="color: hsl(0, 100%, 40%);">-  bitvec_pack(ack_vec, msgb_put(msg, 23));</span><br><span style="color: hsl(0, 100%, 40%);">-        bitvec_free(ack_vec);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-   /* TS 44.060 7a.2.1.1: "The contention resolution is completed on</span><br><span style="color: hsl(0, 100%, 40%);">-   * the network side when the network receives an RLC data block that</span><br><span style="color: hsl(0, 100%, 40%);">-     * comprises the TLLI value that identifies the mobile station and the</span><br><span style="color: hsl(0, 100%, 40%);">-   * TFI value associated with the TBF."</span><br><span style="color: hsl(0, 100%, 40%);">-      * However, it's handier for us to mark contention resolution success</span><br><span style="color: hsl(0, 100%, 40%);">-        * here since according to spec upon rx UL ACK is the time at which MS</span><br><span style="color: hsl(0, 100%, 40%);">-   * realizes contention resolution succeeds. */</span><br><span style="color: hsl(0, 100%, 40%);">-  if (is_tlli_valid())</span><br><span style="color: hsl(0, 100%, 40%);">-            contention_resolution_success();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-        if (final) {</span><br><span style="color: hsl(0, 100%, 40%);">-            set_polling(new_poll_fn, ts, PDCH_ULC_POLL_UL_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">-             /* waiting for final acknowledge */</span><br><span style="color: hsl(0, 100%, 40%);">-             m_final_ack_sent = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-   } else</span><br><span style="color: hsl(0, 100%, 40%);">-          TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_NONE);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-       return msg;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! \brief receive data from PDCH/L1 */</span><br><span> int gprs_rlcmac_ul_tbf::rcv_data_block_acknowledged(</span><br><span>      const struct gprs_rlc_data_info *rlc,</span><br><span>@@ -590,14 +524,7 @@</span><br><span>         if (!require_ack)</span><br><span>            return;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (ul_ack_state_is(GPRS_RLCMAC_UL_ACK_NONE)) {</span><br><span style="color: hsl(0, 100%, 40%);">-         /* trigger sending at next RTS */</span><br><span style="color: hsl(0, 100%, 40%);">-               TBF_SET_ACK_STATE(this, GPRS_RLCMAC_UL_ACK_SEND_ACK);</span><br><span style="color: hsl(0, 100%, 40%);">-   } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* already triggered */</span><br><span style="color: hsl(0, 100%, 40%);">-         LOGPTBFUL(this, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">-                       "Sending Ack/Nack already scheduled, no need to re-schedule\n");</span><br><span style="color: hsl(0, 100%, 40%);">-    }</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fsm_inst_dispatch(this->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span> }</span><br><span> </span><br><span> /* Send Uplink unit-data to SGSN. */</span><br><span>@@ -843,3 +770,13 @@</span><br><span> {</span><br><span>  return tbf->m_contention_resolution_done;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_fsm_inst *tbf_ul_ack_fi(const struct gprs_rlcmac_ul_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+     return tbf->ul_ack_fsm.fi;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void ul_tbf_contention_resolution_success(struct gprs_rlcmac_ul_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      return tbf->contention_resolution_success();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/tbf_ul.h b/src/tbf_ul.h</span><br><span>index 826062f..defdfba 100644</span><br><span>--- a/src/tbf_ul.h</span><br><span>+++ b/src/tbf_ul.h</span><br><span>@@ -24,6 +24,15 @@</span><br><span> #include <stdbool.h></span><br><span> </span><br><span> #include "tbf.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+extern "C" {</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+#include <tbf_ul_ack_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef __cplusplus</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*</span><br><span>  * TBF instance</span><br><span>  */</span><br><span>@@ -54,9 +63,6 @@</span><br><span>   gprs_rlcmac_ul_tbf(struct gprs_rlcmac_bts *bts, GprsMs *ms);</span><br><span>         ~gprs_rlcmac_ul_tbf();</span><br><span>       gprs_rlc_window *window();</span><br><span style="color: hsl(0, 100%, 40%);">-      struct msgb *create_ul_ack(uint32_t fn, uint8_t ts);</span><br><span style="color: hsl(0, 100%, 40%);">-    bool ctrl_ack_to_toggle();</span><br><span style="color: hsl(0, 100%, 40%);">-      bool handle_ctrl_ack(enum pdch_ulc_tbf_poll_reason reason);</span><br><span>  /* blocks were acked */</span><br><span>      int rcv_data_block_acknowledged(</span><br><span>             const struct gprs_rlc_data_info *rlc,</span><br><span>@@ -97,11 +103,12 @@</span><br><span>         int32_t m_rx_counter; /* count all received blocks */</span><br><span>        uint8_t m_usf[8];       /* list USFs per PDCH (timeslot), initialized to USF_INVALID */</span><br><span>      uint8_t m_contention_resolution_done; /* set after done */</span><br><span style="color: hsl(0, 100%, 40%);">-      uint8_t m_final_ack_sent; /* set if we sent final ack */</span><br><span> </span><br><span>         struct rate_ctr_group *m_ul_gprs_ctrs;</span><br><span>       struct rate_ctr_group *m_ul_egprs_ctrs;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+   struct tbf_ul_ass_fsm_ctx ul_ack_fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> protected:</span><br><span>        void maybe_schedule_uplink_acknack(const gprs_rlc_data_info *rlc, bool countdown_finished);</span><br><span> </span><br><span>@@ -138,6 +145,8 @@</span><br><span> struct gprs_rlcmac_ul_tbf *as_ul_tbf(struct gprs_rlcmac_tbf *tbf);</span><br><span> void tbf_usf_timeout(struct gprs_rlcmac_ul_tbf *tbf);</span><br><span> bool ul_tbf_contention_resolution_done(const struct gprs_rlcmac_ul_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_fsm_inst *tbf_ul_ack_fi(const struct gprs_rlcmac_ul_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+void ul_tbf_contention_resolution_success(struct gprs_rlcmac_ul_tbf *tbf);</span><br><span> </span><br><span> #define LOGPTBFUL(tbf, level, fmt, args...) LOGP(DTBFUL, level, "%s " fmt, tbf_name(tbf), ## args)</span><br><span> #ifdef __cplusplus</span><br><span>diff --git a/src/tbf_ul_ack_fsm.c b/src/tbf_ul_ack_fsm.c</span><br><span>new file mode 100644</span><br><span>index 0000000..16ca22b</span><br><span>--- /dev/null</span><br><span>+++ b/src/tbf_ul_ack_fsm.c</span><br><span>@@ -0,0 +1,254 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* tbf_ul_ack_fsm.c</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or</span><br><span style="color: hsl(120, 100%, 40%);">+ * modify it under the terms of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * as published by the Free Software Foundation; either version 2</span><br><span style="color: hsl(120, 100%, 40%);">+ * of the License, or (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(120, 100%, 40%);">+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/bitvec.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <tbf_ul_ack_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_rlcmac.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_ms.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <encoding.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <bts.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <tbf.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <tbf_ul.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <tbf_ul_ack_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#define X(s) (1 << (s))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct osmo_tdef_state_timeout tbf_ul_ack_fsm_timeouts[32] = {</span><br><span style="color: hsl(120, 100%, 40%);">+   [TBF_UL_ACK_ST_NONE] = {},</span><br><span style="color: hsl(120, 100%, 40%);">+    [TBF_UL_ACK_ST_SCHED_UL_ACK] = {},</span><br><span style="color: hsl(120, 100%, 40%);">+    [TBF_UL_ACK_ST_WAIT_ACK] = {},</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string tbf_ul_ack_fsm_event_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+      { TBF_UL_ACK_EV_SCHED_ACK, "SCHED_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { TBF_UL_ACK_EV_CREATE_RLCMAC_MSG, "CREATE_RLCMAC_MSG" },</span><br><span style="color: hsl(120, 100%, 40%);">+   { TBF_UL_ACK_EV_RX_CTRL_ACK, "RX_CTRL_ACK" },</span><br><span style="color: hsl(120, 100%, 40%);">+       { TBF_UL_ACK_EV_POLL_TIMEOUT, "POLL_TIMEOUT" },</span><br><span style="color: hsl(120, 100%, 40%);">+     { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct msgb *create_ul_ack_nack(const struct tbf_ul_ack_fsm_ctx *ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      const struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *d,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  bool final)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+     int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       unsigned int rrbp = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+        uint32_t new_poll_fn = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)ctx->tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct GprsMs *ms = tbf_ms(tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+    if (final) {</span><br><span style="color: hsl(120, 100%, 40%);">+          rc = tbf_check_polling(tbf, d->fn, d->ts, &new_poll_fn, &rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+         if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+                        return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   msg = msgb_alloc(23, "rlcmac_ul_ack");</span><br><span style="color: hsl(120, 100%, 40%);">+      if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+             return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct bitvec *ack_vec = bitvec_alloc(23, tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+       if (!ack_vec) {</span><br><span style="color: hsl(120, 100%, 40%);">+               msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+               return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  }</span><br><span style="color: hsl(120, 100%, 40%);">+     bitvec_unhex(ack_vec, DUMMY_VEC);</span><br><span style="color: hsl(120, 100%, 40%);">+     write_packet_uplink_ack(ack_vec, ctx->tbf, final, rrbp);</span><br><span style="color: hsl(120, 100%, 40%);">+   bitvec_pack(ack_vec, msgb_put(msg, 23));</span><br><span style="color: hsl(120, 100%, 40%);">+      bitvec_free(ack_vec);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       /* TS 44.060 7a.2.1.1: "The contention resolution is completed on</span><br><span style="color: hsl(120, 100%, 40%);">+         * the network side when the network receives an RLC data block that</span><br><span style="color: hsl(120, 100%, 40%);">+   * comprises the TLLI value that identifies the mobile station and the</span><br><span style="color: hsl(120, 100%, 40%);">+         * TFI value associated with the TBF."</span><br><span style="color: hsl(120, 100%, 40%);">+    * However, it's handier for us to mark contention resolution success</span><br><span style="color: hsl(120, 100%, 40%);">+      * here since according to spec upon rx UL ACK is the time at which MS</span><br><span style="color: hsl(120, 100%, 40%);">+         * realizes contention resolution succeeds. */</span><br><span style="color: hsl(120, 100%, 40%);">+        if (ms_tlli(ms) != GSM_RESERVED_TMSI)</span><br><span style="color: hsl(120, 100%, 40%);">+         ul_tbf_contention_resolution_success(ctx->tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  if (final)</span><br><span style="color: hsl(120, 100%, 40%);">+            tbf_set_polling(tbf, new_poll_fn, d->ts, PDCH_ULC_POLL_UL_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+  return msg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_none(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+      case TBF_UL_ACK_EV_SCHED_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+         tbf_ul_ack_fsm_state_chg(fi, TBF_UL_ACK_ST_SCHED_UL_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_sched_ul_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  struct tbf_ul_ack_fsm_ctx *ctx = (struct tbf_ul_ack_fsm_ctx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)ctx->tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *data_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool final;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+      case TBF_UL_ACK_EV_SCHED_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+         LOGPTBFUL(tbf, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+                      "Sending Ack/Nack already scheduled, no need to re-schedule\n");</span><br><span style="color: hsl(120, 100%, 40%);">+          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case TBF_UL_ACK_EV_CREATE_RLCMAC_MSG:</span><br><span style="color: hsl(120, 100%, 40%);">+         data_ctx = (struct tbf_ul_ack_ev_create_rlcmac_msg_ctx *)data;</span><br><span style="color: hsl(120, 100%, 40%);">+                final = tbf_state(tbf) == TBF_ST_FINISHED;</span><br><span style="color: hsl(120, 100%, 40%);">+            data_ctx->msg = create_ul_ack_nack(ctx, data_ctx, final);</span><br><span style="color: hsl(120, 100%, 40%);">+          if (!data_ctx->msg)</span><br><span style="color: hsl(120, 100%, 40%);">+                        return;</span><br><span style="color: hsl(120, 100%, 40%);">+               if (final) /* poll set */</span><br><span style="color: hsl(120, 100%, 40%);">+                     tbf_ul_ack_fsm_state_chg(fi, TBF_UL_ACK_ST_WAIT_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+         else</span><br><span style="color: hsl(120, 100%, 40%);">+                  tbf_ul_ack_fsm_state_chg(fi, TBF_UL_ACK_ST_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void st_wait_ctrl_ack(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct tbf_ul_ack_fsm_ctx *ctx = (struct tbf_ul_ack_fsm_ctx *)fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+    struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)ctx->tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        switch (event) {</span><br><span style="color: hsl(120, 100%, 40%);">+      case TBF_UL_ACK_EV_SCHED_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+         /* ignore, we are in the middle of waiting for a response */</span><br><span style="color: hsl(120, 100%, 40%);">+          break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case TBF_UL_ACK_EV_RX_CTRL_ACK:</span><br><span style="color: hsl(120, 100%, 40%);">+               tbf_ul_ack_fsm_state_chg(fi, TBF_UL_ACK_ST_NONE);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case TBF_UL_ACK_EV_POLL_TIMEOUT:</span><br><span style="color: hsl(120, 100%, 40%);">+              LOGPTBF(tbf, LOGL_NOTICE,</span><br><span style="color: hsl(120, 100%, 40%);">+                     "Timeout for polling PACKET CONTROL ACK for PACKET UPLINK ACK: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                       tbf_rlcmac_diag(tbf));</span><br><span style="color: hsl(120, 100%, 40%);">+                /* Reschedule Ul Ack/NAck */</span><br><span style="color: hsl(120, 100%, 40%);">+          tbf_ul_ack_fsm_state_chg(fi, TBF_UL_ACK_ST_SCHED_UL_ACK);</span><br><span style="color: hsl(120, 100%, 40%);">+             break;</span><br><span style="color: hsl(120, 100%, 40%);">+        default:</span><br><span style="color: hsl(120, 100%, 40%);">+              OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int tbf_ul_ack_fsm_timer_cb(struct osmo_fsm_inst *fi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       switch (fi->T) {</span><br><span style="color: hsl(120, 100%, 40%);">+   default:</span><br><span style="color: hsl(120, 100%, 40%);">+              OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+     return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct osmo_fsm_state tbf_ul_ack_fsm_states[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+      [TBF_UL_ACK_ST_NONE] = {</span><br><span style="color: hsl(120, 100%, 40%);">+              .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                      X(TBF_UL_ACK_EV_SCHED_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+           .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(TBF_UL_ACK_ST_SCHED_UL_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+                .name = "NONE",</span><br><span style="color: hsl(120, 100%, 40%);">+             .action = st_none,</span><br><span style="color: hsl(120, 100%, 40%);">+    },</span><br><span style="color: hsl(120, 100%, 40%);">+    [TBF_UL_ACK_ST_SCHED_UL_ACK] = {</span><br><span style="color: hsl(120, 100%, 40%);">+              .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                      X(TBF_UL_ACK_EV_SCHED_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+                  X(TBF_UL_ACK_EV_CREATE_RLCMAC_MSG),</span><br><span style="color: hsl(120, 100%, 40%);">+           .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(TBF_UL_ACK_ST_NONE) |</span><br><span style="color: hsl(120, 100%, 40%);">+                       X(TBF_UL_ACK_ST_WAIT_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+            .name = "SCHED_UL_ACK",</span><br><span style="color: hsl(120, 100%, 40%);">+             .action = st_sched_ul_ack,</span><br><span style="color: hsl(120, 100%, 40%);">+    },</span><br><span style="color: hsl(120, 100%, 40%);">+    [TBF_UL_ACK_ST_WAIT_ACK] = {</span><br><span style="color: hsl(120, 100%, 40%);">+          .in_event_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                      X(TBF_UL_ACK_EV_SCHED_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+                  X(TBF_UL_ACK_EV_RX_CTRL_ACK) |</span><br><span style="color: hsl(120, 100%, 40%);">+                        X(TBF_UL_ACK_EV_POLL_TIMEOUT),</span><br><span style="color: hsl(120, 100%, 40%);">+                .out_state_mask =</span><br><span style="color: hsl(120, 100%, 40%);">+                     X(TBF_UL_ACK_ST_NONE) |</span><br><span style="color: hsl(120, 100%, 40%);">+                       X(TBF_UL_ACK_ST_SCHED_UL_ACK),</span><br><span style="color: hsl(120, 100%, 40%);">+                .name = "WAIT_ACK",</span><br><span style="color: hsl(120, 100%, 40%);">+         .action = st_wait_ctrl_ack,</span><br><span style="color: hsl(120, 100%, 40%);">+   },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_fsm tbf_ul_ack_fsm = {</span><br><span style="color: hsl(120, 100%, 40%);">+  .name = "UL_ACK_TBF",</span><br><span style="color: hsl(120, 100%, 40%);">+       .states = tbf_ul_ack_fsm_states,</span><br><span style="color: hsl(120, 100%, 40%);">+      .num_states = ARRAY_SIZE(tbf_ul_ack_fsm_states),</span><br><span style="color: hsl(120, 100%, 40%);">+      .timer_cb = tbf_ul_ack_fsm_timer_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+  .log_subsys = DTBFUL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .event_names = tbf_ul_ack_fsm_event_names,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static __attribute__((constructor)) void tbf_ul_ack_fsm_init(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+       OSMO_ASSERT(osmo_fsm_register(&tbf_ul_ack_fsm) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *tbf_ul_ack_create_rlcmac_msg(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+       struct tbf_ul_ack_ev_create_rlcmac_msg_ctx data_ctx = {</span><br><span style="color: hsl(120, 100%, 40%);">+               .fn = fn,</span><br><span style="color: hsl(120, 100%, 40%);">+             .ts = ts,</span><br><span style="color: hsl(120, 100%, 40%);">+             .msg = NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+  };</span><br><span style="color: hsl(120, 100%, 40%);">+    OSMO_ASSERT(tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      rc = osmo_fsm_inst_dispatch(tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf), TBF_UL_ACK_EV_CREATE_RLCMAC_MSG, &data_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+   if (rc != 0 || !data_ctx.msg)</span><br><span style="color: hsl(120, 100%, 40%);">+         return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+  return data_ctx.msg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_rts(const struct gprs_rlcmac_tbf *tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+     return fi->state == TBF_UL_ACK_ST_SCHED_UL_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Did we already send the Final ACK and we are waiting for its confirmation (CTRL ACK) ? */</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_waiting_cnf_final_ack(const struct gprs_rlcmac_tbf* tbf)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+    OSMO_ASSERT(tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF);</span><br><span style="color: hsl(120, 100%, 40%);">+        struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+     return fi->state == TBF_UL_ACK_ST_WAIT_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_exp_ctrl_ack(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+      struct osmo_fsm_inst *fi = tbf_ul_ack_fi((const struct gprs_rlcmac_ul_tbf *)tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+     return fi->state == TBF_UL_ACK_ST_WAIT_ACK;</span><br><span style="color: hsl(120, 100%, 40%);">+        /* FIXME: validate FN and TS match: && ctx->poll_fn = fn && ctx->poll_ts == ts */</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/tbf_ul_ack_fsm.h b/src/tbf_ul_ack_fsm.h</span><br><span>new file mode 100644</span><br><span>index 0000000..aaee5a3</span><br><span>--- /dev/null</span><br><span>+++ b/src/tbf_ul_ack_fsm.h</span><br><span>@@ -0,0 +1,72 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* tbf_ul_ack_fsm.h</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Copyright (C) 2021 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or</span><br><span style="color: hsl(120, 100%, 40%);">+ * modify it under the terms of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * as published by the Free Software Foundation; either version 2</span><br><span style="color: hsl(120, 100%, 40%);">+ * of the License, or (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(120, 100%, 40%);">+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/tdef.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <gprs_pcu.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+struct gprs_rlcmac_ul_tbf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum tbf_ul_ack_fsm_event {</span><br><span style="color: hsl(120, 100%, 40%);">+   TBF_UL_ACK_EV_SCHED_ACK, /* Tx UL ACK/NACK is pending */</span><br><span style="color: hsl(120, 100%, 40%);">+      TBF_UL_ACK_EV_CREATE_RLCMAC_MSG, /* Scheduler wants to gen+Tx the Ass (rej): data=tbf_ul_ack_ev_create_rlcmac_msg_ctx */</span><br><span style="color: hsl(120, 100%, 40%);">+      TBF_UL_ACK_EV_RX_CTRL_ACK, /* Received CTRL ACK answering poll set on UL ACK/NACK */</span><br><span style="color: hsl(120, 100%, 40%);">+  TBF_UL_ACK_EV_POLL_TIMEOUT, /* Pdch Ul Controller signals timeout for poll set on UL ACK/NACK */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum tbf_ul_ack_fsm_states {</span><br><span style="color: hsl(120, 100%, 40%);">+  TBF_UL_ACK_ST_NONE = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+       TBF_UL_ACK_ST_SCHED_UL_ACK, /* send UL ACK/NACK on next RTS */</span><br><span style="color: hsl(120, 100%, 40%);">+        TBF_UL_ACK_ST_WAIT_ACK, /* wait for PACKET CONTROL ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct tbf_ul_ack_fsm_ctx {</span><br><span style="color: hsl(120, 100%, 40%);">+  struct osmo_fsm_inst *fi;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct gprs_rlcmac_ul_tbf *tbf; /* back pointer */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct osmo_tdef_state_timeout tbf_ul_ack_fsm_timeouts[32];</span><br><span style="color: hsl(120, 100%, 40%);">+/* Transition to a state, using the T timer defined in tbf_ul_ack_fsm_timeouts.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The actual timeout value is in turn obtained from conn->T_defs.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Assumes local variable fi exists. */</span><br><span style="color: hsl(120, 100%, 40%);">+#define tbf_ul_ack_fsm_state_chg(fi, NEXT_STATE) \</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, \</span><br><span style="color: hsl(120, 100%, 40%);">+                                     tbf_ul_ack_fsm_timeouts, \</span><br><span style="color: hsl(120, 100%, 40%);">+                                    the_pcu->T_defs, \</span><br><span style="color: hsl(120, 100%, 40%);">+                                 -1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern struct osmo_fsm tbf_ul_ack_fsm;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* passed as data in TBF_UL_ACK_EV_CREATE_RLCMAC_MSG */</span><br><span style="color: hsl(120, 100%, 40%);">+struct tbf_ul_ack_ev_create_rlcmac_msg_ctx {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t fn; /* FN where the created DL ctrl block is to be sent */</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t ts; /* TS where the created DL ctrl block is to be sent */</span><br><span style="color: hsl(120, 100%, 40%);">+    struct msgb *msg; /* to be filled by FSM during event processing */</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *tbf_ul_ack_create_rlcmac_msg(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts);</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_rts(const struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_waiting_cnf_final_ack(const struct gprs_rlcmac_tbf *tbf);</span><br><span style="color: hsl(120, 100%, 40%);">+bool tbf_ul_ack_exp_ctrl_ack(const struct gprs_rlcmac_tbf *tbf, uint32_t fn, uint8_t ts);</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 19611a7..62a2582 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -831,7 +831,8 @@</span><br><span> </span><br><span>        pdch->rcv_block(data_msg, 42, *fn, &meas);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   struct msgb *msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+     osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      struct msgb *msg1 = tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span> </span><br><span>    static uint8_t exp1[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x9c, 0x70, 0x87, 0xb0,</span><br><span>                              0x06, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span>@@ -858,7 +859,8 @@</span><br><span> </span><br><span>         pdch->rcv_block(data_msg, 42, *fn, &meas);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      msg1 = tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span> </span><br><span>         static uint8_t exp2[] = { 0x40, 0x24, 0x01, 0x0b, 0x3e, 0x24, 0x46, 0x68, 0x9c, 0x70, 0x88, 0xb0,</span><br><span>                              0x06, 0x8b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span>@@ -1412,7 +1414,8 @@</span><br><span>           pdch = &bts->trx[trx_no].pdch[ts_no];</span><br><span>                 pdch->rcv_block(&data[0], sizeof(data), *fn, &meas);</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span>    memset(data, 0x2b, sizeof(data));</span><br><span>    hdr3 = (struct gprs_rlc_ul_header_egprs_3 *)data;</span><br><span>    hdr3->r = 0;</span><br><span>@@ -1440,7 +1443,7 @@</span><br><span>      request_dl_rlc_block(ul_tbf, fn);</span><br><span> </span><br><span>        check_tbf(ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-      OSMO_ASSERT(ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_NONE));</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE);</span><br><span> </span><br><span>      ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI);</span><br><span>   OSMO_ASSERT(ms != NULL);</span><br><span>@@ -1494,7 +1497,8 @@</span><br><span>             pdch = &bts->trx[trx_no].pdch[ts_no];</span><br><span>                 pdch->rcv_block(&data[0], sizeof(data), *fn, &meas);</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span>    memset(data, 0x2b, sizeof(data));</span><br><span>    hdr3 = (struct gprs_rlc_ul_header_egprs_3 *)data;</span><br><span>    hdr3->r = 0;</span><br><span>@@ -1518,12 +1522,13 @@</span><br><span> </span><br><span>        pdch = &bts->trx[trx_no].pdch[ts_no];</span><br><span>         pdch->rcv_block(&data[0], sizeof(data), *fn, &meas);</span><br><span style="color: hsl(0, 100%, 40%);">- ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span> </span><br><span>        request_dl_rlc_block(ul_tbf, fn);</span><br><span> </span><br><span>        check_tbf(ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-      OSMO_ASSERT(ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_NONE));</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE);</span><br><span> </span><br><span>      ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI);</span><br><span>   OSMO_ASSERT(ms != NULL);</span><br><span>@@ -1580,7 +1585,8 @@</span><br><span>             pdch = &bts->trx[trx_no].pdch[ts_no];</span><br><span>                 pdch->rcv_block(&data[0], sizeof(data), *fn, &meas);</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(ul_tbf->ul_ack_fsm.fi, TBF_UL_ACK_EV_SCHED_ACK, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+      tbf_ul_ack_create_rlcmac_msg(ul_tbf, *fn, ts_no);</span><br><span>    memset(data, 0x2b, sizeof(data));</span><br><span>    hdr3 = (struct gprs_rlc_ul_header_egprs_3 *)data;</span><br><span>    hdr3->r = 0;</span><br><span>@@ -1608,7 +1614,7 @@</span><br><span>      request_dl_rlc_block(ul_tbf, fn);</span><br><span> </span><br><span>        check_tbf(ul_tbf);</span><br><span style="color: hsl(0, 100%, 40%);">-      OSMO_ASSERT(ul_tbf->ul_ack_state_is(GPRS_RLCMAC_UL_ACK_NONE));</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(tbf_ul_ack_fi(ul_tbf)->state == TBF_UL_ACK_ST_NONE);</span><br><span> </span><br><span>      ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI);</span><br><span>   OSMO_ASSERT(ms != NULL);</span><br><span>diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err</span><br><span>index e5664ef..afc5a8f 100644</span><br><span>--- a/tests/tbf/TbfTest.err</span><br><span>+++ b/tests/tbf/TbfTest.err</span><br><span>@@ -27,6 +27,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1730,6 +1731,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1769,7 +1771,8 @@</span><br><span> TBF(UL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling Ack/Nack, because TLLI is included.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling final Ack/Nack, because all data was received and last block has CV==0.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED)', TA=7</span><br><span> Got MS: TLLI = 0xf1223344, TA = 7</span><br><span> Modifying MS object, TLLI = 0xf1223344, IMSI '' -> '0011223344'</span><br><span>@@ -1820,6 +1823,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -1918,6 +1922,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2082,6 +2087,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2151,6 +2157,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), 1 TBFs, USFs = 02, TFIs = 00000002.</span><br><span> MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0,) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW)</span><br><span> ********** UL-TBF ends here **********</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> TBF(UL-TFI_0){FLOW}: Deallocated</span><br><span> UL_ASS_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> DL_ASS_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span>@@ -2179,6 +2186,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2264,6 +2272,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW)</span><br><span> ********** UL-TBF ends here **********</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> TBF(UL-TFI_0){FLOW}: Deallocated</span><br><span> UL_ASS_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Deallocated</span><br><span>@@ -2281,6 +2290,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2349,6 +2359,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2434,6 +2445,7 @@</span><br><span> PDCH(bts=0,trx=0,ts=7) Detaching TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW), 0 TBFs, USFs = 00, TFIs = 00000000.</span><br><span> MS(TLLI=0xf1223344, IMSI=0011223344, TA=7, 1/0, DL) Detaching TBF: TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW)</span><br><span> ********** UL-TBF ends here **********</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> TBF(UL-TFI_0){FLOW}: Deallocated</span><br><span> UL_ASS_TBF(UL-TFI_0){NONE}: Deallocated</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Deallocated</span><br><span>@@ -2445,6 +2457,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -2494,7 +2507,8 @@</span><br><span> TBF(UL-TFI_0){FLOW}: state_chg to FINISHED</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling Ack/Nack, because TLLI is included.</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) Scheduling final Ack/Nack, because all data was received and last block has CV==0.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FINISHED) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> New MS: TLLI = 0xf1223344, TA = 7, IMSI = 0011223344, LLC = 2</span><br><span> === end test_tbf_dl_flow_and_rach_single_phase ===</span><br><span> === start test_tbf_dl_reuse ===</span><br><span>@@ -2516,6 +2530,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -3691,6 +3706,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -3797,6 +3813,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -3868,7 +3885,8 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=74, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=1 CV=7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because MS is stalled.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-3 RLC block: R=1, SI=1, TFI=0, CPS=5, RSB=0, rc=329</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=2 .. V(R)=2)</span><br><span>@@ -3889,6 +3907,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=74, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=2 CV=7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because MS is stalled.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-3 RLC block: R=1, SI=1, TFI=0, CPS=5, RSB=0, rc=329</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -3917,6 +3936,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=74, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=3 CV=7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because MS is stalled.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-3 RLC block: R=1, SI=1, TFI=0, CPS=5, RSB=0, rc=329</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -3944,6 +3964,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=74, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=4 CV=7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because MS is stalled.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-3 RLC block: R=1, SI=1, TFI=0, CPS=5, RSB=0, rc=329</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -3965,6 +3986,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=74, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=5 CV=7</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because MS is stalled.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)', TA=7</span><br><span> Got MS: TLLI = 0xf1223344, TA = 7</span><br><span>@@ -6784,6 +6806,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -6844,14 +6867,20 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Assembling frames: (len=37)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Frame 1 starts at offset 0, length=37, is_complete=0</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) No gaps in received block, last block: BSN=1 CV=7</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-3 RLC block: R=1, SI=0, TFI=0, CPS=5, RSB=0, rc=329</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=2 .. V(R)=2)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Got MCS-3 RLC data block: CV=7, BSN=4, SPB=0, PI=0, E=1, TI=0, bitoffs=33</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 4 storing in window (2..65)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=37, data=00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 </span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> Got 'TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)', TA=7</span><br><span> Got MS: TLLI = 0xf1223344, TA = 7</span><br><span> Modifying MS object, TLLI = 0xf1223344, IMSI '' -> '0011223344'</span><br><span>@@ -6966,6 +6995,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7123,6 +7153,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7149,6 +7180,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7175,6 +7207,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7201,6 +7234,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7227,6 +7261,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7253,6 +7288,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7279,6 +7315,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7305,6 +7342,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <single> (suggested TRX: -1): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7316,6 +7354,7 @@</span><br><span> - Skipping TS 7, because no USF available</span><br><span> [UL] algo A <single> (suggested TRX: -1): failed to allocate a TS, no USF available</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Timeslot Allocation failed: trx = -1, single_slot = 1</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Deallocated</span><br><span> TBF{NULL}: Deallocated</span><br><span> UL_ASS_TBF{NONE}: Deallocated</span><br><span> DL_ASS_TBF{NONE}: Deallocated</span><br><span>@@ -7351,6 +7390,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -7517,7 +7557,8 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 38 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=1 .. V(R)=39)</span><br><span>@@ -7639,6 +7680,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 78 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -7761,6 +7803,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 118 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -7883,8 +7926,12 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 158 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_SEND_ACK to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654275 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=1 .. V(R)=159)</span><br><span>@@ -8041,14 +8088,18 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 36 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654279 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=1 .. V(R)=37)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Got MCS-4 RLC data block: CV=10, BSN=38, SPB=0, PI=0, E=1, TI=0, bitoffs=33</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 38 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_SEND_ACK to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654279 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=1 .. V(R)=39)</span><br><span>@@ -8056,8 +8107,12 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 64 storing in window (1..192)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because some data is missing and last block has CV==0.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_SEND_ACK to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> PDCH(bts=0,trx=0,ts=7) Received RTS for PDCH: FN=2654279 block_nr=10 scheduling USF=0 for TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS), expect answer on UL FN=2654283</span><br><span> DL_ASS_TBF(UL-TFI_0){SEND_ASS}: Received Event CREATE_RLCMAC_MSG</span><br><span> PDCH(bts=0,trx=0,ts=7) POLL scheduled at FN 2654279 + 13 = 2654292</span><br><span>@@ -8178,7 +8233,8 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 97 storing in window (0..191)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_NONE to GPRS_RLCMAC_UL_ACK_SEND_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){NONE}: state_chg to SCHED_UL_ACK</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654283 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=0 .. V(R)=98)</span><br><span>@@ -8300,6 +8356,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 117 storing in window (0..191)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654283 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -8422,6 +8479,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 137 storing in window (0..191)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654283 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -8544,6 +8602,7 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 157 storing in window (0..191)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Scheduling Ack/Nack, because 20 frames received.</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654283 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span>@@ -8557,7 +8616,10 @@</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Got MCS-4 RLC data block: CV=10, BSN=159, SPB=0, PI=0, E=1, TI=0, bitoffs=33</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) BSN 159 storing in window (0..191)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) data_length=44, data=00 80 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 95 </span><br><span style="color: hsl(0, 100%, 40%);">-TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) changes UL ACK state from GPRS_RLCMAC_UL_ACK_SEND_ACK to GPRS_RLCMAC_UL_ACK_NONE</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event SCHED_ACK</span><br><span style="color: hsl(120, 100%, 40%);">+TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) Sending Ack/Nack already scheduled, no need to re-schedule</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: Received Event CREATE_RLCMAC_MSG</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF(UL-TFI_0){SCHED_UL_ACK}: state_chg to NONE</span><br><span> PDCH(bts=0,trx=0,ts=7) Got MCS-4 RLC block: R=0, SI=0, TFI=0, CPS=0, RSB=0, rc=385</span><br><span> PDCH(bts=0,trx=0,ts=7) FN=2654283 Rx UL DATA from unexpected TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS)</span><br><span> TBF(TFI=0 TLLI=0xf1223344 DIR=UL STATE=FLOW EGPRS) UL DATA TFI=0 received (V(Q)=0 .. V(R)=160)</span><br><span>@@ -8662,6 +8724,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8707,6 +8770,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8759,6 +8823,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8811,6 +8876,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8863,6 +8929,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8915,6 +8982,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -8967,6 +9035,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -9019,6 +9088,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> [UL] algo A <multi> (suggested TRX: 0): Alloc start</span><br><span> - Skipping TS 0, because not enabled</span><br><span> - Skipping TS 1, because not enabled</span><br><span>@@ -9030,6 +9100,7 @@</span><br><span> - Skipping TS 7, because no USF available</span><br><span> [UL] algo A <multi> (suggested TRX: 0): failed to allocate a TS, no USF available</span><br><span> TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NULL EGPRS) Timeslot Allocation failed: trx = 0, single_slot = 0</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Deallocated</span><br><span> TBF{NULL}: Deallocated</span><br><span> UL_ASS_TBF{NONE}: Deallocated</span><br><span> DL_ASS_TBF{NONE}: Deallocated</span><br><span>@@ -9037,6 +9108,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> MS(TLLI=0xffeeddd3, IMSI=, TA=7, 11/11,) Attaching UL TBF: TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NULL)</span><br><span> TBF{NULL}: Received Event ASSIGN_ADD_PACCH</span><br><span> TBF(TFI=0 TLLI=0xffeeddd3 DIR=UL STATE=NULL) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span>@@ -9066,6 +9138,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Attaching UL TBF: TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL)</span><br><span> TBF{NULL}: Received Event ASSIGN_ADD_PACCH</span><br><span> TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=NULL) set ass. type PACCH [prev CCCH:0, PACCH:0]</span><br><span>@@ -9082,6 +9155,7 @@</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Detaching TBF: TBF(TFI=0 TLLI=0xffeeddcc DIR=UL STATE=ASSIGN)</span><br><span> MS(TLLI=0xffeeddcc, IMSI=, TA=220, 0/0,) Destroying MS object</span><br><span> ********** UL-TBF ends here **********</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Deallocated</span><br><span> TBF{ASSIGN}: Deallocated</span><br><span> UL_ASS_TBF{NONE}: Deallocated</span><br><span> DL_ASS_TBF{NONE}: Deallocated</span><br><span>diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp</span><br><span>index a975761..3834acb 100644</span><br><span>--- a/tests/types/TypesTest.cpp</span><br><span>+++ b/tests/types/TypesTest.cpp</span><br><span>@@ -698,7 +698,7 @@</span><br><span>        win->reset_state();</span><br><span>       win->set_ws(256);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        Encoding::write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span>        extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false);</span><br><span>     check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size);</span><br><span>    free_egprs_ul_ack_nack(&rbb, &crbb_test);</span><br><span>@@ -709,7 +709,7 @@</span><br><span>      win->set_ws(256);</span><br><span>         win->receive_bsn(1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     Encoding::write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span>        extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false);</span><br><span>     check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size);</span><br><span>    free_egprs_ul_ack_nack(&rbb, &crbb_test);</span><br><span>@@ -720,7 +720,7 @@</span><br><span>      win->set_ws(128);</span><br><span>         win->receive_bsn(127);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   Encoding::write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span>        extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false);</span><br><span>     check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size);</span><br><span>    free_egprs_ul_ack_nack(&rbb, &crbb_test);</span><br><span>@@ -731,7 +731,7 @@</span><br><span>      for (uint16_t i=1; i<384/2; i++)</span><br><span>          win->receive_bsn(i*2);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   Encoding::write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       write_packet_uplink_ack(dest, tbf, false, 0);</span><br><span>        extract_egprs_ul_ack_nack(tbf, dest, &ssn, &crbb_test, &rbb, false);</span><br><span>     check_egprs_bitmap(tbf, ssn, &crbb_test, rbb, &rbb_size);</span><br><span>    free_egprs_ul_ack_nack(&rbb, &crbb_test);</span><br><span>diff --git a/tests/types/TypesTest.err b/tests/types/TypesTest.err</span><br><span>index 9cd3c7c..8c8ba94 100644</span><br><span>--- a/tests/types/TypesTest.err</span><br><span>+++ b/tests/types/TypesTest.err</span><br><span>@@ -8,12 +8,14 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Setting Control TS 4</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL) Allocated: trx = 0, ul_slots = 10, dl_slots = 00</span><br><span> MS(TLLI=0xffffffff, IMSI=, TA=220, 1/1,) Allocating UL TBF</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) Setting Control TS 1</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 02, dl_slots = 00</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)</span><br><span>@@ -22,6 +24,7 @@</span><br><span> TBF{NULL}: Allocated</span><br><span> UL_ASS_TBF{NONE}: Allocated</span><br><span> DL_ASS_TBF{NONE}: Allocated</span><br><span style="color: hsl(120, 100%, 40%);">+UL_ACK_TBF{NONE}: Allocated</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) Setting Control TS 4</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) Allocated: trx = 0, ul_slots = 10, dl_slots = 00</span><br><span> TBF(TFI=0 TLLI=0xffffffff DIR=UL STATE=NULL EGPRS) setting EGPRS UL window size to 64, base(64) slots(1) ws_pdch(0)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/25108">change 25108</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/25108"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Icf23bf5a4b85fbcbf1542cebceb76b9ba7185d30 </div>
<div style="display:none"> Gerrit-Change-Number: 25108 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>