Attention is currently required from: pespin.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33304 )
Change subject: mgcp_client: Introduce mgcp_client_conf_alloc(), deprecate mgcp_client_conf_init()
......................................................................
Patch Set 3: Code-Review+1
(1 comment)
File src/libosmo-mgcp-client/mgcp_client.c:
https://gerrit.osmocom.org/c/osmo-mgw/+/33304/comment/c024d725_b9ffcbc9
PS3, Line 211: * \param[out] ctx talloc context to use as a parent during allocation.
I think this should be \param[in] ...
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33304
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Iba0853ed099a32cf1dde78c17e1b34343db41cfc
Gerrit-Change-Number: 33304
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 Jun 2023 07:55:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33279 )
Change subject: cosmetic: tbf_dl_fsm: Fix a couple comment typos
......................................................................
cosmetic: tbf_dl_fsm: Fix a couple comment typos
Change-Id: I1bcb199f3ba9564870b82ab67218ffbf72da4824
---
M src/tbf_dl_fsm.c
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c
index ce9bee3..a977507 100644
--- a/src/tbf_dl_fsm.c
+++ b/src/tbf_dl_fsm.c
@@ -160,13 +160,13 @@
* have to wait for X2002 to trigger (meaning MS is already
* listening on PDCH) in order to move to FLOW state and start
* transmitting data to it. When X2002 triggers (see cb timer
- * end of the file) it will send TBF_EV_ASSIGN_READY_CCCH back
+ * end of the file) it will send TBF_EV_ASSIGN_READY_CCCH back
* to us here.
*/
if (!(ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) {
/* This can happen if we initiated a CCCH DlAss from an
* older TBF object (same TLLI) towards BTS, and the DL-TBF
- * was recreated and is now trying to be assigned throguh
+ * was recreated and is now trying to be assigned through
* PACCH.
*/
LOGPTBFDL(ctx->dl_tbf, LOGL_INFO,
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33279
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I1bcb199f3ba9564870b82ab67218ffbf72da4824
Gerrit-Change-Number: 33279
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33277 )
Change subject: Move GPRS_RLCMAC_FLAG_DL_ACK from state_fsm to dl_tbf
......................................................................
Move GPRS_RLCMAC_FLAG_DL_ACK from state_fsm to dl_tbf
That flag was still in state_fsm for historical reasons (refactoring
steps), but it's not really the best place for it, since it's really
specific to dl_tbf and to transmit of data and DL ACK/NACK not the
overall state of the TBF.
Change-Id: I12c28c1a52f363f2d17a8bc24bbdf379543fc7a6
---
M src/tbf.cpp
M src/tbf.h
M src/tbf_dl.cpp
M src/tbf_dl.h
M src/tbf_dl_fsm.c
5 files changed, 27 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/tbf.cpp b/src/tbf.cpp
index 8981615..279efcd 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -885,7 +885,7 @@
OSMO_STRBUF_PRINTF(sb, "Assignment was on CCCH|");
if (dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_PACCH))
OSMO_STRBUF_PRINTF(sb, "Assignment was on PACCH|");
- if (dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))
+ if (dl_tbf->m_first_dl_ack_rcvd)
OSMO_STRBUF_PRINTF(sb, "Downlink ACK was received|");
else
OSMO_STRBUF_PRINTF(sb, "No downlink ACK received yet|");
diff --git a/src/tbf.h b/src/tbf.h
index 941e350..124a2e6 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -109,7 +109,6 @@
#define GPRS_RLCMAC_FLAG_CCCH 0 /* assignment on CCCH */
#define GPRS_RLCMAC_FLAG_PACCH 1 /* assignment on PACCH */
-#define GPRS_RLCMAC_FLAG_DL_ACK 2 /* DL TBF: At least one DL ACK/NACK was recieved since it was assigned */
#define TBF_TFI_UNSET 0xff
#define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)
diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 170ed25..17d2934 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -164,6 +164,7 @@
m_last_dl_poll_fn(-1),
m_last_dl_poll_ack_lost(false),
m_last_dl_drained_fn(-1),
+ m_first_dl_ack_rcvd(false),
m_dl_gprs_ctrs(NULL),
m_dl_egprs_ctrs(NULL)
{
@@ -1080,7 +1081,7 @@
int rc;
LOGPTBFDL(this, LOGL_DEBUG, "downlink acknowledge\n");
- state_fsm.state_flags |= (1 << GPRS_RLCMAC_FLAG_DL_ACK);
+ m_first_dl_ack_rcvd = true;
m_last_dl_poll_ack_lost = false;
/* reset N3105 */
@@ -1114,6 +1115,11 @@
dl_tbf->request_dl_ack();
}
+bool dl_tbf_first_dl_ack_rcvd(const struct gprs_rlcmac_dl_tbf *tbf)
+{
+ return tbf->m_first_dl_ack_rcvd;
+}
+
/* Does this DL TBF require to poll the MS for DL ACK/NACK? */
bool gprs_rlcmac_dl_tbf::need_poll_for_dl_ack_nack() const
{
diff --git a/src/tbf_dl.h b/src/tbf_dl.h
index ec75e32..dabe9a9 100644
--- a/src/tbf_dl.h
+++ b/src/tbf_dl.h
@@ -75,6 +75,8 @@
* MS polled during DL ACK/NACK with RRBP set in "m_last_dl_poll_fn": */
bool m_last_dl_poll_ack_lost;
int32_t m_last_dl_drained_fn;
+ /* Whether we receive at least one PKT DL ACK/NACK from MS since this DL TBF was assigned: */
+ bool m_first_dl_ack_rcvd;
struct BandWidth {
struct timespec dl_bw_tv; /* timestamp for dl bw calculation */
@@ -156,6 +158,7 @@
void dl_tbf_trigger_ass_on_pacch(struct gprs_rlcmac_dl_tbf *tbf, struct gprs_rlcmac_tbf *old_tbf);
void dl_tbf_trigger_ass_on_pch(struct gprs_rlcmac_dl_tbf *tbf);
void dl_tbf_request_dl_ack(struct gprs_rlcmac_dl_tbf *tbf);
+bool dl_tbf_first_dl_ack_rcvd(const struct gprs_rlcmac_dl_tbf *tbf);
int dl_tbf_upgrade_to_multislot(struct gprs_rlcmac_dl_tbf *tbf);
static inline struct gprs_rlcmac_tbf *dl_tbf_as_tbf(struct gprs_rlcmac_dl_tbf *dl_tbf)
diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c
index 6c3f4f1..ce9bee3 100644
--- a/src/tbf_dl_fsm.c
+++ b/src/tbf_dl_fsm.c
@@ -208,8 +208,8 @@
* don't even know if the MS successfully received the Imm Ass on
* CCCH and hence is listening on PDCH. Let's better refrain
* from continuing and start assignment on CCCH again */
- if ((ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))
- && !(ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_DL_ACK))) {
+ if ((ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH)) &&
+ !dl_tbf_first_dl_ack_rcvd(ctx->dl_tbf)) {
struct GprsMs *ms = tbf_ms(ctx->tbf);
LOGPTBFDL(ctx->dl_tbf, LOGL_DEBUG,
"Re-send downlink assignment on PCH (IMSI=%s)\n",
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33277
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I12c28c1a52f363f2d17a8bc24bbdf379543fc7a6
Gerrit-Change-Number: 33277
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33278 )
Change subject: tests/tbf: Drop unneeded line re-setting CCCH ass type
......................................................................
tests/tbf: Drop unneeded line re-setting CCCH ass type
Change-Id: I384753234651657c890faf1a4bdc1342e23e462b
---
M tests/tbf/TbfTest.cpp
M tests/tbf/TbfTest.err
2 files changed, 9 insertions(+), 82 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp
index bb36f9e..9a4b846 100644
--- a/tests/tbf/TbfTest.cpp
+++ b/tests/tbf/TbfTest.cpp
@@ -219,7 +219,6 @@
/* "Establish" the DL TBF */
osmo_fsm_inst_dispatch(dl_tbf->dl_ass_fsm.fi, TBF_DL_ASS_EV_SCHED_ASS, NULL);
- osmo_fsm_inst_dispatch(dl_tbf->state_fi, TBF_EV_ASSIGN_ADD_CCCH, NULL);
osmo_fsm_inst_dispatch(dl_tbf->state_fi, TBF_EV_ASSIGN_ACK_PACCH, NULL);
check_tbf(dl_tbf);
diff --git a/tests/tbf/TbfTest.err b/tests/tbf/TbfTest.err
index a4b94cf..442f298 100644
--- a/tests/tbf/TbfTest.err
+++ b/tests/tbf/TbfTest.err
@@ -98,9 +98,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:G){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:G){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -224,9 +221,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:G){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:G){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -350,9 +344,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:G){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:G){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -629,9 +620,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:G){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:G){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:G){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:G){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:G){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -668,9 +656,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-1:G){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-1:G){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-1:G){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-1:G){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-1:G){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-1:G){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-1:G){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-1:G){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -4619,9 +4604,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -4938,9 +4920,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -5204,9 +5183,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -5430,9 +5406,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -5640,9 +5613,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -5834,9 +5804,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6004,9 +5971,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6183,9 +6147,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6353,9 +6314,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6515,9 +6473,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6594,9 +6549,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6672,9 +6624,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6750,9 +6699,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6853,9 +6799,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -6955,9 +6898,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7057,9 +6997,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7162,9 +7099,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7247,9 +7181,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7332,9 +7263,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7417,9 +7345,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -7863,9 +7788,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
@@ -9470,9 +9392,6 @@
Modifying MS object, TLLI = 0xffffffff, TA 220 -> 0
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: Received Event SCHED_ASS
DL_ASS_TBF(DL:TFI-0-0-0:E){NONE}: state_chg to SEND_ASS
-DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ADD_CCCH
-TBF(DL:TFI-0-0-0:E){ASSIGN} set ass. type CCCH [prev CCCH:1, PACCH:0]
-TBF(DL:TFI-0-0-0:E){ASSIGN} Attempted to set ass. type CCCH which is already set
DL_TBF(DL:TFI-0-0-0:E){ASSIGN}: Received Event ASSIGN_ACK_PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} The TBF has been confirmed on the PACCH, changed type from CCCH to PACCH
TBF(DL:TFI-0-0-0:E){ASSIGN} unset ass. type CCCH [prev CCCH:1, PACCH:0]
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I384753234651657c890faf1a4bdc1342e23e462b
Gerrit-Change-Number: 33278
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33280 )
Change subject: Move call to bts_snd_dl_ass() from tbf_dl.cpp to tbf_dl_fsm.c
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33280
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I8af39d3087ccf197321f0c71cb29b67adbe1f36e
Gerrit-Change-Number: 33280
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 Jun 2023 06:52:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33278 )
Change subject: tests/tbf: Drop unneeded line re-setting CCCH ass type
......................................................................
Patch Set 3: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33278
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I384753234651657c890faf1a4bdc1342e23e462b
Gerrit-Change-Number: 33278
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 Jun 2023 06:52:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith, pespin.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33302 )
Change subject: Change several log lines to start with capital letter
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33302
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I98c59dd833b3d0ada5b1ffdba7a5fc2e8cbf6241
Gerrit-Change-Number: 33302
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 14 Jun 2023 06:51:40 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment