March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Avoid sending NOTIFY in ASP role
by pespin 05 Mar '25

05 Mar '25

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email ) Change subject: xua_asp_fsm: Avoid sending NOTIFY in ASP role ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: merging now since I introduced the bug myself recently and I manually tested the NOTIFY is no longer sent. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 Gerrit-Change-Number: 39702 Gerrit-PatchSet: 1 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Mar 2025 16:49:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Avoid sending NOTIFY in ASP role
by daniel 05 Mar '25

05 Mar '25

Attention is currently required from: fixeria, laforge, osmith, pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email ) Change subject: xua_asp_fsm: Avoid sending NOTIFY in ASP role ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 Gerrit-Change-Number: 39702 Gerrit-PatchSet: 1 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Mar 2025 16:11:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-msc[master]: vlr: add PS support
by neels 05 Mar '25

05 Mar '25

Attention is currently required from: lynxis lazus, pespin. neels has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email ) Change subject: vlr: add PS support ...................................................................... Patch Set 9: Code-Review+1 (2 comments) File src/libvlr/vlr_lu_fsm.c: https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/e7c31aa4_d4264ef6?usp… : PS5, Line 771: /*! count times timer T timed out */ > I'm sure whatever else you put in there will be easier to read, that's really a tongue twister. i will veto block this patch unless you make this: "Tally times timer T triggered timeout" https://gerrit.osmocom.org/c/osmo-msc/+/38490/comment/dd7d5d05_53c9a443?usp… : PS5, Line 1611: fi->T > In this case, you could also pass -1 to it. […] I'm a bit confused about what i meant with my original comment. But I'm also still confused by the two arguments for CS and PS, particularly because there is no VLR that is both CS and PS at the same time, is there? I see in my original comment i tried to find out how by looking for callers... So even though i don't have a good point to make, my gut feel is that this could be less confusing? (if only a comment explaining why this is cool) About the code change you hint, I do see that vlr_timer_secs() says * TODO: we should start using osmo_tdef_fsm_inst_state_chg() */ and that sounds about right to me. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38490?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie9ffeb140c9d354b3a0f4822e2619f623235add0 Gerrit-Change-Number: 38490 Gerrit-PatchSet: 9 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 15:59:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in libosmo-sigtran[master]: xua_asp_fsm: Avoid sending NOTIFY in ASP role
by pespin 05 Mar '25

05 Mar '25

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email ) Change subject: xua_asp_fsm: Avoid sending NOTIFY in ASP role ...................................................................... xua_asp_fsm: Avoid sending NOTIFY in ASP role Fixes: f2e324e2f82efc93fd2a1124fa216d680659ed40 Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 --- M src/xua_asp_fsm.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/02/39702/1 diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 9ad9dce..ec149d1 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -481,14 +481,17 @@ static void xua_asp_fsm_inactive_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct xua_asp_fsm_priv *xafp = fi->priv; + struct osmo_ss7_asp *asp = xafp->asp; /* RFC4666 4.3.4.5: "When an ASP moves from ASP-DOWN to ASP-INACTIVE within a * particular AS, a Notify message SHOULD be sent, by the ASP-UP receptor, * after sending the ASP-UP-ACK, in order to inform the ASP of the current AS * state." + * NOTIFY is only transmitted by roles SG and IPSP. */ struct xua_as_event_asp_inactive_ind_pars pars = { - .asp = xafp->asp, - .asp_requires_notify = (prev_state == XUA_ASP_S_DOWN), + .asp = asp, + .asp_requires_notify = (asp->cfg.role != OSMO_SS7_ASP_ROLE_ASP) && + (prev_state == XUA_ASP_S_DOWN), }; dispatch_to_all_as(fi, XUA_ASPAS_ASP_INACTIVE_IND, &pars); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39702?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I48848a69cabbd1c7279344dc8b2b7e2927894d26 Gerrit-Change-Number: 39702 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-sigtran[master]: AS loadsharing: Introduce AS rate_ctr rx:msu:sls:*
by daniel 05 Mar '25

05 Mar '25

Attention is currently required from: pespin. daniel has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39406?usp=email ) Change subject: AS loadsharing: Introduce AS rate_ctr rx:msu:sls:* ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39406?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I695bd3933a116323db45ab7f45dcf539791139aa Gerrit-Change-Number: 39406 Gerrit-PatchSet: 9 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 05 Mar 2025 15:51:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in osmo-msc[master]: vlr: when receiving imsi detach, purge the subscriber towards HLR
by neels 05 Mar '25

05 Mar '25

Attention is currently required from: lynxis lazus. neels has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38489?usp=email ) Change subject: vlr: when receiving imsi detach, purge the subscriber towards HLR ...................................................................... Patch Set 8: Code-Review+2 (1 comment) File src/libvlr/vlr.c: https://gerrit.osmocom.org/c/osmo-msc/+/38489/comment/2736ab46_60c49f4c?usp… : PS8, Line 1519: rc = vlr_subscr_purge(vsub); (i think i would have added this vlr_subscr_detach() instead, not strong opinion) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38489?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9c2569c45e69b422ce26050b682e6eb26c1c2625 Gerrit-Change-Number: 38489 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 15:47:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: vlr: extend the subscriber invalidate callback with reasons
by neels 05 Mar '25

05 Mar '25

Attention is currently required from: lynxis lazus. neels has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email ) Change subject: vlr: extend the subscriber invalidate callback with reasons ...................................................................... Patch Set 8: Code-Review+2 (1 comment) Patchset: PS8: (summing in past +1 from others to give +2) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5b687318b106a230fcee52deba86649641004b3 Gerrit-Change-Number: 38488 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 15:37:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[S] Change in osmo-msc[master]: vlr: extend the subscriber invalidate callback with reasons
by neels 05 Mar '25

05 Mar '25

Attention is currently required from: lynxis lazus. neels has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email ) Change subject: vlr: extend the subscriber invalidate callback with reasons ...................................................................... Patch Set 8: (6 comments) Patchset: PS8: (summing in past +1 by others to give a +2) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/38488/comment/e58370ca_d66f7b25?usp… : PS5, Line 13: b) if the HLR do a Cancel Location Procedure with reason withdraw > @neels I'm a little bit unsure, if the MSC informs the user. […] I think your idea is correct, that we simply drop the subscriber from the VLR cache. Maybe somewhere in the specs (in the VLR state machine graphs?) they say that some other action could be performed to immediately notify the MS, but as i see it that would be just some kind of optimization. If there is an active conn, we should probably close it with a BSSMAP Clear, which I see in the code is done, so that should be fine. Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/38488/comment/d45ddf3e_2436510f?usp… : PS8, Line 15: d) duplicate entries (unsure if this is valid, but keeping the code as is) duplicate entries are very important to prevent. These obscure cases took some deep thinking to fix back in the days. Search for "evil twin" in MSC_Tests.ttcn. If those tests still pass, you should be fine, IIRC File include/osmocom/vlr/vlr.h: https://gerrit.osmocom.org/c/osmo-msc/+/38488/comment/739ce548_17b48b1e?usp… : PS8, Line 207: enum vlr_inval_reason { these aren't from a spec, right? If they are, a comment to link to it would be great https://gerrit.osmocom.org/c/osmo-msc/+/38488/comment/9cda0e76_0566c5fb?usp… : PS8, Line 260: . : */ (weird comment line break) File src/libmsc/gsm_04_08.c: https://gerrit.osmocom.org/c/osmo-msc/+/38488/comment/5b61aa51_7130904c?usp… : PS8, Line 1587: msc_a_release_cn(msc_a); (re my comment above, this is the release i was talking about, so it is already done properly) -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38488?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie5b687318b106a230fcee52deba86649641004b3 Gerrit-Change-Number: 38488 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 05 Mar 2025 15:36:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: GMM: implement IMEI SV on auth/ciph response
by lynxis lazus 05 Mar '25

05 Mar '25

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39425?usp=email ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: GMM: implement IMEI SV on auth/ciph response ...................................................................... GMM: implement IMEI SV on auth/ciph response The SGSN is requesting the IMEI SV on an auth/ciphering response. Parse the answer of the MS/UE. Change-Id: Ia8b428967a4ce3132a4a63ae10fe610de81c3a29 --- M src/sgsn/gprs_gmm.c 1 file changed, 23 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 b9b13fd..c34c1a1 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -637,6 +637,7 @@ { struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); struct gsm48_auth_ciph_resp *acr = (struct gsm48_auth_ciph_resp *)gh->data; + struct osmo_mobile_identity mi; struct tlv_parsed tp; struct gsm_auth_tuple *at; const char *res_name = "(no response)"; @@ -673,6 +674,28 @@ return -EINVAL; } + /* IMEI SV parsing */ + if (TLVP_LEN(&tp, GSM48_IE_GMM_IMEISV) != 9) { + LOGMMCTXP(LOGL_ERROR, ctx, "-> GMM AUTH AND CIPH RESPONSE: Invalid IMEISV\n"); + return -EINVAL; + } + + /* FIXME: should we allow invalid IMEI SV? Are there phones which have broken SV in hex? */ + if (osmo_mobile_identity_decode(&mi, + TLVP_VAL(&tp, GSM48_IE_GMM_IMEISV), + TLVP_LEN(&tp, GSM48_IE_GMM_IMEISV), + false)) { + LOGMMCTXP(LOGL_ERROR, ctx, "-> GMM AUTH AND CIPH RESPONSE: Cannot decode IMEISV\n"); + return -EINVAL; + } + + if (mi.type != GSM_MI_TYPE_IMEISV) { + LOGMMCTXP(LOGL_ERROR, ctx, "-> GMM AUTH AND CIPH RESPONSE: Invalid MI type found in IMEISV %d\n", mi.type); + return -EINVAL; + } + + memcpy(&ctx->imei, mi.imeisv, ARRAY_SIZE(ctx->imei)); + /* Start with the good old 4-byte SRES */ memcpy(res, TLVP_VAL(&tp, GSM48_IE_GMM_AUTH_SRES), 4); res_len = 4; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39425?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: master Gerrit-Change-Id: Ia8b428967a4ce3132a4a63ae10fe610de81c3a29 Gerrit-Change-Number: 39425 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-sgsn[master]: Assign MME GroupId/Code to remote MMEs
by lynxis lazus 05 Mar '25

05 Mar '25

lynxis lazus has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?usp=email ) Change subject: Assign MME GroupId/Code to remote MMEs ...................................................................... Assign MME GroupId/Code to remote MMEs In preparation to route SGSN Context Req/Resp/Ack the SGSN need to route GTP messages based on the MME GroupId and MME Code. Change-Id: I881aeba904fb6ca815842d36e466a2459ad81913 --- M include/osmocom/sgsn/gtp_mme.h M src/sgsn/gtp_mme.c M src/sgsn/sgsn_vty.c 3 files changed, 61 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified daniel: Looks good to me, approved laforge: Looks good to me, approved diff --git a/include/osmocom/sgsn/gtp_mme.h b/include/osmocom/sgsn/gtp_mme.h index ceea405..8cc8e89 100644 --- a/include/osmocom/sgsn/gtp_mme.h +++ b/include/osmocom/sgsn/gtp_mme.h @@ -5,6 +5,7 @@ #include <osmocom/core/linuxlist.h> #include <osmocom/core/timer.h> #include <osmocom/gprs/protocol/gsm_24_301.h> +#include <osmocom/gsm/gsm23003.h> struct gsn_t; @@ -20,6 +21,9 @@ char *name; struct in_addr remote_addr; + struct osmo_gummei gummei; + bool gummei_valid; + /* is it the default route for outgoing message? are all incoming messages accepted? */ bool default_route; }; @@ -30,6 +34,7 @@ struct sgsn_mme_ctx *sgsn_mme_ctx_by_name(const struct sgsn_instance *sgsn, const char *name); struct sgsn_mme_ctx *sgsn_mme_ctx_by_addr(const struct sgsn_instance *sgsn, const struct in_addr *addr); struct sgsn_mme_ctx *sgsn_mme_ctx_by_route(const struct sgsn_instance *sgsn, const struct osmo_eutran_tai *tai); +struct sgsn_mme_ctx *sgsn_mme_ctx_by_gummei(const struct sgsn_instance *sgsn, const struct osmo_gummei *gummei); struct sgsn_mme_ctx *sgsn_mme_ctx_by_default_route(const struct sgsn_instance *sgsn); void sgsn_mme_ctx_route_add(struct sgsn_mme_ctx *mme, const struct osmo_eutran_tai *tai); diff --git a/src/sgsn/gtp_mme.c b/src/sgsn/gtp_mme.c index 3d7ec76..966b6d7 100644 --- a/src/sgsn/gtp_mme.c +++ b/src/sgsn/gtp_mme.c @@ -131,6 +131,16 @@ return NULL; } +struct sgsn_mme_ctx *sgsn_mme_ctx_by_gummei(const struct sgsn_instance *sgsn, const struct osmo_gummei *gummei) +{ + struct sgsn_mme_ctx *mme; + llist_for_each_entry(mme, &sgsn->mme_list, list) { + if (mme->gummei_valid && !osmo_gummei_cmp(&mme->gummei, gummei)) + return mme; + } + return NULL; +} + struct sgsn_mme_ctx *sgsn_mme_ctx_by_default_route(const struct sgsn_instance *sgsn) { struct sgsn_mme_ctx *mme; diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 42e91e9..7279167 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -235,6 +235,12 @@ osmo_mcc_name(rt->tai.mcc), osmo_mnc_name(rt->tai.mnc, rt->tai.mnc_3_digits), rt->tai.tac, VTY_NEWLINE); } + if (mme->gummei_valid) + vty_out(vty, "%s gummei %s %s %d %d%s", + prefix, + osmo_mcc_name(mme->gummei.plmn.mcc), + osmo_mnc_name(mme->gummei.plmn.mnc, mme->gummei.plmn.mnc_3_digits), + mme->gummei.mme.group_id, mme->gummei.mme.code, VTY_NEWLINE); } static int config_write_sgsn(struct vty *vty) @@ -1781,6 +1787,44 @@ return CMD_SUCCESS; } +DEFUN(cfg_mme_mmei, cfg_mme_mmei_cmd, + "gummei <0-999> <0-999> <0-65535> <0-254>", + "Configure the mme\n" "MCC\n" "MNC\n" "MME GroupId\n" "MME Code") +{ + struct sgsn_mme_ctx *mme = (struct sgsn_mme_ctx *) vty->index; + + const char *mcc = argv[0]; + const char *mnc = argv[1]; + const char *group_id = argv[2]; + const char *code = argv[3]; + + if (osmo_mcc_from_str(mcc, &mme->gummei.plmn.mcc)) { + vty_out(vty, "%% Error decoding MCC: %s%s", mcc, VTY_NEWLINE); + return CMD_WARNING; + } + + if (osmo_mnc_from_str(mnc, &mme->gummei.plmn.mnc, &mme->gummei.plmn.mnc_3_digits)) { + vty_out(vty, "%% Error decoding MNC: %s%s", mnc, VTY_NEWLINE); + return CMD_WARNING; + } + + mme->gummei.mme.code = atoi(code); + mme->gummei.mme.group_id = atoi(group_id); + mme->gummei_valid = true; + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_mme_mmei, cfg_no_mme_mmei_cmd, + "no gummei", + NO_STR "Remove gummei") +{ + struct sgsn_mme_ctx *mme = (struct sgsn_mme_ctx *) vty->index; + mme->gummei_valid = false; + + return CMD_SUCCESS; +} + int sgsn_vty_init(struct sgsn_config *cfg) { g_cfg = cfg; @@ -1857,6 +1901,8 @@ install_element(MME_NODE, &cfg_mme_remote_ip_cmd); install_element(MME_NODE, &cfg_mme_ran_info_relay_default_cmd); install_element(MME_NODE, &cfg_mme_no_ran_info_relay_default_cmd); + install_element(MME_NODE, &cfg_mme_mmei_cmd); + install_element(MME_NODE, &cfg_no_mme_mmei_cmd); install_element(MME_NODE, &cfg_mme_ran_info_relay_tai_cmd); install_element(MME_NODE, &cfg_mme_no_ran_info_relay_tai_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39294?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: master Gerrit-Change-Id: I881aeba904fb6ca815842d36e466a2459ad81913 Gerrit-Change-Number: 39294 Gerrit-PatchSet: 4 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de>

1 0