- gerrit-log - lists.osmocom.org

[M] Change in osmo-mgw[master]: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: dexter, neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email ) Change subject: mgcp-cli: Transmit remote IP addr in CRCX if known and port=0 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35152?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I30165dbac5e484011d0acf46af36f105954a501d Gerrit-Change-Number: 35152 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:36:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: fixeria, jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email ) Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c Gerrit-Change-Number: 35082 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:36:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by laforge 29 Nov '23

29 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Add a GSM RLP decoder and encoder This code implements a decoder and encoder for the RLP (Radio Link Protocol) as used in the bearer channel of GSM CSD (Circuit Switched Data). Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 --- M include/osmocom/gsm/Makefile.am A include/osmocom/gsm/rlp.h M src/gsm/Makefile.am M src/gsm/libosmogsm.map A src/gsm/rlp.c M tests/Makefile.am A tests/rlp/rlp_test.c A tests/rlp/rlp_test.ok M tests/testsuite.at 9 files changed, 608 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am index f840a27..5678a51 100644 --- a/include/osmocom/gsm/Makefile.am +++ b/include/osmocom/gsm/Makefile.am @@ -48,6 +48,7 @@ l1sap.h \ oap.h \ oap_client.h \ + rlp.h \ rsl.h \ rxlev_stat.h \ sysinfo.h \ diff --git a/include/osmocom/gsm/rlp.h b/include/osmocom/gsm/rlp.h new file mode 100644 index 0000000..47b0a6c --- /dev/null +++ b/include/osmocom/gsm/rlp.h @@ -0,0 +1,81 @@ +/* + * GSM RLP (Radio Link Protocol) as used in CSD (3GPP TS 44.022) + * + * Copyright (C) 2022-2023 Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + + +#pragma once +#include <stdint.h> +#include <stdbool.h> +#include <osmocom/core/utils.h> + +/*! \defgroup rlp GSM RLP (Radio Link Protocol) as used in CSD (3GPP TS 24.022) + * @{ + * \file rlp.h */ + +/*! RLP frame type as per 3GPP TS 24.022 Section 5.2.1 */ +enum osmo_rlp_ftype { + OSMO_RLP_FT_U, + OSMO_RLP_FT_S, + OSMO_RLP_FT_IS, +}; +extern const struct value_string osmo_rlp_ftype_vals[]; + +/*! RLP U-Frame Type as per 3GPP TS 24.022 Section 5.2.1 */ +enum osmo_rlp_u_ftype { + OSMO_RLP_U_FT_SABM = 0x07, + OSMO_RLP_U_FT_UA = 0x0c, + OSMO_RLP_U_FT_DISC = 0x08, + OSMO_RLP_U_FT_DM = 0x03, + OSMO_RLP_U_FT_NULL = 0x0f, + OSMO_RLP_U_FT_UI = 0x00, + OSMO_RLP_U_FT_XID = 0x17, + OSMO_RLP_U_FT_TEST = 0x1c, + OSMO_RLP_U_FT_REMAP = 0x11, +}; +extern const struct value_string osmo_rlp_ftype_u_vals[]; + +/*! RLP S-Frame type as per 3GPP TS 24.022 Section 5.2.1 */ +enum osmo_rlp_s_ftype { + OSMO_RLP_S_FT_RR = 0, + OSMO_RLP_S_FT_REJ = 2, + OSMO_RLP_S_FT_RNR = 1, + OSMO_RLP_S_FT_SREJ = 3, +}; +extern const struct value_string osmo_rlp_ftype_s_vals[]; + +/*! Data structure representing one decoded RLP frame */ +struct osmo_rlp_frame_decoded { + uint8_t version; + enum osmo_rlp_ftype ftype; + enum osmo_rlp_u_ftype u_ftype; + enum osmo_rlp_s_ftype s_ftype; + bool c_r; + bool p_f; + uint8_t s_bits; + uint16_t n_s; + uint16_t n_r; + uint32_t fcs; + uint8_t info[536/8]; + uint16_t info_len; +}; + +int osmo_rlp_decode(struct osmo_rlp_frame_decoded *out, uint8_t version, const uint8_t *data, size_t data_len); +int osmo_rlp_encode(uint8_t *out, size_t out_size, const struct osmo_rlp_frame_decoded *in); +uint32_t osmo_rlp_fcs_compute(const uint8_t *in, size_t in_len); + +/*! @} */ diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index a01189c..67ecf9d 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -36,7 +36,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 gsm44021.c gsm44068.c + gad.c bsslap.c bssmap_le.c kdf.c iuup.c gsm44021.c gsm44068.c rlp.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/libosmogsm.map b/src/gsm/libosmogsm.map index 6bb3b4b..db2dbcb 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -864,5 +864,12 @@ osmo_csd_3k6_encode_frame; osmo_csd_ubit_dump; +osmo_rlp_decode; +osmo_rlp_encode; +osmo_rlp_fcs_compute; +osmo_rlp_ftype_s_vals; +osmo_rlp_ftype_u_vals; +osmo_rlp_ftype_vals; + local: *; }; diff --git a/src/gsm/rlp.c b/src/gsm/rlp.c new file mode 100644 index 0000000..9702e4f --- /dev/null +++ b/src/gsm/rlp.c @@ -0,0 +1,238 @@ +/* + * Copyright (C) 2022-2023 Harald Welte <laforge(a)osmocom.org> + * + * All Rights Reserved + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/*! \addtogroup rlp + * @{ + * RLP (Radio Link Protocol) as per 3GPP TS 24.022 + * + */ + +#include <stdint.h> +#include <stddef.h> +#include <string.h> +#include <errno.h> + +#include <osmocom/gsm/rlp.h> + +const struct value_string osmo_rlp_ftype_vals[] = { + { OSMO_RLP_FT_U, "U" }, + { OSMO_RLP_FT_S, "S" }, + { OSMO_RLP_FT_IS, "IS" }, + { 0, NULL } +}; + +const struct value_string osmo_rlp_ftype_u_vals[] = { + { OSMO_RLP_U_FT_SABM, "SABM" }, + { OSMO_RLP_U_FT_UA, "UA" }, + { OSMO_RLP_U_FT_DISC, "DISC" }, + { OSMO_RLP_U_FT_DM, "DM" }, + { OSMO_RLP_U_FT_NULL, "NULL" }, + { OSMO_RLP_U_FT_UI, "UI" }, + { OSMO_RLP_U_FT_XID, "XID" }, + { OSMO_RLP_U_FT_TEST, "TEST" }, + { OSMO_RLP_U_FT_REMAP, "REMAP" }, + { 0, NULL } +}; + +const struct value_string osmo_rlp_ftype_s_vals[] = { + { OSMO_RLP_S_FT_RR, "RR" }, + { OSMO_RLP_S_FT_REJ, "REJ" }, + { OSMO_RLP_S_FT_RNR, "RNR" }, + { OSMO_RLP_S_FT_SREJ, "SREJ" }, + { 0, NULL } +}; + + +/*! decode a RLP frame into its abstract representation. Doesn't check FCS correctness. + * \param[out] out caller-allocated memory for output of decoded frame + * \param[in] version RLP version number to use when decoding + * \param[in] data raw RLP frame input data + * \param[in] data_len length of data (in octets) + * \returns 0 in case of success; negative on error */ +int osmo_rlp_decode(struct osmo_rlp_frame_decoded *out, uint8_t version, const uint8_t *data, size_t data_len) +{ + uint8_t n_s, n_r; + + /* we only support 240 bit so far */ + if (data_len != 240/8) + return -EINVAL; + + /* we only support version 0+1 so far */ + if (version >= 2) + return -ENOTSUP; + + memset(out, 0, sizeof(*out)); + out->version = version; + + out->c_r = data[0] & 1; + n_s = (data[0] >> 3) | (data[1] & 1) << 5; + n_r = (data[1] >> 2); + out->fcs = (data[240/8-1] << 16) | (data[240/8-2]) << 8 | (data[240/8-3] << 0); + out->p_f = (data[1] >> 1) & 1; + + switch (n_s) { + case 0x3f: + out->ftype = OSMO_RLP_FT_U; + out->u_ftype = n_r & 0x1f; + if (out->u_ftype == OSMO_RLP_U_FT_XID) { + memcpy(out->info, data+2, 240/8 - 5); + out->info_len = 240/8 - 5; + } + break; + case 0x3e: + out->ftype = OSMO_RLP_FT_S; + out->s_ftype = (data[0] >> 1) & 3; + out->n_r = n_r; + break; + default: + out->ftype = OSMO_RLP_FT_IS; + out->s_ftype = (data[0] >> 1) & 3; + out->n_s = n_s; + out->n_r = n_r; + memcpy(out->info, data+2, 240/8 - 5); + out->info_len = 240/8 - 5; + break; + } + + return 0; +} + +/*! encode a RLP frame from its abstract representation. Generates FCS. + * \param[out] out caller-allocated output buffer + * \param[in] out_size size of output buffer (in octets) + * \param[in] in decoded RLP frame which is to be encoded + * \returns number of output bytes used; negative on error */ +int osmo_rlp_encode(uint8_t *out, size_t out_size, const struct osmo_rlp_frame_decoded *in) +{ + uint8_t out_len = 240/8; + uint8_t n_s, n_r, s_bits; + uint32_t fcs; + + /* we only support version 0+1 so far */ + if (in->version >= 2) + return -ENOTSUP; + + if (out_size < out_len) + return -EINVAL; + + memset(out, 0, out_len); + + if (in->c_r) + out[0] |= 0x01; + if (in->p_f) + out[1] |= 0x02; + + switch (in->ftype) { + case OSMO_RLP_FT_U: + n_s = 0x3f; + n_r = in->u_ftype; + s_bits = 0; + if (in->u_ftype == OSMO_RLP_U_FT_XID) + memcpy(out+2, in->info, in->info_len); + break; + case OSMO_RLP_FT_S: + n_s = 0x3e; + n_r = in->n_r; + s_bits = in->s_ftype; + break; + case OSMO_RLP_FT_IS: + /* we only support 240 bit so far */ + if (in->info_len != 240/8 - 5) + return -EINVAL; + n_s = in->n_s; + n_r = in->n_r; + s_bits = in->s_ftype; + memcpy(out+2, in->info, in->info_len); + break; + default: + return -EINVAL; + } + + /* patch N(S) into output data */ + out[0] |= (n_s & 0x1F) << 3; + out[1] |= (n_s & 0x20) >> 5; + + /* patch N(R) / M-bits into output data */ + out[1] |= (n_r & 0x3f) << 2; + + /* patch S-bits into output data */ + out[0] |= (s_bits & 3) << 1; + + /* compute FCS + add it to end of frame */ + fcs = osmo_rlp_fcs_compute(out, out_len - 3); + out[out_len - 3] = (fcs >> 0) & 0xff; + out[out_len - 2] = (fcs >> 8) & 0xff; + out[out_len - 1] = (fcs >> 16) & 0xff; + + return out_len; +} + + +static const uint32_t rlp_fcs_table[256] = { + 0x00B29D2D, 0x00643A5B, 0x0044D87A, 0x00927F0C, 0x00051C38, 0x00D3BB4E, 0x00F3596F, 0x0025FE19, + 0x008694BC, 0x005033CA, 0x0070D1EB, 0x00A6769D, 0x003115A9, 0x00E7B2DF, 0x00C750FE, 0x0011F788, + 0x00DA8E0F, 0x000C2979, 0x002CCB58, 0x00FA6C2E, 0x006D0F1A, 0x00BBA86C, 0x009B4A4D, 0x004DED3B, + 0x00EE879E, 0x003820E8, 0x0018C2C9, 0x00CE65BF, 0x0059068B, 0x008FA1FD, 0x00AF43DC, 0x0079E4AA, + 0x0062BB69, 0x00B41C1F, 0x0094FE3E, 0x00425948, 0x00D53A7C, 0x00039D0A, 0x00237F2B, 0x00F5D85D, + 0x0056B2F8, 0x0080158E, 0x00A0F7AF, 0x007650D9, 0x00E133ED, 0x0037949B, 0x001776BA, 0x00C1D1CC, + 0x000AA84B, 0x00DC0F3D, 0x00FCED1C, 0x002A4A6A, 0x00BD295E, 0x006B8E28, 0x004B6C09, 0x009DCB7F, + 0x003EA1DA, 0x00E806AC, 0x00C8E48D, 0x001E43FB, 0x008920CF, 0x005F87B9, 0x007F6598, 0x00A9C2EE, + 0x0049DA1E, 0x009F7D68, 0x00BF9F49, 0x0069383F, 0x00FE5B0B, 0x0028FC7D, 0x00081E5C, 0x00DEB92A, + 0x007DD38F, 0x00AB74F9, 0x008B96D8, 0x005D31AE, 0x00CA529A, 0x001CF5EC, 0x003C17CD, 0x00EAB0BB, + 0x0021C93C, 0x00F76E4A, 0x00D78C6B, 0x00012B1D, 0x00964829, 0x0040EF5F, 0x00600D7E, 0x00B6AA08, + 0x0015C0AD, 0x00C367DB, 0x00E385FA, 0x0035228C, 0x00A241B8, 0x0074E6CE, 0x005404EF, 0x0082A399, + 0x0099FC5A, 0x004F5B2C, 0x006FB90D, 0x00B91E7B, 0x002E7D4F, 0x00F8DA39, 0x00D83818, 0x000E9F6E, + 0x00ADF5CB, 0x007B52BD, 0x005BB09C, 0x008D17EA, 0x001A74DE, 0x00CCD3A8, 0x00EC3189, 0x003A96FF, + 0x00F1EF78, 0x0027480E, 0x0007AA2F, 0x00D10D59, 0x00466E6D, 0x0090C91B, 0x00B02B3A, 0x00668C4C, + 0x00C5E6E9, 0x0013419F, 0x0033A3BE, 0x00E504C8, 0x007267FC, 0x00A4C08A, 0x008422AB, 0x005285DD, + 0x001F18F0, 0x00C9BF86, 0x00E95DA7, 0x003FFAD1, 0x00A899E5, 0x007E3E93, 0x005EDCB2, 0x00887BC4, + 0x002B1161, 0x00FDB617, 0x00DD5436, 0x000BF340, 0x009C9074, 0x004A3702, 0x006AD523, 0x00BC7255, + 0x00770BD2, 0x00A1ACA4, 0x00814E85, 0x0057E9F3, 0x00C08AC7, 0x00162DB1, 0x0036CF90, 0x00E068E6, + 0x00430243, 0x0095A535, 0x00B54714, 0x0063E062, 0x00F48356, 0x00222420, 0x0002C601, 0x00D46177, + 0x00CF3EB4, 0x001999C2, 0x00397BE3, 0x00EFDC95, 0x0078BFA1, 0x00AE18D7, 0x008EFAF6, 0x00585D80, + 0x00FB3725, 0x002D9053, 0x000D7272, 0x00DBD504, 0x004CB630, 0x009A1146, 0x00BAF367, 0x006C5411, + 0x00A72D96, 0x00718AE0, 0x005168C1, 0x0087CFB7, 0x0010AC83, 0x00C60BF5, 0x00E6E9D4, 0x00304EA2, + 0x00932407, 0x00458371, 0x00656150, 0x00B3C626, 0x0024A512, 0x00F20264, 0x00D2E045, 0x00044733, + 0x00E45FC3, 0x0032F8B5, 0x00121A94, 0x00C4BDE2, 0x0053DED6, 0x008579A0, 0x00A59B81, 0x00733CF7, + 0x00D05652, 0x0006F124, 0x00261305, 0x00F0B473, 0x0067D747, 0x00B17031, 0x00919210, 0x00473566, + 0x008C4CE1, 0x005AEB97, 0x007A09B6, 0x00ACAEC0, 0x003BCDF4, 0x00ED6A82, 0x00CD88A3, 0x001B2FD5, + 0x00B84570, 0x006EE206, 0x004E0027, 0x0098A751, 0x000FC465, 0x00D96313, 0x00F98132, 0x002F2644, + 0x00347987, 0x00E2DEF1, 0x00C23CD0, 0x00149BA6, 0x0083F892, 0x00555FE4, 0x0075BDC5, 0x00A31AB3, + 0x00007016, 0x00D6D760, 0x00F63541, 0x00209237, 0x00B7F103, 0x00615675, 0x0041B454, 0x00971322, + 0x005C6AA5, 0x008ACDD3, 0x00AA2FF2, 0x007C8884, 0x00EBEBB0, 0x003D4CC6, 0x001DAEE7, 0x00CB0991, + 0x00686334, 0x00BEC442, 0x009E2663, 0x00488115, 0x00DFE221, 0x00094557, 0x0029A776, 0x00FF0000 +}; + +/*! compute RLP FCS according to 3GPP TS 24.022 Section 4.4. + * \param[in] in input data over which to compute FCS + * \param[in] in_len length of input data (in octets) + * \returns computed frame check sequence (FCS). */ +uint32_t osmo_rlp_fcs_compute(const uint8_t *in, size_t in_len) +{ + uint32_t divider = 0; + size_t i; + + for (i = 0; i < in_len; i++) { + uint8_t input = in[i] ^ (divider & 0xff); + divider = (divider >> 8) ^ rlp_fcs_table[input]; + } + + return divider; +} + +/*! @} */ diff --git a/tests/Makefile.am b/tests/Makefile.am index ce9726c..d4bfe26 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,6 +56,7 @@ gsm44021/frame_csd_test \ osmo_io/osmo_io_test \ soft_uart/soft_uart_test \ + rlp/rlp_test \ $(NULL) if ENABLE_MSGFILE @@ -378,6 +379,9 @@ soft_uart_soft_uart_test_SOURCES = soft_uart/soft_uart_test.c +rlp_rlp_test_SOURCES = rlp/rlp_test.c +rlp_rlp_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD) + # The `:;' works around a Bash 3.2 bug when the output is not writeable. $(srcdir)/package.m4: $(top_srcdir)/configure.ac @@ -483,6 +487,7 @@ gsm44021/frame_csd_test.ok \ osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \ soft_uart/soft_uart_test.ok \ + rlp/rlp_test.ok \ $(NULL) if ENABLE_LIBSCTP @@ -698,7 +703,10 @@ >$(srcdir)/osmo_io/osmo_io_test.ok \ 2>$(srcdir)/osmo_io/osmo_io_test.err soft_uart/soft_uart_test \ - >$(srcdir)/soft_uart/soft_uart.ok + >$(srcdir)/soft_uart/soft_uart.ok \ + rlp/rlp_test \ + >$(srcdir)/rlp/rlp_test.ok \ + $(NULL) check-local: atconfig $(TESTSUITE) diff --git a/tests/rlp/rlp_test.c b/tests/rlp/rlp_test.c new file mode 100644 index 0000000..be26c99 --- /dev/null +++ b/tests/rlp/rlp_test.c @@ -0,0 +1,217 @@ +#include <osmocom/core/utils.h> +#include <osmocom/gsm/rlp.h> + +struct rlp_testcase { + const char *name; + const char *encoded_hex; + struct osmo_rlp_frame_decoded decoded; +}; + + +const struct rlp_testcase testcases[] = { + { + .name = "XID1", + .encoded_hex = "f95f1100213d313d414e6108510600000000000000000000000000c13c6b", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_U, + .u_ftype = OSMO_RLP_U_FT_XID, + .s_ftype = 0, + .c_r = 1, + .p_f = 1, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0x6b3cc1, + .info = { 0x11, 0x00, 0x21, 0x3d, 0x31, 0x3d, 0x41, 0x4e, 0x61, 0x08, + 0x51, 0x06, }, + .info_len = 25, + }, + }, { + .name = "XID2", + .encoded_hex = "f95f1101213d313d41305106610774000008060000000000000000ba14a0", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_U, + .u_ftype = OSMO_RLP_U_FT_XID, + .s_ftype = 0, + .c_r = 1, + .p_f = 1, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0xa014ba, + .info = { 0x11, 0x01, 0x21, 0x3d, 0x31, 0x3d, 0x41, 0x30, 0x51, 0x06, + 0x61, 0x07, 0x74, 0x00, 0x00, 0x08, 0x06, }, + .info_len = 25, + }, + }, { + .name = "SABM", + .encoded_hex = "f91f0000000000000000000000000000000000000000000000000063b2f3", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_U, + .u_ftype = OSMO_RLP_U_FT_SABM, + .s_ftype = 0, + .c_r = 1, + .p_f = 1, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0xf3b263, + .info = {}, + .info_len = 0, + }, + }, { + .name = "UA", + .encoded_hex = "f8330000000000000000000000000000000000000000000000000029d801", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_U, + .u_ftype = OSMO_RLP_U_FT_UA, + .s_ftype = 0, + .c_r = 0, + .p_f = 1, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0x01d829, + .info = {}, + .info_len = 0, + }, + }, { + .name = "IS1", + .encoded_hex = "01001f000000000000000000000000000000000000000000000000f174ad", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_IS, + .u_ftype = 0, + .s_ftype = 0, + .c_r = 1, + .p_f = 0, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0xad74f1, + .info = { 0x1f, }, + .info_len = 25, + }, + }, { + .name = "IS2", + .encoded_hex = "010401661fffffffffffffffffffffffffffffffffffffffffffff388cd3", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_IS, + .u_ftype = 0, + .s_ftype = 0, + .c_r = 1, + .p_f = 0, + .s_bits = 0, + .n_s = 0, + .n_r = 1, + .fcs = 0xd38c38, + .info = { 0x01, 0x66, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff }, + .info_len = 25, + }, + }, { + .name = "DISC", + .encoded_hex = "f923000000000000000000000000000000000000000000000000007986f2", + .decoded = { + .version = 0, + .ftype = OSMO_RLP_FT_U, + .u_ftype = OSMO_RLP_U_FT_DISC, + .s_ftype = 0, + .c_r = 1, + .p_f = 1, + .s_bits = 0, + .n_s = 0, + .n_r = 0, + .fcs = 0xf28679, + .info = { }, + .info_len = 0, + }, + } +}; + +static void rlp_frame_print_u(const struct osmo_rlp_frame_decoded *rf) +{ + OSMO_ASSERT(rf->ftype == OSMO_RLP_FT_U); + printf("C/R=%u P/F=%u U %s (FCS=0x%06x) %s\n", rf->c_r, rf->p_f, + get_value_string(osmo_rlp_ftype_u_vals, rf->u_ftype), + rf->fcs, + rf->u_ftype == OSMO_RLP_U_FT_XID ? osmo_hexdump_nospc(rf->info, rf->info_len) : ""); +} + +static void rlp_frame_print_s(const struct osmo_rlp_frame_decoded *rf) +{ + OSMO_ASSERT(rf->ftype == OSMO_RLP_FT_S); + printf("C/R=%u P/F=%u S N(R)=%u %s (FCS=0x%06x)\n", rf->c_r, rf->p_f, + rf->n_r, get_value_string(osmo_rlp_ftype_s_vals, rf->s_ftype), + rf->fcs); +} + +static void rlp_frame_print_is(const struct osmo_rlp_frame_decoded *rf) +{ + OSMO_ASSERT(rf->ftype == OSMO_RLP_FT_IS); + printf("C/R=%u P/F=%u IS N(R)=%u N(S)=%u %s (FCS=0x%06x) %s\n", rf->c_r, rf->p_f, + rf->n_r, rf->n_s, get_value_string(osmo_rlp_ftype_s_vals, rf->s_ftype), + rf->fcs, osmo_hexdump_nospc(rf->info, rf->info_len)); +} + +static void rlp_frame_print(const struct osmo_rlp_frame_decoded *rf) +{ + switch (rf->ftype) { + case OSMO_RLP_FT_U: + rlp_frame_print_u(rf); + break; + case OSMO_RLP_FT_S: + rlp_frame_print_s(rf); + break; + case OSMO_RLP_FT_IS: + rlp_frame_print_is(rf); + break; + default: + OSMO_ASSERT(0); + } +} + +static void execute_rlp_test(const struct rlp_testcase *tc) +{ + struct osmo_rlp_frame_decoded decoded; + uint8_t inbuf[240/8]; + int rc; + + printf("=== STARTING TESTCASE '%s'\n", tc->name); + + rc = osmo_hexparse(tc->encoded_hex, inbuf, sizeof(inbuf)); + OSMO_ASSERT(rc == 240/8); + + printf("Decoding %s:\n", tc->encoded_hex); + rc = osmo_rlp_decode(&decoded, 0, inbuf, rc); + OSMO_ASSERT(rc == 0); + + printf("Comparing...\n"); + rlp_frame_print(&decoded); + if (memcmp(&decoded, &tc->decoded, sizeof(decoded))) { + printf("DOESN'T MATCH EXPECTED DECODE:\n"); + rlp_frame_print(&tc->decoded); + } + + printf("Reencoding...\n"); + uint8_t reencoded[240/8]; + rc = osmo_rlp_encode(reencoded, sizeof(reencoded), &tc->decoded); + OSMO_ASSERT(rc == 240/8); + if (memcmp(inbuf, reencoded, sizeof(inbuf))) + printf("DOESN'T MATCH EXPECTED ENCODE FROM ABOVE\n"); +} + +int main(int argc, char **argv) +{ + for (unsigned int i = 0; i < ARRAY_SIZE(testcases); i++) { + const struct rlp_testcase *tc = &testcases[i]; + execute_rlp_test(tc); + } + +} diff --git a/tests/rlp/rlp_test.ok b/tests/rlp/rlp_test.ok new file mode 100644 index 0000000..6d073db --- /dev/null +++ b/tests/rlp/rlp_test.ok @@ -0,0 +1,35 @@ +=== STARTING TESTCASE 'XID1' +Decoding f95f1100213d313d414e6108510600000000000000000000000000c13c6b: +Comparing... +C/R=1 P/F=1 U XID (FCS=0x6b3cc1) 1100213d313d414e6108510600000000000000000000000000 +Reencoding... +=== STARTING TESTCASE 'XID2' +Decoding f95f1101213d313d41305106610774000008060000000000000000ba14a0: +Comparing... +C/R=1 P/F=1 U XID (FCS=0xa014ba) 1101213d313d41305106610774000008060000000000000000 +Reencoding... +=== STARTING TESTCASE 'SABM' +Decoding f91f0000000000000000000000000000000000000000000000000063b2f3: +Comparing... +C/R=1 P/F=1 U SABM (FCS=0xf3b263) +Reencoding... +=== STARTING TESTCASE 'UA' +Decoding f8330000000000000000000000000000000000000000000000000029d801: +Comparing... +C/R=0 P/F=1 U UA (FCS=0x01d829) +Reencoding... +=== STARTING TESTCASE 'IS1' +Decoding 01001f000000000000000000000000000000000000000000000000f174ad: +Comparing... +C/R=1 P/F=0 IS N(R)=0 N(S)=0 RR (FCS=0xad74f1) 1f000000000000000000000000000000000000000000000000 +Reencoding... +=== STARTING TESTCASE 'IS2' +Decoding 010401661fffffffffffffffffffffffffffffffffffffffffffff388cd3: +Comparing... +C/R=1 P/F=0 IS N(R)=1 N(S)=0 RR (FCS=0xd38c38) 01661fffffffffffffffffffffffffffffffffffffffffffff +Reencoding... +=== STARTING TESTCASE 'DISC' +Decoding f923000000000000000000000000000000000000000000000000007986f2: +Comparing... +C/R=1 P/F=1 U DISC (FCS=0xf28679) +Reencoding... diff --git a/tests/testsuite.at b/tests/testsuite.at index aacdad7..64ebedf 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -519,3 +519,9 @@ cat $abs_srcdir/soft_uart/soft_uart_test.ok > expout AT_CHECK([$abs_top_builddir/tests/soft_uart/soft_uart_test], [0], [expout], [ignore]) AT_CLEANUP + +AT_SETUP([rlp]) +AT_KEYWORDS([rlp]) +cat $abs_srcdir/rlp/rlp_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/rlp/rlp_test], [0], [expout], [ignore]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 9 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in libosmocore[master]: Add a GSM RLP decoder and encoder
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email ) Change subject: Add a GSM RLP decoder and encoder ...................................................................... Patch Set 8: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2d9bd8eb4f0cd0f72c436996767b199429596917 Gerrit-Change-Number: 35123 Gerrit-PatchSet: 8 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:35:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-gsm-tester[master]: Update git URLs
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email ) Change subject: Update git URLs ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/35157?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I03a06d23e87a75257eb731a97facd7a67c40a2c6 Gerrit-Change-Number: 35157 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:35:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35161?usp=email ) Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:34:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
by laforge 29 Nov '23

29 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) ...................................................................... ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) Unfortunately we had to revert [1] because it worked for current master but not for latest. The mistake here was to change the PCUIF version number in PCU_Tests.cfg to PCUIF v12. This is indeed the correct version for current master, but latest still uses v11. Also the change we made in jenkins-sns only affected 2023q1 builds, it does not affect latest. This is the reason why the previous patch broke latest. This follow up patch now copies the approach we already successfully use with the normal ttcn3-pcu-test / ttcn3-pcu-test-latest. (see also jenkins.sh) [1] I0b37f01f4c7bb829053231339e39ab734f4c8cbc Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Related: OS#6275 --- M ttcn3-pcu-test/jenkins-sns.sh 1 file changed, 32 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index 50027d3..06f833e 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -13,6 +13,15 @@ if image_suffix_is_2023q1; then sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 fi + + # This changes the PCUIF module parameter of the TTCN3 testsuite when the testsuite is + # executed for current master. For latest the PCUIF module parameter must stay at v.11 + # since in osmo-pcu-latest PCUIF v.12 is not yet supported. After the next release, PCUIF + # v.12 will be supported in osmo-pcu-latest as well and this function, including the + # PCUIF_Types.mp_pcuif_version setting in the configuration files can be removed. + if image_suffix_is_master; then + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 12/g' $1 + fi } mkdir $VOL_BASE_DIR/pcu-tester -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: dexter, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:34:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch)
by pespin 29 Nov '23

29 Nov '23

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email ) Change subject: ttcn3-pcu-test/sns: fix PCUIF version number (follow up patch) ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35159?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1f94a0459e35d7b5632c81d7f7e2e60eb0d0229f Gerrit-Change-Number: 35159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 14:32:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: Do not use self.lchan.scc when sending raw APDUs.
by dexter 29 Nov '23

29 Nov '23

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: pySim-shell: Do not use self.lchan.scc when sending raw APDUs. ...................................................................... pySim-shell: Do not use self.lchan.scc when sending raw APDUs. When sending raw APDUs, we access the scc (SimCardCommands) object via the scc member in the lchan object. Unfortunately self.lchan will not be populated when the rs (RuntimeState) object is missing. This is in particular the case when no profile could be detected for the card, which is a common situation when we boostrap an unprovisioned card. So let's access the scc object through the card object. This is also more logical since when we send raw APDUs we work below the level of logical channels. Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Related: OS#6278 --- M pySim-shell.py 1 file changed, 29 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/61/35161/4 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35161?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6bbaebe7d7a2013f0ce558ca2da7d58f5e6d991a Gerrit-Change-Number: 35161 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

2026

2025

2024

2023

2022

gerrit-log