May 2023 - gerrit-log - lists.osmocom.org

[S] Change in libosmo-netif[master]: ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_des...

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33104 ) Change subject: ipa-stream-server: Return -EBADF in read_cb after osmo_stream_srv_destroy() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5ac1920b8d4ce3b0205f00d253e7ed878fb745e3 Gerrit-Change-Number: 33104 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 16:14:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in libosmo-netif[master]: stream: (typo) Change callback param name of struct osmo_stream_cli f...

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33103 ) Change subject: stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665 Gerrit-Change-Number: 33103 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 16:14:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Introduce and use osmo_stream_cli_fd() to get the fd

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33102 ) Change subject: stream: Introduce and use osmo_stream_cli_fd() to get the fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e964dea0adee8edbb9b75d2d17e7d0c5d8917d5 Gerrit-Change-Number: 33102 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 16:14:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in pysim[master]: OTA: Fix padding of AES CMAC

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/33116 ) Change subject: OTA: Fix padding of AES CMAC ...................................................................... OTA: Fix padding of AES CMAC When using AES CMAC for authentication of OTA messages, we must not pad the user data before calling the CMAC function. This is unlike the DES MAC, where padding to the DES block size is mandatory. This bug was discovered when trying to talk OTA with AES to a sysmoISIM-SJA5. This patch makes the OTA AES interoperate with the card. Also, with this patch the cryptographic results of pySim/ota.py are identical to those of the java code org.opentelecoms.gsm0348.impl.crypto.CipheringManager Change-Id: I4b40b5857f95ccb21c35795abe7a1995e368bac3 --- M pySim/ota.py 1 file changed, 21 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/16/33116/1 diff --git a/pySim/ota.py b/pySim/ota.py index 80c823e..83303a6 100644 --- a/pySim/ota.py +++ b/pySim/ota.py @@ -1,6 +1,6 @@ """Code related to SIM/UICC OTA according to TS 102 225 + TS 31.115.""" -# (C) 2021-2022 by Harald Welte <laforge(a)osmocom.org> +# (C) 2021-2023 by Harald Welte <laforge(a)osmocom.org> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -305,7 +305,7 @@ class OtaAlgoAuthAES(OtaAlgoAuth): name = 'AES' enum_name = 'aes_cmac' - blocksize = 16 # TODO: is this needed? + blocksize = 1 # AES CMAC doesn't need any padding by us def _sign(self, data:bytes) -> bytes: cmac = CMAC.new(self.otak.kid, ciphermod=AES, mac_len=8) cmac.update(data) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4b40b5857f95ccb21c35795abe7a1995e368bac3 Gerrit-Change-Number: 33116 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: fix wrong altstep name in a comment

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33114 ) Change subject: BTS_Tests: cosmetic: fix wrong altstep name in a comment ...................................................................... BTS_Tests: cosmetic: fix wrong altstep name in a comment Change-Id: I4e63f309f2a7d22752f7991ebd7e672939d4e52b --- M bts/BTS_Tests.ttcn 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/14/33114/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e715996..d03843d 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7966,7 +7966,7 @@ } -/* Callback function to be called by as_TC_ms_pwr_ctrl_constant(). +/* Callback function to be called by as_TC_ms_pwr_ctrl(). * Return value: Measurement Report to be sent (encoded octetstring). */ type function f_TC_ms_pwr_ctrl_cb(inout SacchL1Header l1h, integer num_blocks) runs on ConnHdlr return octetstring; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33114 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4e63f309f2a7d22752f7991ebd7e672939d4e52b Gerrit-Change-Number: 33114 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests: properly release DCCH in f_TC_acch_overpower()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33115 ) Change subject: BTS_Tests: properly release DCCH in f_TC_acch_overpower() ...................................................................... BTS_Tests: properly release DCCH in f_TC_acch_overpower() Currently the TC_acch_overpower_* testcases are all passing without any sporadic failures. However, most of them start failing due to a DTE (some RSLEM related race condition) if I apply a patch [1] to trxcon removing its internal TDMA clock module. I don't know why this happens, but releasing the DCCH after executing all testcase steps in f_TC_acch_overpower() makes that DTE go away. Change-Id: I658e78ad8d4dc86403d22b5380ddd9a140f8c71c Related: [1] osmocom-bb.git Ic8a5b6277c6b16392026e0557376257d71c9d230 Related: OS#5500 --- M bts/BTS_Tests.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/15/33115/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index d03843d..8d02c40 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -8656,6 +8656,10 @@ setverdict(pass); } + + f_rsl_chan_deact(); + f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr); + f_rslem_unregister(g_pars.trx_nr, g_chan_nr); } testcase TC_acch_overpower_rxqual_thresh() runs on test_CT { var ConnHdlrPars pars; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I658e78ad8d4dc86403d22b5380ddd9a140f8c71c Gerrit-Change-Number: 33115 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmocom-bb[master]: modem: do not send RTS.ind if we got PTCCH/D

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33110 ) Change subject: modem: do not send RTS.ind if we got PTCCH/D ...................................................................... modem: do not send RTS.ind if we got PTCCH/D Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1 Related: OS#5500 --- M src/host/layer23/src/modem/rlcmac.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/33110/1 diff --git a/src/host/layer23/src/modem/rlcmac.c b/src/host/layer23/src/modem/rlcmac.c index e030299..a0a22ad 100644 --- a/src/host/layer23/src/modem/rlcmac.c +++ b/src/host/layer23/src/modem/rlcmac.c @@ -183,6 +183,10 @@ }; osmo_gprs_rlcmac_prim_lower_up(prim); + /* Do not send RTS.ind if we got PTCCH/D */ + if (fn % 104 == 12) + return 0; + /* Every fn % 13 == 12 we have either a PTCCH or an IDLE slot, thus * every fn % 13 == 8 we add 5 frames, or 4 frames othrwise. The * resulting value is first fn of the next block. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33110 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idcdf56de7fc6279d8b942f3670ecdc6f88c3dfd1 Gerrit-Change-Number: 33110 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointers

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33111 ) Change subject: cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointers ...................................................................... cosmetic: tbf_ul_ack_fsm: Clean up use of ul_tbf and tbf pointers Change-Id: I51ebe8174006380821eb978bbd78f600c10b02e7 --- M src/tbf_ul_ack_fsm.c 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/11/33111/1 diff --git a/src/tbf_ul_ack_fsm.c b/src/tbf_ul_ack_fsm.c index 5e5586b..ad6ad02 100644 --- a/src/tbf_ul_ack_fsm.c +++ b/src/tbf_ul_ack_fsm.c @@ -64,11 +64,11 @@ int rc; unsigned int rrbp = 0; uint32_t new_poll_fn = 0; - struct gprs_rlcmac_ul_tbf *tbf = ctx->tbf; - struct GprsMs *ms = tbf_ms(ul_tbf_as_tbf(tbf)); + struct gprs_rlcmac_tbf *tbf = ul_tbf_as_tbf(ctx->tbf); + struct GprsMs *ms = tbf_ms(tbf); if (final) { - rc = tbf_check_polling(ul_tbf_as_tbf(tbf), d->pdch, d->fn, &new_poll_fn, &rrbp); + rc = tbf_check_polling(tbf, d->pdch, d->fn, &new_poll_fn, &rrbp); if (rc < 0) return NULL; } @@ -99,11 +99,11 @@ * PACKET UPLINK ACK/NACK" */ if (ms_tlli(ms) != GSM_RESERVED_TMSI && !ul_tbf_contention_resolution_done(ctx->tbf)) - osmo_fsm_inst_dispatch(tbf_state_fi(ul_tbf_as_tbf(ctx->tbf)), TBF_EV_CONTENTION_RESOLUTION_MS_SUCCESS, NULL); + osmo_fsm_inst_dispatch(tbf_state_fi(tbf), TBF_EV_CONTENTION_RESOLUTION_MS_SUCCESS, NULL); if (final) { - tbf_set_polling(ul_tbf_as_tbf(tbf), d->pdch, new_poll_fn, PDCH_ULC_POLL_UL_ACK); - LOGPTBFUL(tbf, LOGL_DEBUG, + tbf_set_polling(tbf, d->pdch, new_poll_fn, PDCH_ULC_POLL_UL_ACK); + LOGPTBFUL(ctx->tbf, LOGL_DEBUG, "Scheduled UL Acknowledgement polling on PACCH (FN=%d, TS=%d)\n", new_poll_fn, d->pdch->ts_no); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33111 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I51ebe8174006380821eb978bbd78f600c10b02e7 Gerrit-Change-Number: 33111 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Avoid submitting GMMSM-Release.ind if no session was requested

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33113 ) Change subject: gmm: Avoid submitting GMMSM-Release.ind if no session was requested ...................................................................... gmm: Avoid submitting GMMSM-Release.ind if no session was requested Change-Id: I2fecfd122fc4be863be184f1ff08d9a31e07b956 --- M src/gmm/gmm_ms_fsm.c M tests/gmm/gmm_prim_test.ok 2 files changed, 12 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/13/33113/1 diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index ff26dfa..770ede7 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -97,8 +97,9 @@ gprs_gmm_gmme_t3312_stop(ctx->gmme); gprs_gmm_gmme_t3316_stop(ctx->gmme); - /* TS 24.007 9.5.1.4: informs SM layerthat the MS has been GPRS detached, e.g. by timer expiry */ - if (prev_state != GPRS_GMM_MS_ST_NULL) + /* TS 24.007 9.5.1.4: informs SM layer that the MS has been GPRS detached, e.g. by timer expiry */ + if (prev_state != GPRS_GMM_MS_ST_NULL && + ctx->gmme->sess_id != GPRS_GMM_SESS_ID_UNASSIGNED) gprs_gmm_submit_gmmsm_release_ind(ctx->gmme); } diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_test.ok index 2ff27f6..6cf672a 100644 --- a/tests/gmm/gmm_prim_test.ok +++ b/tests/gmm/gmm_prim_test.ok @@ -23,7 +23,6 @@ test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xec999002 SAPI=GMM l3=[08 05 20 0a 00 05 f4 ec 99 90 02 ] test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request old_TLLI=0xec999002 new_TLLI=0xffffffff test_gmm_prim_up_cb(): Rx GMMREG-DETACH.confirm detach_type='GPRS detach' -test_gmm_prim_up_cb(): Rx GMMSM-RELEASE.indication sess_id=4294967295 ==== test_gmm_prim_ms_gmmreg() [end] ==== ==== test_gmm_prim_ms_gmmsm() [start] ==== sys={0.000000}, mono={0.000000}: clock_override_set -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33113 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2fecfd122fc4be863be184f1ff08d9a31e07b956 Gerrit-Change-Number: 33113 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in libosmo-gprs[master]: sm: Handle GMMSM-Release.ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33112 ) Change subject: sm: Handle GMMSM-Release.ind ...................................................................... sm: Handle GMMSM-Release.ind Change-Id: Ia2ac9dbffe29c3509f1088ceb327569a331ec598 --- M include/osmocom/gprs/sm/sm_ms_fsm.h M include/osmocom/gprs/sm/sm_prim.h M src/sm/sm_ms_fsm.c M src/sm/sm_prim.c 4 files changed, 54 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/12/33112/1 diff --git a/include/osmocom/gprs/sm/sm_ms_fsm.h b/include/osmocom/gprs/sm/sm_ms_fsm.h index d1d4689..2ea9bd8 100644 --- a/include/osmocom/gprs/sm/sm_ms_fsm.h +++ b/include/osmocom/gprs/sm/sm_ms_fsm.h @@ -29,6 +29,7 @@ GPRS_SM_MS_EV_TX_MOD_PDP_CTX_REQ, GPRS_SM_MS_EV_RX_MOD_PDP_CTX_REJ, GPRS_SM_MS_EV_RX_MOD_PDP_CTX_ACC, + GPRS_SM_MS_EV_GMM_RELEASE_IND, /* TS 24.007 9.5.1.4 GMMSM-RELEASE-IND */ }; struct gprs_sm_ms_fsm_ctx { diff --git a/include/osmocom/gprs/sm/sm_prim.h b/include/osmocom/gprs/sm/sm_prim.h index d4e17a4..127dd35 100644 --- a/include/osmocom/gprs/sm/sm_prim.h +++ b/include/osmocom/gprs/sm/sm_prim.h @@ -128,7 +128,7 @@ uint8_t pco[OSMO_GPRS_SM_PCO_MAXLEN]; uint8_t pco_len; /* TODO: MBMS protocol configuration options*/ - } deact_req; + } pdp_deact_req; /* OSMO_GPRS_SM_SMREG_PDP_DEACTIVATE | Cnf, 6.5.1.6 */ @@ -138,7 +138,7 @@ uint8_t pco[OSMO_GPRS_SM_PCO_MAXLEN]; uint8_t pco_len; /* TODO: MBMS protocol configuration options*/ - } deact_cnf; + } pdp_deact_cnf; /* OSMO_GPRS_SM_SMREG_PDP_DEACTIVATE | Ind, 6.5.1.7 */ struct { @@ -149,7 +149,7 @@ uint8_t pco[OSMO_GPRS_SM_PCO_MAXLEN]; uint8_t pco_len; /* TODO: MBMS protocol configuration options */ - } deact_ind; + } pdp_deact_ind; /* OSMO_GPRS_SM_SMREG_PDP_MODIFY | Ind, 6.5.1.8 */ struct { diff --git a/src/sm/sm_ms_fsm.c b/src/sm/sm_ms_fsm.c index aaaa008..dc063b9 100644 --- a/src/sm/sm_ms_fsm.c +++ b/src/sm/sm_ms_fsm.c @@ -98,6 +98,9 @@ sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_ACTIVE); gprs_sm_submit_smreg_pdp_act_cnf(ctx->sme, (enum gsm48_gsm_cause)0); break; + case GPRS_SM_MS_EV_GMM_RELEASE_IND: + sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_INACTIVE); + break; default: OSMO_ASSERT(0); } @@ -116,6 +119,9 @@ case GPRS_SM_MS_EV_TX_MOD_PDP_CTX_REQ: sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_MODIFY_PENDING); break; + case GPRS_SM_MS_EV_GMM_RELEASE_IND: + sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_INACTIVE); + break; default: OSMO_ASSERT(0); } @@ -134,6 +140,9 @@ case GPRS_SM_MS_EV_RX_MOD_PDP_CTX_ACC: sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_ACTIVE); break; + case GPRS_SM_MS_EV_GMM_RELEASE_IND: + sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_INACTIVE); + break; default: OSMO_ASSERT(0); } @@ -145,6 +154,9 @@ case GPRS_SM_MS_EV_RX_DEACT_PDP_CTX_ACC: sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_INACTIVE); break; + case GPRS_SM_MS_EV_GMM_RELEASE_IND: + sm_ms_fsm_state_chg(fi, GPRS_SM_MS_ST_PDP_INACTIVE); + break; default: OSMO_ASSERT(0); } @@ -201,7 +213,8 @@ X(GPRS_SM_MS_EV_RX_GMM_ESTABLISH_REJ) | X(GPRS_SM_MS_EV_RX_ACT_PDP_CTX_REJ) | X(GPRS_SM_MS_EV_RX_ACT_PDP_CTX_ACC) | - X(GPRS_SM_MS_EV_NSAPI_ACTIVATED), + X(GPRS_SM_MS_EV_NSAPI_ACTIVATED) | + X(GPRS_SM_MS_EV_GMM_RELEASE_IND), .out_state_mask = X(GPRS_SM_MS_ST_PDP_INACTIVE) | X(GPRS_SM_MS_ST_PDP_ACTIVE_PENDING) | @@ -214,7 +227,8 @@ .in_event_mask = X(GPRS_SM_MS_EV_RX_DEACT_PDP_CTX_REQ) | X(GPRS_SM_MS_EV_TX_DEACT_PDP_CTX_REQ)| - X(GPRS_SM_MS_EV_TX_MOD_PDP_CTX_REQ), + X(GPRS_SM_MS_EV_TX_MOD_PDP_CTX_REQ) | + X(GPRS_SM_MS_EV_GMM_RELEASE_IND), .out_state_mask = X(GPRS_SM_MS_ST_PDP_INACTIVE) | X(GPRS_SM_MS_ST_PDP_INACTIVE_PENDING) | @@ -226,7 +240,8 @@ .in_event_mask = X(GPRS_SM_MS_EV_RX_DEACT_PDP_CTX_REQ) | X(GPRS_SM_MS_EV_RX_MOD_PDP_CTX_REJ) | - X(GPRS_SM_MS_EV_RX_MOD_PDP_CTX_ACC), + X(GPRS_SM_MS_EV_RX_MOD_PDP_CTX_ACC) | + X(GPRS_SM_MS_EV_GMM_RELEASE_IND), .out_state_mask = X(GPRS_SM_MS_ST_PDP_INACTIVE) | X(GPRS_SM_MS_ST_PDP_ACTIVE) | @@ -236,7 +251,8 @@ }, [GPRS_SM_MS_ST_PDP_INACTIVE_PENDING] = { .in_event_mask = - X(GPRS_SM_MS_EV_RX_DEACT_PDP_CTX_ACC), + X(GPRS_SM_MS_EV_RX_DEACT_PDP_CTX_ACC) | + X(GPRS_SM_MS_EV_GMM_RELEASE_IND), .out_state_mask = X(GPRS_SM_MS_ST_PDP_INACTIVE), .name = "PDP_INACTIVE_PENDING", @@ -257,6 +273,7 @@ { GPRS_SM_MS_EV_TX_MOD_PDP_CTX_REQ, "TX_MOD_PDP_CTX_REQ" }, { GPRS_SM_MS_EV_RX_MOD_PDP_CTX_REJ, "RX_MOD_PDP_CTX_REJ" }, { GPRS_SM_MS_EV_RX_MOD_PDP_CTX_ACC, "RX_MOD_PDP_CTX_ACC" }, + { GPRS_SM_MS_EV_GMM_RELEASE_IND, "GMM_RELEASE_IND"}, { 0, NULL } }; diff --git a/src/sm/sm_prim.c b/src/sm/sm_prim.c index 158959e..b513aa7 100644 --- a/src/sm/sm_prim.c +++ b/src/sm/sm_prim.c @@ -493,6 +493,23 @@ return rc; } +/* TS 24.007 9.5.1.2 GMMSM-RELEASE-IND */ +static int gprs_sm_prim_handle_gmmsm_release_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + struct osmo_gprs_gmm_gmmsm_prim *gmmsm = &gmm_prim->gmmsm; + struct gprs_sm_entity *sme; + int rc; + + sme = gprs_sm_find_sme_by_sess_id(gmmsm->sess_id); + if (!sme) { + LOGSM(LOGL_ERROR, "Rx GMMSM-RELEASE.ind for non existing SM Entity sess_id=%u\n", gmmsm->sess_id); + return -EINVAL; + } + rc = osmo_fsm_inst_dispatch(sme->ms_fsm.fi, GPRS_SM_MS_EV_GMM_RELEASE_IND, NULL); + + return rc; +} + /* TS 24.007 9.5.1.6 GMMSM-UNITDATA-IND */ static int gprs_sm_prim_handle_gmmsm_unitdata_ind(struct osmo_gprs_gmm_prim *gmm_prim) { @@ -520,6 +537,9 @@ case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_CONFIRM): rc = gprs_sm_prim_handle_gmmsm_establish_cnf(gmm_prim); break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_RELEASE, PRIM_OP_INDICATION): + rc = gprs_sm_prim_handle_gmmsm_release_ind(gmm_prim); + break; case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_INDICATION): rc = gprs_sm_prim_handle_gmmsm_unitdata_ind(gmm_prim); break; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33112 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ia2ac9dbffe29c3509f1088ceb327569a331ec598 Gerrit-Change-Number: 33112 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newchange

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023