September 2026 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-sgsn[master]: gprs_gmm: Routing Area Update: ensure PDP_CTX_STATUS has correct lenght
by lynxis lazus 09 Sep '26

09 Sep '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43599?usp=email ) Change subject: gprs_gmm: Routing Area Update: ensure PDP_CTX_STATUS has correct lenght ...................................................................... gprs_gmm: Routing Area Update: ensure PDP_CTX_STATUS has correct lenght Change-Id: Ic9560108ee424634e15a5af1424ea44df491a474 --- M src/sgsn/gprs_gmm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/99/43599/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index c8b2671..c35d54f 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1783,7 +1783,7 @@ /* Look at PDP Context Status IE and see if MS's view of * activated/deactivated NSAPIs agrees with our view */ - if (TLVP_PRESENT(&req.tlv, GSM48_IE_GMM_PDP_CTX_STATUS)) { + if (TLVP_PRES_LEN(&req.tlv, GSM48_IE_GMM_PDP_CTX_STATUS, 2)) { uint16_t pdp_status = osmo_load16le(TLVP_VAL(&req.tlv, GSM48_IE_GMM_PDP_CTX_STATUS)); process_ms_ctx_status(mmctx, pdp_status); } -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43599?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Ic9560108ee424634e15a5af1424ea44df491a474 Gerrit-Change-Number: 43599 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: gprs_gmm: refactor handling of GMM Detach Accept into own function
by lynxis lazus 09 Sep '26

09 Sep '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43600?usp=email ) Change subject: gprs_gmm: refactor handling of GMM Detach Accept into own function ...................................................................... gprs_gmm: refactor handling of GMM Detach Accept into own function Change-Id: Iae846bbff0df04295a1579017117b3e84fa29157 --- M src/sgsn/gprs_gmm.c 1 file changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/00/43600/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index c35d54f..e82bc06 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1502,6 +1502,14 @@ return rc; } +/* CHapter 9.4.6: MT Detach Ack */ +static int gsm48_rx_gmm_det_accept(struct sgsn_mm_ctx *ctx, struct msgb *msg) +{ + LOGMMCTXP(LOGL_INFO, ctx, "-> DETACH ACK\n"); + mm_ctx_cleanup_free(ctx, "GMM DETACH ACK"); + return 0; +} + /* Chapter 9.4.15: Routing area update accept */ static int gsm48_tx_gmm_ra_upd_ack(struct sgsn_mm_ctx *mm) { @@ -2100,9 +2108,7 @@ case GSM48_MT_GMM_DETACH_ACK: if (!mmctx) goto null_mmctx; - LOGMMCTXP(LOGL_INFO, mmctx, "-> DETACH ACK\n"); - mm_ctx_cleanup_free(mmctx, "GMM DETACH ACK"); - rc = 0; + rc = gsm48_rx_gmm_det_accept(mmctx, msg); break; case GSM48_MT_GMM_ATTACH_COMPL: if (!mmctx) -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43600?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iae846bbff0df04295a1579017117b3e84fa29157 Gerrit-Change-Number: 43600 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-sgsn[master]: Use osmo_select_main_ctx to support talloc context OTC_SELECT
by lynxis lazus 09 Sep '26

09 Sep '26

Attention is currently required from: daniel, laforge, lynxis lazus. lynxis lazus has uploaded a new patch set (#4) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email ) The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: Use osmo_select_main_ctx to support talloc context OTC_SELECT ...................................................................... Use osmo_select_main_ctx to support talloc context OTC_SELECT The libvlr code is using the OTC_SELECT talloc context. Change-Id: I4b26b73af706ce790181085880c6866e7f7e8c65 --- M src/sgsn/sgsn_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/03/39703/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/39703?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4b26b73af706ce790181085880c6866e7f7e8c65 Gerrit-Change-Number: 39703 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> 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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in osmo-sgsn[master]: gprs_gmm: Use gprs_gmm_parse_att_req() to parse Attach Request
by lynxis lazus 09 Sep '26

09 Sep '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43595?usp=email ) Change subject: gprs_gmm: Use gprs_gmm_parse_att_req() to parse Attach Request ...................................................................... gprs_gmm: Use gprs_gmm_parse_att_req() to parse Attach Request gprs_gmm_parse_att_req() is a parser for Attach Request, use it. Change-Id: Iee3c66d6ab21ead103241753f927d9245aad9e64 --- M src/sgsn/gprs_gmm.c 1 file changed, 22 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/95/43595/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index 3d4b940..c32bb7b 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -1244,20 +1244,22 @@ static int gsm48_rx_gmm_att_req(struct sgsn_mm_ctx *ctx, struct msgb *msg, struct gprs_llc_llme *llme) { - struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_gmmh(msg); - uint8_t *cur = gh->data, *msnc, *mi_data, *ms_ra_acc_cap; - uint8_t msnc_len, att_type, mi_len, ms_ra_acc_cap_len; - uint16_t drx_par; + struct gprs_gmm_att_req req = {}; char mi_log_string[32]; struct osmo_routing_area_id rai; uint16_t cid = 0; enum gsm48_gmm_cause reject_cause; - struct osmo_mobile_identity mi; int rc; LOGMMCTXP(LOGL_INFO, ctx, "-> GMM ATTACH REQUEST "); rate_ctr_inc(rate_ctr_group_get_ctr(sgsn->rate_ctrs, CTR_GPRS_ATTACH_REQUEST)); + rc = gprs_gmm_parse_att_req(msg, &req); + if (rc) { + LOGP(DMM, LOGL_ERROR, "Invalid Attach Request message received.\n"); + goto err_inval; + } + /* As per TS 04.08 Chapter 4.7.1.4, the attach request arrives either * with a foreign TLLI (P-TMSI that was allocated to the MS before), * or with random TLLI. */ @@ -1274,58 +1276,23 @@ #endif } - /* MS network capability 10.5.5.12 */ - msnc_len = *cur++; - msnc = cur; - if (msnc_len > sizeof(ctx->ms_network_capa.buf)) - goto err_inval; - cur += msnc_len; - /* TODO: In iu mode - handle follow-on request. * The follow-on request can be signaled in an Attach Request on IuPS. * This means the MS/UE asks to keep the PS connection open for further requests * after the Attach Request succeed. * The SGSN can decide if it close the connection or not. Both are spec conform. */ - /* aTTACH Type 10.5.5.2 */ - att_type = *cur++ & 0x07; - - /* DRX parameter 10.5.5.6 */ - drx_par = *cur++ << 8; - drx_par |= *cur++; - - /* Mobile Identity (P-TMSI or IMSI) 10.5.1.4 */ - mi_len = *cur++; - mi_data = cur; - cur += mi_len; - - rc = osmo_mobile_identity_decode(&mi, mi_data, mi_len, false); - if (rc) - goto err_inval; - osmo_mobile_identity_to_str_buf(mi_log_string, sizeof(mi_log_string), &mi); - - DEBUGPC(DMM, "MI(%s) type=\"%s\" ", mi_log_string, - get_value_string(gprs_att_t_strs, att_type)); - - /* Old routing area identification 10.5.5.15. Skip it */ - cur += 6; - - /* MS Radio Access Capability 10.5.5.12a */ - ms_ra_acc_cap_len = *cur++; - ms_ra_acc_cap = cur; - if (ms_ra_acc_cap_len > sizeof(ctx->ms_radio_access_capa.buf)) - goto err_inval; - cur += ms_ra_acc_cap_len; - - LOGPC(DMM, LOGL_INFO, "\n"); + osmo_mobile_identity_to_str_buf(mi_log_string, sizeof(mi_log_string), &req.mi); + LOGPC(DMM, LOGL_INFO, "MI(%s) type=\"%s\" ", mi_log_string, + get_value_string(gprs_att_t_strs, req.attach_type)); /* Optional: Old P-TMSI Signature, Requested READY timer, TMSI Status */ - switch (mi.type) { + switch (req.mi.type) { case GSM_MI_TYPE_IMSI: /* Try to find MM context based on IMSI */ if (!ctx) - ctx = sgsn_mm_ctx_by_imsi(mi.imsi); + ctx = sgsn_mm_ctx_by_imsi(req.mi.imsi); if (!ctx) { if (MSG_IU_UE_CTX(msg)) ctx = sgsn_mm_ctx_alloc_iu(MSG_IU_UE_CTX(msg)); @@ -1335,13 +1302,13 @@ reject_cause = GMM_CAUSE_NET_FAIL; goto rejected; } - OSMO_STRLCPY_ARRAY(ctx->imsi, mi.imsi); + OSMO_STRLCPY_ARRAY(ctx->imsi, req.mi.imsi); } break; case GSM_MI_TYPE_TMSI: /* Try to find MM context based on P-TMSI */ if (!ctx) - ctx = sgsn_mm_ctx_by_ptmsi(mi.tmsi); + ctx = sgsn_mm_ctx_by_ptmsi(req.mi.tmsi); if (!ctx) { /* Allocate a context as most of our code expects one. * Context will not have an IMSI ultil ID RESP is received */ @@ -1353,7 +1320,7 @@ reject_cause = GMM_CAUSE_NET_FAIL; goto rejected; } - ctx->p_tmsi = mi.tmsi; + ctx->p_tmsi = req.mi.tmsi; } break; default: @@ -1377,14 +1344,15 @@ ctx->gb.cell_id = cid; /* Update MM Context with other data */ - ctx->drx_parms = drx_par; - ctx->ms_radio_access_capa.len = ms_ra_acc_cap_len; - memcpy(ctx->ms_radio_access_capa.buf, ms_ra_acc_cap, + ctx->drx_parms = req.drx_parms; + ctx->ms_radio_access_capa.len = OSMO_MIN(req.ms_radio_cap_len, sizeof(ctx->ms_radio_access_capa.buf)); + memcpy(ctx->ms_radio_access_capa.buf, req.ms_radio_cap, ctx->ms_radio_access_capa.len); - ctx->ms_network_capa.len = msnc_len; - memcpy(ctx->ms_network_capa.buf, msnc, msnc_len); - ctx->ue_cipher_mask = gprs_ms_net_cap_gea_mask(ctx->ms_network_capa.buf, msnc_len); + ctx->ms_network_capa.len = OSMO_MIN(req.ms_network_cap_len, sizeof(ctx->ms_network_capa.buf)); + memcpy(ctx->ms_network_capa.buf, req.ms_network_cap, ctx->ms_network_capa.len); + + ctx->ue_cipher_mask = gprs_ms_net_cap_gea_mask(ctx->ms_network_capa.buf, ctx->ms_network_capa.len); if (!(ctx->ue_cipher_mask & sgsn->cfg.gea_encryption_mask)) { reject_cause = GMM_CAUSE_PROTO_ERR_UNSPEC; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43595?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Iee3c66d6ab21ead103241753f927d9245aad9e64 Gerrit-Change-Number: 43595 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in osmo-sgsn[master]: gprs_gmm: cosmetic
by lynxis lazus 09 Sep '26

09 Sep '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/43596?usp=email ) Change subject: gprs_gmm: cosmetic ...................................................................... gprs_gmm: cosmetic Change-Id: I8f3e647cb7dc3a1b59a560e0301e4d4db1f94f8b --- M src/sgsn/gprs_gmm.c 1 file changed, 4 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/96/43596/1 diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index c32bb7b..a324066 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -196,7 +196,6 @@ sgsn_mm_ctx_cleanup_free(ctx); } - /* 3GPP TS 24.008 § 10.5.7.1 Process PDP context status value, bit 0 corresponds to nsapi 0 */ static void process_ms_ctx_status(struct sgsn_mm_ctx *mmctx, uint16_t pdp_status) @@ -891,8 +890,9 @@ return gsm48_gmm_sendmsg(msg, 0, NULL, true); } + static int gsm48_tx_gmm_service_rej_oldmsg(const struct msgb *old_msg, - uint8_t gmm_cause) + uint8_t gmm_cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 SERVICE REJ OLD"); gmm_copy_id(msg, old_msg); @@ -901,7 +901,7 @@ #if 0 -- currently unused -- static int gsm48_tx_gmm_service_rej(struct sgsn_mm_ctx *mm, - uint8_t gmm_cause) + uint8_t gmm_cause) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 SERVICE REJ"); mmctx2msgid(msg, mm); @@ -1408,7 +1408,6 @@ gprs_llgmm_unassign(llme); return rc; - } /* 3GPP TS 24.008 § 9.4.3 Attach complete */ @@ -1773,7 +1772,7 @@ #endif if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) { /* Even if there is no P-TMSI allocated, the MS will switch from - * foreign TLLI to local TLLI */ + * foreign TLLI to local TLLI */ mmctx->gb.tlli_new = gprs_tmsi2tlli(mmctx->p_tmsi, TLLI_LOCAL); /* Inform LLC layer about new TLLI but keep accepting the old one during Rx */ @@ -1975,10 +1974,8 @@ rc = gsm48_tx_gmm_service_rej_oldmsg(msg, reject_cause); return rc; - } - static int gsm48_rx_gmm_status(struct sgsn_mm_ctx *mmctx, struct msgb *msg) { struct gsm48_hdr *gh = msgb_l3(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/43596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I8f3e647cb7dc3a1b59a560e0301e4d4db1f94f8b Gerrit-Change-Number: 43596 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in onomondo-ipa[master]: main: load addInitialEimRequest from hex-file
by dexter 09 Sep '26

09 Sep '26

dexter has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43413?usp=email ) Change subject: main: load addInitialEimRequest from hex-file ...................................................................... main: load addInitialEimRequest from hex-file We currently load the addInitialEimRequest binary blob from a binary file. Unfortunately this is very user-unfriendly since onomondo-eim generates the eimConfigurationData as hex string (REST API), which means the user has to convert this data into a binary file first. Let's eliminate those extra conversion steps by changing the input format to a textfile containing a hex-string. Then users can simply copy+paste the hex string they got from onomdon-eim. Related: SYS#8101 Change-Id: Ib2095e5042f42ce77af498831be9c8bd1af32401 --- M README.md D contrib/sample_eim_cfg.ber A contrib/sample_eim_cfg.txt M include/onomondo/ipa/utils.h M src/ipa/libipa/utils.c M src/ipa/main.c M tests/utils/utils_test.c 7 files changed, 84 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/README.md b/README.md index 44d76ea..864c6b4 100644 --- a/README.md +++ b/README.md @@ -106,9 +106,9 @@ In case the IoT eUICC is not yet provisioned with an eIM configuration, onomondo-ipa can be used to perform the provisioning. The configuration must be supplied as a file that contains an AddInitialEimRequest (see also GSMA SGP.32, -section 5.9.18) data object in its encoded form. It is up to the user to compile the data object using appropriate tools -and the ASN specification presented in GSMA SGP.32. For testing purposes onomondo-ipa ships with a sample configuration -(contrib/sample_eim_cfg.ber) that expects the eIM to be running at 127.0.0.1:8000. +section 5.9.18) data object in its encoded form (as a hex-string). It is up to the user to compile the data object using +appropriate tools (e.g. onomondo-eim). For testing purposes onomondo-ipa ships with a sample configuration +(contrib/sample_eim_cfg.txt) which expects the eIM to be running at 127.0.0.1:8000. Example: load the initial eIM configuration onto the eUICC in PCSC reader 2 ``` diff --git a/contrib/sample_eim_cfg.ber b/contrib/sample_eim_cfg.ber deleted file mode 100644 index 0c0d00f..0000000 --- a/contrib/sample_eim_cfg.ber +++ /dev/null Binary files differ diff --git a/contrib/sample_eim_cfg.txt b/contrib/sample_eim_cfg.txt new file mode 100644 index 0000000..af7d842 --- /dev/null +++ b/contrib/sample_eim_cfg.txt @@ -0,0 +1 @@ +BF578183A08180307E800365494D810E3132372E302E302E313A383030308301018401FFA55BA059301306072A8648CE3D020106082A8648CE3D03010703420004FE584A6F450459574AECA195D0299737F74C89BA2D36DF9286EC25D973037A0FBA70D14DF3E1F7D0A305E57B95B731C4DE218D2D7F9F22113ED5D18C2E3DDF1C870207808900 diff --git a/include/onomondo/ipa/utils.h b/include/onomondo/ipa/utils.h index 8b849dd..f35a5a9 100644 --- a/include/onomondo/ipa/utils.h +++ b/include/onomondo/ipa/utils.h @@ -38,6 +38,7 @@ __ptr; \ }) +struct ipa_buf *ipa_hexparse(char *hexstr); char *ipa_hexdump(const uint8_t *data, size_t len); struct ipa_buf { diff --git a/src/ipa/libipa/utils.c b/src/ipa/libipa/utils.c index 4017e3b..7520018 100644 --- a/src/ipa/libipa/utils.c +++ b/src/ipa/libipa/utils.c @@ -34,6 +34,42 @@ return def; } +/*! Decode a human readable hexstring to binary. + * \param[in] hexstr pointer to hexstring. + * \returns pointer to ipa_buf containing the decoded binary data. */ +struct ipa_buf *ipa_hexparse(char *hexstr) +{ + struct ipa_buf *bin = NULL; + size_t i; + uint8_t byte; + int digit; + int digit_counter = 0; + size_t hexstr_len = strlen(hexstr); + + bin = ipa_buf_alloc(hexstr_len / 2); + for (i = 0; i < hexstr_len; i++) { + digit = -1; + if (*hexstr >= 0x30 && *hexstr <= 0x39) + digit = *hexstr & 0x0F; + else if (*hexstr >= 0x41 && *hexstr <= 0x46) + digit = (*hexstr & 0x0F) + 9; + else if (*hexstr >= 0x61 && *hexstr <= 0x66) + digit = (*hexstr & 0x0F) + 9; + hexstr++; + + if (digit >= 0) { + if (digit_counter % 2) { + byte |= digit; + bin->data[bin->len] = byte; + bin->len++; + } else + byte = (digit << 4); + digit_counter++; + } + } + return bin; +} + /*! Generate a hexdump string from the input data. * \param[in] data pointer to binary data. * \param[in] len length of binary data. diff --git a/src/ipa/main.c b/src/ipa/main.c index 13b034d..bf2e386 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -81,31 +81,31 @@ printf(" get-connectivity-parameters . Get connectivity parameters from acurrently active profile\n"); } -struct ipa_buf *load_ber_from_file(char *dir, char *file) +struct ipa_buf *load_ber_from_file(char *file) { - char path[PATH_MAX] = { 0 }; - FILE *ber_file = NULL; - struct ipa_buf *ber = NULL; - size_t ber_size; + FILE *hex_file = NULL; + struct ipa_buf *hex = NULL; + struct ipa_buf *bin = NULL; + size_t hex_size; - if (dir) - strcpy(path, dir); - strcat(path, file); + hex_file = fopen(file, "r"); + assert(hex_file); - ber_file = fopen(path, "r"); - assert(ber_file); + fseek(hex_file, 0L, SEEK_END); + hex_size = ftell(hex_file); + rewind(hex_file); - fseek(ber_file, 0L, SEEK_END); - ber_size = ftell(ber_file); - rewind(ber_file); + hex = ipa_buf_alloc(hex_size + 1); + assert(hex); + hex->len = fread(hex->data, sizeof(char), hex->data_len - 1, hex_file); + hex->data[hex->len] = '\0'; + fclose(hex_file); - ber = ipa_buf_alloc(ber_size + 1); - assert(ber); + bin = ipa_hexparse((char *)hex->data); + ipa_buf_free(hex); - ber->len = fread(ber->data, sizeof(char), ber->data_len, ber_file); - fclose(ber_file); - IPA_LOGP(SMAIN, LINFO, "loaded BER data from file %s, size: %zu\n", path, ber->len); - return ber; + IPA_LOGP(SMAIN, LINFO, "loaded binary data from hex file %s, size: %zu\n", file, bin->len); + return bin; } struct ipa_buf *load_nvstate_from_file(char *path) @@ -364,7 +364,7 @@ break; case OPER_ADD_INITIAL_EIM: /* Load initial eIM configuration */ - struct ipa_buf *eim_cfg = load_ber_from_file(NULL, initial_eim_cfg_file); + struct ipa_buf *eim_cfg = load_ber_from_file(initial_eim_cfg_file); ipa_add_init_eim_cfg(ctx, eim_cfg); IPA_FREE(eim_cfg); break; diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c index 517f0d7..eeadde2 100644 --- a/tests/utils/utils_test.c +++ b/tests/utils/utils_test.c @@ -51,9 +51,32 @@ IPA_FREE(tag_list); } +void ipa_hexparse_test(void) +{ + char hexstr[] = + "bf:57:81:83:A0 81 80 30 7E 80.03.65.494D81////0E31kkk32372En302E302E313A38303oooo0308301018401FFA55BA059301306072A8648CE3D020106082A8648CE3D0301070342...0004FE584A6F450459574A-E-C-A19 5 D0299737F74C89BA2D36DFOOOO9286EC25D973037:A0FBA70D14DF3E1F7D0A305E57B95B731C4DE218D2D7F9F22113ed5d18c2e3ddf1c870207808900"; + char expected_data[] = { 0xBF, 0x57, 0x81, 0x83, 0xA0, 0x81, 0x80, 0x30, 0x7E, 0x80, 0x03, + 0x65, 0x49, 0x4D, 0x81, 0x0E, 0x31, 0x32, 0x37, 0x2E, 0x30, 0x2E, 0x30, 0x2E, + 0x31, 0x3A, 0x38, 0x30, 0x30, 0x30, 0x83, 0x01, 0x01, 0x84, 0x01, 0xFF, 0xA5, + 0x5B, 0xA0, 0x59, 0x30, 0x13, 0x06, 0x07, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, + 0x01, 0x06, 0x08, 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07, 0x03, 0x42, + 0x00, 0x04, 0xFE, 0x58, 0x4A, 0x6F, 0x45, 0x04, 0x59, 0x57, 0x4A, 0xEC, 0xA1, + 0x95, 0xD0, 0x29, 0x97, 0x37, 0xF7, 0x4C, 0x89, 0xBA, 0x2D, 0x36, 0xDF, 0x92, + 0x86, 0xEC, 0x25, 0xD9, 0x73, 0x03, 0x7A, 0x0F, 0xBA, 0x70, 0xD1, 0x4D, 0xF3, + 0xE1, 0xF7, 0xD0, 0xA3, 0x05, 0xE5, 0x7B, 0x95, 0xB7, 0x31, 0xC4, 0xDE, 0x21, + 0x8D, 0x2D, 0x7F, 0x9F, 0x22, 0x11, 0x3E, 0xD5, 0xD1, 0x8C, 0x2E, 0x3D, 0xDF, + 0x1C, 0x87, 0x02, 0x07, 0x80, 0x89, 0x00 + }; + struct ipa_buf *bin; + bin = ipa_hexparse(hexstr); + assert(memcmp(bin->data, expected_data, bin->len) == 0); + ipa_buf_free(bin); +} + int main(int argc, char **argv) { ipa_tag_in_taglist_test(); + ipa_hexparse_test(); return 0; } -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43413?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: Ib2095e5042f42ce77af498831be9c8bd1af32401 Gerrit-Change-Number: 43413 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in onomondo-ipa[master]: main: load addInitialEimRequest from hex-file
by dexter 09 Sep '26

09 Sep '26

dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43413?usp=email ) Change subject: main: load addInitialEimRequest from hex-file ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43413?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: onomondo-ipa Gerrit-Branch: master Gerrit-Change-Id: Ib2095e5042f42ce77af498831be9c8bd1af32401 Gerrit-Change-Number: 43413 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 09 Sep 2026 15:30:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[L] Change in pysim[master]: smpp2sim: make the SCP81 BIP relay work
by dexter 09 Sep '26

09 Sep '26

Attention is currently required from: Hoernchen, daniel, laforge. dexter has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43545?usp=email ) Change subject: smpp2sim: make the SCP81 BIP relay work ...................................................................... Patch Set 2: Code-Review+1 (11 comments) Patchset: PS2: I have now carefully read that through. I think this patch would benefit a lot from a more verbose documentation. All methods that are important for an API user should have all input and output parameters documented and contain a hint on how they should be used. I know I have left a lot of comments, some reflect what I have understood. Maybe you can use that for a reference to improve the documentation. Otherwise I think the logic is all right. This should work. File pySim/bip.py: https://gerrit.osmocom.org/c/pysim/+/43545/comment/fbb002a2_3adc6228?usp=em… : PS2, Line 30: # Without them the handler builds and logs what it would send. I would move such documentation into the API docstrings of the class. General information is ok at this location, the specific bits like which parameters the constructors get, etc, that should be in the API docstrings https://gerrit.osmocom.org/c/pysim/+/43545/comment/d2648cd9_6f51fb19?usp=em… : PS2, Line 64: bandwidth.. This explains why we have moved away from twisted. I would put this into a normal comment. Having this in the API docstring is a bit too much I think... https://gerrit.osmocom.org/c/pysim/+/43545/comment/b2d9b943_f029e2e2?usp=em… : PS2, Line 119: if was_empty and not self._closing: I think its important to document why we only notify when the buffer was empty. As far as I understand the rationale is that when a new event happens the buffer is usually empty. So data comes in, the notify happens and a ENVELOPE EVENT DOWNLOAD is sent to the card (actively by the API user, via the ENVELOPE command). The card now knows that there was an event and how much data is in the buffer. Then the card sends proactive RECEIVE DATA commands to get the data from the buffer. When the card has received all data, the buffer is empty again and ready for a new event. Since with each RECEIVE DATA, the card gets the current amount of remaining bytes, we can be sure that the cards reads all bytes until the buffer really runs empty. So basically we will see burts of incoming data with pauses in between. The ENVELOPE EVENT DOWNLOAD is to get the data transfer to the card going again after there was a pause. https://gerrit.osmocom.org/c/pysim/+/43545/comment/377bf6d1_1d6fa423?usp=em… : PS2, Line 126: def rx_available(self) -> int: Missing API doc (you have take_rx and wait_rx, maybe rename this method to "available_rx" or vice-versa?) https://gerrit.osmocom.org/c/pysim/+/43545/comment/d4a1deef_429e9510?usp=em… : PS2, Line 175: def __init__(self, on_data_available=None): I think here it is in particular important to put an API docstring and to document the on_data_available callback in the API docstring. https://gerrit.osmocom.org/c/pysim/+/43545/comment/9a4cb166_3a92c552?usp=em… : PS2, Line 189: def channel_delete(self, chan_nr: int): maybe add a docstring? https://gerrit.osmocom.org/c/pysim/+/43545/comment/687f6ee6_bf03f992?usp=em… : PS2, Line 192: def notify_data_available(self, chan: ProactChannel): The ProactChannel object is created by the channel_create method in this class. Maybe it makes sense to give the self._on_data_available callback to the constructor of ProactChannel. Then the ProactChannel can call it directly, without reaching back to here. This would also result in a clearer architecture as it seems the only reason why the ProactChannel object has a reference to the ProactChannels object is to reach the notify_data_available callback. Then we can also just pass the callback directly with the constructor. We then also can drop the notify_data_available method here entirely. https://gerrit.osmocom.org/c/pysim/+/43545/comment/7ad435c6_e6e4f723?usp=em… : PS2, Line 199: def __init__(self, data_available_sink=None, sms_sink=None): Explain the parameters in an API docstring. In particular the data_available_sink is important here. The API user should know what to do with the result. I think the comment is already good, but I would mention that the API user gets the encoded bytes. So all he has to do is to forward those bytes using the ENVELOPE command. https://gerrit.osmocom.org/c/pysim/+/43545/comment/91cc2b9d_11c38d19?usp=em… : PS2, Line 268: def build_data_available_envelope(self, chan: ProactChannel) -> bytes: As far as I can see this is called from _on_channel_data_available only. This means that it is an internal method - not to be called by API users. I would recommend to prefix it with an underscore when this is the case. https://gerrit.osmocom.org/c/pysim/+/43545/comment/80ce1b95_14c01fd5?usp=em… : PS2, Line 392: def handle_ReceiveData(self, pcmd: ProactiveCommand): maybe add some more API doc on how to use this function? As far as I understood, this is to be called by the API user when he has received a proactive RECEIVE DATA command from the card. So with this the card basically actively fetches data from the rx buffer. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If96c768f2e35c20ea3753e601059410121517b60 Gerrit-Change-Number: 43545 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Sep 2026 13:47:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

1 0

[XS] Change in osmo-ggsn[master]: configure: search libresolv for res_9_init
by pespin 09 Sep '26

09 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/43584?usp=email ) Change subject: configure: search libresolv for res_9_init ...................................................................... configure: search libresolv for res_9_init sgsnemu points the resolver at the DNS server received in the PCO by writing to the resolver state from <resolv.h>. glibc keeps that state in libc, so nothing extra is needed on GNU/Linux. Darwin keeps it in libresolv and renames the interface to the BIND 9 symbols: /usr/include/resolv.h has "#define res_init res_9_init" and "#define __res_state __res_9_state". The link of sgsnemu then fails with Undefined symbols for architecture arm64: "___res_9_state" Add AC_SEARCH_LIBS([res_9_init], [resolv]) so -lresolv is picked up where the symbol lives there. res_9_init is deliberately the name searched for, rather than res_init: it exists only on the platforms that carry this renaming, so on glibc the search finds nothing, LIBS stays as it was and the link line does not change. Change-Id: I97787b051c712c5cfdb241cb7931a214d5a87630 Signed-off-by: Andrei Gosman <andrei.gosman(a)gmail.com> --- M configure.ac 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index cbb6b66..3283aae 100644 --- a/configure.ac +++ b/configure.ac @@ -152,6 +152,10 @@ # check for getopt in standard library adl_FUNC_GETOPT_LONG +# sgsnemu sets the resolver state (_res) from <resolv.h>. glibc keeps it in +# libc; Darwin exports it from libresolv under BIND 9 names (res_9_*). +AC_SEARCH_LIBS([res_9_init], [resolv]) + AM_INIT_AUTOMAKE([foreign]) PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.14.2) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/43584?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I97787b051c712c5cfdb241cb7931a214d5a87630 Gerrit-Change-Number: 43584 Gerrit-PatchSet: 1 Gerrit-Owner: Andrei G <andrei.gosman(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-trx[master]: build: probe UHD version with PKG_CHECK_EXISTS
by pespin 09 Sep '26

09 Sep '26

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/43580?usp=email ) Change subject: build: probe UHD version with PKG_CHECK_EXISTS ...................................................................... build: probe UHD version with PKG_CHECK_EXISTS configure.ac appends -lboost_thread for libuhd < 4.2, which needs it because of a bug in its own code. The probe is a second PKG_CHECK_MODULES(UHD, uhd < 004.002, ...) reusing the UHD variable prefix of the first one. That never asks pkg-config. PKG_CHECK_MODULES expands _PKG_CONFIG, which opens with if test -n "$$1"; then pkg_cv_[]$1="$$1" so once UHD_CFLAGS and UHD_LIBS are set by the earlier PKG_CHECK_MODULES(UHD, uhd >= 003.011), the second call takes those values as its answer, leaves pkg_failed at no, and runs the action-if-found branch whatever the installed version is. -lboost_thread is therefore always appended. On GNU/Linux that only adds a library that is usually present, so the bug is invisible. On macOS ARM64 with UHD 4.10 from Homebrew there is no such library on the link path and the build stops: ld: library 'boost_thread' not found Use PKG_CHECK_EXISTS, which asks pkg-config and sets no variables. The workaround then applies where it was meant to, on libuhd < 4.2. Change-Id: Icbd8af94f258128ea75c0268e0a240dc423ff69e Signed-off-by: Andrei Gosman <andrei.gosman(a)gmail.com> --- M configure.ac 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/configure.ac b/configure.ac index a384495..0cd388d 100644 --- a/configure.ac +++ b/configure.ac @@ -195,9 +195,8 @@ # code and therefore requires linking against boost_thread. It's missing in # uhd.pc, so work around it here. # https://github.com/EttusResearch/uhd/commit/04a83b6e76beef970854da69ba882d7… - PKG_CHECK_MODULES(UHD, uhd < 004.002, - [LIBS="$LIBS -lboost_thread"], - [] + PKG_CHECK_EXISTS([uhd < 004.002], + [LIBS="$LIBS -lboost_thread"] ) ]) -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/43580?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Icbd8af94f258128ea75c0268e0a240dc423ff69e Gerrit-Change-Number: 43580 Gerrit-PatchSet: 2 Gerrit-Owner: Andrei G <andrei.gosman(a)gmail.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log September 2026