August 2022 - gerrit-log - lists.osmocom.org

Change in libosmo-pfcp[master]: configure: fix warning: AC_OUTPUT should be used without arguments

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28901 ) Change subject: configure: fix warning: AC_OUTPUT should be used without arguments ...................................................................... configure: fix warning: AC_OUTPUT should be used without arguments Change-Id: I71fc8dc78b8b10628ef0533c69e42c0298fb27df --- M configure.ac 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 8d0ebb1..77cb672 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ dnl Generate the output AM_CONFIG_HEADER(config.h) -AC_OUTPUT( +AC_CONFIG_FILES([ libosmo-gtlv.pc libosmo-pfcp.pc include/Makefile @@ -104,4 +104,5 @@ doc/Makefile doc/charts/Makefile contrib/Makefile - Makefile) + Makefile]) +AC_OUTPUT -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28901 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I71fc8dc78b8b10628ef0533c69e42c0298fb27df Gerrit-Change-Number: 28901 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Test ETWS msg over CBSP

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 ) Change subject: cbc: Test ETWS msg over CBSP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28912 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: Ie22a00120218a205db11a5622274dcc67435f5de Gerrit-Change-Number: 28912 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 16:11:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: cbc: Test sending Unknown TAI List to osmo-cbc

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 ) Change subject: cbc: Test sending Unknown TAI List to osmo-cbc ...................................................................... Patch Set 3: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893/comment/a18a8ceb_5ae7… PS2, Line 7: sneding Unknwon > you appear to be competing against me in terms of typo density here... […] Done File cbc/CBC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893/comment/11e1227a_40ea… PS2, Line 505: unknwon > even here this unkn-won, must be some ancient korean unit of currency :) Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28893 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: I7d8cf5e6498d03ad340b8f843ce93a20171e9fca Gerrit-Change-Number: 28893 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 16:10:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-obs-asan: new container

by pespin

Attention is currently required from: osmith, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28902 ) Change subject: debian-bullseye-obs-asan: new container ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I see the point, but the problem with pespin's proposed approach is that we'd end up doing a lot of […] Then tests every night can be run using -nightly, and people can manually easy run -master to find out asan issues or during development. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 Gerrit-Change-Number: 28902 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 03 Aug 2022 16:01:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: fix_perms: use debian:bullseye

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28903 ) Change subject: fix_perms: use debian:bullseye ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28903 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I88f513a0a8ee04628842a7aa1b663c390d2032cd Gerrit-Change-Number: 28903 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> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:58:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-obs-asan: new container

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28902 ) Change subject: debian-bullseye-obs-asan: new container ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > I'd probably change the osmo-*-master Dockerfiles to build all dependency libs from master with --en […] I see the point, but the problem with pespin's proposed approach is that we'd end up doing a lot of builds from source, at least once on every build slave for every change to any of the repos. That sort-of defeats the purpose of using pre-built containers (and AFAIR even having jekins jobs that actively pull them to the slaves) so that we don't have to rebuild everything from adam+eve onwards. I would prefer to spend our CPU cycles on testing rather thnan rebuilding things over and over again. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ic7d6e7cc401acadbae9156d3e7f3a6230c2fb198 Gerrit-Change-Number: 28902 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:58:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo

by pespin

Attention is currently required from: laforge, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28896 ) Change subject: abis_om2000: duplicate nmstate of bb_trxc mo to trx mo ...................................................................... Patch Set 2: (1 comment) File src/osmo-bsc/abis_om2000.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28896/comment/d160b6d8_74da2f76 PS2, Line 2303: memset(&nsd_bb_transc, 0, sizeof(nsd)); All this can be simplified AFAIU: otfp->trx->bb_transc.mo.nm_state.administrative = NM_STATE_UNLOCKED; nsd_bb_transc = nsd; nsd_bb_transc.obj = &otfp->trx->bb_transc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4611d8af16a30725308bd527098b12a356bfde9f Gerrit-Change-Number: 28896 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:57:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-tetra[master]: Added basic AFC as implemented by SQ5BPF into float_to_bits.c

by laforge

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28894 ) Change subject: Added basic AFC as implemented by SQ5BPF into float_to_bits.c ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-tetra/+/28894/comment/3f6d7125_640201f6 PS1, Line 2: A if this was written by SQ5BPF, you should (as a matter of courtesy, I'd say) set the Author tag in git to his name / email-addr. You would remain the Committer. Changing this during an 'amend' requires some extra flags, AFAIR "git commit --amend --author="John Doe <john(a)doe.org>" should work on this commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c9343b83739108a1e423c4880e1dc7964656529 Gerrit-Change-Number: 28894 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:55:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-bsc[master]: abis_om2000: om2k_trx_s_done_onenter() does not send signal

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28916 ) Change subject: abis_om2000: om2k_trx_s_done_onenter() does not send signal ...................................................................... Patch Set 1: (2 comments) Patchset: PS1: +1 once you fix the compiling issues. File src/osmo-bsc/abis_om2000.c: https://gerrit.osmocom.org/c/osmo-bsc/+/28916/comment/2b6f1fd1_8ad785aa PS1, Line 2232: nsd.bts = otfp->trx->bts; having a "trx" variable here would make it easier to read all this. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28916 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iabf9f3a1a345c5d53d9a4d02fa2d6d13ddfd86ae Gerrit-Change-Number: 28916 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 03 Aug 2022 15:52:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 10 months

1
0
0 0

Change in osmo-tetra[master]: Added basic link FCS validation in LLC

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/28851 ) Change subject: Added basic link FCS validation in LLC ...................................................................... Added basic link FCS validation in LLC tetra_llc_pdu.c now parses the FCS (Frame Check Sequence) for basic link pdus that use it. Some changes were made to the tetra_resrc_decoded struct definition. The have_fcs field designates the FCS was present, while the FCS field holds the extracted FCS, and FCS_invalid designates an FCS was present but differs from the computed value. Change-Id: I81941110801d00ca06bdafdcc0a7afaf7b7617d3 --- M src/tetra_llc_pdu.c M src/tetra_llc_pdu.h 2 files changed, 70 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/tetra_llc_pdu.c b/src/tetra_llc_pdu.c index 9f7880c..5bd1688 100644 --- a/src/tetra_llc_pdu.c +++ b/src/tetra_llc_pdu.c @@ -82,42 +82,98 @@ return get_value_string(pdut_dec_names, pdut); } +static uint32_t tetra_llc_compute_fcs(const uint8_t *buf, int len) +{ + uint32_t crc = 0xFFFFFFFF; + if (len < 32) { + crc <<= (32 - len); + } + + for (size_t i = 0; i < len; i++) { + uint8_t bit = (buf[i] ^ (crc >> 31)) & 1; + crc <<= 1; + if (bit) { + crc = crc ^ 0x04C11DB7; + } + } + return ~crc; +} + +static int tetra_llc_check_fcs(struct tetra_llc_pdu *lpp, uint8_t *buf, int len) +{ + uint32_t computed_fcs = tetra_llc_compute_fcs(buf, len); + return lpp->fcs == computed_fcs; +} + int tetra_llc_pdu_parse(struct tetra_llc_pdu *lpp, uint8_t *buf, int len) { uint8_t *cur = buf; uint8_t pdu_type; + lpp->have_fcs = 0; + lpp->fcs = 0; pdu_type = bits_to_uint(cur, 4); cur += 4; switch (pdu_type) { - case TLLC_PDUT_BL_ADATA_FCS: - /* FIXME */ - len -= 32; + case TLLC_PDUT_BL_ADATA: + case TLLC_PDUT_BL_ADATA_FCS: lpp->nr = *cur++; lpp->ns = *cur++; lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_ADATA; + + if (pdu_type == TLLC_PDUT_BL_ADATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; - case TLLC_PDUT_BL_DATA_FCS: - /* FIXME */ - len -= 32; + case TLLC_PDUT_BL_DATA: + case TLLC_PDUT_BL_DATA_FCS: lpp->ns = *cur++; lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_DATA; + + if (pdu_type == TLLC_PDUT_BL_DATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; - case TLLC_PDUT_BL_UDATA_FCS: - /* FIXME */ - len -= 32; + case TLLC_PDUT_BL_UDATA: + case TLLC_PDUT_BL_UDATA_FCS: lpp->tl_sdu = cur; lpp->tl_sdu_len = len - (cur - buf); lpp->pdu_type = TLLC_PDUT_DEC_BL_UDATA; + + if (pdu_type == TLLC_PDUT_BL_UDATA_FCS) { + if (lpp->tl_sdu_len < 32) { + printf("\nWARNING frame too small for FCS (%d)\n", lpp->tl_sdu_len); + return cur-buf; + } + lpp->tl_sdu_len -= 32; + lpp->have_fcs = 1; + lpp->fcs = bits_to_uint(buf + len - 32, 32); + lpp->fcs_invalid = !tetra_llc_check_fcs(lpp, cur, lpp->tl_sdu_len); + } break; + case TLLC_PDUT_AL_DATA_FINAL: if (*cur++) { /* FINAL */ diff --git a/src/tetra_llc_pdu.h b/src/tetra_llc_pdu.h index e2ce6fd..4d260c7 100644 --- a/src/tetra_llc_pdu.h +++ b/src/tetra_llc_pdu.h @@ -72,8 +72,11 @@ uint8_t nr; /* N(R) PDU number (receive) */ uint8_t ns; /* N(S) PDU number (sent) */ uint8_t ss; /* S(S) Segment (sent) */ - uint32_t _fcs; - uint32_t *fcs; + + uint8_t have_fcs; /* 1 if LLC PDU defines FCS is present */ + uint32_t fcs; /* FCS value extracted from pdu */ + uint8_t fcs_invalid; /* 1 if extracted FCS does not match computed FCS */ + uint8_t *tl_sdu; /* pointer to bitbuf */ uint8_t tl_sdu_len; /* in bits */ }; -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/28851 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I81941110801d00ca06bdafdcc0a7afaf7b7617d3 Gerrit-Change-Number: 28851 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2022