- gerrit-log - lists.osmocom.org

[M] Change in libosmocore[master]: gsm23.003: add RNC Id
by Jenkins Builder 25 Nov '24

25 Nov '24

Jenkins Builder has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email ) Change subject: gsm23.003: add RNC Id ...................................................................... Patch Set 1: (1 comment) File include/osmocom/gsm/gsm23003.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-20230): https://gerrit.osmocom.org/c/libosmocore/+/38948/comment/15e75b0b_4e828af0?… : PS1, Line 60: struct osmo_plmn_id plmn ; space prohibited before semicolon -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a Gerrit-Change-Number: 38948 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Nov 2024 23:26:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in libosmocore[master]: gsm23.003: make the header self-contained
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email ) Change subject: gsm23.003: make the header self-contained ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5952f5746f7ee9093d9c5c7eaef76952e2c4107b Gerrit-Change-Number: 38949 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 23:26:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[XS] Change in libosmocore[master]: gsm23.003: make the header self-contained
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email ) Change subject: gsm23.003: make the header self-contained ...................................................................... gsm23.003: make the header self-contained size_t was undefined. Change-Id: I5952f5746f7ee9093d9c5c7eaef76952e2c4107b --- M include/osmocom/gsm/gsm23003.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/49/38949/1 diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 3e203a8..2da3288 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -2,6 +2,7 @@ #pragma once +#include <ctype.h> #include <stdint.h> #include <stdbool.h> -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38949?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I5952f5746f7ee9093d9c5c7eaef76952e2c4107b Gerrit-Change-Number: 38949 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in libosmocore[master]: gsm23.003: add RNC Id
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email ) Change subject: gsm23.003: add RNC Id ...................................................................... gsm23.003: add RNC Id The RNC is similar to the GUMMEI, but for 3G. Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a --- M include/osmocom/gsm/gsm23003.h M src/gsm/gsm23003.c M src/gsm/libosmogsm.map 3 files changed, 70 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/48/38948/1 diff --git a/include/osmocom/gsm/gsm23003.h b/include/osmocom/gsm/gsm23003.h index 8b9bcfb..3e203a8 100644 --- a/include/osmocom/gsm/gsm23003.h +++ b/include/osmocom/gsm/gsm23003.h @@ -55,6 +55,12 @@ uint16_t ci; }; +/* 12.4 */ +struct osmo_rnc_id { + struct osmo_plmn_id plmn ; + uint16_t rnc_id; +}; + /* 12.5 */ struct osmo_service_area_id { struct osmo_location_area_id lai; @@ -137,6 +143,9 @@ const char *osmo_cgi_ps_name2(const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_buf(char *buf, size_t buf_len, const struct osmo_cell_global_id_ps *cgi_ps); char *osmo_cgi_ps_name_c(const void *ctx, const struct osmo_cell_global_id_ps *cgi_ps); +const char *osmo_rnc_id_name(const struct osmo_rnc_id *rnc_id); +char *osmo_rnc_id_name_buf(char *buf, size_t buf_len, const struct osmo_rnc_id *rnc_id); +char *osmo_rnc_id_name_c(const void *ctx, const struct osmo_rnc_id *rnc_id); const char *osmo_sai_name(const struct osmo_service_area_id *sai); const char *osmo_sai_name2(const struct osmo_service_area_id *sai); char *osmo_sai_name_buf(char *buf, size_t buf_len, const struct osmo_service_area_id *sai); @@ -167,6 +176,7 @@ int osmo_rai_cmp(const struct osmo_routing_area_id *a, const struct osmo_routing_area_id *b); int osmo_cgi_cmp(const struct osmo_cell_global_id *a, const struct osmo_cell_global_id *b); int osmo_cgi_ps_cmp(const struct osmo_cell_global_id_ps *a, const struct osmo_cell_global_id_ps *b); +int osmo_rnc_id_cmp(const struct osmo_rnc_id *a, const struct osmo_rnc_id *b); int osmo_mme_id_cmp(const struct osmo_mme_id *a, const struct osmo_mme_id *b); int osmo_gummei_cmp(const struct osmo_gummei *a, const struct osmo_gummei *b); diff --git a/src/gsm/gsm23003.c b/src/gsm/gsm23003.c index 0f4c301..b0bac93 100644 --- a/src/gsm/gsm23003.c +++ b/src/gsm/gsm23003.c @@ -357,6 +357,44 @@ return osmo_cgi_ps_name_buf(buf, sizeof(buf), cgi_ps); } +/*! Return string representation of RNC in caller-provided output buffer. + * \param[out] buf pointer to caller-provided output buffer + * \param[in] buf_len size of buf in bytes + * \param[in] rnc RNC to be stringified + * \returns buf + */ +char *osmo_rnc_id_name_buf(char *buf, size_t buf_len, const struct osmo_rnc_id *rnc) +{ + char plmn[16]; + snprintf(buf, buf_len, "%s-%d", osmo_plmn_name_buf(plmn, sizeof(plmn), &rnc->plmn), + rnc->rnc_id); + return buf; +} + +/*! Return string representation of RNC in static output buffer. + * \param[in] rnc RNC to be stringified + * \returns pointer to static output buffer + */ +const char *osmo_rnc_id_name(const struct osmo_rnc_id *rnc) +{ + static __thread char buf[32]; + return osmo_rnc_id_name_buf(buf, sizeof(buf), rnc); +} + +/*! Return string representation of RNC in static output buffer. + * \param[out] buf pointer to caller-provided output buffer + * \param[in] buf_len size of buf in bytes + * \param[in] rnc RNC to be stringified + * \returns pointer to static output buffer + */ +char *osmo_rnc_id_name_c(const void *ctx, const struct osmo_rnc_id *rnc) +{ + char *buf = talloc_size(ctx, 32); + if (!buf) + return NULL; + return osmo_rnc_id_name_buf(buf, 32, rnc); +} + /*! Return MCC-MNC-LAC-RAC-CI as string, in a talloc-allocated output buffer. * \param[in] ctx talloc context from which to allocate output buffer * \param[in] cgi_ps CGI-PS to encode. @@ -656,6 +694,24 @@ return 0; } +/* Compare two RNC Ids + * The order of comparison is PLMN, RNCId. + * \param a[in] "Left" side RNC Id. + * \param b[in] "Right" side RNC Id. + * \returns 0 if the RNC Ids are equal, -1 if a < b, 1 if a > b. */ +int osmo_rnc_id_cmp(const struct osmo_rnc_id *a, const struct osmo_rnc_id *b) +{ + int rc = osmo_plmn_cmp(&a->plmn, &b->plmn); + if (rc) + return rc; + + if (a->rnc_id < b->rnc_id) + return -1; + if (a->rnc_id > b->rnc_id) + return 1; + return 0; +} + /* Compare two MME Ids * The order of comparison is MME GroupId, MME Code. * \param a[in] "Left" side MME Id. diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 7c78347..78e0385 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -500,6 +500,10 @@ osmo_cgi_ps_name_buf; osmo_cgi_ps_name_c; osmo_cgi_ps_name2; +osmo_rnc_id_name; +osmo_rnc_id_name_buf; +osmo_rnc_id_name_c; +osmo_rnc_id_cmp; osmo_gummei_name; osmo_gummei_name_buf; osmo_gummei_name_c; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/38948?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0768c99b4c42b0948e7574d05b70e1b7bdb8a55a Gerrit-Change-Number: 38948 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-iuh[master]: iu_client: add a new event NEW_LAC_RAC
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/38947?usp=email ) Change subject: iu_client: add a new event NEW_LAC_RAC ...................................................................... iu_client: add a new event NEW_LAC_RAC When the IU client learns a new LAC/RAC or the LAC/RAC has moved from one RNC to another RNC, inform the user via an event. Allows the SGSN to track RACs which uses Iu. Change-Id: I8b1b8c58bf72b00e2705ca87a89a91481bac3470 --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 21 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/47/38947/1 diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index e2bf8a9..1588b08 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -37,11 +37,17 @@ struct osmo_timer_list release_timeout; }; +struct ranap_iu_event_new_lac_rac { + const struct osmo_rnc_id *rnc_id; + const struct osmo_routing_area_id *rai; +}; + enum ranap_iu_event_type { RANAP_IU_EVENT_RAB_ASSIGN, RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, RANAP_IU_EVENT_IU_RELEASE, /* An actual Iu Release message was received */ RANAP_IU_EVENT_LINK_INVALIDATED, /* A SUA link was lost or closed down */ + RANAP_IU_EVENT_NEW_LAC_RAC, /* Either a new LAC/RAC has been detected */ }; extern const struct value_string ranap_iu_event_type_names[]; diff --git a/src/iu_client.c b/src/iu_client.c index 75c7640..c30c237 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -112,6 +112,7 @@ OSMO_VALUE_STRING(RANAP_IU_EVENT_SECURITY_MODE_COMPLETE), OSMO_VALUE_STRING(RANAP_IU_EVENT_IU_RELEASE), OSMO_VALUE_STRING(RANAP_IU_EVENT_LINK_INVALIDATED), + OSMO_VALUE_STRING(RANAP_IU_EVENT_NEW_LAC_RAC), { 0, NULL } }; @@ -122,7 +123,7 @@ if (!global_iu_event_cb) return 0; - if (!ue_ctx->notification) + if (ue_ctx && !ue_ctx->notification) return 0; LOGPIU(LOGL_DEBUG, "Submit Iu event to upper layer: %s\n", ranap_iu_event_type_str(type)); @@ -130,6 +131,17 @@ return global_iu_event_cb(ue_ctx, type, data); } +static void global_iu_event_new_rac(const struct osmo_rnc_id *rnc_id, const struct osmo_routing_area_id *rai) +{ + struct ranap_iu_event_new_lac_rac new_lac_rac = (struct ranap_iu_event_new_lac_rac) { + .rnc_id = rnc_id, + .rai = rai, + }; + + global_iu_event(NULL, RANAP_IU_EVENT_NEW_LAC_RAC, &new_lac_rac); +} + + static void ue_conn_ctx_release_timeout_cb(void *ctx_) { struct ranap_ue_conn_ctx *ctx = (struct ranap_ue_conn_ctx *)ctx_; @@ -326,12 +338,14 @@ llist_del(&lre->entry); llist_add(&lre->entry, &rnc->lac_rac_list); + global_iu_event_new_rac(rnc_id, rai); } else if (!old_rnc) { /* LAC, RAC not recorded yet */ LOGPIU(LOGL_NOTICE, "RNC %s: new LAC/RAC %s\n", osmo_rnc_id_name(rnc_id), osmo_rai_name2(rai)); lre = talloc_zero(rnc, struct iu_lac_rac_entry); lre->rai = *rai; llist_add(&lre->entry, &rnc->lac_rac_list); + global_iu_event_new_rac(rnc_id, rai); } /* else, LAC,RAC already recorded with the current RNC. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38947?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I8b1b8c58bf72b00e2705ca87a89a91481bac3470 Gerrit-Change-Number: 38947 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-iuh[master]: iu_client: add ranap_iu_page_cs2/ranap_iu_page_ps2
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/38946?usp=email ) Change subject: iu_client: add ranap_iu_page_cs2/ranap_iu_page_ps2 ...................................................................... iu_client: add ranap_iu_page_cs2/ranap_iu_page_ps2 ranap_iu_page_cs2 and ranap_iu_page_ps2 are using the new osmocom osmo_location_area_id or osmo_routing_area_id which also contain the PLMN. Change-Id: I1f07e96642737160d387de3e4c3f71d288d356dd --- M include/osmocom/ranap/iu_client.h M src/iu_client.c 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/46/38946/1 diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h index 2e72839..e2bf8a9 100644 --- a/include/osmocom/ranap/iu_client.h +++ b/include/osmocom/ranap/iu_client.h @@ -67,6 +67,8 @@ int ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac); int ranap_iu_page_ps(const char *imsi, const uint32_t *ptmsi, uint16_t lac, uint8_t rac); +int ranap_iu_page_cs2(const char *imsi, const uint32_t *tmsi, const struct osmo_location_area_id *lai); +int ranap_iu_page_ps2(const char *imsi, const uint32_t *ptmsi, const struct osmo_routing_area_id *rai); int ranap_iu_rab_act(struct ranap_ue_conn_ctx *ue_ctx, struct msgb *msg); int ranap_iu_rab_deact(struct ranap_ue_conn_ctx *ue_ctx, uint8_t rab_id); diff --git a/src/iu_client.c b/src/iu_client.c index 018813d..75c7640 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -892,6 +892,19 @@ return iu_page(imsi, ptmsi, lac, rac, true); } +int ranap_iu_page_cs2(const char *imsi, const uint32_t *tmsi, const struct osmo_location_area_id *lai) +{ + struct osmo_routing_area_id rai = { + .lac = *lai, + }; + return iu_page2(imsi, tmsi, &rai, false); +} + +int ranap_iu_page_ps2(const char *imsi, const uint32_t *ptmsi, const struct osmo_routing_area_id *rai) +{ + return iu_page2(imsi, ptmsi, rai, true); +} + /*********************************************************************** * -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38946?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1f07e96642737160d387de3e4c3f71d288d356dd Gerrit-Change-Number: 38946 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-iuh[master]: iu_client: use new struct osmo_rnc_id
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/38944?usp=email ) Change subject: iu_client: use new struct osmo_rnc_id ...................................................................... iu_client: use new struct osmo_rnc_id The osmo_rnc_id is a libosmocore type which can be used across different libraries. In preparation to notify the SGSN when a new RAC/LAC is learned. Change-Id: Id8db70bd3d63b0533b637402a91757eb677c38b7 --- M src/iu_client.c 1 file changed, 18 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/44/38944/1 diff --git a/src/iu_client.c b/src/iu_client.c index ea5ebe8..3fc29bd 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -73,7 +73,7 @@ struct ranap_iu_rnc { struct llist_head entry; - uint16_t rnc_id; + struct osmo_rnc_id rnc_id; struct osmo_sccp_addr sccp_addr; /* A list of struct iu_lac_rac_entry */ @@ -209,18 +209,18 @@ } } -static struct ranap_iu_rnc *iu_rnc_alloc(uint16_t rnc_id, struct osmo_sccp_addr *addr) +static struct ranap_iu_rnc *iu_rnc_alloc(const struct osmo_rnc_id *rnc_id, struct osmo_sccp_addr *addr) { struct ranap_iu_rnc *rnc = talloc_zero(talloc_iu_ctx, struct ranap_iu_rnc); OSMO_ASSERT(rnc); INIT_LLIST_HEAD(&rnc->lac_rac_list); - rnc->rnc_id = rnc_id; + rnc->rnc_id = *rnc_id; rnc->sccp_addr = *addr; llist_add(&rnc->entry, &rnc_list); - LOGPIU(LOGL_NOTICE, "New RNC %d at %s\n", rnc->rnc_id, osmo_sccp_addr_dump(addr)); + LOGPIU(LOGL_NOTICE, "New RNC %s at %s\n", osmo_rnc_id_name(&rnc->rnc_id), osmo_sccp_addr_dump(addr)); return rnc; } @@ -253,11 +253,11 @@ return false; } -static struct ranap_iu_rnc *iu_rnc_id_find(uint16_t rnc_id) +static struct ranap_iu_rnc *iu_rnc_id_find(struct osmo_rnc_id *rnc_id) { struct ranap_iu_rnc *rnc; llist_for_each_entry(rnc, &rnc_list, entry) { - if (rnc->rnc_id == rnc_id) + if (!osmo_rnc_id_cmp(&rnc->rnc_id, rnc_id)) return rnc; } return NULL; @@ -270,7 +270,7 @@ return !strcmp(buf, osmo_sccp_addr_dump(b)); } -static struct ranap_iu_rnc *iu_rnc_register(uint16_t rnc_id, uint16_t lac, +static struct ranap_iu_rnc *iu_rnc_register(struct osmo_rnc_id *rnc_id, uint16_t lac, uint8_t rac, struct osmo_sccp_addr *addr) { struct ranap_iu_rnc *rnc; @@ -282,8 +282,8 @@ if (rnc) { if (!same_sccp_addr(&rnc->sccp_addr, addr)) { - LOGPIU(LOGL_NOTICE, "RNC %u changed its SCCP addr to %s (LAC=%u RAC=%u)\n", - rnc_id, osmo_sccp_addr_dump(addr), lac, rac); + LOGPIU(LOGL_NOTICE, "RNC %s changed its SCCP addr to %s (LAC=%u RAC=%u)\n", + osmo_rnc_id_name(rnc_id), osmo_sccp_addr_dump(addr), lac, rac); rnc->sccp_addr = *addr; } } else @@ -294,16 +294,16 @@ if (old_rnc && old_rnc != rnc) { /* LAC,RAC already exists in a different RNC */ - LOGPIU(LOGL_NOTICE, "LAC %u RAC %u moved from RNC %u %s", - lac, rac, old_rnc->rnc_id, osmo_sccp_addr_dump(&old_rnc->sccp_addr)); - LOGPIUC(LOGL_NOTICE, " to RNC %u %s\n", - rnc->rnc_id, osmo_sccp_addr_dump(&rnc->sccp_addr)); + LOGPIU(LOGL_NOTICE, "LAC %u RAC %u moved from RNC %s %s", + lac, rac, osmo_rnc_id_name(&old_rnc->rnc_id), osmo_sccp_addr_dump(&old_rnc->sccp_addr)); + LOGPIUC(LOGL_NOTICE, " to RNC %s %s\n", + osmo_rnc_id_name(&rnc->rnc_id), osmo_sccp_addr_dump(&rnc->sccp_addr)); llist_del(&lre->entry); llist_add(&lre->entry, &rnc->lac_rac_list); } else if (!old_rnc) { /* LAC,RAC not recorded yet */ - LOGPIU(LOGL_NOTICE, "RNC %u: new LAC %u RAC %u\n", rnc_id, lac, rac); + LOGPIU(LOGL_NOTICE, "RNC %s: new LAC %u RAC %u\n", osmo_rnc_id_name(rnc_id), lac, rac); lre = talloc_zero(rnc, struct iu_lac_rac_entry); lre->lac = lac; lre->rac = rac; @@ -376,7 +376,7 @@ return osmo_sccp_user_sap_down(g_scu, &prim->oph); } -static int iu_grnc_id_parse(struct iu_grnc_id *dst, struct RANAP_GlobalRNC_ID *src) +static int iu_grnc_id_parse(struct osmo_rnc_id *dst, struct RANAP_GlobalRNC_ID *src) { /* The size is coming from arbitrary sender, check it gracefully */ if (src->pLMNidentity.size != 3) { @@ -411,7 +411,7 @@ { struct new_ue_conn_ctx *new_ctx = ctx; struct gprs_ra_id ra_id; - struct iu_grnc_id grnc_id; + struct osmo_rnc_id rnc_id = {}; uint16_t sai; struct ranap_ue_conn_ctx *ue; struct msgb *msg = msgb_alloc(256, "RANAP->NAS"); @@ -426,7 +426,7 @@ ra_id.rac = asn1str_to_u8(&ies->rac); } - if (iu_grnc_id_parse(&grnc_id, &ies->globalRNC_ID) != 0) { + if (iu_grnc_id_parse(&rnc_id, &ies->globalRNC_ID) != 0) { LOGPIU(LOGL_ERROR, "Failed to parse RANAP Global-RNC-ID IE\n"); return -1; @@ -437,7 +437,7 @@ memcpy(msgb_gmmh(msg), ies->nas_pdu.buf, ies->nas_pdu.size); /* Make sure we know the RNC Id and LAC+RAC coming in on this connection. */ - rnc = iu_rnc_register(grnc_id.rnc_id, ra_id.lac, ra_id.rac, &new_ctx->sccp_addr); + rnc = iu_rnc_register(&rnc_id, ra_id.lac, ra_id.rac, &new_ctx->sccp_addr); ue = ue_conn_ctx_alloc(rnc, new_ctx->conn_id); OSMO_ASSERT(ue); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38944?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Id8db70bd3d63b0533b637402a91757eb677c38b7 Gerrit-Change-Number: 38944 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-iuh[master]: iu_client: refactor LAC/RAC handling
by lynxis lazus 25 Nov '24

25 Nov '24

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/38945?usp=email ) Change subject: iu_client: refactor LAC/RAC handling ...................................................................... iu_client: refactor LAC/RAC handling The iu client ignored the PLMN which might ran into duplicate RACs. Replace all lac/rac handling by the "new" osmo_routing_area_id struct which has improved handling. Further it allows to use the embedded lac when CS paging is only required. The old gprs_ra_id is still used to contain api stability. Change-Id: Ie38fa3751cfce1c981d8d0bed1b8ff891593a638 --- M src/iu_client.c 1 file changed, 85 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/45/38945/1 diff --git a/src/iu_client.c b/src/iu_client.c index 3fc29bd..018813d 100644 --- a/src/iu_client.c +++ b/src/iu_client.c @@ -49,10 +49,7 @@ struct iu_lac_rac_entry { struct llist_head entry; - /* LAC: Location Area Code (for CS and PS) */ - uint16_t lac; - /* RAC: Routing Area Code (for PS only) */ - uint8_t rac; + struct osmo_routing_area_id rai; }; /* Entry to cache conn_id <-> sccp_addr mapping in case we receive an empty CR */ @@ -229,7 +226,7 @@ * If rnc and lre pointers are not NULL, *rnc / *lre are set to NULL if no match is found, or to the * match if a match is found. Return true if a match is found. */ static bool iu_rnc_lac_rac_find(struct ranap_iu_rnc **rnc, struct iu_lac_rac_entry **lre, - uint16_t lac, uint8_t rac) + const struct osmo_routing_area_id *ra_id) { struct ranap_iu_rnc *r; struct iu_lac_rac_entry *e; @@ -241,7 +238,33 @@ llist_for_each_entry(r, &rnc_list, entry) { llist_for_each_entry(e, &r->lac_rac_list, entry) { - if (e->lac == lac && e->rac == rac) { + if (!osmo_rai_cmp(&e->rai, ra_id)) { + if (rnc) + *rnc = r; + if (lre) + *lre = e; + return true; + } + } + } + return false; +} + +/* legacy, do a first match with ignoring PLMN */ +static bool iu_rnc_lac_rac_find_legacy(struct ranap_iu_rnc **rnc, struct iu_lac_rac_entry **lre, + uint16_t lac, uint8_t rac) +{ + struct ranap_iu_rnc *r; + struct iu_lac_rac_entry *e; + + if (rnc) + *rnc = NULL; + if (lre) + *lre = NULL; + + llist_for_each_entry(r, &rnc_list, entry) { + llist_for_each_entry(e, &r->lac_rac_list, entry) { + if (e->rai.lac.lac == lac && e->rai.rac == rac) { if (rnc) *rnc = r; if (lre) @@ -270,8 +293,9 @@ return !strcmp(buf, osmo_sccp_addr_dump(b)); } -static struct ranap_iu_rnc *iu_rnc_register(struct osmo_rnc_id *rnc_id, uint16_t lac, - uint8_t rac, struct osmo_sccp_addr *addr) +static struct ranap_iu_rnc *iu_rnc_register(struct osmo_rnc_id *rnc_id, + const struct osmo_routing_area_id *rai, + struct osmo_sccp_addr *addr) { struct ranap_iu_rnc *rnc; struct ranap_iu_rnc *old_rnc; @@ -282,31 +306,31 @@ if (rnc) { if (!same_sccp_addr(&rnc->sccp_addr, addr)) { - LOGPIU(LOGL_NOTICE, "RNC %s changed its SCCP addr to %s (LAC=%u RAC=%u)\n", - osmo_rnc_id_name(rnc_id), osmo_sccp_addr_dump(addr), lac, rac); + LOGPIU(LOGL_NOTICE, "RNC %s changed its SCCP addr to %s (LAC/RAC %s)\n", + osmo_rnc_id_name(rnc_id), osmo_sccp_addr_dump(addr), osmo_rai_name2(rai)); rnc->sccp_addr = *addr; } } else rnc = iu_rnc_alloc(rnc_id, addr); /* Detect whether the LAC,RAC is already recorded in another RNC */ - iu_rnc_lac_rac_find(&old_rnc, &lre, lac, rac); + iu_rnc_lac_rac_find(&old_rnc, &lre, rai); if (old_rnc && old_rnc != rnc) { - /* LAC,RAC already exists in a different RNC */ - LOGPIU(LOGL_NOTICE, "LAC %u RAC %u moved from RNC %s %s", - lac, rac, osmo_rnc_id_name(&old_rnc->rnc_id), osmo_sccp_addr_dump(&old_rnc->sccp_addr)); + /* LAC, RAC already exists in a different RNC */ + LOGPIU(LOGL_NOTICE, "LAC/RAC %s moved from RNC %s %s", + osmo_rai_name2(rai), + osmo_rnc_id_name(&old_rnc->rnc_id), osmo_sccp_addr_dump(&old_rnc->sccp_addr)); LOGPIUC(LOGL_NOTICE, " to RNC %s %s\n", osmo_rnc_id_name(&rnc->rnc_id), osmo_sccp_addr_dump(&rnc->sccp_addr)); llist_del(&lre->entry); llist_add(&lre->entry, &rnc->lac_rac_list); } else if (!old_rnc) { - /* LAC,RAC not recorded yet */ - LOGPIU(LOGL_NOTICE, "RNC %s: new LAC %u RAC %u\n", osmo_rnc_id_name(rnc_id), lac, rac); + /* LAC, RAC not recorded yet */ + LOGPIU(LOGL_NOTICE, "RNC %s: new LAC/RAC %s\n", osmo_rnc_id_name(rnc_id), osmo_rai_name2(rai)); lre = talloc_zero(rnc, struct iu_lac_rac_entry); - lre->lac = lac; - lre->rac = rac; + lre->rai = *rai; llist_add(&lre->entry, &rnc->lac_rac_list); } /* else, LAC,RAC already recorded with the current RNC. */ @@ -410,7 +434,8 @@ static int ranap_handle_co_initial_ue(void *ctx, RANAP_InitialUE_MessageIEs_t *ies) { struct new_ue_conn_ctx *new_ctx = ctx; - struct gprs_ra_id ra_id; + struct gprs_ra_id ra_id = {}; + struct osmo_routing_area_id ra_id2 = {}; struct osmo_rnc_id rnc_id = {}; uint16_t sai; struct ranap_ue_conn_ctx *ue; @@ -436,8 +461,10 @@ msgb_gmmh(msg) = msgb_put(msg, ies->nas_pdu.size); memcpy(msgb_gmmh(msg), ies->nas_pdu.buf, ies->nas_pdu.size); + gprs_rai_to_osmo(&ra_id2, &ra_id); + /* Make sure we know the RNC Id and LAC+RAC coming in on this connection. */ - rnc = iu_rnc_register(&rnc_id, ra_id.lac, ra_id.rac, &new_ctx->sccp_addr); + rnc = iu_rnc_register(&rnc_id, &ra_id2, &new_ctx->sccp_addr); ue = ue_conn_ctx_alloc(rnc, new_ctx->conn_id); OSMO_ASSERT(ue); @@ -789,7 +816,7 @@ int log_level; int paged = 0; - iu_rnc_lac_rac_find(&rnc, NULL, lac, rac); + iu_rnc_lac_rac_find_legacy(&rnc, NULL, lac, rac); if (rnc) { if (iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) { log_msg = "Paging"; @@ -818,6 +845,43 @@ return paged; } +static int iu_page2(const char *imsi, const uint32_t *tmsi_or_ptmsi, + const struct osmo_routing_area_id *ra_id, bool is_ps) +{ + struct ranap_iu_rnc *rnc; + const char *log_msg; + int log_level; + int paged = 0; + + iu_rnc_lac_rac_find(&rnc, NULL, ra_id); + if (rnc) { + if (iu_tx_paging_cmd(&rnc->sccp_addr, imsi, tmsi_or_ptmsi, is_ps, 0) == 0) { + log_msg = "Paging"; + log_level = LOGL_DEBUG; + paged = 1; + } else { + log_msg = "Paging failed"; + log_level = LOGL_ERROR; + } + } else { + log_msg = "Found no RNC to Page"; + log_level = LOGL_ERROR; + } + + if (is_ps) + LOGPIU(log_level, "IuPS: %s on RAC %s", log_msg, osmo_rai_name2(ra_id)); + else + LOGPIU(log_level, "IuCS: %s on LAC %s", log_msg, osmo_lai_name(&ra_id->lac)); + if (rnc) + LOGPIUC(log_level, " at SCCP-addr %s", osmo_sccp_addr_dump(&rnc->sccp_addr)); + if (tmsi_or_ptmsi) + LOGPIUC(log_level, ", for %s %08x\n", is_ps? "PTMSI" : "TMSI", *tmsi_or_ptmsi); + else + LOGPIUC(log_level, ", for IMSI %s\n", imsi); + + return paged; +} + int ranap_iu_page_cs(const char *imsi, const uint32_t *tmsi, uint16_t lac) { return iu_page(imsi, tmsi, lac, 0, false); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38945?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Ie38fa3751cfce1c981d8d0bed1b8ff891593a638 Gerrit-Change-Number: 38945 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI
by fixeria 25 Nov '24

25 Nov '24

Attention is currently required from: daniel, laforge, lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email ) Change subject: SGSN: BSSGP_ConnHdlr: f_gmm_attach(): allow the SGSN to request the IMEI ...................................................................... Patch Set 8: Code-Review+2 (1 comment) File sgsn/BSSGP_ConnHdlr.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398/comment/4510cad5_ca14… : PS6, Line 578: allow_id_imei_req > Yes, but that is fine. The timer is here to fire on unexpected PDUs. […] Acknowledged -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38398?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id49c9e6ef7517a6a831315ac1f9915c50b88beb6 Gerrit-Change-Number: 38398 Gerrit-PatchSet: 8 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 20:19:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-msc[master]: vlr: vlr_auth_fsm: make the fsm private
by fixeria 25 Nov '24

25 Nov '24

Attention is currently required from: daniel, laforge, lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38413?usp=email ) Change subject: vlr: vlr_auth_fsm: make the fsm private ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38413?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: Iec85f299cd99879475ab094998433d935e980394 Gerrit-Change-Number: 38413 Gerrit-PatchSet: 9 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Nov 2024 19:51:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

2026

2025

2024

2023

2022

gerrit-log