- gerrit-log - lists.osmocom.org

[XS] Change in osmo-ttcn3-hacks[master]: sgsn: remove osmo-sgsn <= 1.12.0 code path
by osmith 13 Feb '25

13 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email ) Change subject: sgsn: remove osmo-sgsn <= 1.12.0 code path ...................................................................... sgsn: remove osmo-sgsn <= 1.12.0 code path Now that 1.13.0 has been released, we can run this test in latest too. Change-Id: I4ead7b05d7d956303584ccbfe1e13692f54341af --- M sgsn/SGSN_Tests.ttcn 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/51/39551/1 diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn index 62856ff..b2d9731 100644 --- a/sgsn/SGSN_Tests.ttcn +++ b/sgsn/SGSN_Tests.ttcn @@ -3232,10 +3232,7 @@ execute( TC_attach_rau() ); execute( TC_attach_rau_a_a() ); execute( TC_attach_rau_a_b() ); - if (Misc_Helpers.f_osmo_repo_is("nightly")) { - /* Will double-free and crash osmo-sgsn <= 1.12.0 */ - execute( TC_attach_rau_a_b_wrong_old_ra() ); - } + execute( TC_attach_rau_a_b_wrong_old_ra() ); execute( TC_attach_usim_resync() ); execute( TC_attach_usim_a54_a54() ); execute( TC_attach_usim_a54_a53() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39551?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4ead7b05d7d956303584ccbfe1e13692f54341af Gerrit-Change-Number: 39551 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: remove osmo-hnbgw <= 1.6.0 code path
by osmith 13 Feb '25

13 Feb '25

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email ) Change subject: hnbgw: remove osmo-hnbgw <= 1.6.0 code path ...................................................................... hnbgw: remove osmo-hnbgw <= 1.6.0 code path osmo-hnbgw 1.7.0 has been released, so we can remove this code path. Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 2 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/39550/1 diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 589c699..33800f3 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -381,19 +381,10 @@ /* Temporarily access Statsd during test startup: */ connect(self:STATSD_PROC, vc_STATSD:STATSD_PROC); - /* osmo-hnbgw <= 1.6.0 doesn't support the stats "pfcp_associated". - * Assume we have to wait for IUT to send PFCP Assoc Setup Req, - * but avoid failing if we don't receive any. */ - var boolean validate_pfcp_assoc := Misc_Helpers.f_osmo_repo_is("nightly"); - var boolean pfcp_associated := false; - if (validate_pfcp_assoc) { - pfcp_associated := f_statsd_pfcp_associated(); - } - - if (not pfcp_associated) { + if (not f_statsd_pfcp_associated()) { connect(self:PFCP, vc_PFCP:CLIENT); connect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); - f_pfcp_wait_assoc_setup_req(fail_timeout := validate_pfcp_assoc); + f_pfcp_wait_assoc_setup_req(fail_timeout := true); disconnect(self:PFCP, vc_PFCP:CLIENT); disconnect(self:PFCP_PROC, vc_PFCP:CLIENT_PROC); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/39550?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie55b752c19aa597afdc47b6e57e8ff0b42313e00 Gerrit-Change-Number: 39550 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[pespin/base]: GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email ) Change subject: GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known ...................................................................... GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known The IE is optional, but if it is present, it must be 11 byte long containing a 8 byte IMEISV. If IMEI is unknown the SGSN would add an empty IMEISV IE which is invalid. Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 (cherry picked from commit 7d94476bde47cd9803f410ec2ffd072213e9ab48) --- M src/sgsn/sgsn_libgtp.c 1 file changed, 8 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index faf0e7f..385b843 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -299,11 +299,14 @@ break; } - /* include the IMEI(SV) */ - pdp->imeisv_given = 1; - gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); - pdp->imeisv.l = pdp->imeisv.v[0]; - memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + /* optional include the IMEI(SV) */ + if (mmctx->imei[0] != '\0') { + memset(&pdp->imeisv.v[0], 0, 8); + pdp->imeisv_given = 1; + gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); + pdp->imeisv.l = 8; + memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + } /* change pdp state to 'requested' */ pctx->state = PDP_STATE_CR_REQ; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39544?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I812af1e702e77214244f32ae65663c1a03b23962 Gerrit-Change-Number: 39544 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-CC: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-sgsn[pespin/base]: jenkins.sh: libosmo-netif no longer depends on libosmo-abis
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39542?usp=email ) Change subject: jenkins.sh: libosmo-netif no longer depends on libosmo-abis ...................................................................... jenkins.sh: libosmo-netif no longer depends on libosmo-abis Change-Id: Id62040f41e9a5c233cc42eedb0bd5df9f62df418 Depends: libosmo-abis.git Change-Id I079dc3999de508301dd37ed03e399356a58d3cab Depends: libosmo-netif.git Change-Id I13d6e88158f6d9ce017986283183ee9c2cc68cae (cherry picked from commit 11854f52ac0a117d1161b2c82f5836680955082f) --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index c04bc9e..ced8367 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,12 +32,12 @@ export LD_LIBRARY_PATH="$inst/lib" export PATH="$inst/bin:$PATH" +osmo-build-dep.sh libosmo-netif "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh osmo-ggsn osmo-build-dep.sh osmo-hlr if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libosmo-netif osmo-build-dep.sh libosmo-sigtran osmo-build-dep.sh libasn1c #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39542?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Id62040f41e9a5c233cc42eedb0bd5df9f62df418 Gerrit-Change-Number: 39542 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>

1 0

[S] Change in osmo-sgsn[pespin/base]: vty: Avoid accessing gsupclient object fields directly
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39543?usp=email ) Change subject: vty: Avoid accessing gsupclient object fields directly ...................................................................... vty: Avoid accessing gsupclient object fields directly Use new APIs recently added. Depends: osmo-hlr.git Change-Id I401af83232022f1c141eef1f428cbe206a8aaaa2 Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 (cherry picked from commit 6668b2b29a5c1e8b7a22c66df95795485e204a8a) --- M TODO-RELEASE M src/sgsn/sgsn_vty.c 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index eb1cdfd..02149e5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libgtp >1.12.0 new field dir_tun_flags in struct pdp_t libgtp >1.12.0 gtp_set_cb_update_context_ind(), gtp_update_context_resp() +libosmo-gsup-client >1.8.0 osmo_gsup_client_is_connected(), osmo_gsup_client_get_rem_addr(), osmo_gsup_client_get_rem_port() diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index bcb8dc2..113fdd1 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -669,11 +669,10 @@ SHOW_STR "Display information about the SGSN") { if (sgsn->gsup_client) { - struct ipa_client_conn *link = sgsn->gsup_client->link; - vty_out(vty, - " Remote authorization: %sconnected to %s:%d via GSUP%s", - sgsn->gsup_client->is_connected ? "" : "not ", - link->addr, link->port, + vty_out(vty, " Remote authorization: %sconnected to %s:%d via GSUP%s", + osmo_gsup_client_is_connected(sgsn->gsup_client) ? "" : "not ", + osmo_gsup_client_get_rem_addr(sgsn->gsup_client), + osmo_gsup_client_get_rem_port(sgsn->gsup_client), VTY_NEWLINE); } if (sgsn->gsn) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39543?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Ie443ef0bd983635a5b29e434d79b93ef3f7ce370 Gerrit-Change-Number: 39543 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>

1 0

[XS] Change in osmo-sgsn[pespin/base]: sgsn_vty: Drop unneeded use of abis/ipa.h header
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email ) Change subject: sgsn_vty: Drop unneeded use of abis/ipa.h header ...................................................................... sgsn_vty: Drop unneeded use of abis/ipa.h header The header is not needed and will eventually be deprecated. Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 (cherry picked from commit 7a45b5748582594d8113c24d7de03dd4740ccb4e) --- M src/sgsn/sgsn_vty.c 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 113fdd1..2d41009 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -53,7 +53,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/crypt/utran_cipher.h> -#include <osmocom/abis/ipa.h> #include <osmocom/gprs/gprs_bssgp.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I48a513b8ea63dadbc6d6d571380980f55ff04a06 Gerrit-Change-Number: 39545 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>

1 0

[XS] Change in osmo-sgsn[pespin/base]: jenkins.sh: No need to build libosmo-sigtran with doxygen
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39546?usp=email ) Change subject: jenkins.sh: No need to build libosmo-sigtran with doxygen ...................................................................... jenkins.sh: No need to build libosmo-sigtran with doxygen Change-Id: Iab3d1b2e1591e66702a01def6c322f4a11970ead (cherry picked from commit df44350b4b6fbc3922308fae18501ff11d546d9a) --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ced8367..d3c7616 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -38,7 +38,7 @@ osmo-build-dep.sh osmo-hlr if [ "x$IU" = "x--enable-iu" ]; then - osmo-build-dep.sh libosmo-sigtran + osmo-build-dep.sh libosmo-sigtran "" --disable-doxygen osmo-build-dep.sh libasn1c #osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh osmo-build-dep.sh osmo-iuh -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39546?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Iab3d1b2e1591e66702a01def6c322f4a11970ead Gerrit-Change-Number: 39546 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>

1 0

[XS] Change in osmo-sgsn[pespin/base]: gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabili...
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39548?usp=email ) Change subject: gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabilities ...................................................................... gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabilities When the MS Network Capability is empty, expect to support at least unencrypted communications. This shouldn't be empty at all, as the minimum length of it is 2 when the MS/UE is doing an Attach Request. But when receiving a MS/UE SGSN Context via Gn, the field is optional. The MS/UE shall include it into the Routing Area Request, but not must. Change-Id: Ieef2e3eeaaadc90c35fff6f20d47bd36aaa4b9e6 (cherry picked from commit d3b037ccfae542807b7602c2163f11fa0eb3b885) --- M src/sgsn/gprs_gmm.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 9aae62b..7a4ea20 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1229,6 +1229,10 @@ static uint8_t gprs_ms_net_cap_gea_mask(const uint8_t *ms_net_cap, uint8_t cap_len) { uint8_t mask = (1 << GPRS_ALGO_GEA0); + + if (cap_len == 0) + return mask; + mask |= (0x80 & ms_net_cap[0]) ? (1 << GPRS_ALGO_GEA1) : 0; if (cap_len < 2) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39548?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: Ieef2e3eeaaadc90c35fff6f20d47bd36aaa4b9e6 Gerrit-Change-Number: 39548 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-CC: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-sgsn[pespin/base]: GMM: rework PDP context status
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39547?usp=email ) Change subject: GMM: rework PDP context status ...................................................................... GMM: rework PDP context status Use an uint16 instead of an pointer with an unknown length. Also encode the current active PDP context (e.g. on 2G/4G mobilty this could change). It resynchronizes the UE with the SGSN state. Change-Id: I12d3110c9365132f96ef7ff8a1be22a431682c81 (cherry picked from commit 0e8f05563112eadc0ed50dc273cf9a723e8f99ac) --- M src/sgsn/gprs_gmm.c M tests/sgsn/sgsn_test.c 2 files changed, 77 insertions(+), 55 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 7f70260..9aae62b 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -214,6 +214,61 @@ sgsn_mm_ctx_cleanup_free(ctx); } + +/* 3GPP TS 24.008 § 10.5.7.1 Process PDP context status value, bit 0 corresponds to nsapi 0 */ +static void process_ms_ctx_status(struct sgsn_mm_ctx *mmctx, + uint16_t pdp_status) +{ + struct sgsn_pdp_ctx *pdp, *pdp2; + /* 24.008 4.7.5.1.3: If the PDP context status information element is + * included in ROUTING AREA UPDATE REQUEST message, then the network + * shall deactivate all those PDP contexts locally (without peer to + * peer signalling between the MS and the network), which are not in SM + * state PDP-INACTIVE on network side but are indicated by the MS as + * being in state PDP-INACTIVE. */ + + /* NSAPI 0 - 4 are spare, ignore these */ + pdp_status &= 0xffe0; + + llist_for_each_entry_safe(pdp, pdp2, &mmctx->pdp_list, list) { + bool active = (pdp_status & (1 << pdp->nsapi)); + if (active) + continue; + + LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping PDP context for NSAPI=%u " + "due to PDP CTX STATUS IE=0x%02x\n", + pdp->nsapi, pdp_status); + pdp->ue_pdp_active = false; + if (pdp->ggsn) + sgsn_delete_pdp_ctx(pdp); + else /* GTP side already detached, freeing */ + sgsn_pdp_ctx_free(pdp); + } +} + +/* 3GPP TS 24.008 § 10.5.7.1 Encode PDP context status value, bit 0 correspond to nsapi 0 */ +uint16_t encode_ms_ctx_status(struct sgsn_mm_ctx *mmctx) +{ + struct sgsn_pdp_ctx *pdp; + + uint16_t pdp_status = 0; + + llist_for_each_entry(pdp, &mmctx->pdp_list, list) { + if (pdp->ue_pdp_active) + pdp_status |= (1 << pdp->nsapi); + } + + return pdp_status; +} + +/* 3GPP TS 24.008 § 4.7.13.4/10.5.7.1 Service request procedure not accepted by the + * network. Returns true if MS has active PDP contexts in pdp_status */ +bool pdp_status_has_active_nsapis(uint16_t pdp_status) +{ + /* NSAPI 0 - 4 are spare and should be ignored 0 */ + return (pdp_status >> 5) != 0; +} + /* Chapter 9.4.18 */ static int _tx_status(struct msgb *msg, uint8_t cause, struct sgsn_mm_ctx *mmctx) @@ -1512,6 +1567,8 @@ rua = (struct gsm48_ra_upd_ack *) msgb_put(msg, sizeof(*rua)); rua->force_stby = 0; /* not indicated */ rua->upd_result = 0; /* RA updated */ + + /* Periodic RA update timer */ t = osmo_tdef_get(sgsn->cfg.T_defs, 3312, OSMO_TDEF_S, -1); rua->ra_upd_timer = gprs_secs_to_tmr_floor(t); @@ -1540,12 +1597,19 @@ } *l = rc; #endif + /* MS identity */ + /* List of Received N-PDU */ /* Optional: Negotiated READY timer value */ t = osmo_tdef_get(sgsn->cfg.T_defs, 3314, OSMO_TDEF_S, -1); msgb_tv_put(msg, GSM48_IE_GMM_TIMER_READY, gprs_secs_to_tmr_floor(t)); - /* Option: MS ID, ... */ + /* GMM cause */ + /* PDP Context Status */ + uint16_t pdp_ctx_status = encode_ms_ctx_status(mm); + msgb_tlv_put(msg, GSM48_IE_GMM_PDP_CTX_STATUS, 2, (uint8_t *) &pdp_ctx_status); + + /* MS ID, ... */ return gsm48_gmm_sendmsg(msg, 0, mm, true); } @@ -1570,48 +1634,6 @@ return gsm48_gmm_sendmsg(msg, 0, NULL, false); } -static void process_ms_ctx_status(struct sgsn_mm_ctx *mmctx, - const uint8_t *pdp_status) -{ - struct sgsn_pdp_ctx *pdp, *pdp2; - /* 24.008 4.7.5.1.3: If the PDP context status information element is - * included in ROUTING AREA UPDATE REQUEST message, then the network - * shall deactivate all those PDP contexts locally (without peer to - * peer signalling between the MS and the network), which are not in SM - * state PDP-INACTIVE on network side but are indicated by the MS as - * being in state PDP-INACTIVE. */ - - llist_for_each_entry_safe(pdp, pdp2, &mmctx->pdp_list, list) { - bool inactive = (pdp->nsapi < 8) ? - !(pdp_status[0] & (1 << pdp->nsapi)) : - !(pdp_status[1] & (1 << (pdp->nsapi - 8))); - if (!inactive) - continue; - - LOGMMCTXP(LOGL_NOTICE, mmctx, "Dropping PDP context for NSAPI=%u " - "due to PDP CTX STATUS IE=0x%02x%02x\n", - pdp->nsapi, pdp_status[1], pdp_status[0]); - pdp->ue_pdp_active = false; - if (pdp->ggsn) - sgsn_delete_pdp_ctx(pdp); - else /* GTP side already detached, freeing */ - sgsn_pdp_ctx_free(pdp); - } -} - -/* 3GPP TS 24.008 § 4.7.13.4 Service request procedure not accepted by the - * network. Returns true if MS has active PDP contexts in pdp_status */ -bool pdp_status_has_active_nsapis(const uint8_t *pdp_status, const size_t pdp_status_len) -{ - size_t i; - - for (i = 0; i < pdp_status_len; i++) - if (pdp_status[i] != 0) - return true; - - return false; -} - /* Chapter 9.4.14: Routing area update request */ static int gsm48_rx_gmm_ra_upd_req(struct sgsn_mm_ctx *mmctx, struct msgb *msg, struct gprs_llc_llme *llme) @@ -1824,7 +1846,7 @@ /* Look at PDP Context Status IE and see if MS's view of * activated/deactivated NSAPIs agrees with our view */ if (TLVP_PRESENT(&tp, GSM48_IE_GMM_PDP_CTX_STATUS)) { - const uint8_t *pdp_status = TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS); + uint16_t pdp_status = osmo_load16le(TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS)); process_ms_ctx_status(mmctx, pdp_status); } @@ -1983,8 +2005,7 @@ /* Look at PDP Context Status IE and see if MS's view of * activated/deactivated NSAPIs agrees with our view */ if (TLVP_PRESENT(&tp, GSM48_IE_GMM_PDP_CTX_STATUS)) { - const uint8_t *pdp_status = TLVP_VAL(&tp, GSM48_IE_GMM_PDP_CTX_STATUS); - const size_t pdp_status_len = TLVP_LEN(&tp, GSM48_IE_GMM_PDP_CTX_STATUS); + uint16_t pdp_status = tlvp_val16be(&tp, GSM48_IE_GMM_PDP_CTX_STATUS); process_ms_ctx_status(ctx, pdp_status); @@ -1993,7 +2014,7 @@ * Active state in pdp_status but there is no PDP contexts on * SGSN side then Reject with the cause will force the mobile to * reset PDP contexts */ - if (llist_empty(&ctx->pdp_list) && pdp_status_has_active_nsapis(pdp_status, pdp_status_len)) { + if (llist_empty(&ctx->pdp_list) && pdp_status_has_active_nsapis(pdp_status)) { reject_cause = GMM_CAUSE_NO_PDP_ACTIVATED; goto rejected; } diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 29dad74..6dcda84 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -1582,20 +1582,21 @@ cleanup_test(); } -bool pdp_status_has_active_nsapis(const uint8_t *pdp_status, const size_t pdp_status_len); +bool pdp_status_has_active_nsapis(uint16_t pdp_status); static void test_pdp_status_has_active_nsapis(void) { - const size_t pdp_status_len = 2; - const uint8_t pdp_status1[] = { 0b00100000, 0b00000000 }; /* PDP NSAPI 5 active */ - const uint8_t pdp_status2[] = { 0b00000000, 0b00000000 }; /* no active PDP NSAPI */ - const uint8_t pdp_status3[] = { 0b00000000, 0b00000001 }; /* PDP NSAPI 8 active */ + uint16_t pdp_status1 = 0b0000000000100000; /* PDP NSAPI 5 active */ + uint16_t pdp_status2 = 0b0000000000000000; /* no active PDP NSAPI */ + uint16_t pdp_status3 = 0b0000000100000000; /* PDP NSAPI 8 active */ + uint16_t pdp_status4 = 0b0000000000000001; /* reserved NSAPI 0 active -> no active */ printf("Testing pdp_status_has_active_nsapis\n"); - OSMO_ASSERT(pdp_status_has_active_nsapis(pdp_status1, pdp_status_len)); - OSMO_ASSERT(!pdp_status_has_active_nsapis(pdp_status2, pdp_status_len)); - OSMO_ASSERT(pdp_status_has_active_nsapis(pdp_status3, pdp_status_len)); + OSMO_ASSERT(pdp_status_has_active_nsapis(pdp_status1)); + OSMO_ASSERT(!pdp_status_has_active_nsapis(pdp_status2)); + OSMO_ASSERT(pdp_status_has_active_nsapis(pdp_status3)); + OSMO_ASSERT(!pdp_status_has_active_nsapis(pdp_status4)); } static struct log_info_cat gprs_categories[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39547?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I12d3110c9365132f96ef7ff8a1be22a431682c81 Gerrit-Change-Number: 39547 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-CC: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-sgsn[pespin/base]: Bump version: 1.12.0.23-dc62-dirty → 1.13.0
by osmith 13 Feb '25

13 Feb '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39549?usp=email ) Change subject: Bump version: 1.12.0.23-dc62-dirty → 1.13.0 ...................................................................... Bump version: 1.12.0.23-dc62-dirty → 1.13.0 This release was made on top of commit 6213201b ("ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails") instead of master as master is currently too much in WIP state for making a release, as discussed with Alexander and Pau. The release also has several fixes from master backported. Change-Id: I9b37f6354d3f6343ac5befbd6944c1a5786d2b48 --- M TODO-RELEASE M configure.ac M debian/changelog M debian/control 4 files changed, 51 insertions(+), 19 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 02149e5..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,6 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libgtp >1.12.0 new field dir_tun_flags in struct pdp_t -libgtp >1.12.0 gtp_set_cb_update_context_ind(), gtp_update_context_resp() -libosmo-gsup-client >1.8.0 osmo_gsup_client_is_connected(), osmo_gsup_client_get_rem_addr(), osmo_gsup_client_get_rem_port() diff --git a/configure.ac b/configure.ac index 5286d2e..f9f6220 100644 --- a/configure.ac +++ b/configure.ac @@ -38,22 +38,22 @@ CFLAGS="$CFLAGS -std=gnu11" dnl checks for libraries -PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.10.0) -PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0) -PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.8.0) -PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.12.0) +PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 1.11.0) +PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 2.0.0) +PKG_CHECK_MODULES(LIBOSMOGSUPCLIENT, libosmo-gsup-client >= 1.9.0) +PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.13.0) # Enable/disable 3G aka IuPS + IuCS support? AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])], [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"]) if test "x$osmo_ac_iu" = "xyes" ; then - PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.9.0) + PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 2.1.0) PKG_CHECK_MODULES(LIBASN1C, libasn1c >= 0.9.30) - PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.6.0) + PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap >= 1.7.0) AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support]) fi AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes") diff --git a/debian/changelog b/debian/changelog index a1f0216..7bc1351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +osmo-sgsn (1.13.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context + * gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx + * Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE + * Handle rx UpdatePDPCtxReq with Tunnel Direct Flags EI=1 + * Fix double free during RAU with unexpected Old RAI + * llc: Mark old/current tlli as all 1's when unassigning LLME + * ranap: Fix decoding of padded ITU X.213 IPv4 TLA in Rab Ass Resp + * ranap: Reject ActivatePDPCtx from UE if RABAssResp parsing fails + * jenkins.sh: libosmo-netif no longer depends on libosmo-abis + * vty: Avoid accessing gsupclient object fields directly + * sgsn_vty: Drop unneeded use of abis/ipa.h header + * jenkins.sh: No need to build libosmo-sigtran with doxygen + + [ Alexander Couzens ] + * includes: sgsn.h: use full path include for gtp.h + * includes: add forward declartion of external types + * Replace gprs_ra_id with modern osmo_routing_area_id + * GTP: CreatePDPContext: only use IMEISV IE when IMEISV is known + * GMM: rework PDP context status + * gprs_ms_net_cap_gea_mask(): protect against empty MS Network Capabilities + + [ Vadim Yanitskiy ] + * build: remove indirect libosmo-netif dependency + * build: do not link against libosmo-abis + * sm: pdpctx_timer_stop(): warn about timer not running + + [ Oliver Smith ] + * debian/control: remove build-dep: libosmo-sccp-dev + * contrib/jenkins: libosmo-sccp -> libosmo-sigtran + + -- Oliver Smith <osmith(a)sysmocom.de> Thu, 13 Feb 2025 15:10:23 +0100 + osmo-sgsn (1.12.0) unstable; urgency=medium [ Andreas Eversberg ] diff --git a/debian/control b/debian/control index 2a3d427..acb4230 100644 --- a/debian/control +++ b/debian/control @@ -11,13 +11,13 @@ pkg-config, libtalloc-dev, libc-ares-dev, - libgtp-dev (>= 1.12.0), - libosmocore-dev (>= 1.10.0), - libosmo-abis-dev (>= 1.6.0), - libosmo-gsup-client-dev (>= 1.8.0), + libgtp-dev (>= 1.13.0), + libosmocore-dev (>= 1.11.0), + libosmo-abis-dev (>= 2.0.0), + libosmo-gsup-client-dev (>= 1.9.0), libasn1c-dev (>= 0.9.30), - libosmo-ranap-dev (>= 1.6.0), - libosmo-sigtran-dev (>= 1.9.0), + libosmo-ranap-dev (>= 1.7.0), + libosmo-sigtran-dev (>= 2.1.0), osmo-gsm-manuals-dev (>= 1.6.0) Standards-Version: 3.9.8 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-sgsn -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39549?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-sgsn Gerrit-Branch: pespin/base Gerrit-Change-Id: I9b37f6354d3f6343ac5befbd6944c1a5786d2b48 Gerrit-Change-Number: 39549 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>

1 0

2026

2025

2024

2023

2022

gerrit-log