- gerrit-log - lists.osmocom.org

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by Jenkins Builder 17 Dec '23

17 Dec '23

Attention is currently required from: laforge, osmith. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email ) Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Patch Set 7: (2 comments) File src/common/l1sap.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13154): https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/45c2a135_173a4b22 PS7, Line 1889: } else { else is not generally useful after a break or return Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13154): https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/2e4f9a18_c2d3b502 PS7, Line 1903: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 17 Dec 2023 11:11:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: gsmtap-rlp: Add support for skipping generating NULL frames
by fixeria 17 Dec '23

17 Dec '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35133?usp=email ) Change subject: gsmtap-rlp: Add support for skipping generating NULL frames ...................................................................... Patch Set 6: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/35133/comment/79013bdd_711936cf PS5, Line 13: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad > `Depends: libosmocore. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?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: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad Gerrit-Change-Number: 35133 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 17 Dec 2023 11:10:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by fixeria 17 Dec '23

17 Dec '23

Attention is currently required from: laforge, osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email ) Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sun, 17 Dec 2023 11:10:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by laforge 17 Dec '23

17 Dec '23

Attention is currently required from: fixeria, osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email ) Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Patch Set 6: (4 comments) File src/common/l1sap.c: https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/cd2e5146_6136d7a8 PS6, Line 1854: if (!inst || !trx->bts->gsmtap.rlp) > We also need to check `if (lchan->csd_mode == LCHAN_CSD_M_NT)`, otherwise we would be emitting garba […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/7468b140_31128147 PS6, Line 1866: 2x > Actually it's `4x36bit` for TCH/H2.4. […] Done https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/0ab2c337_6d368a94 PS6, Line 1867: TCH/H 14.4 > TCH/F, not half-rate. Done https://gerrit.osmocom.org/c/osmo-bts/+/35124/comment/9b562d2d_e4bb0b2d PS6, Line 1879: } else { > I think it's fine to have it enabled in general. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 6 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 17 Dec 2023 11:08:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Add GSMTAP encapsulation of RLP frames in CSD NT mode
by laforge 17 Dec '23

17 Dec '23

Attention is currently required from: fixeria, laforge, osmith. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?usp=email to look at the new patch set (#7). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified-1 by Jenkins Builder Change subject: Add GSMTAP encapsulation of RLP frames in CSD NT mode ...................................................................... Add GSMTAP encapsulation of RLP frames in CSD NT mode In CSD (Circuit Switched Data) NT (Non-Transparent) mode, there are RLP (Radio Link Protocol) frames inside the modified V.110. wireshark alrady has a dissector for this, and we've introduced a GSMTAP type for RLP some time ago. So with this patch, we now generate such GSMTAP RLP frames. Change-Id: I6a258458822bcb3fe7290a9b9b3d104beecda219 --- M include/osmo-bts/bts.h M include/osmo-bts/lchan.h M src/common/l1sap.c M src/common/vty.c M tests/osmo-bts.vty 5 files changed, 127 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/24/35124/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35124?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: I6a258458822bcb3fe7290a9b9b3d104beecda219 Gerrit-Change-Number: 35124 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: gsmtap-rlp: Add support for skipping generating NULL frames
by laforge 17 Dec '23

17 Dec '23

Attention is currently required from: fixeria, laforge. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?usp=email to look at the new patch set (#6). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Verified-1 by Jenkins Builder Change subject: gsmtap-rlp: Add support for skipping generating NULL frames ...................................................................... gsmtap-rlp: Add support for skipping generating NULL frames If there's nothing to transmit over a CSD NT channel, both ends generate NULL frames. Let's add an option to suppress GSMTAP output for those, creating pcap files with less noise. Change-Id: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad Depends: libosmocore.git I2d9bd8eb4f0cd0f72c436996767b199429596917 --- M TODO-RELEASE M include/osmo-bts/bts.h M src/common/l1sap.c M src/common/vty.c M tests/osmo-bts.vty 5 files changed, 38 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/35133/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35133?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: I85a2159cfaa01bfb4205c1462e3a9dbda68e4bad Gerrit-Change-Number: 35133 Gerrit-PatchSet: 6 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

[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
by laforge 17 Dec '23

17 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames ...................................................................... rlp: Add support for 576bit RLP frames The code so far only supported 240bit RLP frames; Add support for 576bit in this patch. We still only support versions 0+1 and not version 2. Change-Id: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c --- M src/gsm/rlp.c 1 file changed, 39 insertions(+), 21 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/rlp.c b/src/gsm/rlp.c index 9702e4f..1e90a68 100644 --- a/src/gsm/rlp.c +++ b/src/gsm/rlp.c @@ -57,19 +57,21 @@ { 0, NULL } }; +/* number of bytes used up by FCS */ +#define FCS_SIZE_BYTES 3 /*! 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) + * \param[in] data_len length of data (in octets); must be 30 (240bit) or 72 (576bit) * \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) { + const uint8_t hdr_len = 2; /* will become a variable when we introduce v2 support */ uint8_t n_s, n_r; - /* we only support 240 bit so far */ - if (data_len != 240/8) + if (data_len != 240/8 && data_len != 576/8) return -EINVAL; /* we only support version 0+1 so far */ @@ -82,7 +84,7 @@ 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->fcs = (data[data_len-1] << 16) | (data[data_len-2]) << 8 | (data[data_len-3] << 0); out->p_f = (data[1] >> 1) & 1; switch (n_s) { @@ -90,8 +92,8 @@ 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; + memcpy(out->info, data + hdr_len, data_len - (hdr_len + FCS_SIZE_BYTES)); + out->info_len = data_len - (hdr_len + FCS_SIZE_BYTES); } break; case 0x3e: @@ -104,8 +106,8 @@ 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; + memcpy(out->info, data + hdr_len, data_len - (hdr_len + FCS_SIZE_BYTES)); + out->info_len = data_len - (2 + 3); break; } @@ -114,12 +116,12 @@ /*! 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] out_size size of output buffer (in octets); must be 30 (240bit) or 72 (576bit) * \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; + const uint8_t hdr_len = 2; /* will become a variable when we introduce v2 support */ uint8_t n_s, n_r, s_bits; uint32_t fcs; @@ -127,10 +129,10 @@ if (in->version >= 2) return -ENOTSUP; - if (out_size < out_len) + if (out_size != 240/8 && out_size != 576/8) return -EINVAL; - memset(out, 0, out_len); + memset(out, 0, out_size); if (in->c_r) out[0] |= 0x01; @@ -142,8 +144,11 @@ 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); + if (in->u_ftype == OSMO_RLP_U_FT_XID) { + if (in->info_len > out_size - (hdr_len + FCS_SIZE_BYTES)) + return -EINVAL; + memcpy(out+hdr_len, in->info, in->info_len); + } break; case OSMO_RLP_FT_S: n_s = 0x3e; @@ -152,12 +157,12 @@ break; case OSMO_RLP_FT_IS: /* we only support 240 bit so far */ - if (in->info_len != 240/8 - 5) + if (in->info_len > out_size - (hdr_len + FCS_SIZE_BYTES)) 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); + memcpy(out+hdr_len, in->info, in->info_len); break; default: return -EINVAL; @@ -174,12 +179,12 @@ 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; + fcs = osmo_rlp_fcs_compute(out, out_size - FCS_SIZE_BYTES); + out[out_size - 3] = (fcs >> 0) & 0xff; + out[out_size - 2] = (fcs >> 8) & 0xff; + out[out_size - 1] = (fcs >> 16) & 0xff; - return out_len; + return out_size; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?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: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 5 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

[M] Change in libosmocore[master]: rlp: Add support for 576bit RLP frames
by laforge 17 Dec '23

17 Dec '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35134?usp=email ) Change subject: rlp: Add support for 576bit RLP frames ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35134?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: Idfdcabb19fe8733fb9c5ee76a39b0bf4cdf60c2c Gerrit-Change-Number: 35134 Gerrit-PatchSet: 5 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: Sun, 17 Dec 2023 11:03:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: early-IA: use the correct TRX
by laforge 17 Dec '23

17 Dec '23

Attention is currently required from: daniel, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35095?usp=email ) Change subject: early-IA: use the correct TRX ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: ping? This has been idle 2 weeks; let's ad the error report and get it merged. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35095?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: Id9a930e5c67122812b229dc27ea2bfe246b67611 Gerrit-Change-Number: 35095 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Sun, 17 Dec 2023 10:48:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing include of rfc4004
by laforge 17 Dec '23

17 Dec '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35217?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing include of rfc4004 ...................................................................... dia: 3gpp_ts29_273_s6b: add missing include of rfc4004 Erlang diameter compiler doesn't track includes of includes resulting in missing AVPs. It was missing MIP-Home-Agent-Address. Change-Id: I986154f057f84e131845f6aff79e3ec81aea6a81 --- M dia/diameter_3gpp_ts29_273_s6b.dia 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/dia/diameter_3gpp_ts29_273_s6b.dia b/dia/diameter_3gpp_ts29_273_s6b.dia index af1c561..5468458 100644 --- a/dia/diameter_3gpp_ts29_273_s6b.dia +++ b/dia/diameter_3gpp_ts29_273_s6b.dia @@ -42,6 +42,7 @@ @inherits diameter_3gpp_ts29_273 @inherits diameter_3gpp_ts32_299 @inherits diameter_etsi_es283_034 +@inherits diameter_rfc4004 @inherits diameter_rfc4006_cc @inherits diameter_rfc5447 @inherits diameter_rfc5580 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35217?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I986154f057f84e131845f6aff79e3ec81aea6a81 Gerrit-Change-Number: 35217 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log