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

[S] Change in libosmocore[master]: Add flag to enable RTS bases polling
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: fixeria, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS bases polling ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: this fixes a regression in current libosmocore master affecting osmo-bts. We should get it merged fast. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?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: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 12:07:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Add flag to enable RTS bases polling
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS bases polling ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?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: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 29 Nov 2023 12:06:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Add flag to enable RTS bases polling
by jolly 29 Nov '23

29 Nov '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35160?usp=email ) Change subject: Add flag to enable RTS bases polling ...................................................................... Add flag to enable RTS bases polling RTS based polling in LAPDm code is disabled by default. Make libosmogsm stay compatible with existing applications that do not use RTS based polling. This patch fixes the issue that LAPDM_ENT_F_POLLING_ONLY did enable RTS based polling too, which breaks existing applications like older versions of osmo-bts. Change-Id: I2a75c192bbc24e85bfc1656b2be21cea7a92814a --- M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c 2 files changed, 23 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/60/35160/1 diff --git a/include/osmocom/gsm/lapdm.h b/include/osmocom/gsm/lapdm.h index 42ebbce..6812102 100644 --- a/include/osmocom/gsm/lapdm.h +++ b/include/osmocom/gsm/lapdm.h @@ -51,6 +51,7 @@ #define LAPDM_ENT_F_EMPTY_FRAME 0x0001 #define LAPDM_ENT_F_POLLING_ONLY 0x0002 #define LAPDM_ENT_F_DROP_2ND_REJ 0x0004 +#define LAPDM_ENT_F_RTS 0x0008 /*! a LAPDm Entity */ struct lapdm_entity { diff --git a/src/gsm/lapdm.c b/src/gsm/lapdm.c index fb892d2..1fc986d 100644 --- a/src/gsm/lapdm.c +++ b/src/gsm/lapdm.c @@ -363,8 +363,8 @@ if (le->tx_pending || le->flags & LAPDM_ENT_F_POLLING_ONLY) { struct msgb *old_msg; - /* In 'Polling only' mode there can be only one message. */ - if (le->flags & LAPDM_ENT_F_POLLING_ONLY) { + /* In 'RTS' mode there can be only one message. */ + if (le->flags & LAPDM_ENT_F_RTS) { /* Overwrite existing message by removing it first. */ if ((old_msg = msgb_dequeue(&dl->dl.tx_queue))) { msgb_free(old_msg); @@ -424,8 +424,8 @@ { struct msgb *msg; - /* Call RTS function of LAPD, to poll next frame. */ - if (dl->entity->flags & LAPDM_ENT_F_POLLING_ONLY) { + /* Call RTS function of LAPD, to queue next frame. */ + if (dl->entity->flags & LAPDM_ENT_F_RTS) { struct lapd_msg_ctx lctx; int rc; @@ -1635,7 +1635,7 @@ le->flags = flags; /* Set flags at LAPD. */ - if (le->flags & LAPDM_ENT_F_POLLING_ONLY) + if (le->flags & LAPDM_ENT_F_RTS) dl_flags |= LAPD_F_RTS; if (le->flags & LAPDM_ENT_F_DROP_2ND_REJ) dl_flags |= LAPD_F_DROP_2ND_REJ; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35160?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: I2a75c192bbc24e85bfc1656b2be21cea7a92814a Gerrit-Change-Number: 35160 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers ...................................................................... Patch Set 6: Code-Review-1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?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: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 6 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 29 Nov 2023 10:18:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bts[master]: Use polling based LAPDm with frame numbers
by laforge 29 Nov '23

29 Nov '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35007?usp=email ) Change subject: Use polling based LAPDm with frame numbers ...................................................................... Patch Set 6: (1 comment) Patchset: PS6: let's wait a bit before merging this to make sure osmo-bts works still while using the old timer-based approach, after all the LAPD/LAPDm changes to libosmocore/libosmgsm -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/35007?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: Ic6d7902b13cf491daaa8752db78f9875387aeffd Gerrit-Change-Number: 35007 Gerrit-PatchSet: 6 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 29 Nov 2023 10:18:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Fix union abis_rsl_chan_nr and abis_rsl_link_id
by laforge 29 Nov '23

29 Nov '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35156?usp=email ) Change subject: Fix union abis_rsl_chan_nr and abis_rsl_link_id ...................................................................... Fix union abis_rsl_chan_nr and abis_rsl_link_id All bit fields in a union will overlap in memory, as all elements in a union do. To prevent the bit fields from overlapping, wrap them into a packed structure. Change-Id: I5ef5aa62be8310da4ebe9ea73ebbedcbcc2ba49c --- M include/osmocom/gsm/protocol/gsm_08_58.h 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/gsm/protocol/gsm_08_58.h b/include/osmocom/gsm/protocol/gsm_08_58.h index 0a44db9..e8758df 100644 --- a/include/osmocom/gsm/protocol/gsm_08_58.h +++ b/include/osmocom/gsm/protocol/gsm_08_58.h @@ -29,6 +29,7 @@ /* Channel Number 9.3.1 */ union abis_rsl_chan_nr { + struct { #if OSMO_IS_BIG_ENDIAN uint8_t cbits:5, tn:3; @@ -36,7 +37,8 @@ uint8_t tn:3, cbits:5; #endif - uint8_t chan_nr; + } __attribute__ ((packed)); + uint8_t chan_nr; } __attribute__ ((packed)); #define ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs 0x01 #define ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(ss) (0x02 + (ss)) @@ -55,6 +57,7 @@ /* Link Identifier 9.3.2 */ union abis_rsl_link_id { + struct { #if OSMO_IS_BIG_ENDIAN uint8_t cbits:2, na:1, @@ -66,7 +69,8 @@ na:1, cbits:2; #endif - uint8_t link_id; + } __attribute__ ((packed)); + uint8_t link_id; } __attribute__ ((packed)); #define ABIS_RSL_LINK_ID_CBITS_FACCH_SDCCH 0x00 #define ABIS_RSL_LINK_ID_CBITS_SACCH 0x01 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35156?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: I5ef5aa62be8310da4ebe9ea73ebbedcbcc2ba49c Gerrit-Change-Number: 35156 Gerrit-PatchSet: 2 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-MessageType: merged

1 0

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

29 Nov '23

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/35082?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by fixeria, Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload ...................................................................... LAPDm: Reject (release) establishment on DCCH, SAPI 0 without L3 payload A special flag is used to keep track on the establishment of the data link. If it is being established (not re-established) without L3 payload, it is rejected by a release request inside BTS. Related: OS#5971 Change-Id: I6819b51a876b8743c2d4a04165b7900723a1631c --- M include/osmo-bts/lchan.h M src/common/lchan.c M src/common/rsl.c 3 files changed, 36 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/82/35082/5 -- 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: Revert "ttcn3-pcu-test/sns: fix PCUIF version number"
by dexter 29 Nov '23

29 Nov '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35158?usp=email ) Change subject: Revert "ttcn3-pcu-test/sns: fix PCUIF version number" ...................................................................... Revert "ttcn3-pcu-test/sns: fix PCUIF version number" Unfortunately this patch only fixes ttcn3-pcu-test-sns but it breaks ttcn3-pcu-test-sns-latest, this means a different solution is needed. This reverts commit c9820d7b36eb3f75c32d193394da46aad9406cb2. Change-Id: I101d27ae8ed7449b199e49795a3561436c2532dd Related: OS#6275 --- M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/sns/PCU_Tests.cfg 2 files changed, 17 insertions(+), 2 deletions(-) Approvals: dexter: 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 d63229b..50027d3 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -11,7 +11,7 @@ set_pcuif_version() { if image_suffix_is_2023q1; then - sed -i 's/PCUIF_Types.mp_pcuif_version := 12/PCUIF_Types.mp_pcuif_version := 10/g' $1 + sed -i 's/PCUIF_Types.mp_pcuif_version := 11/PCUIF_Types.mp_pcuif_version := 10/g' $1 fi } diff --git a/ttcn3-pcu-test/sns/PCU_Tests.cfg b/ttcn3-pcu-test/sns/PCU_Tests.cfg index 2b11462..d62f52d 100644 --- a/ttcn3-pcu-test/sns/PCU_Tests.cfg +++ b/ttcn3-pcu-test/sns/PCU_Tests.cfg @@ -59,7 +59,7 @@ } } } -PCUIF_Types.mp_pcuif_version := 12 +PCUIF_Types.mp_pcuif_version := 11 [MAIN_CONTROLLER] -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35158?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: I101d27ae8ed7449b199e49795a3561436c2532dd Gerrit-Change-Number: 35158 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: Revert "ttcn3-pcu-test/sns: fix PCUIF version number"
by dexter 29 Nov '23

29 Nov '23

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/35158?usp=email ) Change subject: Revert "ttcn3-pcu-test/sns: fix PCUIF version number" ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35158?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: I101d27ae8ed7449b199e49795a3561436c2532dd Gerrit-Change-Number: 35158 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 29 Nov 2023 10:03:27 +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 dexter 29 Nov '23

29 Nov '23

dexter has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/59/35159/1 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-MessageType: newchange

1 0