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

[XS] Change in osmo-ttcn3-hacks[master]: s1gw: use the new counter name (out_pkt.forward.unmodified)
by laforge 05 Oct '24

05 Oct '24

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email ) Change subject: s1gw: use the new counter name (out_pkt.forward.unmodified) ...................................................................... Patch Set 1: (1 comment) File s1gw/S1GW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309/comment/0ea0f7d2_1868… : PS1, Line 206: {name := mp_statsd_prefix & "ctr.s1ap.proxy.out_pkt.forward.unmodified.value", mtype := "c", min := 2, max := 2} > Well, imho the counter simply says what I explained: A received (input, incoming) packet was forward […] I don't know all the low-level details, but I tend to agree with what @pespin mentions here. I think also osmo-hnbgw has separate input and output counters? see cnlink_ctr_description + cnpool_ctr_description which are independent of hnb_ctr_description ? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I037fea187bb78ba0d4b82d30915c5270d4cd28bb Gerrit-Change-Number: 38309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Oct 2024 08:48:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XL] Change in pysim[master]: tests: sanitize all cards before running tests
by laforge 05 Oct '24

05 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38254?usp=email ) Change subject: tests: sanitize all cards before running tests ...................................................................... tests: sanitize all cards before running tests Even though our tests are written in a way that they shouldn't interfere with each other, it may happen that one testrun writes content to a file that upsets a different testrun. The resulting problems are often difficult to diagnose. To minimize the problem, let's add code that can reset the cards to a defined state. This can be done using pySim-shell's export feature. We can generate a backup from a known good state and then play back the backup to reset files that have been changed. Files that didn't change will not be written thanks to the conserve_write feature of pySim-shell. Related: OS#4384 Change-Id: I42eaf61280968518164f2280245136fd30a603ce --- A tests/card_sanitizer/card_backup_3b991800118822334455667760_2222334455667788990.script A tests/card_sanitizer/card_backup_3b9a940092027593110001020221_1122334455667788990.script A tests/card_sanitizer/card_backup_3b9f95801fc78031e073f62113674d4516004301008f_89445310150011013678.script A tests/card_sanitizer/card_backup_3b9f96801f878031e073fe211b674a357530350265f8_8949440000001155314.script A tests/card_sanitizer/card_backup_3b9f96801f878031e073fe211b674a4c753034054ba9_8988211000000467343.script A tests/card_sanitizer/card_backup_3b9f96801fc78031a073be21136743200718000001a5_8988211320300000028.script A tests/card_sanitizer/card_backup_3b9f96801fc78031a073be21136744220610000001a9_8988219000000117833.script A tests/card_sanitizer/card_data.csv A tests/card_sanitizer/card_sanitizer.py 9 files changed, 18,132 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38254?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I42eaf61280968518164f2280245136fd30a603ce Gerrit-Change-Number: 38254 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

[XL] Change in pysim[master]: tests: sanitize all cards before running tests
by laforge 05 Oct '24

05 Oct '24

Attention is currently required from: dexter, fixeria, osmith. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38254?usp=email ) Change subject: tests: sanitize all cards before running tests ...................................................................... Patch Set 5: Code-Review+2 (1 comment) Commit Message: https://gerrit.osmocom.org/c/pysim/+/38254/comment/c1c36ad6_43e455e3?usp=em… : PS4, Line 14: let's reset the cards to a defined state before : running the actual tests > right, this commit message made sense in the first version of the patch. […] Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38254?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: I42eaf61280968518164f2280245136fd30a603ce Gerrit-Change-Number: 38254 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Oct 2024 08:44:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org>

1 0

[XL] Change in upf-benchmark[master]: Initial version of improved osmo-pfcp-tool from osmo-upf.git.
by laforge 05 Oct '24

05 Oct '24

Attention is currently required from: neels, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/upf-benchmark/+/38327?usp=email ) Change subject: Initial version of improved osmo-pfcp-tool from osmo-upf.git. ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/upf-benchmark/+/38327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: upf-benchmark Gerrit-Branch: master Gerrit-Change-Id: I179d575f53ef5797f296e13cd4d52a043fc4c1c1 Gerrit-Change-Number: 38327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 05 Oct 2024 08:42:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-abis[master]: trau2rtp: add support for EDATA
by laforge 05 Oct '24

05 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38325?usp=email ) Change subject: trau2rtp: add support for EDATA ...................................................................... trau2rtp: add support for EDATA Regular DATA frames are used for 9.6 kbit/s and lower data services, EDATA frames are used for 14.4 kbit/s service. Add support for the latter. Change-Id: If5344eb4718ac95b996e20caf969de35a9c8a35d --- M src/trau/trau_rtp_conv.c 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 4df72d1..b0bde7d 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -31,6 +31,7 @@ #include <osmocom/trau/trau_frame.h> #include <osmocom/trau/trau_rtp.h> #include <osmocom/trau/csd_ra2.h> +#include <osmocom/trau/csd_raa_prime.h> /* RFC4040 "clearmode" RTP payload length */ #define RFC4040_RTP_PLEN 160 @@ -1168,6 +1169,23 @@ return RFC4040_RTP_PLEN; } +static int trau2rtp_edata(uint8_t *out, size_t out_len, + const struct osmo_trau_frame *tf) +{ + /* function interface preliminaries */ + if (tf->type != OSMO_TRAU16_FT_EDATA) + return -EINVAL; + if (out_len < RFC4040_RTP_PLEN) + return -ENOSPC; + + /* Per TS 48.020 section 11.1: + * A-TRAU bit C4 is always 1 in BSS->IWF direction + * A-TRAU bit C5 comes from E-TRAU bit C6 */ + osmo_csd144_to_atrau_ra2(out, tf->m_bits, tf->d_bits, 1, tf->c_bits[5]); + + return RFC4040_RTP_PLEN; +} + /* * CSD in the opposite direction: from clearmode RTP input * to TRAU frame output. @@ -1405,6 +1423,8 @@ return trau2rtp_data_fr(out, out_len, tf); case OSMO_TRAU16_FT_DATA_HR: return trau2rtp_data_hr16(out, out_len, tf); + case OSMO_TRAU16_FT_EDATA: + return trau2rtp_edata(out, out_len, tf); case OSMO_TRAU8_SPEECH: return trau2rtp_hr8(out, out_len, tf, check_twts002(st)); case OSMO_TRAU8_DATA: -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38325?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If5344eb4718ac95b996e20caf969de35a9c8a35d Gerrit-Change-Number: 38325 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: trau_frame: D145_SYNC does not follow EDATA format
by laforge 05 Oct '24

05 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38324?usp=email ) Change subject: trau_frame: D145_SYNC does not follow EDATA format ...................................................................... trau_frame: D145_SYNC does not follow EDATA format 14.5 kbit/s data service uses a special protocol: the CCU and the TRAU exchange D145_SYNC frames first, conveying only alignment of 320-bit TRAU frames, then switch to EDATA frames that can carry payload. (EDATA frames don't have enough sync pattern bits to be reliable against false alignment.) Per TS 48.060 section 5.5.3, D145_SYNC frames are structured like "regular" (lower rates) data frames with all payload bits set to 1, _not_ like EDATA frames. Therefore: * osmo_trau_frame_decode_16k() should decode D145_SYNC frames like regular data frames, not like EDATA; * osmo_trau_frame_encode() given OSMO_TRAU16_FT_D145_SYNC should produce a frame with correct sync pattern and all-1 payload bits, but with control bits up to C15 per TS 48.060 section 5.5.3. Change-Id: I7c743996fc620227438225ffda419217881034d1 --- M src/trau/trau_frame.c 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 88d0031..966c794 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -650,6 +650,22 @@ return 40 * 8; } +/* TS 48.060 section 5.5.3 */ +static int encode16_d145_sync(ubit_t *trau_bits, const struct osmo_trau_frame *fr) +{ + encode_sync16(trau_bits); + + /* C1 .. C5 */ + memcpy(trau_bits + 17, ft_d145s_bits, 5); + /* C6 .. C15 */ + memcpy(trau_bits + 17 + 5, fr->c_bits + 5, 15 - 5); + + /* This frame is for sync only, all data bits filled with 1s */ + memset(trau_bits + 4 * 8, 1, (40 - 4) * 8); + + return 40 * 8; +} + /* TS 08.60 3.3.2 */ static int decode16_edata(struct osmo_trau_frame *fr, const ubit_t *trau_bits, enum osmo_trau_frame_direction dir) @@ -1285,6 +1301,7 @@ case OSMO_TRAU16_FT_DATA: return encode16_data(bits, fr); case OSMO_TRAU16_FT_D145_SYNC: + return encode16_d145_sync(bits, fr); case OSMO_TRAU16_FT_EDATA: return encode16_edata(bits, fr); case OSMO_TRAU8_SPEECH: @@ -1355,7 +1372,7 @@ return decode16_edata(fr, bits, dir); case TRAU_FT_D145_SYNC: fr->type = OSMO_TRAU16_FT_D145_SYNC; - return decode16_edata(fr, bits, dir); + return decode16_data(fr, bits, dir); default: return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38324?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I7c743996fc620227438225ffda419217881034d1 Gerrit-Change-Number: 38324 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmo-abis[master]: TRAU frame output EDATA: set sync pattern bits
by laforge 05 Oct '24

05 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38323?usp=email ) Change subject: TRAU frame output EDATA: set sync pattern bits ...................................................................... TRAU frame output EDATA: set sync pattern bits osmo_trau_frame_encode() for OSMO_TRAU16_FT_EDATA previously failed to set the sync pattern bits in the generated output. Fix it. Change-Id: Iacd391cb6d389d8320c8ed767878eed144ee9d69 --- M src/trau/trau_frame.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c index 43b0e6b..88d0031 100644 --- a/src/trau/trau_frame.c +++ b/src/trau/trau_frame.c @@ -676,6 +676,10 @@ else cbits5 = ft_edata_bits; + /* sync pattern */ + memset(trau_bits, 0, 16); + trau_bits[16] = 1; + /* C1 .. C5 */ memcpy(trau_bits + 17, cbits5, 5); -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38323?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iacd391cb6d389d8320c8ed767878eed144ee9d69 Gerrit-Change-Number: 38323 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: rtp2trau: add support for EDATA
by laforge 05 Oct '24

05 Oct '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38326?usp=email ) Change subject: rtp2trau: add support for EDATA ...................................................................... rtp2trau: add support for EDATA Change-Id: I538567ac208c89b3fc8f4dc408dc15a813a1272a --- M src/trau/trau_rtp_conv.c 1 file changed, 49 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index b0bde7d..9bee640 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -1393,6 +1393,53 @@ return 0; } +/* + * For 14.4 kbit/s data, we do _not_ forward A-TRAU bit C5 to E-TRAU bit C6 + * like TS 48.020 section 11.1 Note 1 suggests. That spec note says: + * "Bit C5 corresponds to bit C6 of the E-TRAU frame as defined in 3GPP + * TS 48.060." However, while the note says (effectively) that the two + * bits are logically equivalent, it does not prescribe specific forwarding + * rules for implementations. When the BTS looks at bit C6 in TRAU-DL, + * it will want to know whether its TRAU-UL frames were received correctly + * by the TRAU, hence the TRAU-emulating Abis MGW will need to set this bit + * based on UL reception status - but it has nothing to do with the incoming + * RTP stream. Hence we don't forward this "logically equivalent" bit. + */ + +static int rtp2trau_edata(struct osmo_trau_frame *tf, const uint8_t *data, + size_t data_len) +{ + ubit_t atrau_c4; + + tf->type = OSMO_TRAU16_FT_EDATA; + + /* set all C bits to 1s: covers frame type, initial C6 & C7, + * and the remaining unused bits. */ + memset(tf->c_bits, 1, 13); + /* set C6=0: indicate good reception of TRAU-UL frames */ + tf->c_bits[5] = 0; + + if (data_len == RFC4040_RTP_PLEN && + osmo_csd144_from_atrau_ra2(tf->m_bits, tf->d_bits, &atrau_c4, NULL, + data) >= 0) { + /* We got good A-TRAU input. 3GPP specs define the following + * mapping for DL direction only: + * + * E-TRAU bit C7 is set if idle, inverse of A-TRAU bit C4. + * Spec references: TS 48.020 section 11.1, TS 48.060 + * section 6.5.1. */ + tf->c_bits[6] = !atrau_c4; + } else { + /* We did not get good A-TRAU input: generate idle fill. */ + memset(tf->m_bits, 1, 2); + memset(tf->d_bits, 1, 288); + /* C7=1 means idle */ + tf->c_bits[6] = 1; + } + + return 0; +} + static inline bool check_twts001(struct osmo_trau2rtp_state *st) { if (st->rtp_extensions & OSMO_RTP_EXT_TWTS001) @@ -1448,6 +1495,8 @@ return rtp2trau_data_fr(tf, rtp, rtp_len, st->interm_rate_16k); case OSMO_TRAU16_FT_DATA_HR: return rtp2trau_data_hr16(tf, rtp, rtp_len); + case OSMO_TRAU16_FT_EDATA: + return rtp2trau_edata(tf, rtp, rtp_len); case OSMO_TRAU8_SPEECH: return rtp2trau_hr8(tf, rtp, rtp_len); case OSMO_TRAU8_DATA: -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38326?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I538567ac208c89b3fc8f4dc408dc15a813a1272a Gerrit-Change-Number: 38326 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: rtp2trau: add support for EDATA
by laforge 05 Oct '24

05 Oct '24

Attention is currently required from: falconia. laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38326?usp=email ) Change subject: rtp2trau: add support for EDATA ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38326?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I538567ac208c89b3fc8f4dc408dc15a813a1272a Gerrit-Change-Number: 38326 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Sat, 05 Oct 2024 08:42:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmo-abis[master]: trau2rtp: add support for EDATA
by laforge 05 Oct '24

05 Oct '24

Attention is currently required from: falconia. laforge has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38325?usp=email ) Change subject: trau2rtp: add support for EDATA ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38325?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: If5344eb4718ac95b996e20caf969de35a9c8a35d Gerrit-Change-Number: 38325 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Sat, 05 Oct 2024 08:42:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0