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

[L] Change in libosmocore[master]: gsm: TS 44.021 modified V.110 frame encoding/decoding support
by Jenkins Builder 05 Mar '23

05 Mar '23

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31668 ) Change subject: gsm: TS 44.021 modified V.110 frame encoding/decoding support ...................................................................... Patch Set 2: (1 comment) File src/gsm/gsm44021.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4454): https://gerrit.osmocom.org/c/libosmocore/+/31668/comment/21ecb3d5_7371b986 PS2, Line 21: D28 D29 D30 S6 D31 D32 D33 please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 Gerrit-Change-Number: 31668 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 05 Mar 2023 20:24:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: gsm: TS 44.021 modified V.110 frame encoding/decoding support
by laforge 05 Mar '23

05 Mar '23

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/31668 to look at the new patch set (#2). Change subject: gsm: TS 44.021 modified V.110 frame encoding/decoding support ...................................................................... gsm: TS 44.021 modified V.110 frame encoding/decoding support 3GPP TS 44.021 specifies the format for modified V.110 frames as used on the GSM air (radio) interface. Implement encoders and decoders for this modified V.110 format. Related: OS#1572 Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/gsm44021.h M src/gsm/Makefile.am A src/gsm/gsm44021.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm44021/test_frame_csd.c A tests/gsm44021/test_frame_csd.ok M tests/testsuite.at 9 files changed, 455 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/31668/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 Gerrit-Change-Number: 31668 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[XL] Change in libosmocore[master]: isdn: Add V.110 encoder/decoder
by laforge 05 Mar '23

05 Mar '23

Attention is currently required from: laforge, fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/30762 to look at the new patch set (#8). Change subject: isdn: Add V.110 encoder/decoder ...................................................................... isdn: Add V.110 encoder/decoder V.110 defines a B-channel protocol for transmission of synchronous and asynchronous serial data of V-series interfaces via terminal adapters over ISDN. Let's add (unoptimized but easy to debug) functions for encoding and decoding of V.110 frames for various bit-rates. Related: OS#1572 Change-Id: I1b5fd3847d3bfb0a0f763e0574893962ec699680 --- M include/osmocom/isdn/Makefile.am A include/osmocom/isdn/v110.h M src/isdn/Makefile.am M src/isdn/libosmoisdn.map A src/isdn/v110.c M tests/Makefile.am M tests/testsuite.at A tests/v110/test_frame.c A tests/v110/test_frame.ok A tests/v110/test_ra1.c A tests/v110/test_ra1.ok 11 files changed, 1,031 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/30762/8 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1b5fd3847d3bfb0a0f763e0574893962ec699680 Gerrit-Change-Number: 30762 Gerrit-PatchSet: 8 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[XL] Change in libosmocore[master]: isdn: Add V.110 encoder/decoder
by Jenkins Builder 05 Mar '23

05 Mar '23

Attention is currently required from: laforge, fixeria. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/30762 ) Change subject: isdn: Add V.110 encoder/decoder ...................................................................... Patch Set 7: (2 comments) File src/isdn/v110.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4453): https://gerrit.osmocom.org/c/libosmocore/+/30762/comment/b265c80e_34fafb6c PS7, Line 82: ra_bits[2*8 +7] = fr->x_bits[0]; need consistent spacing around '+' (ctx:WxV) (or typedef missing in osmo-ci/lint/checkpatch/typedefs_osmo.txt?) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4453): https://gerrit.osmocom.org/c/libosmocore/+/30762/comment/da811362_9499232e PS7, Line 83: ra_bits[7*8 +7] = fr->x_bits[1]; need consistent spacing around '+' (ctx:WxV) (or typedef missing in osmo-ci/lint/checkpatch/typedefs_osmo.txt?) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/30762 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1b5fd3847d3bfb0a0f763e0574893962ec699680 Gerrit-Change-Number: 30762 Gerrit-PatchSet: 7 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 05 Mar 2023 20:09:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: gsm: TS 44.021 modified V.110 frame encoding/decoding support
by Jenkins Builder 05 Mar '23

05 Mar '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31668 ) Change subject: gsm: TS 44.021 modified V.110 frame encoding/decoding support ...................................................................... Patch Set 1: (1 comment) File src/gsm/gsm44021.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-4452): https://gerrit.osmocom.org/c/libosmocore/+/31668/comment/9962e020_d96971b3 PS1, Line 21: D28 D29 D30 S6 D31 D32 D33 please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 Gerrit-Change-Number: 31668 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 05 Mar 2023 20:09:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: gsm: TS 44.021 modified V.110 frame encoding/decoding support
by laforge 05 Mar '23

05 Mar '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31668 ) Change subject: gsm: TS 44.021 modified V.110 frame encoding/decoding support ...................................................................... gsm: TS 44.021 modified V.110 frame encoding/decoding support 3GPP TS 44.021 specifies the format for modified V.110 frames as used on the GSM air (radio) interface. Implement encoders and decoders for this modified V.110 format. Related: OS#1572 Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/gsm44021.h M src/gsm/Makefile.am A src/gsm/gsm44021.c M src/gsm/libosmogsm.map M tests/Makefile.am A tests/gsm44021/test_frame_csd.c A tests/gsm44021/test_frame_csd.ok M tests/testsuite.at 9 files changed, 454 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/68/31668/1 diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am index 2c59e55..f840a27 100644 --- a/include/osmocom/gsm/Makefile.am +++ b/include/osmocom/gsm/Makefile.am @@ -29,6 +29,7 @@ gsm23003.h \ gsm23236.h \ gsm29118.h \ + gsm44021.h \ gsm48.h \ gsm48_arfcn_range_encode.h \ gsm48_ie.h \ diff --git a/include/osmocom/gsm/gsm44021.h b/include/osmocom/gsm/gsm44021.h new file mode 100644 index 0000000..8f89c56 --- /dev/null +++ b/include/osmocom/gsm/gsm44021.h @@ -0,0 +1,8 @@ +#pragma once +#include <osmocom/isdn/v110.h> + +int osmo_csd_12k_6k_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits); +int osmo_csd_12k_6k_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr); +int osmo_csd_3k6_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits); +int osmo_csd_3k6_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr); +void osmo_csd_ubit_dump(FILE *outf, const ubit_t *fr, size_t in_len); diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 79c5f04..ce0b1f4 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -33,7 +33,7 @@ gsup.c gsup_sms.c gprs_gea.c gsm0503_conv.c oap.c gsm0808_utils.c \ gsm23003.c gsm23236.c mncc.c bts_features.c oap_client.c \ gsm29118.c gsm48_rest_octets.c cbsp.c gsm48049.c \ - gad.c bsslap.c bssmap_le.c kdf.c iuup.c + gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c libgsmint_la_LDFLAGS = -no-undefined libgsmint_la_LIBADD = $(top_builddir)/src/core/libosmocore.la $(top_builddir)/src/isdn/libosmoisdn.la diff --git a/src/gsm/gsm44021.c b/src/gsm/gsm44021.c new file mode 100644 index 0000000..1d3e55e --- /dev/null +++ b/src/gsm/gsm44021.c @@ -0,0 +1,285 @@ + +#include <errno.h> +#include <osmocom/core/bits.h> +#include <osmocom/isdn/v110.h> + +/************************************************************************* + * GSM CSD modified V.110 frame decoding/encoding (ubits <-> struct with D/S/X/E bits) + *************************************************************************/ + +/*! Decode a 60-bit GSM 12kbit/s CSD frame present as 60 ubits into a struct osmo_v110_decoded_frame. + * \param[out] caller-allocated output data structure, filled by this function + * \param[in] ra_bits One V.110 frame as 60 unpacked bits. */ +int osmo_csd_12k_6k_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits) +{ + /* 3GPP TS 44.021 Section 8.1.2 / 8.1.3 + D1 D2 D3 D4 D5 D6 S1 + D7 D8 D9 D10 D11 D12 X + D13 D14 D15 D16 D17 D18 S3 + D19 D20 D21 D22 D23 D24 S4 + E4 E5 E6 E7 D25 D26 D27 + D28 D29 D30 S6 D31 D32 D33 + D34 D35 D36 X D37 D38 D39 + D40 D41 D42 S8 D43 D44 D45 + D46 D47 D48 S9 */ + + if (n_bits < 60) + return -EINVAL; + + /* X1 .. X2 */ + fr->x_bits[0] = ra_bits[1*7 + 6]; + fr->x_bits[1] = ra_bits[6*7 + 3]; + + /* S1, S3, S4, S6, S8, S9 */ + fr->s_bits[0] = ra_bits[0*7 + 6]; + fr->s_bits[2] = ra_bits[2*7 + 6]; + fr->s_bits[3] = ra_bits[3*7 + 6]; + fr->s_bits[5] = ra_bits[5*7 + 3]; + fr->s_bits[7] = ra_bits[7*7 + 3]; + fr->s_bits[8] = ra_bits[8*7 + 3]; + + /* E1 .. E3 must be set by out-of-band knowledge! */ + + /* E4 .. E7 */ + memcpy(fr->e_bits+3, ra_bits + 4*7 + 0, 4); + + /* D-bits */ + memcpy(fr->d_bits + 0*6 + 0, ra_bits + 0*7 + 0, 6); + memcpy(fr->d_bits + 1*6 + 0, ra_bits + 1*7 + 0, 6); + memcpy(fr->d_bits + 2*6 + 0, ra_bits + 2*7 + 0, 6); + memcpy(fr->d_bits + 3*6 + 0, ra_bits + 3*7 + 0, 6); + memcpy(fr->d_bits + 4*6 + 0, ra_bits + 4*7 + 4, 3); + memcpy(fr->d_bits + 4*6 + 3, ra_bits + 5*7 + 0, 3); + memcpy(fr->d_bits + 5*6 + 0, ra_bits + 5*7 + 4, 3); + memcpy(fr->d_bits + 5*6 + 3, ra_bits + 6*7 + 0, 3); + memcpy(fr->d_bits + 6*6 + 0, ra_bits + 6*7 + 4, 3); + memcpy(fr->d_bits + 6*6 + 3, ra_bits + 7*7 + 0, 3); + memcpy(fr->d_bits + 7*6 + 0, ra_bits + 7*7 + 4, 3); + memcpy(fr->d_bits + 7*6 + 3, ra_bits + 8*7 + 0, 3); + + return 0; +} + +int osmo_csd_12k_6k_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr) +{ + if (ra_bits_size < 60) + return -EINVAL; + + /* X1 .. X2 */ + ra_bits[1*7 + 6] = fr->x_bits[0]; + ra_bits[6*7 + 3] = fr->x_bits[1]; + + /* S1, S3, S4, S6, S8, S9 */ + ra_bits[0*7 + 6] = fr->s_bits[0]; + ra_bits[2*7 + 6] = fr->s_bits[2]; + ra_bits[3*7 + 6] = fr->s_bits[3]; + ra_bits[5*7 + 3] = fr->s_bits[5]; + ra_bits[7*7 + 3] = fr->s_bits[7]; + ra_bits[8*7 + 3] = fr->s_bits[8]; + + /* E1 .. E3 are dropped */ + + /* E4 .. E7 */ + memcpy(ra_bits + 4*7 + 0, fr->e_bits+3, 4); + + /* D-bits */ + memcpy(ra_bits + 0*7 + 0, fr->d_bits + 0*6 + 0, 6); + memcpy(ra_bits + 1*7 + 0, fr->d_bits + 1*6 + 0, 6); + memcpy(ra_bits + 2*7 + 0, fr->d_bits + 2*6 + 0, 6); + memcpy(ra_bits + 3*7 + 0, fr->d_bits + 3*6 + 0, 6); + memcpy(ra_bits + 4*7 + 4, fr->d_bits + 4*6 + 0, 3); + memcpy(ra_bits + 5*7 + 0, fr->d_bits + 4*6 + 3, 3); + memcpy(ra_bits + 5*7 + 4, fr->d_bits + 5*6 + 0, 3); + memcpy(ra_bits + 6*7 + 0, fr->d_bits + 5*6 + 3, 3); + memcpy(ra_bits + 6*7 + 4, fr->d_bits + 6*6 + 0, 3); + memcpy(ra_bits + 7*7 + 0, fr->d_bits + 6*6 + 3, 3); + memcpy(ra_bits + 7*7 + 4, fr->d_bits + 7*6 + 0, 3); + memcpy(ra_bits + 8*7 + 0, fr->d_bits + 7*6 + 3, 3); + + return 60; +} + +/*! Decode a 36-bit GSM 3k6kbit/s CSD frame present as 36 ubits into a struct osmo_v110_decoded_frame. + * \param[out] caller-allocated output data structure, filled by this function + * \param[in] ra_bits One V.110 frame as 36 unpacked bits. */ +int osmo_csd_3k6_decode_frame(struct osmo_v110_decoded_frame *fr, const ubit_t *ra_bits, size_t n_bits) +{ + + /* 3GPP TS 44.021 Section 8.1.4 + D1 D2 D3 S1 D4 D5 D6 X + D7 D8 D9 S3 D10 D11 D12 S4 + E4 E5 E6 E7 D13 D14 D15 S6 + D16 D17 D18 X D19 D20 D21 S8 + D22 D23 D24 S9 + */ + + if (n_bits < 36) + return -EINVAL; + + /* X1 .. X2 */ + fr->x_bits[0] = ra_bits[0*8 + 7]; + fr->x_bits[1] = ra_bits[3*8 + 3]; + + /* S1, S3, S4, S6, S8, S9 */ + fr->s_bits[0] = ra_bits[0*8 + 3]; + fr->s_bits[2] = ra_bits[1*8 + 3]; + fr->s_bits[3] = ra_bits[1*8 + 7]; + fr->s_bits[5] = ra_bits[2*8 + 7]; + fr->s_bits[7] = ra_bits[3*8 + 7]; + fr->s_bits[8] = ra_bits[4*8 + 3]; + + /* E1 .. E3 must be set by out-of-band knowledge! */ + + /* E4 .. E7 */ + memcpy(fr->e_bits+3, ra_bits + 2*8 + 0, 4); + + /* D-bits */ + unsigned int d_idx = 0; + fr->d_bits[d_idx++] = ra_bits[0*8+0]; /* D1 */ + fr->d_bits[d_idx++] = ra_bits[0*8+0]; /* D1 */ + fr->d_bits[d_idx++] = ra_bits[0*8+1]; /* D2 */ + fr->d_bits[d_idx++] = ra_bits[0*8+1]; /* D2 */ + fr->d_bits[d_idx++] = ra_bits[0*8+2]; /* D3 */ + fr->d_bits[d_idx++] = ra_bits[0*8+2]; /* D3 */ + fr->d_bits[d_idx++] = ra_bits[0*8+4]; /* D4 */ + fr->d_bits[d_idx++] = ra_bits[0*8+4]; /* D4 */ + fr->d_bits[d_idx++] = ra_bits[0*8+5]; /* D5 */ + fr->d_bits[d_idx++] = ra_bits[0*8+5]; /* D5 */ + fr->d_bits[d_idx++] = ra_bits[0*8+6]; /* D6 */ + fr->d_bits[d_idx++] = ra_bits[0*8+6]; /* D6 */ + + fr->d_bits[d_idx++] = ra_bits[1*8+0]; /* D7 */ + fr->d_bits[d_idx++] = ra_bits[1*8+0]; /* D7 */ + fr->d_bits[d_idx++] = ra_bits[1*8+1]; /* D8 */ + fr->d_bits[d_idx++] = ra_bits[1*8+1]; /* D8 */ + fr->d_bits[d_idx++] = ra_bits[1*8+2]; /* D9 */ + fr->d_bits[d_idx++] = ra_bits[1*8+2]; /* D9 */ + fr->d_bits[d_idx++] = ra_bits[1*8+4]; /* D10 */ + fr->d_bits[d_idx++] = ra_bits[1*8+4]; /* D10 */ + fr->d_bits[d_idx++] = ra_bits[1*8+5]; /* D11 */ + fr->d_bits[d_idx++] = ra_bits[1*8+5]; /* D11 */ + fr->d_bits[d_idx++] = ra_bits[1*8+6]; /* D12 */ + fr->d_bits[d_idx++] = ra_bits[1*8+6]; /* D12 */ + + fr->d_bits[d_idx++] = ra_bits[2*8+4]; /* D13 */ + fr->d_bits[d_idx++] = ra_bits[2*8+4]; /* D13 */ + fr->d_bits[d_idx++] = ra_bits[2*8+5]; /* D14 */ + fr->d_bits[d_idx++] = ra_bits[2*8+5]; /* D14 */ + fr->d_bits[d_idx++] = ra_bits[2*8+6]; /* D15 */ + fr->d_bits[d_idx++] = ra_bits[2*8+6]; /* D15 */ + + fr->d_bits[d_idx++] = ra_bits[3*8+0]; /* D16 */ + fr->d_bits[d_idx++] = ra_bits[3*8+0]; /* D16 */ + fr->d_bits[d_idx++] = ra_bits[3*8+1]; /* D17 */ + fr->d_bits[d_idx++] = ra_bits[3*8+1]; /* D17 */ + fr->d_bits[d_idx++] = ra_bits[3*8+2]; /* D18 */ + fr->d_bits[d_idx++] = ra_bits[3*8+2]; /* D18 */ + fr->d_bits[d_idx++] = ra_bits[3*8+4]; /* D19 */ + fr->d_bits[d_idx++] = ra_bits[3*8+4]; /* D19 */ + fr->d_bits[d_idx++] = ra_bits[3*8+5]; /* D20 */ + fr->d_bits[d_idx++] = ra_bits[3*8+5]; /* D20 */ + fr->d_bits[d_idx++] = ra_bits[3*8+6]; /* D21 */ + fr->d_bits[d_idx++] = ra_bits[3*8+6]; /* D21 */ + + fr->d_bits[d_idx++] = ra_bits[4*8+0]; /* D22 */ + fr->d_bits[d_idx++] = ra_bits[4*8+0]; /* D22 */ + fr->d_bits[d_idx++] = ra_bits[4*8+1]; /* D23 */ + fr->d_bits[d_idx++] = ra_bits[4*8+1]; /* D23 */ + fr->d_bits[d_idx++] = ra_bits[4*8+2]; /* D24 */ + fr->d_bits[d_idx++] = ra_bits[4*8+2]; /* D24 */ + + OSMO_ASSERT(d_idx == 48); + + return 0; +} + +int osmo_csd_3k6_encode_frame(ubit_t *ra_bits, size_t ra_bits_size, const struct osmo_v110_decoded_frame *fr) +{ + if (ra_bits_size < 36) + return -EINVAL; + + /* X1 .. X2 */ + ra_bits[0*8 + 7] = fr->x_bits[0]; + ra_bits[3*8 + 3] = fr->x_bits[1]; + + /* S1, S3, S4, S6, S8, S9 */ + ra_bits[0*8 + 3] = fr->s_bits[0]; + ra_bits[1*8 + 3] = fr->s_bits[2]; + ra_bits[1*8 + 7] = fr->s_bits[3]; + ra_bits[2*8 + 7] = fr->s_bits[5]; + ra_bits[3*8 + 7] = fr->s_bits[7]; + ra_bits[4*8 + 3] = fr->s_bits[8]; + + /* E1 .. E3 are ignored */ + + /* E4 .. E7 */ + memcpy(ra_bits + 2*8 + 0, fr->e_bits+3, 4); + + /* D-bits */ + unsigned int d_idx = 0; + ra_bits[0*8 + 0] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[0*8 + 1] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[0*8 + 2] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[0*8 + 4] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[0*8 + 5] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[0*8 + 6] = fr->d_bits[d_idx]; d_idx += 2; + + ra_bits[1*8 + 0] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[1*8 + 1] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[1*8 + 2] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[1*8 + 4] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[1*8 + 5] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[1*8 + 6] = fr->d_bits[d_idx]; d_idx += 2; + + ra_bits[2*8 + 4] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[2*8 + 5] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[2*8 + 6] = fr->d_bits[d_idx]; d_idx += 2; + + ra_bits[3*8 + 0] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[3*8 + 1] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[3*8 + 2] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[3*8 + 4] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[3*8 + 5] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[3*8 + 6] = fr->d_bits[d_idx]; d_idx += 2; + + ra_bits[4*8 + 0] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[4*8 + 1] = fr->d_bits[d_idx]; d_idx += 2; + ra_bits[4*8 + 2] = fr->d_bits[d_idx]; d_idx += 2; + + OSMO_ASSERT(d_idx == 48); + + return 36; +} + +/*! Print a encoded "CSD modififed V.110" frame in the same table-like structure as the spec. */ +void osmo_csd_ubit_dump(FILE *outf, const ubit_t *fr, size_t in_len) +{ + switch (in_len) { + case 60: + for (unsigned int septet = 0; septet < 9; septet++) { + if (septet < 8) { + fprintf(outf, "%d\t%d\t%d\t%d\t%d\t%d\t%d\n", + fr[septet*7+0], fr[septet*7+1], fr[septet*7+2], fr[septet*7+3], + fr[septet*7+4], fr[septet*7+5], fr[septet*7+6]); + } else { + fprintf(outf, "%d\t%d\t%d\t%d\n", + fr[septet*7+0], fr[septet*7+1], fr[septet*7+2], fr[septet*7+3]); + } + } + break; + case 36: + for (unsigned int octet = 0; octet < 5; octet++) { + if (octet < 4) { + fprintf(outf, "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n", + fr[octet*8+0], fr[octet*8+1], fr[octet*8+2], fr[octet*8+3], + fr[octet*8+4], fr[octet*8+5], fr[octet*8+6], fr[octet*8+7]); + } else { + fprintf(outf, "%d\t%d\t%d\t%d\n", + fr[octet*8+0], fr[octet*8+1], fr[octet*8+2], fr[octet*8+3]); + } + } + break; + default: + fprintf(outf, "invalid input data length: %zu\n", in_len); + } +} diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 6ad363f..6795c57 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -791,5 +791,11 @@ osmo_iuup_rnl_prim_alloc; osmo_iuup_tnl_prim_alloc; +osmo_csd_12k_6k_decode_frame; +osmo_csd_12k_6k_encode_frame; +osmo_csd_3k6_decode_frame; +osmo_csd_3k6_encode_frame; +osmo_csd_ubit_dump; + local: *; }; diff --git a/tests/Makefile.am b/tests/Makefile.am index f0c80d5..275cf5f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,6 +52,7 @@ auth/xor2g_test \ v110/test_frame \ v110/test_ra1 \ + gsm44021/test_frame_csd \ $(NULL) if ENABLE_MSGFILE @@ -347,6 +348,11 @@ v110_test_ra1_SOURCES = v110/test_ra1.c v110_test_ra1_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la +gsm44021_test_frame_csd_SOURCES = gsm44021/test_frame_csd.c +gsm44021_test_frame_csd_LDADD = $(LDADD) $(top_builddir)/src/isdn/libosmoisdn.la \ + $(top_builddir)/src/gsm/libosmogsm.la + + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac :;{ \ @@ -447,6 +453,7 @@ smscb/cbsp_test.ok \ v110/test_frame.ok \ v110/test_ra1.ok \ + gsm44021/test_frame_csd.ok \ $(NULL) if ENABLE_LIBSCTP @@ -654,6 +661,8 @@ >$(srcdir)/v110/test_frame.ok v110/test_ra1 \ >$(srcdir)/v110/test_ra1.ok + gsm44021/test_frame_csd \ + >$(srcdir)/gsm44021/test_frame_csd.ok check-local: atconfig $(TESTSUITE) [ -e /proc/cpuinfo ] && cat /proc/cpuinfo diff --git a/tests/gsm44021/test_frame_csd.c b/tests/gsm44021/test_frame_csd.c new file mode 100644 index 0000000..98efdac --- /dev/null +++ b/tests/gsm44021/test_frame_csd.c @@ -0,0 +1,93 @@ +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <unistd.h> + +#include <osmocom/core/bits.h> +#include <osmocom/isdn/v110.h> +#include <osmocom/gsm/gsm44021.h> + + +static void fill_v110_frame(struct osmo_v110_decoded_frame *fr) +{ + unsigned int i; + + memset(fr, 0, sizeof(*fr)); + + /* we abuse the fact that ubit_t is 8bit so we can actually + * store integer values to clearly identify which bit ends up where */ + + /* D1..D48: 101..148 */ + for (i = 0; i < ARRAY_SIZE(fr->d_bits); i++) + fr->d_bits[i] = 101 + i; + /* E1..E7: 201..207 */ + for (i = 0; i < ARRAY_SIZE(fr->e_bits); i++) + fr->e_bits[i] = 201 + i; + /* S1..S9: 211..219 */ + for (i = 0; i < ARRAY_SIZE(fr->s_bits); i++) + fr->s_bits[i] = 211 + i; + /* X1..X2: 221..222 */ + for (i = 0; i < ARRAY_SIZE(fr->x_bits); i++) + fr->x_bits[i] = 221 + i; +} + + +static void test_frame_enc_12k_6k(void) +{ + struct osmo_v110_decoded_frame fr; + ubit_t bits[60]; + + printf("Testing Frame Encoding for 12k/6k radio interface rate\n"); + + fill_v110_frame(&fr); + + /* run encoder and dump to stdout */ + memset(bits, 0xff, sizeof(bits)); + osmo_csd_12k_6k_encode_frame(bits, sizeof(bits), &fr); + osmo_csd_ubit_dump(stdout, bits, sizeof(bits)); + + /* run decoder on what we just encoded */ + memset(&fr, 0, sizeof(fr)); + osmo_csd_12k_6k_decode_frame(&fr, bits, sizeof(bits)); + + /* re-encode and dump again 'expout' will match it. */ + memset(bits, 0xff, sizeof(bits)); + osmo_csd_12k_6k_encode_frame(bits, sizeof(bits), &fr); + osmo_csd_ubit_dump(stdout, bits, sizeof(bits)); +} + +static void test_frame_enc_3k6(void) +{ + struct osmo_v110_decoded_frame fr; + ubit_t bits[36]; + + printf("Testing Frame Encoding for 3.6k radio interface rate\n"); + + fill_v110_frame(&fr); + /* different D-bit numbering for 3k6, see TS 44.021 Section 8.1.4 */ + for (unsigned int i = 0; i < ARRAY_SIZE(fr.d_bits); i++) + fr.d_bits[i] = 101 + i/2; + + /* run encoder and dump to stdout */ + memset(bits, 0xff, sizeof(bits)); + osmo_csd_3k6_encode_frame(bits, sizeof(bits), &fr); + osmo_csd_ubit_dump(stdout, bits, sizeof(bits)); + + /* run decoder on what we just encoded */ + memset(&fr, 0, sizeof(fr)); + osmo_csd_3k6_decode_frame(&fr, bits, sizeof(bits)); + + /* re-encode and dump again 'expout' will match it. */ + memset(bits, 0xff, sizeof(bits)); + osmo_csd_3k6_encode_frame(bits, sizeof(bits), &fr); + osmo_csd_ubit_dump(stdout, bits, sizeof(bits)); +} + + +int main(int argc, char **argv) +{ + test_frame_enc_12k_6k(); + printf("\n"); + test_frame_enc_3k6(); +} + diff --git a/tests/gsm44021/test_frame_csd.ok b/tests/gsm44021/test_frame_csd.ok new file mode 100644 index 0000000..1a5d3f2 --- /dev/null +++ b/tests/gsm44021/test_frame_csd.ok @@ -0,0 +1,31 @@ +Testing Frame Encoding for 12k/6k radio interface rate +101 102 103 104 105 106 211 +107 108 109 110 111 112 221 +113 114 115 116 117 118 213 +119 120 121 122 123 124 214 +204 205 206 207 125 126 127 +128 129 130 216 131 132 133 +134 135 136 222 137 138 139 +140 141 142 218 143 144 145 +146 147 148 219 +101 102 103 104 105 106 211 +107 108 109 110 111 112 221 +113 114 115 116 117 118 213 +119 120 121 122 123 124 214 +204 205 206 207 125 126 127 +128 129 130 216 131 132 133 +134 135 136 222 137 138 139 +140 141 142 218 143 144 145 +146 147 148 219 + +Testing Frame Encoding for 3.6k radio interface rate +101 102 103 211 104 105 106 221 +107 108 109 213 110 111 112 214 +204 205 206 207 113 114 115 216 +116 117 118 222 119 120 121 218 +122 123 124 219 +101 102 103 211 104 105 106 221 +107 108 109 213 110 111 112 214 +204 205 206 207 113 114 115 216 +116 117 118 222 119 120 121 218 +122 123 124 219 diff --git a/tests/testsuite.at b/tests/testsuite.at index 39cf54a..60aa74d 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -502,3 +502,9 @@ cat $abs_srcdir/v110/test_ra1.ok > expout AT_CHECK([$abs_top_builddir/tests/v110/test_ra1], [], [expout],[]) AT_CLEANUP + +AT_SETUP([gsm44021_test_frame_csd]) +AT_KEYWORDS([gsm44021_test_frame_csd]) +cat $abs_srcdir/gsm44021/test_frame_csd.ok > expout +AT_CHECK([$abs_top_builddir/tests/gsm44021/test_frame_csd], [], [expout],[]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31668 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I60a2f2690459359437df20cf4da9043fa7c3ad11 Gerrit-Change-Number: 31668 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Makefile.am: Make libraries depend on .map files
by laforge 05 Mar '23

05 Mar '23

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31667 ) Change subject: Makefile.am: Make libraries depend on .map files ...................................................................... Makefile.am: Make libraries depend on .map files Without this, an update to the .map file doesn't re-trigger a re-link of the library. Change-Id: If0ea6f41730a28b04562d45efa6ca376abaf3f6b --- M src/coding/Makefile.am M src/core/Makefile.am M src/ctrl/Makefile.am M src/gb/Makefile.am M src/gsm/Makefile.am M src/isdn/Makefile.am 6 files changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/67/31667/1 diff --git a/src/coding/Makefile.am b/src/coding/Makefile.am index 42b16e8..905d684 100644 --- a/src/coding/Makefile.am +++ b/src/coding/Makefile.am @@ -37,3 +37,4 @@ $(NULL) EXTRA_DIST = libosmocoding.map +EXTRA_libosmocoding_la_DEPENDENCIES = libosmocoding.map diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 7e24013..50c39d1 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -111,6 +111,8 @@ libosmocore.map \ $(NULL) +EXTRA_libosmocore_la_DEPENDENCIES = libosmocore.map + libosmocore_la_LDFLAGS = \ $(LTLDFLAGS_OSMOCORE) \ -version-info \ diff --git a/src/ctrl/Makefile.am b/src/ctrl/Makefile.am index e1c6587..29f867e 100644 --- a/src/ctrl/Makefile.am +++ b/src/ctrl/Makefile.am @@ -22,5 +22,6 @@ endif EXTRA_DIST = libosmoctrl.map +EXTRA_libosmoctrl_la_DEPENDENCIES = libosmoctrl.map endif diff --git a/src/gb/Makefile.am b/src/gb/Makefile.am index 1818db7..3a64a71 100644 --- a/src/gb/Makefile.am +++ b/src/gb/Makefile.am @@ -40,3 +40,4 @@ endif EXTRA_DIST = libosmogb.map +EXTRA_libosmogb_la_DEPENDENCIES = libosmogb.map diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index cff089b..79c5f04 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -52,6 +52,7 @@ endif EXTRA_DIST = libosmogsm.map +EXTRA_libosmogsm_la_DEPENDENCIES = libosmogsm.map # Convolutional codes generation gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py diff --git a/src/isdn/Makefile.am b/src/isdn/Makefile.am index 97e7a28..2aed0bf 100644 --- a/src/isdn/Makefile.am +++ b/src/isdn/Makefile.am @@ -23,3 +23,4 @@ libosmoisdn_la_LIBADD = libisdnint.la $(TALLOC_LIBS) EXTRA_DIST = libosmoisdn.map +EXTRA_libosmoisdn_la_DEPENDENCIES = libosmoisdn.map -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If0ea6f41730a28b04562d45efa6ca376abaf3f6b Gerrit-Change-Number: 31667 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: f_iuh2iu_disconnect: allow more time
by laforge 05 Mar '23

05 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31410 ) Change subject: hnbgw: f_iuh2iu_disconnect: allow more time ...................................................................... hnbgw: f_iuh2iu_disconnect: allow more time Increase timeout for expecting an SCCP RLSD from osmo-hnbgw. Affects tests HNBGW_Tests.TC_ranap_cs_mo_disconnect HNBGW_Tests.TC_ranap_ps_mo_disconnect Rationale: For the case RUA --id-Disconnect--> HNBGW ----release-SCCP---- CN the tests expect behavior not exactly specified. 3GPP TS 48.006 9.2 Connection release: The MSC sends a SCCP released message. This message shall not contain any user data field. So what we should expect is this: HNBGW MSC RUA --id-Disconnect-------> | ---Data-Form-1(!)---> | Iu-ReleaseComplete | <--Released---------- | (no data) Instead, we expect the HNBGW to immediately send a RLSD to the MSC: HNBGW MSC RUA --id-Disconnect-------> | ---Released---------> | Iu-ReleaseComplete osmo-hnbgw is being fixed in that respect: it will soon give time for the CN to send an SCCP RLSD, and only if that times out will osmo-hnbgw send an SCCP RLSD to the CN. So HNBGW_Tests.ttcn should still ensure that osmo-hnbgw will eventually send an SCCP RLSD if the CN fails to do so, but it should allow more time to accomodate the release timeout. Related: osmo-hnbgw I6ff7e36532ff57c6f2d3e7e419dd22ef27dafd19 Related: SYS#6297 Change-Id: Ibf6eaeb1b82d43e4f208f64a71f2f6e889883a11 --- M hnbgw/HNBGW_Tests.ttcn 1 file changed, 63 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 2aa6407..5a2c72e 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -561,11 +561,25 @@ return rx; } +/* 3GPP TS 48.006 9.2 Connection release: + * + * The MSC sends a SCCP released message. This message shall not contain + * any user data field. + * + * So what we expect normally is: + * + * HNBGW MSC + * RUA --id-Disconnect-------> | ---Data-Form-1(!)---> | Iu-ReleaseComplete + * | <--Released---------- | (no data) + * + * This function tests osmo-hnbgw behavior if the CN fails to send a RLSD: + * after some timeout, osmo-hnbgw should send a RLSD to the CN. + */ function f_iuh2iu_disconnect(template (present) RANAP_PDU tx, RUA_IEs.Cause cause, template RANAP_PDU exp_rx := omit) runs on ConnHdlr return RANAP_PDU { var RANAP_PDU rx - timer T := 5.0; + timer T := 10.0; if (istemplatekind(exp_rx, "omit")) { exp_rx := tx; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibf6eaeb1b82d43e4f208f64a71f2f6e889883a11 Gerrit-Change-Number: 31410 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: f_iuh2iu_disconnect: allow more time
by laforge 05 Mar '23

05 Mar '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31410 ) Change subject: hnbgw: f_iuh2iu_disconnect: allow more time ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31410 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibf6eaeb1b82d43e4f208f64a71f2f6e889883a11 Gerrit-Change-Number: 31410 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Sun, 05 Mar 2023 18:06:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-abis[master]: e1d: Remove useless call of handle_ts_trau_write()
by laforge 05 Mar '23

05 Mar '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/31501 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: e1d: Remove useless call of handle_ts_trau_write() ...................................................................... e1d: Remove useless call of handle_ts_trau_write() handle_ts_trau_write() is called inside handle_ts_trau_read(). There is no need to call it when OSMO_FD_WRITE flag is set, because it is never set. Change-Id: Iccddcdb0975e8a043cc395c8908a157f5b376752 --- M src/input/e1d.c 1 file changed, 16 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/input/e1d.c b/src/input/e1d.c index b638439..db4988f 100644 --- a/src/input/e1d.c +++ b/src/input/e1d.c @@ -284,8 +284,9 @@ case E1INP_TS_TYPE_TRAU: if (what & OSMO_FD_READ) ret = handle_ts_trau_read(bfd); - if (what & OSMO_FD_WRITE) - ret = handle_ts_trau_write(bfd); + /* handle_ts_trau_write() is called inside handle_ts_trau_read(). + * OSMO_FD_WRITE flag is not required here and will not be set. + */ break; case E1INP_TS_TYPE_RAW: if (what & OSMO_FD_READ) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/31501 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iccddcdb0975e8a043cc395c8908a157f5b376752 Gerrit-Change-Number: 31501 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0