- gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: pySim-prog: rework documentation
by dexter 17 Sep '24

17 Sep '24

Attention is currently required from: laforge. dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/38166?usp=email ) Change subject: pySim-prog: rework documentation ...................................................................... Patch Set 3: (1 comment) File docs/legacy.rst: https://gerrit.osmocom.org/c/pysim/+/38166/comment/bc2e1501_9f41473b?usp=em… : PS1, Line 46: KI, OPc > Let's keep this one open until we made a decision. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38166?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: I1d1a65154cea7fa77428b412fcf8c7b4cba629b1 Gerrit-Change-Number: 38166 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 17 Sep 2024 08:40:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[S] Change in libosmo-abis[master]: trau2rtp EFR unit test: add patterns with bad CRC
by falconia 16 Sep '24

16 Sep '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38184?usp=email ) Change subject: trau2rtp EFR unit test: add patterns with bad CRC ...................................................................... trau2rtp EFR unit test: add patterns with bad CRC Unlike its FRv1 counterpart, the TRAU frame format for EFR includes CRC, intended to catch transmission errors in terrestrial circuits. Add some bad CRC patterns to the unit test for osmo_trau2rtp() EFR. Change-Id: Iee69b6a1593bdc8d11904a5f2ad46cd0fc6052a9 --- M tests/trau_conv/trau16_efr.in M tests/trau_conv/trau16_efr_std.ok M tests/trau_conv/trau16_efr_twts001.ok 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/84/38184/1 diff --git a/tests/trau_conv/trau16_efr.in b/tests/trau_conv/trau16_efr.in index b4bdb02..0f113aa 100644 --- a/tests/trau_conv/trau16_efr.in +++ b/tests/trau_conv/trau16_efr.in @@ -78,3 +78,11 @@ 0000ebecca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff ID perfect SID with BFI=1 SID=0 0000ebe8ca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff + +# The following frames were also constructed by hand. They have bad CRC +# and thus test the handling of this case in osmo_trau2rtp(). + +ID all Dn bits set to 0 +0000ebe88000800080008000800080008000800080008000800080008000800080008000800082ff +ID all Dn bits set to 1 +0000ebe8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff diff --git a/tests/trau_conv/trau16_efr_std.ok b/tests/trau_conv/trau16_efr_std.ok index 8fff73a..110cd0e 100644 --- a/tests/trau_conv/trau16_efr_std.ok +++ b/tests/trau_conv/trau16_efr_std.ok @@ -116,3 +116,11 @@ 0000ebe8ca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff TRAU frame type: EFR osmo_trau2rtp() result: 0 +ID all Dn bits set to 0 +0000ebe88000800080008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: EFR + osmo_trau2rtp() result: 0 +ID all Dn bits set to 1 +0000ebe8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff + TRAU frame type: EFR + osmo_trau2rtp() result: 0 diff --git a/tests/trau_conv/trau16_efr_twts001.ok b/tests/trau_conv/trau16_efr_twts001.ok index 2b11d14..370d1ba 100644 --- a/tests/trau_conv/trau16_efr_twts001.ok +++ b/tests/trau_conv/trau16_efr_twts001.ok @@ -226,3 +226,13 @@ 0 12 15 15 15 15 12 0 0 0 0 0 17 12 12 15 12 15 15 12 0 0 0 0 0 19 SID recompute: 0 +ID all Dn bits set to 0 +0000ebe88000800080008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: EFR + osmo_trau2rtp() result: 1 + TW-TS-001 TEH octet: 0xE6 +ID all Dn bits set to 1 +0000ebe8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeff + TRAU frame type: EFR + osmo_trau2rtp() result: 1 + TW-TS-001 TEH octet: 0xE6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38184?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iee69b6a1593bdc8d11904a5f2ad46cd0fc6052a9 Gerrit-Change-Number: 38184 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in libosmo-abis[master]: trau2rtp unit test: add patterns that showcase BFI=1 SID=0
by pespin 16 Sep '24

16 Sep '24

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38183?usp=email ) Change subject: trau2rtp unit test: add patterns that showcase BFI=1 SID=0 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38183?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: Ic6a0ad289864fe3e11192d158e3bbe221994eaaa Gerrit-Change-Number: 38183 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 16 Sep 2024 22:02:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau2rtp TW-TS-001: handle corner case of BFI with stale SID bits
by pespin 16 Sep '24

16 Sep '24

Attention is currently required from: falconia. pespin has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38182?usp=email ) Change subject: trau2rtp TW-TS-001: handle corner case of BFI with stale SID bits ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38182?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: I2800301f7ac25537c4d7fb14acefd73a80590d7c Gerrit-Change-Number: 38182 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Mon, 16 Sep 2024 22:01:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[M] Change in libosmo-abis[master]: trau2rtp unit test: add patterns that showcase BFI=1 SID=0
by falconia 16 Sep '24

16 Sep '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38183?usp=email ) Change subject: trau2rtp unit test: add patterns that showcase BFI=1 SID=0 ...................................................................... trau2rtp unit test: add patterns that showcase BFI=1 SID=0 The previous patch added special handling for the corner case in which the BTS indicates BFI=1 SID=0, but the bit pattern is still SID by the bit counting rules of GSM 06.31 or 06.81 section 6.1.1. The selection of test patterns in the unit test already had some frames that exhibit this effect, taken from actual Abis output of Nokia InSite BTS, but the exact effect of our handling becomes more visible when the bit pattern forms a perfect (not corrupted) SID frame, which I haven't been able to produce with the InSite. Therefore, add some hand-crafted test frames that fully showcase the effect of our transform. Change-Id: Ic6a0ad289864fe3e11192d158e3bbe221994eaaa --- M tests/trau_conv/trau16_efr.in M tests/trau_conv/trau16_efr_std.ok M tests/trau_conv/trau16_efr_twts001.ok M tests/trau_conv/trau16_fr.in M tests/trau_conv/trau16_fr_std.ok M tests/trau_conv/trau16_fr_twts001.ok 6 files changed, 88 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/83/38183/1 diff --git a/tests/trau_conv/trau16_efr.in b/tests/trau_conv/trau16_efr.in index a0a3fa0..b4bdb02 100644 --- a/tests/trau_conv/trau16_efr.in +++ b/tests/trau_conv/trau16_efr.in @@ -66,3 +66,15 @@ 0000ebead10eba68ada886f7fbfca494ca8cfffffe4ba04ac07ffffff0048491fffcffe0a485c2ff ID efr-dtx-dtmf.bin frame 0x53af1 0000ebe8cf05b311adada617fbfca494c87afffffe4ba04ac214fffff00484affffcffe0a485deff + +# The following two frames have been constructed by hand, starting with +# efr-dtx.bin frame 0x3cad1 and editing the hex string for desired effect. +# The first constructed frame is a perfect SID that has BFI=1 set, +# the second constructed frame is the same with C13 cleared. +# The intent is to showcase the effect of the hacky logic that "breaks" +# the SID bit pattern when the metadata bits indicate BFI=1 SID=0. + +ID perfect SID with BFI=1 +0000ebecca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff +ID perfect SID with BFI=1 SID=0 +0000ebe8ca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff diff --git a/tests/trau_conv/trau16_efr_std.ok b/tests/trau_conv/trau16_efr_std.ok index 1f09a0b..8fff73a 100644 --- a/tests/trau_conv/trau16_efr_std.ok +++ b/tests/trau_conv/trau16_efr_std.ok @@ -108,3 +108,11 @@ 0000ebe8cf05b311adada617fbfca494c87afffffe4ba04ac214fffff00484affffcffe0a485deff TRAU frame type: EFR osmo_trau2rtp() result: 0 +ID perfect SID with BFI=1 +0000ebecca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff + TRAU frame type: EFR + osmo_trau2rtp() result: 0 +ID perfect SID with BFI=1 SID=0 +0000ebe8ca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff + TRAU frame type: EFR + osmo_trau2rtp() result: 0 diff --git a/tests/trau_conv/trau16_efr_twts001.ok b/tests/trau_conv/trau16_efr_twts001.ok index 761f03b..2b11d14 100644 --- a/tests/trau_conv/trau16_efr_twts001.ok +++ b/tests/trau_conv/trau16_efr_twts001.ok @@ -202,3 +202,27 @@ 16 8 7 15 15 15 14 0 0 1 0 0 18 60 12 15 12 15 15 12 0 2 2 2 0 22 SID recompute: 0 +ID perfect SID with BFI=1 +0000ebecca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff + TRAU frame type: EFR + osmo_trau2rtp() result: 32 + TW-TS-001 TEH octet: 0xE2 + EFR frame: + LPC 20 54 191 155 17 + 3 7 15 15 15 15 12 0 0 0 0 0 17 + 7 7 15 15 15 15 12 0 0 0 0 0 17 + 3 15 15 15 15 15 12 0 0 0 0 0 17 + 15 15 15 12 15 15 12 0 0 0 0 0 19 + SID recompute: 2 +ID perfect SID with BFI=1 SID=0 +0000ebe8ca1b97f3b45086fffffc8000c68efffffe008046c07fffffe0008451fffcffe08004e2ff + TRAU frame type: EFR + osmo_trau2rtp() result: 32 + TW-TS-001 TEH octet: 0xE2 + EFR frame: + LPC 20 54 191 155 17 + 0 4 15 15 15 15 12 0 0 0 0 0 17 + 4 4 15 15 15 15 12 0 0 0 0 0 17 + 0 12 15 15 15 15 12 0 0 0 0 0 17 + 12 12 15 12 15 15 12 0 0 0 0 0 19 + SID recompute: 0 diff --git a/tests/trau_conv/trau16_fr.in b/tests/trau_conv/trau16_fr.in index 2b3f20a..1153e34 100644 --- a/tests/trau_conv/trau16_fr.in +++ b/tests/trau_conv/trau16_fr.in @@ -55,3 +55,15 @@ ID fr1-dtx.bin frame 0x104d1 000088b8ee49c3b2e00691e58000800080f1889fa000800086948004c8008000821b90009000caff + +# The following two frames have been constructed by hand, starting with +# fr1-dtx.bin frame 0x8051 and editing the hex string for desired effect. +# The first constructed frame is a perfect SID that has BFI=1 set, +# the second constructed frame is the same with C13 cleared. +# The intent is to showcase the effect of the hacky logic that "breaks" +# the SID bit pattern when the metadata bits indicate BFI=1 SID=0. + +ID perfect SID with BFI=1 +000088bcb58ee6ee92008000800080008000800080008000800080008000800080008000800082ff +ID perfect SID with BFI=1 SID=0 +000088b8b58ee6ee92008000800080008000800080008000800080008000800080008000800082ff diff --git a/tests/trau_conv/trau16_fr_std.ok b/tests/trau_conv/trau16_fr_std.ok index 584bade..baad06f 100644 --- a/tests/trau_conv/trau16_fr_std.ok +++ b/tests/trau_conv/trau16_fr_std.ok @@ -92,3 +92,11 @@ 000088b8ee49c3b2e00691e58000800080f1889fa000800086948004c8008000821b90009000caff TRAU frame type: FR osmo_trau2rtp() result: 0 +ID perfect SID with BFI=1 +000088bcb58ee6ee92008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: FR + osmo_trau2rtp() result: 0 +ID perfect SID with BFI=1 SID=0 +000088b8b58ee6ee92008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: FR + osmo_trau2rtp() result: 0 diff --git a/tests/trau_conv/trau16_fr_twts001.ok b/tests/trau_conv/trau16_fr_twts001.ok index 5cef573..bc31762 100644 --- a/tests/trau_conv/trau16_fr_twts001.ok +++ b/tests/trau_conv/trau16_fr_twts001.ok @@ -154,3 +154,27 @@ 64 1 1 10 2 2 2 2 1 1 1 0 0 0 0 0 0 0 0 0 33 7 3 3 2 0 0 0 1 0 0 0 2 2 SID recompute: 0 +ID perfect SID with BFI=1 +000088bcb58ee6ee92008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: FR + osmo_trau2rtp() result: 34 + TW-TS-001 TEH octet: 0xE2 + FR frame: + LARc 22 35 27 12 7 7 4 4 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + SID recompute: 2 +ID perfect SID with BFI=1 SID=0 +000088b8b58ee6ee92008000800080008000800080008000800080008000800080008000800082ff + TRAU frame type: FR + osmo_trau2rtp() result: 34 + TW-TS-001 TEH octet: 0xE2 + FR frame: + LARc 22 35 27 12 7 7 4 4 + 0 0 0 0 2 2 2 2 0 0 0 0 0 0 0 0 0 + 0 0 0 0 2 2 2 2 0 0 0 0 0 0 0 0 0 + 0 0 0 0 2 2 2 2 0 0 0 0 0 0 0 0 0 + 0 0 0 0 2 2 2 2 0 0 0 0 0 0 0 0 0 + SID recompute: 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38183?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ic6a0ad289864fe3e11192d158e3bbe221994eaaa Gerrit-Change-Number: 38183 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[M] Change in libosmo-abis[master]: trau2rtp TW-TS-001: handle corner case of BFI with stale SID bits
by falconia 16 Sep '24

16 Sep '24

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38182?usp=email ) Change subject: trau2rtp TW-TS-001: handle corner case of BFI with stale SID bits ...................................................................... trau2rtp TW-TS-001: handle corner case of BFI with stale SID bits Many BTS models will emit the previous content of their internal buffer, perhaps corrupted in some peculiar way, when they need to emit "BFI with no data" because they received FACCH, or because they received nothing at all and no channel decoding attempt was made. This situation is described in detail here: https://osmocom.org/projects/retro-gsm/wiki/No-data_output However, when these TRAU-UL BFIs (from Abis or from incoming TFO) are to be converted to TW-TS-001 with osmo_trau2rtp(), a corner case arises: if the BTS indicated SID=0 by way of C13 & C14 bits but the stale payload bit content indicates SID != 0, the full decoder or TFO transform on the receiving end of the RTP stream will get an erroneous "invalid SID" indication (instead of "plain" BFI) if the marked-bad payload is passed through without alteration. Handle this corner case by modifying marked-bad (BFI=1) payloads to make them non-SID in the special case when the BTS indicated SID=0, but the bit pattern says otherwise. Change-Id: I2800301f7ac25537c4d7fb14acefd73a80590d7c --- M src/trau/trau_rtp_conv.c M tests/trau_conv/trau16_efr_twts001.ok M tests/trau_conv/trau16_fr_twts001.ok 3 files changed, 137 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/82/38182/1 diff --git a/src/trau/trau_rtp_conv.c b/src/trau/trau_rtp_conv.c index 1a200c7..24ea70c 100644 --- a/src/trau/trau_rtp_conv.c +++ b/src/trau/trau_rtp_conv.c @@ -98,6 +98,36 @@ //static const uint8_t c_bits_check_fr[] = { 0, 0, 0, 1, 0 }; //static const uint8_t c_bits_check_efr[] = { 1, 1, 0, 1, 0 }; +/* + * This little helper function modifies a marked-bad (BFI=1) GSM-FR payload + * so it would no longer classify as SID by the bit counting rules + * of GSM 06.31 section 6.1.1. It is needed at times when a BTS emits + * "BFI with no data", out-of-band SID bits (C13 & C14) are set to 0, + * but the stale bit pattern in the output buffer used by the BTS + * happens to be (usually invalid) SID. + * + * In order to reliably "break the SID", we need to set 16 bits in the + * SID field to values opposite of SID codeword, i.e., to 1 for GSM-FR. + * The SID field of GSM-FR includes the msb of every xMc pulse, and also + * the middle bit of most (but not all) xMc pulses. The pulses whose + * middle bit is not part of the SID field are the last 9 pulses of + * the last subframe. For simplicity, we produce the desired effect + * by setting the middle bit of pulses 0, 1, 2 and 3 in every subframe, + * for a total of 16 bits. + */ +static void make_fr_bfi_nonsid(uint8_t *fr_bytes) +{ + uint8_t *subf_bytes; + unsigned subn; + + subf_bytes = fr_bytes + 5; /* skip signature and LARc bits */ + for (subn = 0; subn < 4; subn++) { + subf_bytes[2] |= 0x24; + subf_bytes[3] |= 0x90; + subf_bytes += 7; + } +} + /*! Generate the 33 bytes RTP payload for GSM-FR from a decoded TRAU frame. * \param[out] out caller-provided output buffer * \param[in] out_len length of out buffer in bytes @@ -153,6 +183,36 @@ j++; } + /* + * Many BTS models will emit the previous content of their internal + * buffer, perhaps corrupted in some peculiar way, when they need to + * emit "BFI with no data" because they received FACCH, or because + * they received nothing at all and no channel decoding attempt was + * made. When this situation occurs, the Rx DTX handler in the TRAU + * needs to be told "this is a regular BFI, not an invalid SID", + * and the BTS makes this indication by setting C12=1 (BFI), + * C13=0 and C14=0 (SID=0). However, the stale or corrupted frame + * payload bit content in the Abis output buffer will still sometimes + * indicate SID (usually invalid) by the bit counting rules of + * GSM 06.31 section 6.1.1! This situation creates a problem + * in the case of TW-TS-001 output: there are no out-of-band bits + * for C13 & C14, and when the remote transcoder or TFO transform + * calls osmo_fr_sid_classify() or its libgsmfr2 equivalent, + * it will detect an invalid SID (always invalid due to BFI=1) + * instead of intended-by-BTS "regular BFI". Solution: because + * there is no need to preserve all payload bits that are known + * to be bad or dummy, we can afford to corrupt some of them; + * as a workaround for the unintentional-SID problem, we "break" + * the SID field. + * + * Note that BFI=1 is a required condition for the logic below. + * Because standard RFC 3551 output does not support BFI, + * this logic applies only to TW-TS-001 output. + */ + if (tf->c_bits[11] && !tf->c_bits[12] && !tf->c_bits[13] && + osmo_fr_is_any_sid(out)) + make_fr_bfi_nonsid(out); + return req_out_len; } @@ -356,6 +416,38 @@ } } +/* + * This little helper function modifies a marked-bad (BFI=1) GSM-EFR payload + * so it would no longer classify as SID by the bit counting rules + * of GSM 06.81 section 6.1.1. It is needed at times when a BTS emits + * "BFI with no data", out-of-band SID bits (C13 & C14) are set to 0, + * but the stale bit pattern in the output buffer used by the BTS + * happens to be (usually invalid) SID. + * + * In order to reliably "break the SID", we need to set 16 bits in the + * SID field to values opposite of SID codeword, i.e., to 0 for GSM-EFR. + * The SID field of GSM-EFR includes (in every subframe) some bits in + * LTP lag and LTP gain fields, and many bits in the fixed codebook + * excitation pulses portion. The reference decoder from ETSI makes use + * of the fixed codebook portion even in marked-bad frames, hence + * we prefer not to corrupt this portion - but we can still reliably + * break the SID by clearing some bits in LTP lag and gain fields. + * Let's clear the two lsbs of each LTP lag and LTP gain field, + * giving us the needed total of 16 bits. + */ +static void make_efr_bfi_nonsid(uint8_t *efr_bytes) +{ + /* subframe 0 */ + efr_bytes[6] &= 0x99; + /* subframe 1 */ + efr_bytes[12] &= 0xE6; + efr_bytes[13] &= 0x7F; + /* subframe 2 */ + efr_bytes[19] &= 0x33; + /* subframe 3 */ + efr_bytes[25] &= 0xCC; +} + /*! Generate the 31 bytes RTP payload for GSM-EFR from a decoded TRAU frame. * \param[out] out caller-provided output buffer * \param[in] out_len length of out buffer in bytes @@ -430,6 +522,36 @@ if (rc) goto bad_frame; + /* + * Many BTS models will emit the previous content of their internal + * buffer, perhaps corrupted in some peculiar way, when they need to + * emit "BFI with no data" because they received FACCH, or because + * they received nothing at all and no channel decoding attempt was + * made. When this situation occurs, the Rx DTX handler in the TRAU + * needs to be told "this is a regular BFI, not an invalid SID", + * and the BTS makes this indication by setting C12=1 (BFI), + * C13=0 and C14=0 (SID=0). However, the stale or corrupted frame + * payload bit content in the Abis output buffer will still sometimes + * indicate SID (usually invalid) by the bit counting rules of + * GSM 06.81 section 6.1.1! This situation creates a problem + * in the case of TW-TS-001 output: there are no out-of-band bits + * for C13 & C14, and when the remote transcoder or TFO transform + * calls osmo_efr_sid_classify() or its libgsmefr equivalent, + * it will detect an invalid SID (always invalid due to BFI=1) + * instead of intended-by-BTS "regular BFI". Solution: because + * there is no need to preserve all payload bits that are known + * to be bad or dummy, we can afford to corrupt some of them; + * as a workaround for the unintentional-SID problem, we "break" + * the SID field. + * + * Note that BFI=1 is a required condition for the logic below. + * Because standard RFC 3551 output does not support BFI, + * this logic applies only to TW-TS-001 output. + */ + if (tf->c_bits[11] && !tf->c_bits[12] && !tf->c_bits[13] && + osmo_efr_is_any_sid(out)) + make_efr_bfi_nonsid(out); + return req_out_len; bad_frame: diff --git a/tests/trau_conv/trau16_efr_twts001.ok b/tests/trau_conv/trau16_efr_twts001.ok index 14dfe9d..761f03b 100644 --- a/tests/trau_conv/trau16_efr_twts001.ok +++ b/tests/trau_conv/trau16_efr_twts001.ok @@ -173,11 +173,11 @@ TW-TS-001 TEH octet: 0xE2 EFR frame: LPC 15 202 265 142 28 - 339 0 15 15 15 15 12 2 2 2 2 4 19 - 60 15 15 15 15 15 12 4 5 5 0 0 19 - 144 10 7 15 15 15 14 0 0 1 0 0 19 - 63 15 15 12 15 15 12 0 2 2 2 0 19 - SID recompute: 1 + 336 0 15 15 15 15 12 2 2 2 2 4 19 + 60 12 15 15 15 15 12 4 5 5 0 0 19 + 144 8 7 15 15 15 14 0 0 1 0 0 19 + 60 12 15 12 15 15 12 0 2 2 2 0 19 + SID recompute: 0 ID efr-dtx-dtmf.bin frame 0x53a51 0000ebead10eba68ada886f7fbfca494ca8cfffffe4ba04ac07ffffff0048491fffcffe0a485c2ff TRAU frame type: EFR @@ -197,8 +197,8 @@ TW-TS-001 TEH octet: 0xE2 EFR frame: LPC 30 10 408 138 54 - 339 0 11 15 11 15 12 2 2 2 2 4 18 - 61 7 15 15 15 15 12 4 5 5 0 0 18 - 16 10 7 15 15 15 14 0 0 1 0 0 18 - 63 15 15 12 15 15 12 0 2 2 2 0 22 - SID recompute: 1 + 336 0 11 15 11 15 12 2 2 2 2 4 18 + 60 4 15 15 15 15 12 4 5 5 0 0 18 + 16 8 7 15 15 15 14 0 0 1 0 0 18 + 60 12 15 12 15 15 12 0 2 2 2 0 22 + SID recompute: 0 diff --git a/tests/trau_conv/trau16_fr_twts001.ok b/tests/trau_conv/trau16_fr_twts001.ok index a26439b..5cef573 100644 --- a/tests/trau_conv/trau16_fr_twts001.ok +++ b/tests/trau_conv/trau16_fr_twts001.ok @@ -149,8 +149,8 @@ TW-TS-001 TEH octet: 0xE2 FR frame: LARc 59 36 12 24 13 4 3 0 - 64 1 0 49 3 2 1 0 0 0 0 0 0 0 0 0 0 - 96 3 0 34 0 1 7 3 1 0 0 0 0 0 0 0 0 - 64 1 1 10 0 0 0 0 1 1 1 0 0 0 0 0 0 - 0 0 0 33 5 1 1 0 0 0 0 1 0 0 0 2 2 - SID recompute: 1 + 64 1 0 49 3 2 3 2 0 0 0 0 0 0 0 0 0 + 96 3 0 34 2 3 7 3 1 0 0 0 0 0 0 0 0 + 64 1 1 10 2 2 2 2 1 1 1 0 0 0 0 0 0 + 0 0 0 33 7 3 3 2 0 0 0 1 0 0 0 2 2 + SID recompute: 0 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38182?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2800301f7ac25537c4d7fb14acefd73a80590d7c Gerrit-Change-Number: 38182 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org>

1 0

[S] Change in libosmo-sigtran[master]: SS7: Support secondary point codes
by laforge 16 Sep '24

16 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38180?usp=email ) Change subject: SS7: Support secondary point codes ...................................................................... SS7: Support secondary point codes osmo_ss7 so far only supported a single local point code per cs7 instance: The primary point code. Let's add support for a secondary point code, just like it is the case in Cisco ITP. Change-Id: I3c4c0d89d2a0ea36aa5df0887225d99a16b810f0 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 5 files changed, 31 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..935cda8 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-sigtran API change struct osmo_ss7_instance has new member 'secondary_pc' diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 155e05a..049c7d8 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -96,12 +96,12 @@ char *name; char *description; uint32_t primary_pc; - /* secondary PCs */ /* capability PCs */ uint8_t network_indicator; struct osmo_ss7_pc_fmt pc_fmt; bool permit_dyn_rkm_alloc; struct llist_head sccp_address_book; + uint32_t secondary_pc; } cfg; }; diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 74b0f50..55d3d02 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -332,6 +332,7 @@ return NULL; inst->cfg.primary_pc = OSMO_SS7_PC_INVALID; + inst->cfg.secondary_pc = OSMO_SS7_PC_INVALID; inst->cfg.id = id; LOGSS7(inst, LOGL_INFO, "Creating SS7 Instance\n"); @@ -1134,7 +1135,9 @@ OSMO_ASSERT(ss7_initialized); if (osmo_ss7_pc_is_valid(inst->cfg.primary_pc) && pc == inst->cfg.primary_pc) return true; - /* FIXME: Secondary and Capability Point Codes */ + if (osmo_ss7_pc_is_valid(inst->cfg.secondary_pc) && pc == inst->cfg.secondary_pc) + return true; + /* FIXME: Capability Point Codes */ return false; } diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 9d58fb6..f1b0a1c 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -234,7 +234,23 @@ return CMD_SUCCESS; } -/* TODO: cs7 secondary-pc */ +DEFUN_ATTR(cs7_secondary_pc, cs7_secondary_pc_cmd, + "secondary-pc POINT_CODE", + "Configure the local Secondary Point Code\n" + "Point Code\n", + CMD_ATTR_IMMEDIATE) +{ + struct osmo_ss7_instance *inst = vty->index; + int pc = osmo_ss7_pointcode_parse(inst, argv[0]); + if (pc < 0 || !osmo_ss7_pc_is_valid((uint32_t)pc)) { + vty_out(vty, "Invalid point code (%s)%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + inst->cfg.secondary_pc = pc; + return CMD_SUCCESS; +} + /* TODO: cs7 capability-pc */ DEFUN_ATTR(cs7_permit_dyn_rkm, cs7_permit_dyn_rkm_cmd, "xua rkm routing-key-allocation (static-only|dynamic-permitted)", @@ -2812,6 +2828,11 @@ osmo_ss7_pointcode_print(inst, inst->cfg.primary_pc), VTY_NEWLINE); + if (osmo_ss7_pc_is_valid(inst->cfg.secondary_pc)) { + vty_out(vty, " secondary-pc %s%s", + osmo_ss7_pointcode_print(inst, inst->cfg.secondary_pc), VTY_NEWLINE); + } + if (inst->cfg.permit_dyn_rkm_alloc) vty_out(vty, " xua rkm routing-key-allocation dynamic-permitted%s", VTY_NEWLINE); @@ -2972,6 +2993,7 @@ install_lib_element(L_CS7_NODE, &cfg_description_cmd); install_lib_element(L_CS7_NODE, &cs7_net_ind_cmd); install_lib_element(L_CS7_NODE, &cs7_point_code_cmd); + install_lib_element(L_CS7_NODE, &cs7_secondary_pc_cmd); install_lib_element(L_CS7_NODE, &cs7_pc_format_cmd); install_lib_element(L_CS7_NODE, &cs7_pc_format_def_cmd); install_lib_element(L_CS7_NODE, &cs7_pc_delimiter_cmd); diff --git a/tests/vty/ss7_asp_test.vty b/tests/vty/ss7_asp_test.vty index 7168d20..b565557 100644 --- a/tests/vty/ss7_asp_test.vty +++ b/tests/vty/ss7_asp_test.vty @@ -104,6 +104,7 @@ description .TEXT network-indicator (international | national | reserved | spare) point-code POINT_CODE + secondary-pc POINT_CODE point-code format <1-24> [<1-23>] [<1-22>] point-code format default point-code delimiter (default|dash) @@ -123,6 +124,7 @@ description Save human-readable description of the object network-indicator Configure the Network Indicator point-code Configure the local Point Code + secondary-pc Configure the local Secondary Point Code xua SIGTRAN xxxUA related asp Configure Application Server Process no Negate a command or set its defaults -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38180?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I3c4c0d89d2a0ea36aa5df0887225d99a16b810f0 Gerrit-Change-Number: 38180 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-hnbgw[master]: contrib/jenkins: libosmo-sccp -> libosmo-sigtran
by laforge 16 Sep '24

16 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38171?usp=email ) Change subject: contrib/jenkins: libosmo-sccp -> libosmo-sigtran ...................................................................... contrib/jenkins: libosmo-sccp -> libosmo-sigtran Change-Id: I4eeda27c331399a1971ce8d5a398861d4dac8403 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 3d028ed..d55ef12 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -36,7 +36,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif -osmo-build-dep.sh libosmo-sccp +osmo-build-dep.sh libosmo-sigtran osmo-build-dep.sh libasn1c osmo-build-dep.sh osmo-iuh osmo-build-dep.sh osmo-mgw -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38171?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4eeda27c331399a1971ce8d5a398861d4dac8403 Gerrit-Change-Number: 38171 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-iuh[master]: contrib/jenkins: libosmo-sccp -> libosmo-sigtran
by laforge 16 Sep '24

16 Sep '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/38173?usp=email ) Change subject: contrib/jenkins: libosmo-sccp -> libosmo-sigtran ...................................................................... contrib/jenkins: libosmo-sccp -> libosmo-sigtran Change-Id: I1aa4162dc5d6fc5ac94ae987cff662ed65e907ca --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 36a4b61..312db1f 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -20,7 +20,7 @@ osmo-build-dep.sh libosmocore "" --disable-doxygen osmo-build-dep.sh libosmo-abis osmo-build-dep.sh libosmo-netif -osmo-build-dep.sh libosmo-sccp +osmo-build-dep.sh libosmo-sigtran osmo-build-dep.sh libasn1c # the asn1c binary is used by the 'regen' target below -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/38173?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I1aa4162dc5d6fc5ac94ae987cff662ed65e907ca Gerrit-Change-Number: 38173 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in osmo-ttcn3-hacks[master]: asterisk: TC_ims_reregistration: Expect re-register using existing ip...
by pespin 16 Sep '24

16 Sep '24

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38179?usp=email ) Change subject: asterisk: TC_ims_reregistration: Expect re-register using existing ipsec ctx ...................................................................... asterisk: TC_ims_reregistration: Expect re-register using existing ipsec ctx Change-Id: I8d100dbba6cddfa5f31437c9cdc8c48f1bbd5701 --- M asterisk/Asterisk_Tests.ttcn M asterisk/IMS_ConnectionHandler.ttcn 2 files changed, 13 insertions(+), 13 deletions(-) Approvals: jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asterisk/Asterisk_Tests.ttcn b/asterisk/Asterisk_Tests.ttcn index 20e01e7..dccf9fa 100644 --- a/asterisk/Asterisk_Tests.ttcn +++ b/asterisk/Asterisk_Tests.ttcn @@ -706,11 +706,11 @@ f_create_sip_expect(valueof(ts_SipUrl_from_Addr_Union(g_pars.subscr.registrar_sip_record.addr))); as_IMS_register(); - /* Re-Register: This should optimally be a as_IMS_2nd_register() instead... */ timer Trereg; Trereg.start(int2float(g_pars.subscr.registrar_expires) - 5.0); + g_pars.subscr.registrar_expires := c_def_expires; alt { - [] as_IMS_register(); + [] as_IMS_2nd_register(); [] Trereg.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str(g_name & ": Timeout waiting for re-registration")); } @@ -730,8 +730,8 @@ f_AMI_IMS_register(pars); - /* Re-Register: if this was a 2nd REGISTER, then reauth shouldn't be needed... */ - as_AMI_IMS_register_Auth(pars, resync := false); + /* Wait for Asterisk to re-register and IMS_ConnHdlr to handle it... */ + f_sleep(int2float(pars.subscr.registrar_expires)); /* Trigger unregistration: */ f_AMI_IMS_unregister(pars); diff --git a/asterisk/IMS_ConnectionHandler.ttcn b/asterisk/IMS_ConnectionHandler.ttcn index 12f624c..39abc59 100644 --- a/asterisk/IMS_ConnectionHandler.ttcn +++ b/asterisk/IMS_ConnectionHandler.ttcn @@ -102,6 +102,7 @@ integer registrar_expires, SipUrl local_sip_url_ext, SipAddr local_sip_record, + WwwAuthenticate www_auth optional, Contact registered_contact optional, P_Associated_Uri p_associated_uri, IMS_CallPars cp optional @@ -241,6 +242,7 @@ ts_UserInfo(imsi)), local_sip_record := ts_SipAddr(ts_HostPort(domain), ts_UserInfo(imsi)), + www_auth := omit, registered_contact := omit, p_associated_uri := ts_P_Associated_Uri({}), cp := cp @@ -781,7 +783,6 @@ var CallidString sip_call_id; var template (value) From from_addr; var template (value) To to_addr; - var WwwAuthenticate wwwAuthenticate; var Security_server security_server; var template (value) Require require := ts_Require({"sec-agree"}); var template (value) Supported supported := ts_Supported({"sec-agree"}); @@ -835,7 +836,7 @@ } to_addr.toParams := f_sip_param_set(to_addr.toParams, "tag", f_sip_rand_tag()); - wwwAuthenticate := f_gen_WwwAuthenticate(); + g_pars.subscr.www_auth := f_gen_WwwAuthenticate(); security_server := f_gen_Security_server(); /* Tx 401 Unauthorized */ @@ -843,7 +844,7 @@ from_addr, to_addr, via, - wwwAuthenticate, + g_pars.subscr.www_auth, sip_seq_nr, "REGISTER", p_associated_uri := g_pars.subscr.p_associated_uri, @@ -857,7 +858,7 @@ /* Now we should receive a new non-protected REGISTER * with Authoritzation containing auts in base64: */ var template (present) Authorization authorization := - f_tr_Authorization_AKAv1MD5(wwwAuthenticate, + f_tr_Authorization_AKAv1MD5(g_pars.subscr.www_auth, g_pars.subscr.imsi & "@" & g_pars.realm, f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri)); exp_req := @@ -906,7 +907,7 @@ from_addr, to_addr, via, - wwwAuthenticate, + g_pars.subscr.www_auth, sip_seq_nr, "REGISTER", p_associated_uri := g_pars.subscr.p_associated_uri, @@ -918,7 +919,7 @@ } /* Now we should receive a new REGISTER over ipsec: */ - as_IMS_2nd_register(wwwAuthenticate, early_ret := early_ret); + as_IMS_2nd_register(early_ret := early_ret); } [fail_others] as_SIP_fail_resp(sip_expect_str); [fail_others] as_SIP_fail_req(sip_expect_str); @@ -926,12 +927,11 @@ } /* Peer is issuing 2nd register, accept it: */ -altstep as_IMS_2nd_register(WwwAuthenticate wwwAuthenticate, - IMS_register_early_return early_ret := IMS_REG_EARLY_RET_BEFORE_None, +altstep as_IMS_2nd_register(IMS_register_early_return early_ret := IMS_REG_EARLY_RET_BEFORE_None, boolean fail_others := true) runs on IMS_ConnHdlr { var template (present) Authorization authorization := - f_tr_Authorization_AKAv1MD5(wwwAuthenticate, + f_tr_Authorization_AKAv1MD5(g_pars.subscr.www_auth, g_pars.subscr.imsi & "@" & g_pars.realm, f_sip_SipUrl_to_str(g_pars.registrar_sip_req_uri)); var template (present) PDU_SIP_Request exp_req := -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38179?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: I8d100dbba6cddfa5f31437c9cdc8c48f1bbd5701 Gerrit-Change-Number: 38179 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log