December 2023 - gerrit-log - lists.osmocom.org

[S] Change in pysim[master]: euicc: Fix encoding of Lc value in STORE DATA

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35260?usp=email ) Change subject: euicc: Fix encoding of Lc value in STORE DATA ...................................................................... euicc: Fix encoding of Lc value in STORE DATA The length value "of course" is a hex value, don't use %02u but %02x This fixes any eUICC command with a Lc > 10 bytes. Change-Id: I1e1efbfb9916fc43699602cc889cf4b3d42736f2 --- M pySim/euicc.py 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/60/35260/1 diff --git a/pySim/euicc.py b/pySim/euicc.py index 58d19f1..c070525 100644 --- a/pySim/euicc.py +++ b/pySim/euicc.py @@ -297,7 +297,7 @@ def store_data(scc: SimCardCommands, tx_do: Hexstr) -> Tuple[Hexstr, SwHexstr]: """Perform STORE DATA according to Table 47+48 in Section 5.7.2 of SGP.22. Only single-block store supported for now.""" - capdu = '%sE29100%02u%s' % (scc.cla4lchan('80'), len(tx_do)//2, tx_do) + capdu = '%sE29100%02x%s' % (scc.cla4lchan('80'), len(tx_do)//2, tx_do) return scc._tp.send_apdu_checksw(capdu) @staticmethod -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35260?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I1e1efbfb9916fc43699602cc889cf4b3d42736f2 Gerrit-Change-Number: 35260 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: tests/coding: fix -Wmaybe-uninitialized in test_pdtch()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35259?usp=email ) Change subject: tests/coding: fix -Wmaybe-uninitialized in test_pdtch() ...................................................................... tests/coding: fix -Wmaybe-uninitialized in test_pdtch() I am seeing this when building with gcc v13.2.1: tests/coding/coding_test.c: In function ‘test_pdtch’: tests/coding/coding_test.c:444:23: warning: ‘*result[<unknown>]’ may be used uninitialized 444 | result[len - 1] &= 0x7f; | ~~~~~~^~~~~~~~~ tests/coding/coding_test.c:448:23: warning: ‘*result[39]’ may be used uninitialized 448 | result[len - 1] &= 0x07; | ~~~~~~^~~~~~~~~ The idea here is to pre-clear some bits in the resulting buffer, because they're not going to be set during decoding of the burst bits. The problem is that result[] holds uninitialized data, so we're basically taking a 'garbage' octet and clear some of its bits. The remaining 'garbage' bits of that octet are overwritten by the decoder, so in the end we still get deterministic results. Let's make GCC happy by clearing all bits in the last octet. Change-Id: I24d79de8b3a5f4184b71414504657e5857498e0e --- M tests/coding/coding_test.c 1 file changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/35259/1 diff --git a/tests/coding/coding_test.c b/tests/coding/coding_test.c index c9508f7..d536e44 100644 --- a/tests/coding/coding_test.c +++ b/tests/coding/coding_test.c @@ -441,11 +441,11 @@ case 34: case 54: l2[len - 1] &= 0x7f; - result[len - 1] &= 0x7f; + result[len - 1] = 0x00; break; case 40: l2[len - 1] &= 0x07; - result[len - 1] &= 0x07; + result[len - 1] = 0x00; break; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35259?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I24d79de8b3a5f4184b71414504657e5857498e0e Gerrit-Change-Number: 35259 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: coding: fix doxygen docs for gsm0503_pdtch[_egprs]_decode()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35256?usp=email ) Change subject: coding: fix doxygen docs for gsm0503_pdtch[_egprs]_decode() ...................................................................... coding: fix doxygen docs for gsm0503_pdtch[_egprs]_decode() Change-Id: I09a4c52f5704a6436eff524cd2ce5c35347aafde --- M src/coding/gsm0503_coding.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/56/35256/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 365ae6e..612e0ad 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -924,7 +924,7 @@ * \param usf_p unused argument ?!? * \param[out] n_errors number of detected bit-errors * \param[out] n_bits_total total number of decoded bits - * \returns 0 on success; negative on error */ + * \returns number of bytes decoded; negative on error */ int gsm0503_pdtch_egprs_decode(uint8_t *l2_data, const sbit_t *bursts, uint16_t nbits, uint8_t *usf_p, int *n_errors, int *n_bits_total) { @@ -1013,7 +1013,7 @@ * \param[out] usf_p uplink stealing flag * \param[out] n_errors number of detected bit-errors * \param[out] n_bits_total total number of dcoded bits - * \returns 0 on success; negative on error */ + * \returns number of bytes decoded; negative on error */ int gsm0503_pdtch_decode(uint8_t *l2_data, const sbit_t *bursts, uint8_t *usf_p, int *n_errors, int *n_bits_total) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35256?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I09a4c52f5704a6436eff524cd2ce5c35347aafde Gerrit-Change-Number: 35256 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: coding: gsm0503_pdtch_decode(): implement USF decoding for CS1

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35258?usp=email ) Change subject: coding: gsm0503_pdtch_decode(): implement USF decoding for CS1 ...................................................................... coding: gsm0503_pdtch_decode(): implement USF decoding for CS1 This patch brings decoding of the CS1 in consistency with the other three coding schemes, for which we support decoding USF independently. Change-Id: I61a3628741c0ac68374fc7f077cf3a07e51277c3 --- M src/coding/gsm0503_coding.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/35258/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 5b78502..1f409d6 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -1042,6 +1042,10 @@ osmo_conv_decode_ber(&gsm0503_xcch, cB, conv, n_errors, n_bits_total); + /* the three USF bits d(0),d(1),d(2) are *not* precoded */ + if (usf_p) + *usf_p = (conv[0] << 2) | (conv[1] << 1) | (conv[2] << 0); + rv = osmo_crc64gen_check_bits(&gsm0503_fire_crc40, conv, 184, conv + 184); if (rv) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35258?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I61a3628741c0ac68374fc7f077cf3a07e51277c3 Gerrit-Change-Number: 35258 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: coding: clarify the USF decoding for PDCH blocks

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35257?usp=email ) Change subject: coding: clarify the USF decoding for PDCH blocks ...................................................................... coding: clarify the USF decoding for PDCH blocks The USF (Uplink State Flag) field is present in the MAC header of all Downlink PDCH blocks. It is used by the network to indicate which MS can transmit on subsequent Uplink PDCH block(s). This field is of a high importance for the MS, thus the decoder API allows the caller to obtain USF value separately from the actual data bits. In the case of gsm0503_pdtch_decode(), if the 'usf_p' pointer is not NULL, the USF value would be assigned for CS2/CS3/CS4 (but not CS1) even if the CRC check fails (negative return value). A subsequent patch is to bring the CS1 in consistency with CS2/CS3/CS4. In the case of gsm0503_pdtch_egprs_decode(), decoding of the USF field separately from data bits is not implemented, and moreover the function itself cannot be used for decoding Downlink blocks. Change-Id: I43e8bfb4003f34766ace7c5c6080ca583ce5efbb --- M src/coding/gsm0503_coding.c 1 file changed, 29 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/57/35257/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 612e0ad..5b78502 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -921,7 +921,7 @@ * \param[out] l2_data caller-allocated buffer for L2 Frame * \param[in] bursts burst input data as soft unpacked bits * \param[in] nbits number of bits in \a bursts - * \param usf_p unused argument ?!? + * \param usf_p Uplink State Flag, FIXME: not implemented * \param[out] n_errors number of detected bit-errors * \param[out] n_bits_total total number of decoded bits * \returns number of bytes decoded; negative on error */ @@ -1010,7 +1010,7 @@ /*! Decode GPRS PDTCH * \param[out] l2_data caller-allocated buffer for L2 Frame * \param[in] bursts burst input data as soft unpacked bits - * \param[out] usf_p uplink stealing flag + * \param[out] usf_p Uplink State Flag, only relevant for DL blocks * \param[out] n_errors number of detected bit-errors * \param[out] n_bits_total total number of dcoded bits * \returns number of bytes decoded; negative on error */ @@ -1061,6 +1061,7 @@ osmo_conv_decode_ber(&gsm0503_cs2_np, cB, conv, n_errors, n_bits_total); + /* 5.1.2.2 a) the three USF bits d(0),d(1),d(2) are precoded into six bits */ for (i = 0; i < 8; i++) { for (j = 0, k = 0; j < 6; j++) k += abs(((int)gsm0503_usf2six[i][j]) - ((int)conv[j])); @@ -1096,6 +1097,7 @@ osmo_conv_decode_ber(&gsm0503_cs3_np, cB, conv, n_errors, n_bits_total); + /* 5.1.3.2 a) the three USF bits d(0),d(1),d(2) are precoded into six bits */ for (i = 0; i < 8; i++) { for (j = 0, k = 0; j < 6; j++) k += abs(((int)gsm0503_usf2six[i][j]) - ((int)conv[j])); @@ -1124,6 +1126,7 @@ for (i = 12; i < 456; i++) conv[i] = (cB[i] < 0) ? 1 : 0; + /* 5.1.4.2 a) the three USF bits d(0),d(1),d(2) are precoded into twelve bits */ for (i = 0; i < 8; i++) { for (j = 0, k = 0; j < 12; j++) k += abs(((int)gsm0503_usf2twelve_sbit[i][j]) - ((int)cB[j])); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35257?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I43e8bfb4003f34766ace7c5c6080ca583ce5efbb Gerrit-Change-Number: 35257 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmo-sccp[master]: ipa: Fix client setting unit_id with ASP name instead of AS

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35255?usp=email ) Change subject: ipa: Fix client setting unit_id with ASP name instead of AS ...................................................................... ipa: Fix client setting unit_id with ASP name instead of AS This was broken since ever. The client was submitting the ASP name in the unit_id field during IPA handshake, and the server was expecting it to contain the AS, so it failed with message: "Cannot find any definition for IPA Unit Name '%s'" in ipa_asp_fsm_wait_id_resp(). Fixes: 5f0a8df34cae20455a520c3a85cf94124f486bf2 Change-Id: I249964e171f578726439c40e01ae85aa447afada --- M src/ipa.c M src/xua_asp_fsm.c M src/xua_internal.h 3 files changed, 26 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/55/35255/1 diff --git a/src/ipa.c b/src/ipa.c index a77d331..82ece8b 100644 --- a/src/ipa.c +++ b/src/ipa.c @@ -131,7 +131,7 @@ return 0; } -static struct osmo_ss7_as *find_as_for_asp(struct osmo_ss7_asp *asp) +struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp) { struct osmo_ss7_as *as; @@ -216,7 +216,7 @@ int rc; struct m3ua_data_hdr data_hdr; struct xua_msg *xua; - struct osmo_ss7_as *as = find_as_for_asp(asp); + struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); uint32_t opc, dpc; if (!as) { diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 2d81bc3..cc94ac7 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -1190,10 +1190,16 @@ { struct osmo_fsm_inst *fi; struct ipa_asp_fsm_priv *iafp; + struct osmo_ss7_as *as = ipa_find_as_for_asp(asp); /* allocate as child of AS? */ fi = osmo_fsm_inst_alloc(&ipa_asp_fsm, asp, NULL, log_level, asp->cfg.name); + if (!as) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); + return NULL; + } + iafp = talloc_zero(fi, struct ipa_asp_fsm_priv); if (!iafp) { osmo_fsm_inst_term(fi, OSMO_FSM_TERM_ERROR, NULL); @@ -1202,7 +1208,7 @@ iafp->role = role; iafp->asp = asp; iafp->ipa_unit = talloc_zero(iafp, struct ipaccess_unit); - iafp->ipa_unit->unit_name = talloc_strdup(iafp->ipa_unit, asp->cfg.name); + iafp->ipa_unit->unit_name = talloc_strdup(iafp->ipa_unit, as->cfg.name); iafp->pong_timer.cb = ipa_pong_timer_cb; iafp->pong_timer.data = fi; diff --git a/src/xua_internal.h b/src/xua_internal.h index 93f6140..b6b33af 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -117,6 +117,7 @@ int ipa_tx_xua_as(struct osmo_ss7_as *as, struct xua_msg *xua); int ipa_rx_msg(struct osmo_ss7_asp *asp, struct msgb *msg, uint8_t sls); +struct osmo_ss7_as *ipa_find_as_for_asp(struct osmo_ss7_asp *asp); int osmo_isup_party_parse(char *out_digits, const uint8_t *in, unsigned int in_num_bytes, bool odd); -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35255?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I249964e171f578726439c40e01ae85aa447afada Gerrit-Change-Number: 35255 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in osmo-bsc[master]: SI10: generate rest-octets

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31047?usp=email ) Change subject: SI10: generate rest-octets ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31047?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6b39f193d5940a629505bab0c0f1c4d192943fd8 Gerrit-Change-Number: 31047 Gerrit-PatchSet: 20 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

1 year, 6 months

1
0
0 0

[S] Change in osmo-bsc[master]: SI10: add to SACCH filling

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32631?usp=email ) Change subject: SI10: add to SACCH filling ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32631?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5f5bd8887682ff09cf11cc7a3dae5048f50e3fd0 Gerrit-Change-Number: 32631 Gerrit-PatchSet: 2 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

1 year, 6 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: add SI10 receive stub

by fixeria

fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31665?usp=email ) Change subject: mobile: add SI10 receive stub ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31665?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia2672636251be1894c50b34d67ea1e6295f97d97 Gerrit-Change-Number: 31665 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: abandon

1 year, 6 months

1
0
0 0

[S] Change in pysim[master]: euicc: the ICCID TLV object uses bcd-swapped-nibble encoding

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35252?usp=email ) Change subject: euicc: the ICCID TLV object uses bcd-swapped-nibble encoding ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35252?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I050f9e0fb128f3e1d472e2330b136a753794a5a1 Gerrit-Change-Number: 35252 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 07 Dec 2023 17:39:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023