August 2024 - gerrit-log - lists.osmocom.org

[XS] Change in libosmocore[master]: core/socket.c: Fix socket binding on IPv4-only hosts
by pespin 20 Aug '24

20 Aug '24

Attention is currently required from: Hoernchen, laforge, pespin. pespin has posted comments on this change by laforge. ( https://gerrit.osmocom.org/c/libosmocore/+/37874?usp=email ) Change subject: core/socket.c: Fix socket binding on IPv4-only hosts ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/37874/comment/35b14eda_3bdccc24?… : PS1, Line 19: > valid as a configured address. *This flag is useful on, for example, so does that mean that if I have a system with no net card, then getaddrinfo() will fail to provide a localhost address? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37874?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: I5690a25af98089e3a8a092cb91dfc969720abdc0 Gerrit-Change-Number: 37874 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 20 Aug 2024 09:42:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in libosmocore[master]: core/socket.c: Fix socket binding on IPv4-only hosts
by laforge 20 Aug '24

20 Aug '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/37874?usp=email ) Change subject: core/socket.c: Fix socket binding on IPv4-only hosts ...................................................................... core/socket.c: Fix socket binding on IPv4-only hosts Let's add the AI_ADDRCONFIG flag to prevent getaddrinfo() from returning IPv6 addresses on sytems that have no IPv6. From the manpage: > If hints.ai_flags includes the AI_ADDRCONFIG flag, then IPv4 > addresses are returned in the list pointed to by res only if the local > system has at least one IPv4 address configured, and IPv6 addresses are > returned only if the local system has at least one IPv6 address > configured. The loopback address is not considered for this case as > valid as a configured address. *This flag is useful on, for example, > IPv4-only systems, to ensure that getaddrinfo() does not return IPv6 > socket addresses that would always fail in connect(2) or bind(2).* Change-Id: I5690a25af98089e3a8a092cb91dfc969720abdc0 Closes: OS#7074 --- M src/core/socket.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/74/37874/1 diff --git a/src/core/socket.c b/src/core/socket.c index 97708a7..7d10e7b 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -66,6 +66,7 @@ snprintf(portbuf, sizeof(portbuf), "%u", port); memset(&hints, 0, sizeof(struct addrinfo)); hints.ai_family = family; + hints.ai_flsgs = AI_ADDRCONFIG; if (type == SOCK_RAW) { /* Workaround for glibc, that returns EAI_SERVICE (-8) if * SOCK_RAW and IPPROTO_GRE is used. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/37874?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: I5690a25af98089e3a8a092cb91dfc969720abdc0 Gerrit-Change-Number: 37874 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in libosmo-gprs[master]: llc: Mark old/current tlli as all 1's when unassigning LLME
by pespin 20 Aug '24

20 Aug '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37873?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. This is a port of osmo-sgsn.git 35c178e84d25a216a5c2d9bd1320d072e36937fa. Change-Id: I9db198a31963db015e887e33baf3c32b46e2b11a --- M src/llc/llc_llgmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/73/37873/1 diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index 27150cc..125923a 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -212,7 +212,7 @@ gprs_llc_llme_submit_prim_ll_assign_ind(old_tlli, new_tlli); } 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 = OSMO_GPRS_LLC_LLMS_ASSIGNED; 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/libosmo-gprs/+/37873?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9db198a31963db015e887e33baf3c32b46e2b11a Gerrit-Change-Number: 37873 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-gprs[master]: gmm: Introduce interface GMMBSSGP
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email ) Change subject: gmm: Introduce interface GMMBSSGP ...................................................................... gmm: Introduce interface GMMBSSGP This interface was not described in TS 24.007 like the rest, though some references to it can be seen in that document in Annex C. The interface is actually described in TS 48.018 5.3. This commit only adds the skeleton with all the primitives, etc. All the logic inside GMM layer implementation, and primitive specific fields, is still missing. Related: OS#5852 Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 --- M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm_prim.c 3 files changed, 255 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index e066a15..e38e188 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -30,6 +30,7 @@ OSMO_GPRS_GMM_SAP_GMMRABM, /* UMTS only */ OSMO_GPRS_GMM_SAP_GMMSS, OSMO_GPRS_GMM_SAP_GMMSS2, + OSMO_GPRS_GMM_SAP_GMMBSSGP, /* TS 48.018 5.3 */ }; extern const struct value_string osmo_gprs_gmm_prim_sap_names[]; static inline const char *osmo_gprs_gmm_prim_sap_name(enum osmo_gprs_gmm_prim_sap val) @@ -197,6 +198,63 @@ }; }; +/* TS 48.018 Section 5.3 "GMM<->BSSGP" + * This interface wasn't described in TS 24.007 like the others, but can be seen + * greyed up in TS 24.007 Annex C diagrams. + */ +enum osmo_gprs_gmm_gmmbssgp_prim_type { + OSMO_GPRS_GMM_GMMBSSGP_PAGING, /* Req: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, /* Req: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, /* Ind, Resp */ + OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_RESUME, /* Ind: BVCI, NSEI,... */ + OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, /* Ind, Resp */ +}; +extern const struct value_string osmo_gprs_gmm_gmmbssgp_prim_type_names[]; +static inline const char *osmo_gprs_gmm_gmmbssgp_prim_type_name(enum osmo_gprs_gmm_gmmbssgp_prim_type val) +{ + return get_value_string(osmo_gprs_gmm_gmmbssgp_prim_type_names, val); +} + +/* Parameters for OSMO_GPRS_GMM_BSSGP_* prims + * Same as struct osmo_gprs_rlcmac_gmmbssgp_prim. + */ +struct osmo_gprs_gmm_gmmbssgp_prim { + /* Common fields */ + uint16_t bvci; + uint16_t nsei; + union { + /* OSMO_GPRS_GMM_GMMBSSGP_PAGING | Req */ + struct { + } paging_req; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY | Req */ + struct { + } ra_capability_req; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE | Ind */ + struct { + } ra_capability_update_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE | Resp */ + struct { + } ra_capability_update_resp; + /* OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS | Ind */ + struct { + } radio_status_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_SUSPEND | Ind */ + struct { + } suspend_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_RESUME | Ind */ + struct { + } resume_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY | Ind */ + struct { + } ms_registration_enquiry_ind; + /* OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY | Resp */ + struct { + } ms_registration_enquiry_resp; + }; +}; + /* TS 24.007 Section 9.5.1 "Service primitives for GMMSM-SAP" */ enum osmo_gprs_gmm_gmmsm_prim_type { @@ -279,6 +337,7 @@ union { struct osmo_gprs_gmm_gmmreg_prim gmmreg; struct osmo_gprs_gmm_gmmrr_prim gmmrr; + struct osmo_gprs_gmm_gmmbssgp_prim gmmbssgp; struct osmo_gprs_gmm_gmmsm_prim gmmsm; }; }; @@ -307,6 +366,13 @@ /* Alloc primitive for GMMRR SAP: */ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmrr_page_ind(uint32_t tlli); +/* Alloc primitive for GMMBSSGP SAP: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_radio_status_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_suspend_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_resume_ind(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_ind(uint16_t bvci, uint16_t nsei); + /* Alloc primitive for GMMSM SAP: */ struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_establish_req(uint32_t id); struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmsm_unitdata_req(uint32_t id, uint8_t *smpdu, unsigned int smpdu_len); diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index db2cc8e..a94fec2 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -110,10 +110,16 @@ struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmrr_assign_req(uint32_t old_tlli, uint32_t new_tlli); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_paging_req(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_req(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_resp(uint16_t bvci, uint16_t nsei); +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_resp(uint16_t bvci, uint16_t nsei); + struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_establish_cnf(uint32_t id, uint8_t cause); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_release_ind(uint32_t id); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_unitdata_ind(uint32_t id, uint8_t *smpdu, unsigned int smpdu_len); struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmsm_modify_ind(uint32_t id); + /* gmm.c: */ struct gprs_gmm_entity *gprs_gmm_gmme_alloc(uint32_t ptmsi, const char *imsi); void gprs_gmm_gmme_free(struct gprs_gmm_entity *gmme); diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 693a811..bae2dbd 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -43,6 +43,7 @@ { OSMO_GPRS_GMM_SAP_GMMRABM, "GMMRABM" }, { OSMO_GPRS_GMM_SAP_GMMSS, "GMMSS" }, { OSMO_GPRS_GMM_SAP_GMMSS2, "GMMSS2" }, + { OSMO_GPRS_GMM_SAP_GMMBSSGP, "GMMBSSGP" }, { 0, NULL } }; @@ -60,6 +61,17 @@ { 0, NULL } }; +const struct value_string osmo_gprs_gmm_gmmbssgp_prim_type_names[] = { + { OSMO_GPRS_GMM_GMMBSSGP_PAGING, "AGING" }, + { OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, "A_CAPABILITY" }, + { OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, "A_CAPABILITY_UPDATE" }, + { OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, "RADIO_STATUS" }, + { OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, "SUSPEND" }, + { OSMO_GPRS_GMM_GMMBSSGP_RESUME, "RESUME" }, + { OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, "MS_REGISTRATION_ENQUIRY" }, + { 0, NULL } +}; + const struct value_string osmo_gprs_gmm_gmmsm_prim_type_names[] = { { OSMO_GPRS_GMM_GMMSM_ESTABLISH, "ESTABLISH" }, { OSMO_GPRS_GMM_GMMSM_RELEASE, "RELEASE" }, @@ -107,6 +119,9 @@ case OSMO_GPRS_GMM_SAP_GMMSM: type = osmo_gprs_gmm_gmmsm_prim_type_name(gmm_prim->oph.primitive); break; + case OSMO_GPRS_GMM_SAP_GMMBSSGP: + type = osmo_gprs_gmm_gmmbssgp_prim_type_name(gmm_prim->oph.primitive); + break; default: type = "unsupported-gmm-sap"; } @@ -281,6 +296,105 @@ return gmm_prim; } +/*** GMMBSSGP ***/ +static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmbssgp_alloc(enum osmo_gprs_gmm_gmmbssgp_prim_type type, + enum osmo_prim_operation operation, + unsigned int extra_size) +{ + return gprs_gmm_prim_alloc(OSMO_GPRS_GMM_SAP_GMMBSSGP, type, operation, extra_size); +} + +/* 3GPP TS 48.018 5.3.4 GMM-PAGING.req: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_paging_req(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_PAGING, PRIM_OP_REQUEST, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.5 GMM-RA-CAPABILITY.req: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_req(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, PRIM_OP_REQUEST, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.6 GMM-RA-CAPABILITY-UPDATE.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.7 GMM-RA-CAPABILITY-UPDATE.res: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ra_capability_update_resp(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_RESPONSE, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.8 GMM-RADIO-STATUS.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_radio_status_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.9 GMM-SUSPEND.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_suspend_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10 GMM-RESUME.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_resume_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_RESUME, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10a GMM-MS-REGISTRATION-ENQUIRY.ind: */ +struct osmo_gprs_gmm_prim *osmo_gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_ind(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_INDICATION, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + +/* 3GPP TS 48.018 5.3.10b GMM-MS-REGISTRATION-ENQUIRY.res: */ +struct osmo_gprs_gmm_prim *gprs_gmm_prim_alloc_gmmbssgp_ms_registration_enquiry_resp(uint16_t bvci, uint16_t nsei) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + gmm_prim = gmm_prim_gmmrr_alloc(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_RESPONSE, 0); + gmm_prim->gmmbssgp.bvci = bvci; + gmm_prim->gmmbssgp.nsei = nsei; + return gmm_prim; +} + + /*** GMMSM ***/ static inline struct osmo_gprs_gmm_prim *gmm_prim_gmmsm_alloc(enum osmo_gprs_gmm_gmmsm_prim_type type, @@ -666,6 +780,72 @@ return rc; } +static int gprs_gmm_prim_handle_gmmbssgp_ra_capability_update_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_radio_status_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_suspend_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_resume_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp_ms_registration_enquiry_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc; + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; /* prim ownership taken, already freed */ + return rc; +} + +static int gprs_gmm_prim_handle_gmmbssgp(struct osmo_gprs_gmm_prim *gmm_prim) +{ + int rc = 0; + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_ra_capability_update_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RADIO_STATUS, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_radio_status_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_SUSPEND, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_suspend_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RESUME, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_resume_ind(gmm_prim); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_INDICATION): + rc = gprs_gmm_prim_handle_gmmbssgp_ms_registration_enquiry_ind(gmm_prim); + break; + default: + rc = gprs_gmm_prim_handle_unsupported(gmm_prim); + rc = 1; + } + return rc; +} + /* GMM lower layers (LLC) push GMM primitive up to GMM layer: */ int osmo_gprs_gmm_prim_lower_up(struct osmo_gprs_gmm_prim *gmm_prim) { @@ -680,6 +860,9 @@ case OSMO_GPRS_GMM_SAP_GMMRR: rc = gprs_gmm_prim_handle_gmmrr(gmm_prim); break; + case OSMO_GPRS_GMM_SAP_GMMBSSGP: + rc = gprs_gmm_prim_handle_gmmbssgp(gmm_prim); + break; default: rc = gprs_gmm_prim_handle_unsupported(gmm_prim); rc = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 Gerrit-Change-Number: 37724 Gerrit-PatchSet: 1 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>

1 0

[S] Change in libosmo-gprs[master]: gmm: Rename gmm_prim_test -> gmm_prim_ms_test
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email ) Change subject: gmm: Rename gmm_prim_test -> gmm_prim_ms_test ...................................................................... gmm: Rename gmm_prim_test -> gmm_prim_ms_test A new test file will be added to test GMM in network (SGSN) mode. Change-Id: I9c7bccbf229aa2e136869baf98c5401c0dbae954 --- M tests/gmm/Makefile.am R tests/gmm/gmm_prim_ms_test.c R tests/gmm/gmm_prim_ms_test.err R tests/gmm/gmm_prim_ms_test.ok M tests/testsuite.at 5 files changed, 11 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/tests/gmm/Makefile.am b/tests/gmm/Makefile.am index 83517e5..c84c879 100644 --- a/tests/gmm/Makefile.am +++ b/tests/gmm/Makefile.am @@ -14,14 +14,14 @@ check_PROGRAMS = \ gmm_misc_test \ - gmm_prim_test \ + gmm_prim_ms_test \ $(NULL) EXTRA_DIST = \ gmm_misc_test.err \ gmm_misc_test.ok \ - gmm_prim_test.err \ - gmm_prim_test.ok \ + gmm_prim_ms_test.err \ + gmm_prim_ms_test.ok \ $(NULL) # libosmo-gprs-gmm.a is used below to access non-exported private symbols used in the test: @@ -39,8 +39,8 @@ # libosmo-gprs-llc.a is used below to access non-exported private symbols used in the test: # libosmo-gprs-rlcmac.a is used below to access non-exported private symbols used in the test: -gmm_prim_test_SOURCES = gmm_prim_test.c -gmm_prim_test_LDADD = \ +gmm_prim_ms_test_SOURCES = gmm_prim_ms_test.c +gmm_prim_ms_test_LDADD = \ $(top_builddir)/src/gmm/libosmo-gprs-gmm.la \ $(top_builddir)/src/llc/.libs/libosmo-gprs-llc.a \ $(top_builddir)/src/rlcmac/.libs/libosmo-gprs-rlcmac.a \ @@ -49,7 +49,7 @@ $(LIBOSMOGSM_LIBS) \ $(NULL) -gmm_prim_test_LDFLAGS = \ +gmm_prim_ms_test_LDFLAGS = \ -Wl,--wrap=osmo_get_rand_id \ -no-install \ $(NULL) diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_ms_test.c similarity index 100% rename from tests/gmm/gmm_prim_test.c rename to tests/gmm/gmm_prim_ms_test.c diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_ms_test.err similarity index 100% rename from tests/gmm/gmm_prim_test.err rename to tests/gmm/gmm_prim_ms_test.err diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_ms_test.ok similarity index 100% rename from tests/gmm/gmm_prim_test.ok rename to tests/gmm/gmm_prim_ms_test.ok diff --git a/tests/testsuite.at b/tests/testsuite.at index ce51e35..3b5c326 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -8,11 +8,11 @@ AT_CHECK([$abs_top_builddir/tests/gmm/gmm_misc_test], [0], [expout], [experr]) AT_CLEANUP -AT_SETUP([gmm/gmm_prim]) -AT_KEYWORDS([gmm gmm_prim]) -cat $abs_srcdir/gmm/gmm_prim_test.ok > expout -cat $abs_srcdir/gmm/gmm_prim_test.err > experr -AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_test], [0], [expout], [experr]) +AT_SETUP([gmm/gmm_prim_ms]) +AT_KEYWORDS([gmm gmm_prim_ms]) +cat $abs_srcdir/gmm/gmm_prim_ms_test.ok > expout +cat $abs_srcdir/gmm/gmm_prim_ms_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_ms_test], [0], [expout], [experr]) AT_CLEANUP AT_SETUP([llc/llc]) -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37725?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9c7bccbf229aa2e136869baf98c5401c0dbae954 Gerrit-Change-Number: 37725 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-gprs[master]: tests/gmm: Introduce skeleton for gmm_prim_network tests
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37726?usp=email ) Change subject: tests/gmm: Introduce skeleton for gmm_prim_network tests ...................................................................... tests/gmm: Introduce skeleton for gmm_prim_network tests A new skeleton to add tests for the network (SGSN) mode is added. Related: OS#5852 Change-Id: I832f16f598f49c18455531fac75367376a3065e6 --- M tests/gmm/Makefile.am M tests/gmm/gmm_prim_ms_test.c A tests/gmm/gmm_prim_network_test.c A tests/gmm/gmm_prim_network_test.err A tests/gmm/gmm_prim_network_test.ok A tests/gmm/gmm_prim_test.h M tests/testsuite.at 7 files changed, 358 insertions(+), 40 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/gmm/Makefile.am b/tests/gmm/Makefile.am index c84c879..7ae62d2 100644 --- a/tests/gmm/Makefile.am +++ b/tests/gmm/Makefile.am @@ -15,6 +15,7 @@ check_PROGRAMS = \ gmm_misc_test \ gmm_prim_ms_test \ + gmm_prim_network_test \ $(NULL) EXTRA_DIST = \ @@ -22,6 +23,12 @@ gmm_misc_test.ok \ gmm_prim_ms_test.err \ gmm_prim_ms_test.ok \ + gmm_prim_network_test.err \ + gmm_prim_network_test.ok \ + $(NULL) + +noinst_HEADERS = \ + gmm_prim_test.h \ $(NULL) # libosmo-gprs-gmm.a is used below to access non-exported private symbols used in the test: @@ -53,3 +60,20 @@ -Wl,--wrap=osmo_get_rand_id \ -no-install \ $(NULL) + +# libosmo-gprs-llc.a is used below to access non-exported private symbols used in the test: +# libosmo-gprs-rlcmac.a is used below to access non-exported private symbols used in the test: +gmm_prim_network_test_SOURCES = gmm_prim_network_test.c +gmm_prim_network_test_LDADD = \ + $(top_builddir)/src/gmm/libosmo-gprs-gmm.la \ + $(top_builddir)/src/llc/.libs/libosmo-gprs-llc.a \ + $(top_builddir)/src/rlcmac/.libs/libosmo-gprs-rlcmac.a \ + $(top_builddir)/src/csn1/libosmo-csn1.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + +gmm_prim_network_test_LDFLAGS = \ + -Wl,--wrap=osmo_get_rand_id \ + -no-install \ + $(NULL) diff --git a/tests/gmm/gmm_prim_ms_test.c b/tests/gmm/gmm_prim_ms_test.c index c33bddc..dcbd31a 100644 --- a/tests/gmm/gmm_prim_ms_test.c +++ b/tests/gmm/gmm_prim_ms_test.c @@ -1,4 +1,4 @@ -/* gmm_prim tests +/* gmm_prim tests (MS side) * * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> * Author: Pau espin Pedrol <pespin(a)sysmocom.de> @@ -28,8 +28,6 @@ #include <osmocom/core/utils.h> #include <osmocom/core/fsm.h> #include <osmocom/core/msgb.h> -#include <osmocom/core/timer.h> -#include <osmocom/core/timer_compat.h> #include <osmocom/core/select.h> #include <osmocom/gprs/rlcmac/rlcmac_private.h> @@ -39,6 +37,8 @@ #include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/gprs/gmm/gmm_pdu.h> +#include "gmm_prim_test.h" + static void *tall_ctx = NULL; /* @@ -189,43 +189,6 @@ return 0; } -#define clock_debug(fmt, args...) \ - do { \ - struct timespec ts; \ - struct timeval tv; \ - osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \ - osmo_gettimeofday(&tv, NULL); \ - fprintf(stdout, "sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt "\n", \ - tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \ - } while (0) - -static void clock_override_enable(bool enable) -{ - osmo_gettimeofday_override = enable; - osmo_clock_override_enable(CLOCK_MONOTONIC, enable); -} - -static void clock_override_set(long sec, long usec) -{ - struct timespec *mono; - osmo_gettimeofday_override_time.tv_sec = sec; - osmo_gettimeofday_override_time.tv_usec = usec; - mono = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); - mono->tv_sec = sec; - mono->tv_nsec = usec*1000; - - clock_debug("clock_override_set"); -} - -static void clock_override_add_debug(long sec, long usec, bool dbg) -{ - osmo_gettimeofday_override_add(sec, usec); - osmo_clock_override_add(CLOCK_MONOTONIC, sec, usec*1000); - if (dbg) - clock_debug("clock_override_add"); -} -#define clock_override_add(sec, usec) clock_override_add_debug(sec, usec, true) - int test_gmm_prim_up_cb(struct osmo_gprs_gmm_prim *gmm_prim, void *user_data) { const char *pdu_name = osmo_gprs_gmm_prim_name(gmm_prim); diff --git a/tests/gmm/gmm_prim_network_test.c b/tests/gmm/gmm_prim_network_test.c new file mode 100644 index 0000000..6e8a053 --- /dev/null +++ b/tests/gmm/gmm_prim_network_test.c @@ -0,0 +1,276 @@ +/* gmm_prim tests (network side) + * + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Pau espin Pedrol <pespin(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <stdio.h> + +#include <osmocom/core/application.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/fsm.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> + +#include <osmocom/gprs/rlcmac/rlcmac_private.h> +#include <osmocom/gprs/llc/llc_prim.h> +#include <osmocom/gprs/llc/llc_private.h> +#include <osmocom/gprs/gmm/gmm.h> +#include <osmocom/gprs/gmm/gmm_prim.h> +#include <osmocom/gprs/gmm/gmm_pdu.h> + +#include "gmm_prim_test.h" + +static void *tall_ctx = NULL; + +static uint8_t pdu_gmm_att_req[] = { /* TODO: provide good hexstring, this comes from a att_accept... */ +0x08, 0x02, 0x01, 0x2a, 0x44, 0x32, 0xf4, 0x07, 0x00, 0x05, 0x00, 0x17, 0x16, 0x18, 0x05, 0xf4, +0xea, 0x71, 0x1b, 0x41 +}; + +static uint8_t pdu_gmm_id_resp[] = { /* TODO: provide GMM Identification Response here */ +}; + +/* override, requires '-Wl,--wrap=osmo_get_rand_id' */ +int __real_osmo_get_rand_id(uint8_t *data, size_t len); +int __wrap_osmo_get_rand_id(uint8_t *data, size_t len) +{ + memset(data, 0x00, len); + return 0; +} + +int test_gmm_prim_up_cb(struct osmo_gprs_gmm_prim *gmm_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_gmm_prim_name(gmm_prim); + struct osmo_gprs_gmm_prim *gmm_prim_tx; + int rc; + + switch (gmm_prim->oph.sap) { + case OSMO_GPRS_GMM_SAP_GMMREG: + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_ATTACH, PRIM_OP_CONFIRM): + if (gmm_prim->gmmreg.attach_cnf.accepted) { + printf("%s(): Rx %s accepted=%u allocated_ptmsi=0x%08x allocated_ptmsi_sig=0x%06x allocated_tlli=0x%08x\n", __func__, pdu_name, + gmm_prim->gmmreg.attach_cnf.accepted, + gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi, + gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi_sig, + gmm_prim->gmmreg.attach_cnf.acc.allocated_tlli); + } else { + printf("%s(): Rx %s accepted=%u rej_cause=%u\n", __func__, pdu_name, + gmm_prim->gmmreg.attach_cnf.accepted, + gmm_prim->gmmreg.attach_cnf.rej.cause); + } + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_DETACH, PRIM_OP_CONFIRM): + printf("%s(): Rx %s detach_type='%s'\n", __func__, pdu_name, + osmo_gprs_gmm_detach_ms_type_name(gmm_prim->gmmreg.detach_cnf.detach_type)); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_SIM_AUTH, PRIM_OP_INDICATION): + printf("%s(): Rx %s ac_ref_nr=%u key_seq=%u rand=%s\n", + __func__, pdu_name, + gmm_prim->gmmreg.sim_auth_ind.ac_ref_nr, + gmm_prim->gmmreg.sim_auth_ind.key_seq, + osmo_hexdump(gmm_prim->gmmreg.sim_auth_ind.rand, + sizeof(gmm_prim->gmmreg.sim_auth_ind.rand))); + /* Emulate SIM, asnwer SRES=0xacacacac, Kc=bdbdbd... */ + gmm_prim_tx = osmo_gprs_gmm_prim_alloc_gmmreg_sim_auth_rsp(); + OSMO_ASSERT(gmm_prim_tx); + gmm_prim_tx->gmmreg.sim_auth_rsp.ac_ref_nr = gmm_prim->gmmreg.sim_auth_ind.ac_ref_nr; + gmm_prim_tx->gmmreg.sim_auth_rsp.key_seq = gmm_prim->gmmreg.sim_auth_ind.key_seq; + memcpy(gmm_prim_tx->gmmreg.sim_auth_rsp.rand, gmm_prim->gmmreg.sim_auth_ind.rand, + sizeof(gmm_prim_tx->gmmreg.sim_auth_rsp.rand)); + memset(gmm_prim_tx->gmmreg.sim_auth_rsp.sres, 0xac, + sizeof(gmm_prim_tx->gmmreg.sim_auth_rsp.sres)); + memset(gmm_prim_tx->gmmreg.sim_auth_rsp.kc, 0xbd, + sizeof(gmm_prim_tx->gmmreg.sim_auth_rsp.kc)); + rc = osmo_gprs_gmm_prim_upper_down(gmm_prim_tx); + OSMO_ASSERT(rc == 0); + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0) + } + break; + case OSMO_GPRS_GMM_SAP_GMMSM: + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_CONFIRM): + if (gmm_prim->gmmsm.establish_cnf.accepted) + printf("%s(): Rx %s sess_id=%u accepted\n", __func__, pdu_name, + gmm_prim->gmmsm.sess_id); + else + printf("%s(): Rx %s sess_id=%u rejected cause=%u\n", __func__, pdu_name, + gmm_prim->gmmsm.sess_id, + gmm_prim->gmmsm.establish_cnf.rej.cause); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_INDICATION): + printf("%s(): Rx %s sess_id=%u sm_pdu=%s\n", __func__, pdu_name, + gmm_prim->gmmsm.sess_id, + osmo_hexdump(gmm_prim->gmmsm.unitdata_ind.smpdu, + gmm_prim->gmmsm.unitdata_ind.smpdu_len)); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_RELEASE, PRIM_OP_INDICATION): + printf("%s(): Rx %s sess_id=%u\n", __func__, pdu_name, + gmm_prim->gmmsm.sess_id); + break; + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_MODIFY, PRIM_OP_INDICATION): + printf("%s(): Rx %s sess_id=%u allocated_ptmsi=0x%08x allocated_ptmsi_sig=0x%06x allocated_tlli=0x%08x\n", __func__, pdu_name, + gmm_prim->gmmsm.sess_id, + gmm_prim->gmmsm.modify_ind.allocated_ptmsi, + gmm_prim->gmmsm.modify_ind.allocated_ptmsi_sig, + gmm_prim->gmmsm.modify_ind.allocated_tlli); + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0) + } + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return 0; +} + +int test_gmm_prim_down_cb(struct osmo_gprs_gmm_prim *gmm_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_gmm_prim_name(gmm_prim); + + switch (gmm_prim->oph.sap) { + case OSMO_GPRS_GMM_SAP_GMMBSSGP: + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_PAGING, PRIM_OP_REQUEST): + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY, PRIM_OP_REQUEST): + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_RA_CAPABILITY_UPDATE, PRIM_OP_RESPONSE): + case OSMO_PRIM(OSMO_GPRS_GMM_GMMBSSGP_MS_REGISTRATION_ENQUIRY, PRIM_OP_RESPONSE): + printf("%s(): Rx %s\n", __func__, pdu_name); + break; + } + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return 0; +} + +int test_gmm_prim_llc_down_cb(struct osmo_gprs_llc_prim *llc_prim, void *user_data) +{ + const char *pdu_name = osmo_gprs_llc_prim_name(llc_prim); + struct osmo_gprs_gmm_prim *gmm_prim_tx; + + switch (llc_prim->oph.sap) { + case OSMO_GPRS_LLC_SAP_LLGMM: + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST): + printf("%s(): Rx %s old_TLLI=0x%08x new_TLLI=0x%08x\n", + __func__, pdu_name, + llc_prim->llgmm.tlli, llc_prim->llgmm.assign_req.tlli_new); + break; + default: + printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); + } + break; + case OSMO_GPRS_LLC_SAP_LL: + printf("%s(): Rx %s TLLI=0x%08x SAPI=%s l3=[%s]\n", __func__, pdu_name, + llc_prim->ll.tlli, osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LL_UNITDATA, PRIM_OP_REQUEST): + /* Immediately notify GMM that it was transmitted over the air: */ + gmm_prim_tx = (struct osmo_gprs_gmm_prim *)gprs_rlcmac_prim_alloc_gmmrr_llc_transmitted_ind(llc_prim->ll.tlli); + gmm_prim_tx->oph.sap = OSMO_GPRS_GMM_SAP_GMMRR; + gmm_prim_tx->oph.primitive = OSMO_GPRS_GMM_GMMRR_LLC_TRANSMITTED; + osmo_gprs_gmm_prim_lower_up(gmm_prim_tx); + break; + } + break; + default: + printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); + OSMO_ASSERT(0); + } + return 0; +} + +/* Test explicit GPRS attach through GMMREG, TS 24.007 Annex C.1 */ +static void test_gmm_prim_ms_gmmreg(void) +{ + //struct osmo_gprs_gmm_prim *gmm_prim; + struct osmo_gprs_llc_prim *llc_prim; + int rc; + uint32_t rand_tlli = 0x80001234; + + printf("==== %s() [start] ====\n", __func__); + + clock_override_set(0, 0); + + rc = osmo_gprs_gmm_init(OSMO_GPRS_GMM_LOCATION_NETWORK); + OSMO_ASSERT(rc == 0); + + osmo_gprs_gmm_prim_set_up_cb(test_gmm_prim_up_cb, NULL); + osmo_gprs_gmm_prim_set_down_cb(test_gmm_prim_down_cb, NULL); + osmo_gprs_gmm_prim_set_llc_down_cb(test_gmm_prim_llc_down_cb, NULL); + + /* MS sends GMM Attach Req */ + llc_prim = gprs_llc_prim_alloc_ll_unitdata_ind(rand_tlli, OSMO_GPRS_LLC_SAPI_GMM, (uint8_t *)pdu_gmm_att_req, sizeof(pdu_gmm_att_req)); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_gmm_prim_llc_lower_up(llc_prim); + /* TODO: implement this primitive! + * OSMO_ASSERT(rc == 0); */ + /* As a result, Network answers with GMM Identification Request. */ + + /* MS sends GMM Identification response */ + llc_prim = gprs_llc_prim_alloc_ll_unitdata_ind(rand_tlli, OSMO_GPRS_LLC_SAPI_GMM, (uint8_t *)pdu_gmm_id_resp, sizeof(pdu_gmm_id_resp)); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_gmm_prim_llc_lower_up(llc_prim); + /* TODO: implement this primitive! + * OSMO_ASSERT(rc == 0); */ + + /* ... */ + + printf("==== %s() [end] ====\n", __func__); +} + +static const struct log_info_cat test_log_categories[] = { }; +static const struct log_info test_log_info = { + .cat = test_log_categories, + .num_cat = ARRAY_SIZE(test_log_categories), +}; + +int main(int argc, char *argv[]) +{ + tall_ctx = talloc_named_const(NULL, 1, __FILE__); + + osmo_init_logging2(tall_ctx, &test_log_info); + log_parse_category_mask(osmo_stderr_target, "DLGLOBAL,1:"); + osmo_fsm_log_addr(false); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + log_set_use_color(osmo_stderr_target, 0); + + clock_override_enable(true); + + test_gmm_prim_ms_gmmreg(); + + talloc_free(tall_ctx); +} diff --git a/tests/gmm/gmm_prim_network_test.err b/tests/gmm/gmm_prim_network_test.err new file mode 100644 index 0000000..e73f215 --- /dev/null +++ b/tests/gmm/gmm_prim_network_test.err @@ -0,0 +1,4 @@ +DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication +DLGLOBAL NOTICE Rx LL-UNITDATA.indication: Unknown TLLI 0x80001234 +DLGLOBAL INFO Rx from lower layers: LL-UNITDATA.indication +DLGLOBAL NOTICE Rx LL-UNITDATA.indication: Unknown TLLI 0x80001234 diff --git a/tests/gmm/gmm_prim_network_test.ok b/tests/gmm/gmm_prim_network_test.ok new file mode 100644 index 0000000..a26ff56 --- /dev/null +++ b/tests/gmm/gmm_prim_network_test.ok @@ -0,0 +1,3 @@ +==== test_gmm_prim_ms_gmmreg() [start] ==== +sys={0.000000}, mono={0.000000}: clock_override_set +==== test_gmm_prim_ms_gmmreg() [end] ==== diff --git a/tests/gmm/gmm_prim_test.h b/tests/gmm/gmm_prim_test.h new file mode 100644 index 0000000..1e231b1 --- /dev/null +++ b/tests/gmm/gmm_prim_test.h @@ -0,0 +1,41 @@ +#pragma once + +#include <osmocom/core/timer.h> +#include <osmocom/core/timer_compat.h> + +#define clock_debug(fmt, args...) \ + do { \ + struct timespec ts; \ + struct timeval tv; \ + osmo_clock_gettime(CLOCK_MONOTONIC, &ts); \ + osmo_gettimeofday(&tv, NULL); \ + fprintf(stdout, "sys={%lu.%06lu}, mono={%lu.%06lu}: " fmt "\n", \ + tv.tv_sec, tv.tv_usec, ts.tv_sec, ts.tv_nsec/1000, ##args); \ + } while (0) + +static void clock_override_enable(bool enable) +{ + osmo_gettimeofday_override = enable; + osmo_clock_override_enable(CLOCK_MONOTONIC, enable); +} + +static void clock_override_set(long sec, long usec) +{ + struct timespec *mono; + osmo_gettimeofday_override_time.tv_sec = sec; + osmo_gettimeofday_override_time.tv_usec = usec; + mono = osmo_clock_override_gettimespec(CLOCK_MONOTONIC); + mono->tv_sec = sec; + mono->tv_nsec = usec*1000; + + clock_debug("clock_override_set"); +} + +static inline void clock_override_add_debug(long sec, long usec, bool dbg) +{ + osmo_gettimeofday_override_add(sec, usec); + osmo_clock_override_add(CLOCK_MONOTONIC, sec, usec*1000); + if (dbg) + clock_debug("clock_override_add"); +} +#define clock_override_add(sec, usec) clock_override_add_debug(sec, usec, true) diff --git a/tests/testsuite.at b/tests/testsuite.at index 3b5c326..e819a8d 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -15,6 +15,13 @@ AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_ms_test], [0], [expout], [experr]) AT_CLEANUP +AT_SETUP([gmm/gmm_prim_network]) +AT_KEYWORDS([gmm gmm_prim_network]) +cat $abs_srcdir/gmm/gmm_prim_network_test.ok > expout +cat $abs_srcdir/gmm/gmm_prim_network_test.err > experr +AT_CHECK([$abs_top_builddir/tests/gmm/gmm_prim_network_test], [0], [expout], [experr]) +AT_CLEANUP + AT_SETUP([llc/llc]) AT_KEYWORDS([llc llc]) cat $abs_srcdir/llc/llc_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37726?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I832f16f598f49c18455531fac75367376a3065e6 Gerrit-Change-Number: 37726 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in libosmo-gprs[master]: gmm: Introduce interface GMMBSSGP
by pespin 20 Aug '24

20 Aug '24

Attention is currently required from: fixeria, lynxis lazus, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email ) Change subject: gmm: Introduce interface GMMBSSGP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/37724?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I39045833fd43cfe98cb1a3812fbce3fdcaae6dc6 Gerrit-Change-Number: 37724 Gerrit-PatchSet: 1 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 20 Aug 2024 09:23:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-sgsn[master]: llc: Mark old/current tlli as all 1's when unassigning LLME
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37871?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 --- M src/sgsn/gprs_llc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved 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/+/37871?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: I660c8d0ef08b34f8cb74fd51b5c59e5628d687ae Gerrit-Change-Number: 37871 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-sgsn[master]: Fix double free during RAU with unexpected Old RAI
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/37870?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 --- M include/osmocom/sgsn/mmctx.h M src/sgsn/gprs_gmm.c M src/sgsn/mmctx.c 3 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve lynxis lazus: Looks good to me, approved 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/+/37870?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: I5a4328c6e945b85dd815215724feecadba59c435 Gerrit-Change-Number: 37870 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: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: sgsn: Fix running with testenv.py podman setup
by pespin 20 Aug '24

20 Aug '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37862?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: sgsn: Fix running with testenv.py podman setup ...................................................................... sgsn: Fix running with testenv.py podman setup The initial testenv.py setup introduced in osmo-ttcn3-hacks.git 6baec93cb85fa8a0051e9aacd0178e90adbfdadc lacked some recent updates to the ttcn3 testsuite setup where a second IP address is added to the container in order to distinguish between RNC and CN in GTPU. Change-Id: Ia0af52f8b7d61c15bdf2b6152fae27dd003d00e8 --- M sgsn/SGSN_Tests.cfg M sgsn/osmo-stp.cfg 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified lynxis lazus: Looks good to me, but someone else must approve diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg index 4f92ac2..365d4cd 100644 --- a/sgsn/SGSN_Tests.cfg +++ b/sgsn/SGSN_Tests.cfg @@ -55,7 +55,7 @@ } SGSN_Tests.mp_ranap_cfg := { { - sctp_addr := { 23908, "127.0.0.103", 2905, "127.0.0.200" } + sctp_addr := { 23908, "127.0.0.104", 2905, "127.0.0.200" } } } SGSN_Tests.mp_hlr_ip := "127.0.0.103" diff --git a/sgsn/osmo-stp.cfg b/sgsn/osmo-stp.cfg index 23c4e8f..e79c298 100644 --- a/sgsn/osmo-stp.cfg +++ b/sgsn/osmo-stp.cfg @@ -39,7 +39,7 @@ xua rkm routing-key-allocation dynamic-permitted asp virt-rnc0-0 23908 2905 m3ua local-ip 127.0.0.200 - remote-ip 127.0.0.103 + remote-ip 127.0.0.104 role sg sctp-role server as virt-rnc0 m3ua -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia0af52f8b7d61c15bdf2b6152fae27dd003d00e8 Gerrit-Change-Number: 37862 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-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2024