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

[S] Change in osmo-hnbgw[master]: vty_go_parent(): remove legacy cruft

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32914 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: vty_go_parent(): remove legacy cruft ...................................................................... vty_go_parent(): remove legacy cruft We do not need to restore the parent node on vty_go_parent() anymore, only call the ss7 go-parent callback to trigger actions on vty node exit. Change-Id: Id3ecc53885436294d2217c52130910872dde550e --- M src/osmo-hnbgw/hnbgw_vty.c 1 file changed, 14 insertions(+), 24 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index 2952913..47db695 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -104,30 +104,7 @@ int hnbgw_vty_go_parent(struct vty *vty) { - switch (vty->node) { - case IUH_NODE: - case IUCS_NODE: - case IUPS_NODE: - vty->node = HNBGW_NODE; - vty->index = NULL; - break; - case MGCP_NODE: - vty->node = HNBGW_NODE; - vty->index = NULL; - break; - case HNBGW_NODE: - vty->node = CONFIG_NODE; - vty->index = NULL; - break; - case CONFIG_NODE: - vty->node = ENABLE_NODE; - vty->index = NULL; - break; - default: - osmo_ss7_vty_go_parent(vty); - break; - } - + osmo_ss7_vty_go_parent(vty); return vty->node; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32914 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id3ecc53885436294d2217c52130910872dde550e Gerrit-Change-Number: 32914 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: codec: new function osmo_hr_sid_reset()

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33060 ) Change subject: codec: new function osmo_hr_sid_reset() ...................................................................... codec: new function osmo_hr_sid_reset() If a network element that receives call leg A UL and is responsible for preparing leg B DL receives a GSM-HR SID frame whose SID field is not all 1s but which is marked as valid SID by out-of-band means (TRAU-UL frame control bits or the FT field in RFC 5993 ToC octet), this SID frame should be rejuvenated (SID field reset to all 1s) prior to retransmission on call leg B DL. Provide a function that performs this operation. Related: OS#6036 Change-Id: Iebc0863ffcc3f8f25aeb54d4b14fac0487bc2bbb --- M include/osmocom/codec/codec.h M src/codec/gsm620.c 2 files changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/33060/1 diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index 4dbe129..c5981f8 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -131,6 +131,7 @@ bool osmo_efr_sid_preen(uint8_t *rtp_payload); void osmo_fr_sid_reset(uint8_t *rtp_payload); +void osmo_hr_sid_reset(uint8_t *rtp_payload); void osmo_efr_sid_reset(uint8_t *rtp_payload); int osmo_amr_rtp_enc(uint8_t *payload, uint8_t cmr, enum osmo_amr_type ft, diff --git a/src/codec/gsm620.c b/src/codec/gsm620.c index 4eae514..ef1d3b9 100644 --- a/src/codec/gsm620.c +++ b/src/codec/gsm620.c @@ -21,6 +21,7 @@ #include <stdint.h> #include <stdbool.h> +#include <string.h> #include <osmocom/core/bitvec.h> #include <osmocom/core/utils.h> @@ -285,3 +286,31 @@ return true; } + +/*! Reset the SID field of a potentially corrupted, but still valid GSM-HR + * SID frame in TS 101 318 format to its pristine state (full SID codeword). + * \param[in] rtp_payload Buffer with RTP payload - must be writable! + * + * Per GSM 06.22 section 5.3, a freshly minted SID frame consists of 33 bits + * of comfort noise parameters and 79 bits of SID codeword (all 1s). Network + * elements that receive SID frames from call leg A uplink and need to + * retransmit them on leg B downlink should "rejuvenate" received SID frames + * prior to retransmission by resetting the SID field to its pristine state + * of all 1s; this function does the job. + * + * Important note: because of HR-specific quirks (lack of exact bit counting + * rules in GSM 06.41 spec compared to 06.31 & 06.81, plus the fact that such + * bit counting can only be done efficiently in the GSM 05.03 channel decoder + * prior to bit reordering based on voiced or unvoiced mode), a generic + * (usable from any network element) SID classification function similar to + * osmo_{fr,efr}_sid_classify() unfortunately cannot exist for HR. Therefore, + * the triggering condition for invoking this SID rejuvenation/reset function + * can only be an out-of-band SID indication, as in GSM 08.61 TRAU frames + * or RFC 5993 ToC octet. + */ +void osmo_hr_sid_reset(uint8_t *rtp_payload) +{ + /* set all 79 SID codeword bits to 1 */ + rtp_payload[4] |= 0x7F; + memset(rtp_payload + 5, 0xFF, 9); +} -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33060 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iebc0863ffcc3f8f25aeb54d4b14fac0487bc2bbb Gerrit-Change-Number: 33060 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: codec: new functions osmo_{fr,efr}_sid_reset()

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33059 ) Change subject: codec: new functions osmo_{fr,efr}_sid_reset() ...................................................................... codec: new functions osmo_{fr,efr}_sid_reset() In Iec5c1f2619a82499f61cb3e5a7cd03ff0f020ad8 we added osmo_{fr,efr}_sid_preen() functions that apply SID classification of GSM 06.31/06.81 section 6.1.1 (osmo_{fr,efr}_sid_classify()), reject invalid SID, and "rejuvenate" deemed-valid SID frames by resetting their SID code word, correcting the one bit error that may be present in a deemed-valid SID frame. However, the last operation (rejuvenation of a SID frame by resetting its SID field) should also be made available as its own function, as it may be more efficient in some applications: for example, an application may need to call osmo_{fr,efr}_sid_classify(), apply the rejuvenation to valid SID, but also use the classification result to drive other logic. Factor out these functions. Change-Id: I1d6dd867a358bdda8850cd8c959d0f361c0a5b6d --- M include/osmocom/codec/codec.h M src/codec/gsm610.c M src/codec/gsm660.c 3 files changed, 94 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/33059/1 diff --git a/include/osmocom/codec/codec.h b/include/osmocom/codec/codec.h index 731f169..4dbe129 100644 --- a/include/osmocom/codec/codec.h +++ b/include/osmocom/codec/codec.h @@ -130,6 +130,9 @@ bool osmo_fr_sid_preen(uint8_t *rtp_payload); bool osmo_efr_sid_preen(uint8_t *rtp_payload); +void osmo_fr_sid_reset(uint8_t *rtp_payload); +void osmo_efr_sid_reset(uint8_t *rtp_payload); + int osmo_amr_rtp_enc(uint8_t *payload, uint8_t cmr, enum osmo_amr_type ft, enum osmo_amr_quality bfi); int osmo_amr_rtp_dec(const uint8_t *payload, int payload_len, uint8_t *cmr, diff --git a/src/codec/gsm610.c b/src/codec/gsm610.c index 19c7aa4..5cc4f14 100644 --- a/src/codec/gsm610.c +++ b/src/codec/gsm610.c @@ -404,6 +404,35 @@ return OSMO_GSM631_SID_CLASS_VALID; } +/*! Reset the SID field and the unused bits of a potentially corrupted, + * but still valid GSM-FR SID frame in RTP encoding to their pristine state. + * \param[in] rtp_payload Buffer with RTP payload - must be writable! + * + * Per GSM 06.12 section 5.2, a freshly minted SID frame carries 60 bits + * of comfort noise parameters (LARc and 4 times Xmaxc), while the remaining + * 200 bits are all zeros; the latter 200 all-0 bits further break down into + * 95 bits of SID field (checked by receivers to detect SID) and 105 unused + * bits which receivers are told to ignore. Network elements that receive + * SID frames from call leg A uplink and need to retransmit them on leg B + * downlink should "rejuvenate" received SID frames prior to retransmission; + * this function does the job. + */ +void osmo_fr_sid_reset(uint8_t *rtp_payload) +{ + uint8_t *p, sub; + + p = rtp_payload + 5; /* skip magic+LARc */ + for (sub = 0; sub < 4; sub++) { + *p++ = 0; + *p++ &= 0x1F; /* upper 5 bits of Xmaxc field */ + *p++ &= 0x80; /* and the lsb spilling into the next byte */ + *p++ = 0; + *p++ = 0; + *p++ = 0; + *p++ = 0; + } +} + /*! Preen potentially-SID FR codec frame in RTP format, ensuring that it is * either a speech frame or a valid SID, and if the latter, making it a * perfect, error-free SID frame. @@ -413,7 +442,6 @@ bool osmo_fr_sid_preen(uint8_t *rtp_payload) { enum osmo_gsm631_sid_class sidc; - uint8_t *p, sub; sidc = osmo_fr_sid_classify(rtp_payload); switch (sidc) { @@ -422,20 +450,8 @@ case OSMO_GSM631_SID_CLASS_INVALID: return false; case OSMO_GSM631_SID_CLASS_VALID: - /* "Rejuvenate" this SID frame, correcting any errors: - * zero out all bits that aren't LARc or Xmaxc, thereby - * clearing all SID code word bits and all unused/reserved - * bits. */ - p = rtp_payload + 5; /* skip magic+LARc */ - for (sub = 0; sub < 4; sub++) { - *p++ = 0; - *p++ &= 0x1F; - *p++ &= 0x80; - *p++ = 0; - *p++ = 0; - *p++ = 0; - *p++ = 0; - } + /* "Rejuvenate" this SID frame, correcting any errors */ + osmo_fr_sid_reset(rtp_payload); return true; default: /* There are only 3 possible SID classifications per GSM 06.31 diff --git a/src/codec/gsm660.c b/src/codec/gsm660.c index 9b5c55a..b15bdf3 100644 --- a/src/codec/gsm660.c +++ b/src/codec/gsm660.c @@ -352,6 +352,42 @@ return OSMO_GSM631_SID_CLASS_VALID; } +/*! Reset the SID field of a potentially corrupted, but still valid GSM-EFR + * SID frame in RTP encoding to its pristine state (full SID code word). + * \param[in] rtp_payload Buffer with RTP payload - must be writable! + * + * Per GSM 06.62 section 5.3, a freshly minted SID frame consists of 58 bits + * of comfort noise parameters (LSF and 4 times fixed codebook gain), 95 bits + * of SID code word (all 1s) and 91 unused bits (all 0s). Network elements + * that receive SID frames from call leg A uplink and need to retransmit them + * on leg B downlink should "rejuvenate" received SID frames prior to + * retransmission by resetting the SID field to its pristine state of all 1s; + * this function does the job. + * + * Potential TODO: it would be nice to also zero out the remaining 91 bits + * which the spec leaves as reserved, clearing out leg A radio bit errors - + * but do we really need to? + */ +void osmo_efr_sid_reset(uint8_t *rtp_payload) +{ + /* set all 95 SID code word bits to 1 */ + rtp_payload[6] |= 0x6F; + rtp_payload[7] = 0xFF; + rtp_payload[8] = 0xFF; + rtp_payload[9] |= 0x80; + rtp_payload[12] |= 0x3B; + rtp_payload[13] = 0xFF; + rtp_payload[14] = 0xFF; + rtp_payload[15] |= 0xE0; + rtp_payload[19] = 0xFF; + rtp_payload[20] = 0xFF; + rtp_payload[21] = 0xFF; + rtp_payload[25] = 0xFF; + rtp_payload[26] |= 0xFC; + rtp_payload[27] = 0xFF; + rtp_payload[28] |= 0xC0; +} + /*! Preen potentially-SID EFR codec frame in RTP format, ensuring that it is * either a speech frame or a valid SID, and if the latter, making it a * perfect, error-free SID frame. @@ -369,23 +405,8 @@ case OSMO_GSM631_SID_CLASS_INVALID: return false; case OSMO_GSM631_SID_CLASS_VALID: - /* "Rejuvenate" this SID frame, correcting any errors: - * set all 95 SID code word bits to 1. */ - rtp_payload[6] |= 0x6F; - rtp_payload[7] = 0xFF; - rtp_payload[8] = 0xFF; - rtp_payload[9] |= 0x80; - rtp_payload[12] |= 0x3B; - rtp_payload[13] = 0xFF; - rtp_payload[14] = 0xFF; - rtp_payload[15] |= 0xE0; - rtp_payload[19] = 0xFF; - rtp_payload[20] = 0xFF; - rtp_payload[21] = 0xFF; - rtp_payload[25] = 0xFF; - rtp_payload[26] |= 0xFC; - rtp_payload[27] = 0xFF; - rtp_payload[28] |= 0xC0; + /* "Rejuvenate" this SID frame, correcting any errors */ + osmo_efr_sid_reset(rtp_payload); return true; default: /* There are only 3 possible SID classifications per GSM 06.81 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33059 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1d6dd867a358bdda8850cd8c959d0f361c0a5b6d Gerrit-Change-Number: 33059 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: add doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989 to look at the new patch set (#2). Change subject: add doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg ...................................................................... add doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg We have not a single example yet showing point code and SCCP address configuration. Add this example, which will also show how the config file syntax changes while introducing CN pooling in upcoming patches. Related: SYS#6412 Change-Id: I42c3b434a7339cc3efb27b43c893cfb734de9ca4 --- M contrib/osmo-hnbgw.spec.in M debian/osmo-hnbgw.install A doc/examples/osmo-hnbgw/osmo-hnbgw-cs7.cfg 3 files changed, 43 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/89/32989/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32989 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I42c3b434a7339cc3efb27b43c893cfb734de9ca4 Gerrit-Change-Number: 32989 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in osmo-hnbgw[master]: immediately SCCP RLSD on HNB re-register

by neels

Attention is currently required from: neels. neels has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32915 ) Change subject: immediately SCCP RLSD on HNB re-register ...................................................................... Removed Code-Review+1 by neels <nhofmeyr(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32915 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4e78617ad39bb73fe92097c8a1a8069da6a7f6a1 Gerrit-Change-Number: 32915 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: deleteVote

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: gmm: Initial implementation of T3166, rx Auth & Ciph Reject

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33054 to look at the new patch set (#3). Change subject: gmm: Initial implementation of T3166, rx Auth & Ciph Reject ...................................................................... gmm: Initial implementation of T3166, rx Auth & Ciph Reject As specified in 3GPP TS 24.008 Table 11.3/3. Change-Id: I2c24b968e90cf5ec71fa8a777ec57b407eec015f --- M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/gmm/gmm_prim.c M tests/gmm/gmm_prim_test.err 5 files changed, 85 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/54/33054/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33054 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2c24b968e90cf5ec71fa8a777ec57b407eec015f Gerrit-Change-Number: 33054 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: gmm: Implement rx RAU Reject

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33058 ) Change subject: gmm: Implement rx RAU Reject ...................................................................... gmm: Implement rx RAU Reject Change-Id: I0d4d8288b78cfd3140c786a52a3906eaf37ebe6b --- M include/osmocom/gprs/gmm/gmm_ms_fsm.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c 3 files changed, 69 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/58/33058/1 diff --git a/include/osmocom/gprs/gmm/gmm_ms_fsm.h b/include/osmocom/gprs/gmm/gmm_ms_fsm.h index 1ebc53c..772444f 100644 --- a/include/osmocom/gprs/gmm/gmm_ms_fsm.h +++ b/include/osmocom/gprs/gmm/gmm_ms_fsm.h @@ -51,7 +51,7 @@ GPRS_GMM_MS_EV_SR_REJECTED, /* (Iu only) */ GPRS_GMM_MS_EV_SR_ACCEPTED, /* (Iu only) */ GPRS_GMM_MS_EV_RAU_REQUESTED, - GPRS_GMM_MS_EV_RAU_REJECTED, + GPRS_GMM_MS_EV_RAU_REJECTED, /* data: ptr to "uint8_t cause" */ GPRS_GMM_MS_EV_RAU_ACCEPTED, GPRS_GMM_MS_EV_LOW_LVL_FAIL, }; diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 2814413..71eb7f7 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -1137,6 +1137,49 @@ return -EINVAL; /* TODO: what to do on error? */ } +/* Rx GMM Routing area update reject, 9.4.17 */ +static int gprs_gmm_rx_rau_rej(struct gprs_gmm_entity *gmme, struct gsm48_hdr *gh, unsigned int len) +{ + uint8_t *buf = &gh->data[0]; + struct tlv_parsed tp; + uint8_t cause = GMM_CAUSE_SEM_INCORR_MSG; + bool force_standby_indicated; + int rc; + + if (len < sizeof(*gh) + 2) { + LOGGMME(gmme, LOGL_ERROR, "Rx GMM ROUTING AREA UPDATE REJECT with wrong size %u\n", len); + goto rejected; + } + + cause = buf[0]; + force_standby_indicated = (buf[1] >> 4) == 0x01; + buf += 2; + + LOGGMME(gmme, LOGL_NOTICE, "Rx GMM ROUTING AREA UPDATE REJECT cause='%s' (%u) force_stdby=%u\n", + get_value_string(gsm48_gmm_cause_names, cause), cause, force_standby_indicated); + + if (force_standby_indicated) + gprs_gmm_gmme_ready_timer_stop(gmme); + + if (len > (buf - (uint8_t *)gh)) { + rc = gprs_gmm_tlv_parse(&tp, buf, len - (buf - (uint8_t *)gh)); + if (rc < 0) { + LOGGMME(gmme, LOGL_ERROR, "Rx GMM ROUTING AREA UPDATE REJECT: failed to parse TLVs %d\n", rc); + goto rejected; + } + + if (TLVP_PRES_LEN(&tp, GSM48_IE_GMM_TIMER_T3302, 1)) + gmme->t3302 = *TLVP_VAL(&tp, GSM48_IE_GMM_TIMER_T3302); + + if (TLVP_PRES_LEN(&tp, GSM48_IE_GMM_TIMER_T3346, 1)) + gmme->t3346 = *TLVP_VAL(&tp, GSM48_IE_GMM_TIMER_T3346); + } + +rejected: + rc = osmo_fsm_inst_dispatch(gmme->ms_fsm.fi, GPRS_GMM_MS_EV_RAU_REJECTED, &cause); + return -EINVAL; +} + /* Rx GMM Identity Request, 9.2.10 */ static int gprs_gmm_rx_id_req(struct gprs_gmm_entity *gmme, struct gsm48_hdr *gh, unsigned int len) { @@ -1384,6 +1427,9 @@ case GSM48_MT_GMM_RA_UPD_ACK: rc = gprs_gmm_rx_rau_acc(gmme, gh, len); break; + case GSM48_MT_GMM_RA_UPD_REJ: + rc = gprs_gmm_rx_rau_rej(gmme, gh, len); + break; case GSM48_MT_GMM_ID_REQ: rc = gprs_gmm_rx_id_req(gmme, gh, len); break; diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index e5a7002..ff26dfa 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -239,13 +239,22 @@ { struct gprs_gmm_ms_fsm_ctx *ctx = (struct gprs_gmm_ms_fsm_ctx *)fi->priv; struct osmo_gprs_llc_prim *llc_prim_tx; + enum gsm48_gmm_cause cause; switch (event) { case GPRS_GMM_MS_EV_RAU_REJECTED: - // causes #13, #15, #25 - gmm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_REGISTERED); - // else - //mm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_DEREGISTERED_INITIATED); + cause = *(uint8_t *)data; + /* 3GPP TS 24.008 Figure 4.1b */ + switch (cause) { + case GMM_CAUSE_ROAMING_NOTALLOWED: + case GMM_CAUSE_NO_SUIT_CELL_IN_LA: + case GMM_CAUSE_NOT_AUTH_FOR_CSG: + gmm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_REGISTERED); + break; + default: + gmm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_DEREGISTERED); + break; + } break; case GPRS_GMM_MS_EV_RAU_ACCEPTED: gprs_gmm_gmme_t3316_stop(ctx->gmme); @@ -351,7 +360,6 @@ X(GPRS_GMM_MS_EV_RAU_ACCEPTED), .out_state_mask = X(GPRS_GMM_MS_ST_REGISTERED) | - X(GPRS_GMM_MS_ST_DEREGISTERED_INITIATED) | X(GPRS_GMM_MS_ST_DEREGISTERED), .name = "RAUInitidated", .action = st_gmm_ms_rau_initiated, -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33058 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I0d4d8288b78cfd3140c786a52a3906eaf37ebe6b Gerrit-Change-Number: 33058 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-mgw[osmith/1.11.2]: systemd: depend on networking-online.target

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33056 ) Change subject: systemd: depend on networking-online.target ...................................................................... systemd: depend on networking-online.target Related: SYS#6400 Change-Id: Ib6c78c76c5f13b9482428ce653a61b03b2aca1d3 --- M contrib/systemd/osmo-mgw.service 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/systemd/osmo-mgw.service b/contrib/systemd/osmo-mgw.service index 13c8515..b187e1a 100644 --- a/contrib/systemd/osmo-mgw.service +++ b/contrib/systemd/osmo-mgw.service @@ -1,5 +1,7 @@ [Unit] Description=Osmocom Media Gateway (MGW) +After=network-online.target +Wants=network-online.target [Service] Type=simple -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33056 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.11.2 Gerrit-Change-Id: Ib6c78c76c5f13b9482428ce653a61b03b2aca1d3 Gerrit-Change-Number: 33056 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-mgw[osmith/1.11.2]: Bump version: 1.11.1.1-fb862 → 1.11.2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33057 ) Change subject: Bump version: 1.11.1.1-fb862 → 1.11.2 ...................................................................... Bump version: 1.11.1.1-fb862 → 1.11.2 Change-Id: I8ba80a0a3ebb1ac1719aaea0a3091d1212508130 --- M debian/changelog 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 8b10b49..6c7328d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-mgw (1.11.2) unstable; urgency=medium + + * systemd: depend on networking-online.target + + -- Oliver Smith <osmith(a)sysmocom.de> Fri, 26 May 2023 17:49:29 +0200 + osmo-mgw (1.11.1) unstable; urgency=medium * mgcp_network: Unregister osmo_fd before closing fd -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.11.2 Gerrit-Change-Id: I8ba80a0a3ebb1ac1719aaea0a3091d1212508130 Gerrit-Change-Number: 33057 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-mgw[osmith/1.11.2]: Bump version: 1.11.1.1-fb862 → 1.11.2

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/33057 ) Change subject: Bump version: 1.11.1.1-fb862 → 1.11.2 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/33057 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: osmith/1.11.2 Gerrit-Change-Id: I8ba80a0a3ebb1ac1719aaea0a3091d1212508130 Gerrit-Change-Number: 33057 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 16:12:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023