Change in osmo-pcu[master]: tbf_fsm: Identify several events as Dl-TBF only
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29917 ) Change subject: tbf_fsm: Identify several events as Dl-TBF only ...................................................................... tbf_fsm: Identify several events as Dl-TBF only This will help in the future when splitting tbf_fsm into different FSMs for UL-TBF and DL-TBF, since only some of the events and states are shared. That means we can keep a single state and event enum, but the FSMs can be implemented separately in different files, easing a lot extending and understanding the logic. Change-Id: Id97f0d532d2d7ab2791a35c1f836d7c8da050124 --- M src/tbf_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index f019214..9118fd7 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -202,6 +202,7 @@ switch (event) { case TBF_EV_DL_ACKNACK_MISS: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* DL TBF: we missed a DL ACK/NACK. If we started assignment * over CCCH and never received any DL ACK/NACK yet, it means we * don't even know if the MS successfuly received the Imm Ass on @@ -223,6 +224,7 @@ tbf_fsm_state_chg(fi, TBF_ST_FINISHED); break; case TBF_EV_FINAL_ACK_RECVD: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* We received Final Ack (DL ACK/NACK) from MS. move to WAIT_RELEASE, we wait there for release or re-use the TBF in case we receive more DL data to tx */ @@ -249,8 +251,10 @@ switch (event) { case TBF_EV_DL_ACKNACK_MISS: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); break; case TBF_EV_FINAL_ACK_RECVD: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* We received Final Ack (DL ACK/NACK) from MS. move to WAIT_RELEASE, we wait there for release or re-use the TBF in case we receive more DL data to tx */ @@ -314,6 +318,7 @@ struct tbf_fsm_ctx *ctx = (struct tbf_fsm_ctx *)fi->priv; switch (event) { case TBF_EV_FINAL_ACK_RECVD: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* ignore, duplicate ACK, we already know about since we are in WAIT_RELEASE */ break; case TBF_EV_MAX_N3101: @@ -351,8 +356,10 @@ static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) { + struct tbf_fsm_ctx *ctx = (struct tbf_fsm_ctx *)fi->priv; switch (event) { case TBF_EV_DL_ACKNACK_MISS: + OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* Ignore, we don't care about missed DL ACK/NACK poll timeouts * anymore, we are already releasing the TBF */ break; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29917 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id97f0d532d2d7ab2791a35c1f836d7c8da050124 Gerrit-Change-Number: 29917 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: pespin <pespin@sysmocom.de> Gerrit-MessageType: merged
participants (1)
-
pespin