- gerrit-log - lists.osmocom.org

[XS] Change in pysim[master]: pySim-prog: add FIXME note to tell that writing hlr.db files is broken
by dexter 16 Sep '24

16 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38162?usp=email ) Change subject: pySim-prog: add FIXME note to tell that writing hlr.db files is broken ...................................................................... pySim-prog: add FIXME note to tell that writing hlr.db files is broken The writing to osmo-hlr SQLITE files is broken since the SQLITE format has evolved over time. Let's add a FIXME note to tell that this needs fixing. Related: SYS#4120 Change-Id: I2b23f8bb9f3c2adeb48b010834057f5b4fb1e626 --- M pySim-prog.py 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/62/38162/1 diff --git a/pySim-prog.py b/pySim-prog.py index 8d330cb..2e299a6 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -622,6 +622,7 @@ def write_params_hlr(opts, params): + # FIXME: The format of the osmo-hlr database has evolved, so that the code below will no longer work. # SQLite3 OpenBSC HLR if opts.write_hlr: import sqlite3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38162?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2b23f8bb9f3c2adeb48b010834057f5b4fb1e626 Gerrit-Change-Number: 38162 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim-prog: treat --imsi and --iccid equally
by dexter 16 Sep '24

16 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38163?usp=email ) Change subject: pySim-prog: treat --imsi and --iccid equally ...................................................................... pySim-prog: treat --imsi and --iccid equally When using a CSV file, we can either read the IMSI or ICCID from the CSV file before programming. However, should also be possible to supply both manually to identify the CSV file entry using the --imsi or --iccid option. This currently only works for the IMSI, but not for the ICCID. Related: SYS#4120 Change-Id: Id3083c7794a7bd59501997f22afdc23bad3069e6 --- M pySim-prog.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/63/38163/1 diff --git a/pySim-prog.py b/pySim-prog.py index 2e299a6..3470c98 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -730,12 +730,12 @@ if opts.source == 'cmdline': cp = gen_parameters(opts) elif opts.source == 'csv': - imsi = None - iccid = None if opts.read_iccid: (res, _) = scc.read_binary(['3f00', '2fe2'], length=10) iccid = dec_iccid(res) - elif opts.read_imsi: + else: + iccid = opts.iccid + if opts.read_imsi: (res, _) = scc.read_binary(EF['IMSI']) imsi = swap_nibbles(res)[3:] else: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38163?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Id3083c7794a7bd59501997f22afdc23bad3069e6 Gerrit-Change-Number: 38163 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in pysim[master]: pySim-prog: generate Ki and OPc value using _digits() function
by dexter 16 Sep '24

16 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38164?usp=email ) Change subject: pySim-prog: generate Ki and OPc value using _digits() function ...................................................................... pySim-prog: generate Ki and OPc value using _digits() function The _digits() function is used in the context of auto generating the card individual data using a random seed (--secret) and a card number. (--num). Unfortunately the Ki and the OPc value are not covered by this mechanism, which means that even when the card number and the random seed remain static, the Ki and the OPc value are always changing. Related: SYS#4120 Change-Id: Ib53d9d04a2073dafcca7cd21b0324bee5a23c540 --- M pySim-prog.py 1 file changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/64/38164/1 diff --git a/pySim-prog.py b/pySim-prog.py index 3470c98..3ab644e 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -219,13 +219,21 @@ parser.error( "Can't give ICCID/IMSI for batch mode, need to use automatic parameters ! see --num and --secret for more information") + if options.secret is None: + options.secret = ''.join(random.choices(string.ascii_letters + string.digits, k=32)) + if options.num is None: + options.num = random.randrange(1000000) + return options -def _digits(secret, usage, len, num): +def _digits(secret, usage, len, num, hex = False): seed = secret + usage + '%d' % num s = hashlib.sha1(seed.encode()) - d = ''.join(['%02d' % x for x in s.digest()]) + if hex: + d = ''.join(['%02x' % x for x in s.digest()]) + else: + d = ''.join(['%02d' % x for x in s.digest()]) return d[0:len] @@ -431,7 +439,7 @@ if not re.match('^[0-9a-fA-F]{32}$', ki): raise ValueError('Ki needs to be 128 bits, in hex format') else: - ki = ''.join(['%02x' % random.randrange(0, 256) for i in range(16)]) + ki = _digits(opts.secret, 'ki', 32, opts.num, hex = True) # OPC (random) if opts.opc is not None: @@ -442,7 +450,7 @@ elif opts.op is not None: opc = derive_milenage_opc(ki, opts.op) else: - opc = ''.join(['%02x' % random.randrange(0, 256) for i in range(16)]) + opc = _digits(opts.secret, 'opc', 32, opts.num, hex = True) pin_adm = sanitize_pin_adm(opts.pin_adm, opts.pin_adm_hex) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38164?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ib53d9d04a2073dafcca7cd21b0324bee5a23c540 Gerrit-Change-Number: 38164 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in pysim[master]: pySim-prog: fix commandline parameter check for CSV mode
by dexter 16 Sep '24

16 Sep '24

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/38165?usp=email ) Change subject: pySim-prog: fix commandline parameter check for CSV mode ...................................................................... pySim-prog: fix commandline parameter check for CSV mode The CSV mode needs one of the four additional parameters: --imsi --iccid, --read-iccid or --read-imsi. Also this check is unrelated to the batch mode. The CSV file parameter reading works independently from the batch mode. Related: SYS#4120 Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f --- M pySim-prog.py 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/38165/1 diff --git a/pySim-prog.py b/pySim-prog.py index 3ab644e..b4221fb 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -197,9 +197,8 @@ return options if options.source == 'csv': - if (options.imsi is None) and (options.batch_mode is False) and (options.read_imsi is False) and (options.read_iccid is False): - parser.error( - "CSV mode needs either an IMSI, --read-imsi, --read-iccid or batch mode") + if (options.imsi is None) and (options.iccid is None) and (options.read_imsi is False) and (options.read_iccid is False): + parser.error("CSV mode requires one additional parameter: --read-iccid, --read-imsi, --iccid or --imsi") if options.read_csv is None: parser.error("CSV mode requires a CSV input file") elif options.source == 'cmdline': -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38165?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1292afb85122ed2b7944d02ede69c928a453866f Gerrit-Change-Number: 38165 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in osmo-sgsn[osmith/1.12.1]: llc: Mark old/current tlli as all 1's when unassigning LLME
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38156?usp=email ) Change subject: llc: Mark old/current tlli as all 1's when unassigning LLME ...................................................................... llc: Mark old/current tlli as all 1's when unassigning LLME TS 44.064 section 8.3.3 (and other sections) talk about special unassigned value of "all 1's", but I couldn't find any reference to a "all 0's" specific value/meaning. In practice in the code this may not be super important since those values may not ve checked due to the FSM state, but in any case they are initially set to all 1's, so it makes total sense to re-set them to the same unassigned value instead of a randomly chosen all 0's value. Change-Id: I660c8d0ef08b34f8cb74fd51b5c59e5628d687ae (cherry picked from commit 35c178e84d25a216a5c2d9bd1320d072e36937fa) --- M src/sgsn/gprs_llc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/56/38156/1 diff --git a/src/sgsn/gprs_llc.c b/src/sgsn/gprs_llc.c index 6f56385..82e876d 100644 --- a/src/sgsn/gprs_llc.c +++ b/src/sgsn/gprs_llc.c @@ -1112,7 +1112,7 @@ llme->state = GPRS_LLMS_ASSIGNED; } else if (old_tlli != TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { /* TLLI Unassignment 8.3.3) */ - llme->tlli = llme->old_tlli = 0; + llme->tlli = llme->old_tlli = TLLI_UNASSIGNED; llme->state = GPRS_LLMS_UNASSIGNED; for (i = 0; i < ARRAY_SIZE(llme->lle); i++) { struct gprs_llc_lle *l = &llme->lle[i]; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38156?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I660c8d0ef08b34f8cb74fd51b5c59e5628d687ae Gerrit-Change-Number: 38156 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-sgsn[osmith/1.12.1]: sm: pdpctx_timer_stop(): warn about timer not running
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38157?usp=email ) Change subject: sm: pdpctx_timer_stop(): warn about timer not running ...................................................................... sm: pdpctx_timer_stop(): warn about timer not running Similarly to 282de031, this commit turns errors like: DGPRS ERROR PDP(---/0) Stopping PDP timer 3395 but 0 is running into warnings with a more accurate reason: DGPRS ERROR PDP(---/0) Stopping *inactive* PDP timer 3395 Change-Id: I64932d1cbd93667ab2e94e04691d6601435dba81 Related: 282de031 "gmm: mmctx_timer_stop(): warn about timer not running" (cherry picked from commit 13592d2fa5d5318857e6b67ff038d66afd3eff59) --- M src/sgsn/gprs_sm.c 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/38157/1 diff --git a/src/sgsn/gprs_sm.c b/src/sgsn/gprs_sm.c index 88d1feb..bcf2923 100644 --- a/src/sgsn/gprs_sm.c +++ b/src/sgsn/gprs_sm.c @@ -114,9 +114,14 @@ static void pdpctx_timer_stop(struct sgsn_pdp_ctx *pdp, unsigned int T) { - if (pdp->T != T) + if (!osmo_timer_pending(&pdp->timer)) { + LOGPDPCTXP(LOGL_NOTICE, pdp, "Stopping *inactive* PDP timer %u\n", T); + return; + } + if (pdp->T != T) { LOGPDPCTXP(LOGL_ERROR, pdp, "Stopping PDP timer %u but " "%u is running\n", T, pdp->T); + } osmo_timer_del(&pdp->timer); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I64932d1cbd93667ab2e94e04691d6601435dba81 Gerrit-Change-Number: 38157 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[osmith/1.12.1]: Bump version: 1.12.0.5-193b7 → 1.12.1
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38159?usp=email ) Change subject: Bump version: 1.12.0.5-193b7 → 1.12.1 ...................................................................... Bump version: 1.12.0.5-193b7 → 1.12.1 Change-Id: I3470865febcc53b63e59cf791869f02d0be3aaa7 --- M debian/changelog 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/59/38159/1 diff --git a/debian/changelog b/debian/changelog index a1f0216..477f270 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +osmo-sgsn (1.12.1) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context + * Fix double free during RAU with unexpected Old RAI + * llc: Mark old/current tlli as all 1's when unassigning LLME + + [ Vadim Yanitskiy ] + * sm: pdpctx_timer_stop(): warn about timer not running + + [ Oliver Smith ] + * debian/control: remove build-dep: libosmo-sccp-dev + + -- Oliver Smith <osmith(a)sysmocom.de> Mon, 16 Sep 2024 12:18:11 +0200 + osmo-sgsn (1.12.0) unstable; urgency=medium [ Andreas Eversberg ] -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I3470865febcc53b63e59cf791869f02d0be3aaa7 Gerrit-Change-Number: 38159 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[XS] Change in osmo-sgsn[osmith/1.12.1]: debian/control: remove build-dep: libosmo-sccp-dev
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38158?usp=email ) Change subject: debian/control: remove build-dep: libosmo-sccp-dev ...................................................................... debian/control: remove build-dep: libosmo-sccp-dev This follows the removal of the libsccp.a and the pkg-config libosmo-sccp.pc from libosmo-sccp.git Related: libosmo-sccp I299a32a2f8f61477cf49c8126567fef2092d5407 Change-Id: I2fc827cf15b7f78173e5ee489abe2c6d12b82c2f (cherry picked from commit a39a564906f138d9cc7d2e7a3bd483921abeeab2) --- M debian/control 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/58/38158/1 diff --git a/debian/control b/debian/control index c9c224b..a4e1528 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,6 @@ libasn1c-dev (>= 0.9.30), libosmo-ranap-dev (>= 1.6.0), libosmo-sigtran-dev (>= 1.9.0), - libosmo-sccp-dev (>= 1.9.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/+/38158?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I2fc827cf15b7f78173e5ee489abe2c6d12b82c2f Gerrit-Change-Number: 38158 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[osmith/1.12.1]: Fix double free during RAU with unexpected Old RAI
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38155?usp=email ) Change subject: Fix double free during RAU with unexpected Old RAI ...................................................................... Fix double free during RAU with unexpected Old RAI If an MS which had an MMCTX at the SGSN sent RAU update with an unexpected Old RA field, the RAU was rejected and LLME (LLC layer) unassigned (freed), because no MMCTX was found matching the wrong old RA. However, an MMCTX may actually exist pointing to that LLME, and hence when the LLME is freed, it stayed unnoticed with a dangling pointer to the freed LLME in ctx->gb.llme. Let's try to harder to avoid this kind of bugs which make osmo-sgsn crash. Once we properly split the code into separate independent layers (LLC, MMCTX, etc.) each holding their own structs, this kind of bugs shouldn't happen anymore. Related: OS#6441 Change-Id: I5a4328c6e945b85dd815215724feecadba59c435 (cherry picked from commit 868d818e6e9c39fcd4acb362708dc162cb4ee7f4) --- M include/osmocom/sgsn/mmctx.h M src/sgsn/gprs_gmm.c M src/sgsn/mmctx.c 3 files changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/55/38155/1 diff --git a/include/osmocom/sgsn/mmctx.h b/include/osmocom/sgsn/mmctx.h index c19f599..5e4662f 100644 --- a/include/osmocom/sgsn/mmctx.h +++ b/include/osmocom/sgsn/mmctx.h @@ -257,6 +257,7 @@ struct sgsn_mm_ctx *sgsn_mm_ctx_by_ptmsi(uint32_t tmsi); struct sgsn_mm_ctx *sgsn_mm_ctx_by_imsi(const char *imsi); struct sgsn_mm_ctx *sgsn_mm_ctx_by_ue_ctx(const void *uectx); +struct sgsn_mm_ctx *sgsn_mm_ctx_by_llme(const struct gprs_llc_llme *llme); /* look-up by matching TLLI and P-TMSI (think twice before using this) */ struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli_and_ptmsi(uint32_t tlli, diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index ab8b7ef..911d42d 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1748,6 +1748,21 @@ * in the MS */ LOGGBP(llme, DMM, LOGL_NOTICE, "LLC XID RESET\n"); gprs_llgmm_reset_oldmsg(msg, GPRS_SAPI_GMM, llme); + + /* The RAU didn't come from expected TLLI+RAI, so it's for sure bad and should be rejected. + * In any case, before unassigning (freeing) the LLME during the REJECT below, make sure + * beforehand that if there's an mmctx relating to that llme it is also freed. + * Otherwise it would be kept pointining at a dangling freed llme object. + */ + mmctx = sgsn_mm_ctx_by_llme(llme); + if (mmctx) { + char old_ra_id_name[32]; + osmo_rai_name_buf(old_ra_id_name, sizeof(old_ra_id_name), &old_ra_id); + LOGMMCTXP(LOGL_NOTICE, mmctx, + "Rx RA Update Request with unexpected TLLI=%08x Old RA=%s (expected Old RA: %s)!\n", + msgb_tlli(msg), old_ra_id_name, osmo_rai_name(&mmctx->ra)); + /* mmctx will be released (and its llme un assigned) after REJECT below. */ + } } /* The MS has to perform GPRS attach */ /* Device is still IMSI attached for CS but initiate GPRS ATTACH, diff --git a/src/sgsn/mmctx.c b/src/sgsn/mmctx.c index 0e93092..459f6cf 100644 --- a/src/sgsn/mmctx.c +++ b/src/sgsn/mmctx.c @@ -105,6 +105,21 @@ return NULL; } + +/* look-up an SGSN MM context based on Gb LLME context (struct gprs_llc_llme)*/ +struct sgsn_mm_ctx *sgsn_mm_ctx_by_llme(const struct gprs_llc_llme *llme) +{ + struct sgsn_mm_ctx *ctx; + + llist_for_each_entry (ctx, &sgsn->mm_list, list) { + if (ctx->ran_type == MM_CTX_T_GERAN_Gb + && llme == ctx->gb.llme) + return ctx; + } + + return NULL; +} + /* look-up a SGSN MM context based on TLLI + RAI */ struct sgsn_mm_ctx *sgsn_mm_ctx_by_tlli(uint32_t tlli, const struct gprs_ra_id *raid) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/38155?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I5a4328c6e945b85dd815215724feecadba59c435 Gerrit-Change-Number: 38155 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[osmith/1.12.1]: Fix DeactPDPCtxAcc when UE goes PMM ENABLED but lost its PDP context
by osmith 16 Sep '24

16 Sep '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/38154?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 (cherry picked from commit 4ced617eb6bb6608b6fcc14f359366551e636923) --- M include/osmocom/sgsn/pdpctx.h M src/sgsn/gprs_gmm.c M src/sgsn/sgsn_libgtp.c 3 files changed, 8 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/54/38154/1 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/+/38154?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: osmith/1.12.1 Gerrit-Change-Id: I0ccd9228d71c29248b5f510356dbfdb09565dc30 Gerrit-Change-Number: 38154 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log