- gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: latest: handle "version is None"
by fixeria 31 Jul '24

31 Jul '24

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37668?usp=email ) Change subject: OBS: latest: handle "version is None" ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I69cb884d499d1f6a8cae4b4585d31b5bc095fd6e Gerrit-Change-Number: 37668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 Jul 2024 10:32:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: OBS: latest: handle "version is None"
by osmith 31 Jul '24

31 Jul '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37668?usp=email ) Change subject: OBS: latest: handle "version is None" ...................................................................... OBS: latest: handle "version is None" Fix the Osmocom_OBS_latest job, which currently fails on git repositories where no tagged release can be found with: File "/obs/lib/debian.py", line 96, in transform_version if "osmo-epdg-" in version: ^^^^^^^^^^^^^^^^^^^^^^^ TypeError: argument of type 'NoneType' is not iterable Fixes: 9b36d2a8 ("OBS: fix up-to-date check for strongswan-epdg") Change-Id: I69cb884d499d1f6a8cae4b4585d31b5bc095fd6e --- M scripts/obs/lib/debian.py 1 file changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/68/37668/1 diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 68459c8..85fcc5f 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -93,6 +93,9 @@ def transform_version(version): + if version is None: + return None + if "osmo-epdg-" in version: version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37668?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I69cb884d499d1f6a8cae4b4585d31b5bc095fd6e Gerrit-Change-Number: 37668 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-sgsn[master]: Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context
by pespin 30 Jul '24

30 Jul '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37636?usp=email ) Change subject: Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context ...................................................................... Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context Scenario: UE activates a PDP context, then after a while goes PMM IDLE (Iu conn is destroyed but PDP is kept). When UE connects through Iu again, it sends eg. RAU or ServiceRequest with pdp_status bitmask statis the active NSAPIs. If some NSAPI (PDP context) is enabled at SGSN but doesn't show up in the bitmask, SGSN will destroy the PDP context with GGSN (DeletePDPContextReq) towards GGSN prior to re-creating it. When SGSN receives the DeletePDPContextResp, it would forward a DeactivatePDPContextReq to the UE for a PDP context which was not known by the UE anymore, this is wrong. With this patch, the state of the NSAPI/PDP at the UE side is tracked, and used to know whether when the PDP gets deleted on the GGSN side then it needs to also be deleted on the Iu side. Change-Id: I0ccd9228d71c29248b5f510356dbfdb09565dc30 --- M include/osmocom/sgsn/pdpctx.h M src/sgsn/gprs_gmm.c M src/sgsn/sgsn_libgtp.c 3 files changed, 32 insertions(+), 3 deletions(-) Approvals: lynxis lazus: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/sgsn/pdpctx.h b/include/osmocom/sgsn/pdpctx.h index 255a77d..f3cf0ed 100644 --- a/include/osmocom/sgsn/pdpctx.h +++ b/include/osmocom/sgsn/pdpctx.h @@ -68,6 +68,7 @@ //uint32_t qos_profile_neg; uint8_t radio_prio; //uint32_t charging_id; + bool ue_pdp_active; /* PDP Context is active for this NSAPI? */ struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 653c425..ab8b7ef 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1591,6 +1591,7 @@ 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 */ diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 9edd0c6..4885ada 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -378,6 +378,7 @@ rc = gsm48_tx_gsm_act_pdp_acc(pctx); if (rc < 0) return rc; + pctx->ue_pdp_active = true; if (pctx->mm->ran_type == MM_CTX_T_GERAN_Gb) { /* Send SNDCP XID to MS */ @@ -567,9 +568,11 @@ return -ENOTSUP; #endif } - - /* Confirm deactivation of PDP context to MS */ - rc = gsm48_tx_gsm_deact_pdp_acc(pctx); + if (pctx->ue_pdp_active) { + /* Confirm deactivation of PDP context to MS */ + rc = gsm48_tx_gsm_deact_pdp_acc(pctx); + pctx->ue_pdp_active = false; + } } else { LOGPDPCTXP(LOGL_NOTICE, pctx, "Not deactivating SNDCP layer since the MM context " -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37636?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0ccd9228d71c29248b5f510356dbfdb09565dc30 Gerrit-Change-Number: 37636 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-sgsn[master]: Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context
by pespin 30 Jul '24

30 Jul '24

Attention is currently required from: daniel, lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37636?usp=email ) Change subject: Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37636?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0ccd9228d71c29248b5f510356dbfdb09565dc30 Gerrit-Change-Number: 37636 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 30 Jul 2024 19:48:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-sgsn[master]: gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx
by pespin 30 Jul '24

30 Jul '24

Attention is currently required from: fixeria, pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37596?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx ...................................................................... gtp: Set Direct Tunnel Flags DTI during UpdatePDPCtx This is required as per TS 28.060 to tell the GGSN that the remote Address/TEID it is receiving it's the one of the RNC. Upon receiving a GTPU Error Indication, the GGSN knowing it's using DirectTunnel, can then update the SGSN with UpdatePDPContextReq with Direct Tunnel Flags DTI=1 EI=1 and then the SGSN can decide whether reconfigure the Direct Tunnel or switch to 2-leg tunnel until the connection with RNC/UE can be reestablished. Depends: osmo-ggsn.git Change-Id Ia3e360a35d30858eab1e438dc2508fd756c2e22e Related: SYS#5435 Change-Id: Iefe73eeea41df0c55db673194c9e9547504cbf0d --- M TODO-RELEASE M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/gprs_ranap.c 3 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/96/37596/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iefe73eeea41df0c55db673194c9e9547504cbf0d Gerrit-Change-Number: 37596 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-sgsn[master]: Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE
by pespin 30 Jul '24

30 Jul '24

Attention is currently required from: daniel, fixeria, lynxis lazus, pespin. Hello Jenkins Builder, daniel, fixeria, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37644?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+2 by lynxis lazus, Verified-1 by Jenkins Builder Change subject: Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE ...................................................................... Announce SGSN own TEID during UpdatePDPCtxReq after UE goes PMM-IDLE When the UE/RNC closes the Iu conn (while keeping the PDP Context activated), the SGSN updates the GGSN to point the GTPU tunnel to itself. Unfortunately, only the IP address was being updated while the TEID was kept the same (the one from the RNC). As a result, when new MT data arrived at the GGSN, it would forward it over GTPU to the SGSN using the incorrect RNC TEID, which the libgtp stack at osmo-sgsn would silently drop due to not being known (because it was >PDP_MAX=1024). The issue can be triggered in test SGSN_Tests_Iu.TC_pmm_idle_rx_mt_data. Related: OS#5773 Related: SYS#5435 Change-Id: I782aa43c71569922a945bd44544bb1388bf8c878 --- M include/osmocom/sgsn/pdpctx.h M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/sgsn_libgtp.c 3 files changed, 36 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/44/37644/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37644?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I782aa43c71569922a945bd44544bb1388bf8c878 Gerrit-Change-Number: 37644 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-sgsn[master]: Handle rx UpdatePDPCtxReq with Tunnel Direct Flags EI=1
by pespin 30 Jul '24

30 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37667?usp=email ) Change subject: Handle rx UpdatePDPCtxReq with Tunnel Direct Flags EI=1 ...................................................................... Handle rx UpdatePDPCtxReq with Tunnel Direct Flags EI=1 GGSN informed us that it received an Error Indication when sending DL data to the RNC. This probably means the RNC lost its state, aka crashed or was rebooted. Mark the subscriber as PMM-IDLE, release Iu and point GTPU back to SGSN. Then page the UE so it hopefully re-creates the state at the RNC. Related: OS#6512 Related: OS#6519 Related: SYS#5435 Depends: osmo-ggsn.git Change-Id Ic80a9a928c55b6ff85be96014920bb42793cb943 Change-Id: I76d4c387730fdbfb9e7e0dd23a5afb9e762228b1 --- M TODO-RELEASE M include/osmocom/sgsn/gprs_mm_state_iu_fsm.h M include/osmocom/sgsn/gtp.h M src/sgsn/gprs_mm_state_iu_fsm.c M src/sgsn/sgsn_libgtp.c 5 files changed, 114 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/67/37667/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 79f557b..eb1cdfd 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # 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() diff --git a/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h index 6dae759..1d0333c 100644 --- a/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h +++ b/include/osmocom/sgsn/gprs_mm_state_iu_fsm.h @@ -17,6 +17,7 @@ E_PMM_PS_CONN_RELEASE, E_PMM_PS_CONN_ESTABLISH, E_PMM_RA_UPDATE, /* = Serving RNC relocation */ + E_PMM_RX_GGSN_GTPU_DT_EI, /* param: struct sgsn_pdp_ctx *pctx */ }; extern struct osmo_fsm mm_state_iu_fsm; diff --git a/include/osmocom/sgsn/gtp.h b/include/osmocom/sgsn/gtp.h index 2aec553..1d76243 100644 --- a/include/osmocom/sgsn/gtp.h +++ b/include/osmocom/sgsn/gtp.h @@ -26,5 +26,4 @@ int sgsn_gtp_data_req(struct gprs_ra_id *ra_id, int32_t tlli, uint8_t nsapi, struct msgb *msg, uint32_t npdu_len, uint8_t *npdu); int sgsn_delete_pdp_ctx(struct sgsn_pdp_ctx *pctx); -void sgsn_pdp_upd_gtp_u(struct sgsn_pdp_ctx *pdp, void *addr, size_t alen); int send_act_pdp_cont_acc(struct sgsn_pdp_ctx *pctx); diff --git a/src/sgsn/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index e770b7c..629f16c 100644 --- a/src/sgsn/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c @@ -30,6 +30,7 @@ #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/gprs_ranap.h> #include <osmocom/sgsn/gtp.h> +#include <osmocom/sgsn/gtp_ggsn.h> #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/mmctx.h> @@ -44,22 +45,30 @@ #define mm_state_iu_fsm_state_chg(fi, NEXT_STATE) \ osmo_tdef_fsm_inst_state_chg(fi, NEXT_STATE, mm_state_iu_fsm_timeouts, sgsn->cfg.T_defs, -1) -static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx) + +static void pdpctx_change_gtpu_endpoint_to_sgsn(const struct sgsn_mm_ctx *mm_ctx, struct sgsn_pdp_ctx *pdp) { char buf[INET_ADDRSTRLEN]; + LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s/0x%08x -> %s/0x%08x\n", + sgsn_gtp_ntoa(&pdp->lib->gsnlu), pdp->lib->teid_own, + inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)), + pdp->sgsn_teid_own); + pdp->lib->gsnlu.l = sizeof(sgsn->cfg.gtp_listenaddr.sin_addr); + memcpy(pdp->lib->gsnlu.v, &sgsn->cfg.gtp_listenaddr.sin_addr, + sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); + pdp->lib->teid_own = pdp->sgsn_teid_own; + /* Disable Direct Tunnel Flags DTI. Other flags make no sense here, so also set to 0. */ + pdp->lib->dir_tun_flags.l = 1; + pdp->lib->dir_tun_flags.v[0] = 0x00; +} + +static void mmctx_change_gtpu_endpoints_to_sgsn(struct sgsn_mm_ctx *mm_ctx, struct sgsn_pdp_ctx *pdp_skip_gtp_upd_req) +{ struct sgsn_pdp_ctx *pdp; llist_for_each_entry(pdp, &mm_ctx->pdp_list, list) { - LOGMMCTXP(LOGL_INFO, mm_ctx, "Changing GTP-U endpoints %s/0x%08x -> %s/0x%08x\n", - sgsn_gtp_ntoa(&pdp->lib->gsnlu), pdp->lib->teid_own, - inet_ntop(AF_INET, &sgsn->cfg.gtp_listenaddr.sin_addr, buf, sizeof(buf)), - pdp->sgsn_teid_own); - pdp->lib->teid_own = pdp->sgsn_teid_own; - /* Disable Direct Tunnel Flags DTI. Other flags make no sense here, so also set to 0. */ - pdp->lib->dir_tun_flags.l = 1; - pdp->lib->dir_tun_flags.v[0] = 0x00; - sgsn_pdp_upd_gtp_u(pdp, - &sgsn->cfg.gtp_listenaddr.sin_addr, - sizeof(sgsn->cfg.gtp_listenaddr.sin_addr)); + pdpctx_change_gtpu_endpoint_to_sgsn(mm_ctx, pdp); + if (pdp != pdp_skip_gtp_upd_req) + gtp_update_context(pdp->ggsn->gsn, pdp->lib, pdp, &pdp->lib->hisaddr0); } } @@ -71,6 +80,11 @@ break; case E_PMM_PS_DETACH: break; + case E_PMM_RX_GGSN_GTPU_DT_EI: + /* This should in general not happen, since Direct Tunnel is not + * enabled during PMM-IDLE, but there may be a race condition of + * packets/events, so simply ignore it. */ + break; } } @@ -82,6 +96,7 @@ case E_PMM_PS_CONN_RELEASE: sgsn_ranap_iu_free(ctx); mm_state_iu_fsm_state_chg(fi, ST_PMM_IDLE); + mmctx_change_gtpu_endpoints_to_sgsn(ctx, NULL); break; case E_PMM_PS_DETACH: sgsn_ranap_iu_release_free(ctx, NULL); @@ -89,16 +104,15 @@ break; case E_PMM_RA_UPDATE: break; + case E_PMM_RX_GGSN_GTPU_DT_EI: /* GTPU Direct Tunnel (RNC<->GGSN): GGSN Received Error Indication when transmitting DL data*/ + struct sgsn_pdp_ctx *pctx = data; + sgsn_ranap_iu_free(ctx); + mm_state_iu_fsm_state_chg(fi, ST_PMM_IDLE); + mmctx_change_gtpu_endpoints_to_sgsn(ctx, pctx); + break; } } -static void st_pmm_idle_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) -{ - struct sgsn_mm_ctx *ctx = fi->priv; - - mmctx_change_gtpu_endpoints_to_sgsn(ctx); -} - static void st_pmm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data) { switch(event) { @@ -109,12 +123,19 @@ case E_PMM_PS_DETACH: mm_state_iu_fsm_state_chg(fi, ST_PMM_DETACHED); break; + case E_PMM_RX_GGSN_GTPU_DT_EI: + /* This should in general not happen, since Direct Tunnel is not + * enabled during PMM-IDLE, but there may be a race condition of + * packets/events, so simply ignore it. */ + break; } } static struct osmo_fsm_state mm_state_iu_fsm_states[] = { [ST_PMM_DETACHED] = { - .in_event_mask = X(E_PMM_PS_ATTACH) | X(E_PMM_PS_DETACH), + .in_event_mask = X(E_PMM_PS_ATTACH) | + X(E_PMM_PS_DETACH) | + X(E_PMM_RX_GGSN_GTPU_DT_EI), .out_state_mask = X(ST_PMM_CONNECTED), .name = "Detached", .action = st_pmm_detached, @@ -123,7 +144,8 @@ .in_event_mask = X(E_PMM_PS_CONN_RELEASE) | X(E_PMM_RA_UPDATE) | - X(E_PMM_PS_DETACH), + X(E_PMM_PS_DETACH) | + X(E_PMM_RX_GGSN_GTPU_DT_EI), .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_IDLE), .name = "Connected", .action = st_pmm_connected, @@ -132,10 +154,10 @@ .in_event_mask = X(E_PMM_PS_DETACH) | X(E_PMM_PS_CONN_ESTABLISH) | - X(E_PMM_PS_ATTACH), + X(E_PMM_PS_ATTACH) | + X(E_PMM_RX_GGSN_GTPU_DT_EI), .out_state_mask = X(ST_PMM_DETACHED) | X(ST_PMM_CONNECTED), .name = "Idle", - .onenter = st_pmm_idle_on_enter, .action = st_pmm_idle, }, }; @@ -146,6 +168,7 @@ OSMO_VALUE_STRING(E_PMM_PS_CONN_ESTABLISH), OSMO_VALUE_STRING(E_PMM_PS_DETACH), OSMO_VALUE_STRING(E_PMM_RA_UPDATE), + OSMO_VALUE_STRING(E_PMM_RX_GGSN_GTPU_DT_EI), { 0, NULL } }; diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index f497609..39dcc7a 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -55,6 +55,7 @@ #include <osmocom/sgsn/gprs_ranap.h> #include <osmocom/sgsn/gprs_gmm_fsm.h> #include <osmocom/sgsn/gprs_mm_state_gb_fsm.h> +#include <osmocom/sgsn/gprs_mm_state_iu_fsm.h> #include <osmocom/sgsn/gtp_ggsn.h> #include <osmocom/sgsn/gtp_mme.h> #include <osmocom/sgsn/sgsn_rim.h> @@ -468,13 +469,6 @@ return EOF; } -void sgsn_pdp_upd_gtp_u(struct sgsn_pdp_ctx *pdp, void *addr, size_t alen) -{ - pdp->lib->gsnlu.l = alen; - memcpy(pdp->lib->gsnlu.v, addr, alen); - gtp_update_context(pdp->ggsn->gsn, pdp->lib, pdp, &pdp->lib->hisaddr0); -} - void sgsn_ggsn_echo_req(struct sgsn_ggsn_ctx *ggc) { LOGGGSN(ggc, LOGL_INFO, "GTP Tx Echo Request\n"); @@ -655,6 +649,52 @@ return 0; } +/* Called whenever a PDP context is updated from the GGSN for any reason */ +static int cb_update_context_ind(struct pdp_t *pdp) +{ + struct sgsn_pdp_ctx *pctx; + struct sgsn_mm_ctx *mm; + int rc; + + LOGPDPX(DGPRS, LOGL_INFO, pdp, "Context %p was updated\n", pdp); + + pctx = pdp->priv; + if (!pctx) { + LOGP(DGPRS, LOGL_NOTICE, + "GTP DATA IND from GGSN for unknown PDP\n"); + return -EIO; + } + mm = pctx->mm; + if (!mm) { + LOGP(DGPRS, LOGL_ERROR, + "PDP context (address=%u) without MM context!\n", + pctx->address); + return -EIO; + } + + if (mm->ran_type == MM_CTX_T_UTRAN_Iu) { +#ifdef BUILD_IU + if (pdp->dir_tun_flags.v[0] & 0x04) { /* EI bit set ? */ + /* GGSN informed us that it received an Error Indication when sending DL data to the RNC. + * This probably means the RNC lost its state, aka crashed or was rebooted. + * Page the UE so it re-creates the state at the RNC. */ + LOGMMCTXP(LOGL_INFO, mm, + "GGSN received ErrorInd from RNC while tx DL data. Paging UE in state %s\n", + osmo_fsm_inst_state_name(mm->gmm_fsm)); + rc = osmo_fsm_inst_dispatch(mm->iu.mm_state_fsm, E_PMM_RX_GGSN_GTPU_DT_EI, pctx); + rc = gtp_update_context_resp(sgsn->gsn, pdp, + GTPCAUSE_ACC_REQ); + ranap_iu_page_ps(mm->imsi, &mm->p_tmsi, mm->ra.lac, mm->ra.rac); + return rc; + } +#endif + } + + rc = gtp_update_context_resp(sgsn->gsn, pdp, + GTPCAUSE_ACC_REQ); + return rc; +} + /* Called whenever a PDP context is deleted for any reason */ static int cb_delete_context(struct pdp_t *pdp) { @@ -951,6 +991,7 @@ } /* Register callbackcs with libgtp */ + gtp_set_cb_update_context_ind(gsn, cb_update_context_ind); gtp_set_cb_delete_context(gsn, cb_delete_context); gtp_set_cb_conf(gsn, cb_conf); gtp_set_cb_recovery3(gsn, cb_recovery3); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/37667?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I76d4c387730fdbfb9e7e0dd23a5afb9e762228b1 Gerrit-Change-Number: 37667 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ggsn[master]: gtp: Allow setting callback to receive update_context_ind
by pespin 30 Jul '24

30 Jul '24

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/37597?usp=email ) Change subject: gtp: Allow setting callback to receive update_context_ind ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37597?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: Ic80a9a928c55b6ff85be96014920bb42793cb943 Gerrit-Change-Number: 37597 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 30 Jul 2024 19:41:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ggsn[master]: gtp: Allow UpdatePDPContext initiated by GGSN
by pespin 30 Jul '24

30 Jul '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/37666?usp=email ) Change subject: gtp: Allow UpdatePDPContext initiated by GGSN ...................................................................... gtp: Allow UpdatePDPContext initiated by GGSN The Update PDP Context procedure can be initiated GGSN -> SGSN, as described in TS 29.060 7.3.3. Related: OS#6512 Change-Id: I1c3441c71b90c5bbf6f4545484586222e6180fe1 --- M gtp/gtp.c 1 file changed, 26 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/66/37666/1 diff --git a/gtp/gtp.c b/gtp/gtp.c index 8736cad..9b68315 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -1899,8 +1899,9 @@ } if (version == 1) { - /* TEID (mandatory) */ - if (gtpie_gettv4(ie, GTPIE_TEI_DI, 0, &pdp->teid_gn)) { + /* TEID (mandatory SGSN->GGSN, Optional SGSN<-GGSN) */ + if (gtpie_gettv4(ie, GTPIE_TEI_DI, 0, &pdp->teid_gn) && + gsn->mode == GTP_MODE_GGSN) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_MISSING); GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Missing mandatory information field\n"); @@ -1954,9 +1955,10 @@ pdp, GTPCAUSE_MAN_IE_MISSING); } - /* SGSN address for user traffic (mandatory) */ + /* SGSN address for user traffic (mandatory SGSN->GGSN, optional SGSN<-GGSN) */ if (gtpie_gettlv(ie, GTPIE_GSN_ADDR, 1, &pdp->gsnru.l, - &pdp->gsnru.v, sizeof(pdp->gsnru.v))) { + &pdp->gsnru.v, sizeof(pdp->gsnru.v)) && + gsn->mode == GTP_MODE_GGSN) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_MISSING); GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Missing mandatory information field\n"); @@ -1966,9 +1968,10 @@ } if (version == 1) { - /* QoS (mandatory) */ + /* QoS (mandatory SGSN->GGSN, optional SGSN<-GGSN) */ if (gtpie_gettlv(ie, GTPIE_QOS_PROFILE, 0, &pdp->qos_req.l, - &pdp->qos_req.v, sizeof(pdp->qos_req.v))) { + &pdp->qos_req.v, sizeof(pdp->qos_req.v)) && + gsn->mode == GTP_MODE_GGSN) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_MISSING); GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Missing mandatory information field\n"); @@ -1978,7 +1981,7 @@ GTPCAUSE_MAN_IE_MISSING); } - /* TFT (conditional) */ + /* TFT (conditional SGSN->GGSN, optional SGSN<-GGSN) */ if (gtpie_gettlv(ie, GTPIE_TFT, 0, &pdp->tft.l, &pdp->tft.v, sizeof(pdp->tft.v))) { } @@ -2100,8 +2103,7 @@ } /* Direct Tunnel Flags */ - if (gsn->mode == GTP_MODE_GGSN && - gtpie_gettlv(ie, GTPIE_DIR_TUN_FLAGS, 0, &pdp->dir_tun_flags.l, + if (gtpie_gettlv(ie, GTPIE_DIR_TUN_FLAGS, 0, &pdp->dir_tun_flags.l, &pdp->dir_tun_flags.v, sizeof(pdp->dir_tun_flags.v))) { } } @@ -2820,8 +2822,7 @@ } if ((gsn->mode == GTP_MODE_GGSN) && - ((pheader->type == GTP_CREATE_PDP_RSP) || - (pheader->type == GTP_UPDATE_PDP_RSP))) { + (pheader->type == GTP_CREATE_PDP_RSP)) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_UNEXPECT); GTP_LOGPKG(LOGL_ERROR, &peer, buffer, status, @@ -2831,8 +2832,7 @@ } if ((gsn->mode == GTP_MODE_SGSN) && - ((pheader->type == GTP_CREATE_PDP_REQ) || - (pheader->type == GTP_UPDATE_PDP_REQ))) { + (pheader->type == GTP_CREATE_PDP_REQ)) { rate_ctr_inc2(gsn->ctrg, GSN_CTR_PKT_UNEXPECT); GTP_LOGPKG(LOGL_ERROR, &peer, buffer, status, -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/37666?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I1c3441c71b90c5bbf6f4545484586222e6180fe1 Gerrit-Change-Number: 37666 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: library/GTPv1U_Templates: Mark parameters as templates
by pespin 30 Jul '24

30 Jul '24

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: library/GTPv1U_Templates: Mark parameters as templates ...................................................................... library/GTPv1U_Templates: Mark parameters as templates Change-Id: I278f7dbc64704c1ba2b8a75d6f540ac52b067598 --- M library/GTPv1C_Templates.ttcn M library/GTPv1U_Templates.ttcn 2 files changed, 44 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/37645/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37645?usp=email 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: I278f7dbc64704c1ba2b8a75d6f540ac52b067598 Gerrit-Change-Number: 37645 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log