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

[S] Change in osmo-ci[master]: jobs/osmo-gsm-tester: disable

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34022 ) Change subject: jobs/osmo-gsm-tester: disable ...................................................................... jobs/osmo-gsm-tester: disable After _run-prod, _run-rnd, _ttcn3 had already been disabled in I8db4fbe2c695e28eb9f7e738c5a848fb0071714a, also disable _run-virtual and the jobs that build the artifacts (as there is no point in building them if all run jobs are disabled). osmo-gsm-tester has been unmaintained for a while now, and after migrating most of the CI infrastructure to debian 12, the virtual job started failing because it depends on the debian-buster-jenkins container (debian 10) that we don't build anymore. While we could still build debian-buster-jenkins, I think it makes more sense to just disable this. The job breaks from time to time, and we don't need to spend time fixing it if it is not really used. Related: OS#6057 Change-Id: I5f7468a402d82e3b6ee03b4f792ae7e3aae3942b --- M jobs/osmo-gsm-tester-builder.yml M jobs/osmo-gsm-tester-runner.yml 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/34022/1 diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml index cd50cb8..c128959 100644 --- a/jobs/osmo-gsm-tester-builder.yml +++ b/jobs/osmo-gsm-tester-builder.yml @@ -46,6 +46,7 @@ - job-template: name: 'osmo-gsm-tester_build-{repo}' + disabled: true project-type: freestyle node: osmo-gsm-tester-build builders: diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index db0a491..ead0676 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -212,6 +212,7 @@ # virtual tester job - job: name: 'osmo-gsm-tester_virtual' + disabled: true defaults: runner node: 'osmocom-master' scm: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34022 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f7468a402d82e3b6ee03b4f792ae7e3aae3942b Gerrit-Change-Number: 34022 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Fix OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED declared in wrong ...

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34021 ) Change subject: rlcmac: Fix OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED declared in wrong offset ...................................................................... rlcmac: Fix OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED declared in wrong offset This enum should match osmo_gprs_gmm_gmmrr_prim_type, and I placed that osmocom-specific enum at the wrong place in the rlcmac counterpart. Change-Id: I3f198c756866417f8f975373f84fd3ec4da608fa --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/21/34021/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index 70d1075..acb0d75 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -71,8 +71,8 @@ */ enum osmo_gprs_rlcmac_gmmrr_prim_type { OSMO_GPRS_RLCMAC_GMMRR_ASSIGN, /* Req: newTLLI */ - OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED, /* Ind: TLLI */ OSMO_GPRS_RLCMAC_GMMRR_PAGE, /* Ind: TLLI */ + OSMO_GPRS_RLCMAC_GMMRR_LLC_TRANSMITTED, /* Ind: TLLI */ }; extern const struct value_string osmo_gprs_rlcmac_gmmrr_prim_type_names[]; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34021 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3f198c756866417f8f975373f84fd3ec4da608fa Gerrit-Change-Number: 34021 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-e1d[master]: usb: Deal with truncated ISO IN transfers

by manawyrm

Attention is currently required from: laforge, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27579 ) Change subject: usb: Deal with truncated ISO IN transfers ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: This still isn't merged, but it probably should be. I don't feel qualified to comment on USB changes (as I have absolutely 0 knowledge about USB), but I've been running this change for a while now and it seems to work fine. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27579 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ic453325b93b0e12727625a1495a948d96df4b542 Gerrit-Change-Number: 27579 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 31 Jul 2023 12:52:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in dahdi-linux[master]: Flush DAHDI->trunkdev FIFO at open time

by manawyrm

Attention is currently required from: roox, laforge, cquirin. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34011 ) Change subject: Flush DAHDI->trunkdev FIFO at open time ...................................................................... Patch Set 2: Verified+1 Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Ifbda3766309cc7d6be485073e36607bdd6742f3a Gerrit-Change-Number: 34011 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: cquirin <christoph.lauter(a)christoph-lauter.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: cquirin <christoph.lauter(a)christoph-lauter.org> Gerrit-Comment-Date: Mon, 31 Jul 2023 12:46:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in dahdi-linux[master]: Introduce virtual DAHDI trunk device

by manawyrm

Attention is currently required from: roox, laforge, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34010 ) Change subject: Introduce virtual DAHDI trunk device ...................................................................... Patch Set 2: Verified+1 Code-Review+1 (1 comment) Patchset: PS2: commit description says /dev/dahd/chanw instead of dahdi, but that's just really nitpicky 😊 looks good, battle tested by now, I guess, I've been running this code without problems for the last year :) -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: Iffd9a1a09d835b29927acd374364cab56745fb74 Gerrit-Change-Number: 34010 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 31 Jul 2023 12:45:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in dahdi-linux[master]: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP

by manawyrm

Attention is currently required from: roox, laforge, tnt. manawyrm has posted comments on this change. ( https://gerrit.osmocom.org/c/dahdi-linux/+/34012 ) Change subject: trunkdev: Implement DAHDI_MAINT_{LOCAL,NETWORKPAYLOAD}LOOP ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/34012 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: dahdi-linux Gerrit-Branch: master Gerrit-Change-Id: I12cf9647fb6def38865aaac8ad6bbb58ebf7b5fd Gerrit-Change-Number: 34012 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: roox <mardnh(a)gmx.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: roox <mardnh(a)gmx.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Mon, 31 Jul 2023 12:40:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Several fixes for radio_prio

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34020 ) Change subject: gmm: Several fixes for radio_prio ...................................................................... gmm: Several fixes for radio_prio The "Radio Priority" received in GMM Attach Accept are for SMS and TOM8 SAPs only. For GMM/SM unitdata transferred to LLC, use highest radio_prio=1. Change-Id: Ie583c433547fb5ecbb6b6077c39a157961f73cfc --- M include/osmocom/gprs/gmm/gmm_private.h M src/gmm/gmm.c M src/gmm/gmm_prim.c 3 files changed, 27 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/20/34020/1 diff --git a/include/osmocom/gprs/gmm/gmm_private.h b/include/osmocom/gprs/gmm/gmm_private.h index 2abd583..db2cc8e 100644 --- a/include/osmocom/gprs/gmm/gmm_private.h +++ b/include/osmocom/gprs/gmm/gmm_private.h @@ -64,7 +64,8 @@ char imei[GSM23003_IMEI_NUM_DIGITS + 1]; char imeisv[GSM23003_IMEISV_NUM_DIGITS+1]; - uint8_t radio_prio; /* TS 24.008 10.5.7.2 */ + uint8_t radio_prio_sms; /* TS 24.008 10.5.7.2 */ + uint8_t radio_prio_tom8; /* TS 24.008 10.5.7.2 */ struct gprs_ra_id ra; /* TS 24.008 10.5.5.15 (decoded) */ bool pdp_ctx_status_present; uint8_t pdp_ctx_status[2]; /* TS 24.008 10.5.7.1 */ diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index e3afc18..7be6c13 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -581,9 +581,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -615,9 +615,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -652,9 +652,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -684,9 +684,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -718,9 +718,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -750,9 +750,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -784,9 +784,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -825,9 +825,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -857,9 +857,9 @@ } llc_prim->ll.l3_pdu = msg->l3h; llc_prim->ll.l3_pdu_len = msgb_l3len(msg); + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; - llc_prim->ll.radio_prio; llc_prim->ll.apply_gea; llc_prim->ll.apply_gia; */ @@ -886,7 +886,8 @@ aa = (struct gsm48_attach_ack *)&gh->data[0]; periodic_rau_sec = gprs_gmm_gprs_tmr_to_secs(aa->ra_upd_timer); - gmme->radio_prio = aa->radio_prio; + gmme->radio_prio_sms = aa->radio_prio >> 4; + gmme->radio_prio_tom8 = aa->radio_prio & 0x0f; gmme->t3312_assigned_sec = periodic_rau_sec >= 0 ? periodic_rau_sec : 0; if (gmme->t3312_assigned_sec == 0) gprs_gmm_gmme_t3312_stop(gmme); diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 3beaea8..693a811 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -541,7 +541,7 @@ gmme->tlli, OSMO_GPRS_LLC_SAPI_GMM, gmm_prim->gmmsm.unitdata_req.smpdu, gmm_prim->gmmsm.unitdata_req.smpdu_len); - llc_prim->ll.unitdata_req.radio_prio = gmme->radio_prio; + llc_prim->ll.unitdata_req.radio_prio = 1; /* highest */ /* TODO: llc_prim->ll.qos_params.*; llc_prim->ll.apply_gea; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34020 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ie583c433547fb5ecbb6b6077c39a157961f73cfc Gerrit-Change-Number: 34020 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon/l1sched: implement CSD scheduling support

by osmith

Attention is currently required from: Hoernchen, laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32922 ) Change subject: trxcon/l1sched: implement CSD scheduling support ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Gerrit-Change-Number: 32922 Gerrit-PatchSet: 12 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 12:04:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/c1f203c9_8cc7… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; > ... Sounds simple, but then also means that they need their own f_init* etc. functions wrapping those of the components derived of to set up that port. Adding module-local f_init* etc. functions is not really needed if you derive a new component from an already existing component (using the `extends` keyword). For instance: ``` type component FooBarCT extends FooCT, BarCT { ... }; function f_foo() runs on FooCT { ... } ``` In this example function `f_foo` can not only be called from component `FooCT`, but also from component `FooBarCT`, because the later inherits all fields/ports from the former. So all `f_init*` functions and altsteps from module `MSC_Tests` would still be usable for `MSC_Tests_ASCI`, even if it derives its own `TestCT`. Furthermore, AFAICS, setting up the COORD ports currently needs to be done manually in each testcase spawning more than one child component. The `f_init*` functions are not involved in this process. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:48:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by laforge

Attention is currently required from: arehbein, pespin, daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 13: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/5f649303_ba47e4b2 PS10, Line 540: osmo_stream_cli_set_addr(osc, "127.0.0.11"); > What I meant is that in linux for the loopback interface the range 127.0.0. […] we don't really support any non-linux systems at this point, so it's a bit of an esoteric discussion. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:35:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback

by laforge

Attention is currently required from: arehbein, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33652 ) Change subject: ipa: Add segmentation callback ...................................................................... Patch Set 5: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/bf5d663f_92111fe4 PS4, Line 27: #define msgb_ipa_proto(__x) OSMO_MSGB_IPA_CB(__x)->proto > I am really not following. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:34:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bsc[master]: osmo-bsc (WIP): Have PCU socket connection use osmo_wqueue

by laforge

Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33891 ) Change subject: osmo-bsc (WIP): Have PCU socket connection use osmo_wqueue ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/33891/comment/2a9f7c1f_f3f5971d PS1, Line 7: WIP see my comment in the other patch about using WIP in the commit log vs gerrit. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33891 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifd9741045a87338e17eec3492590a5de9c308cb5 Gerrit-Change-Number: 33891 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:33:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: bsc (WIP): Make socket queue max. length configurable

by laforge

Attention is currently required from: arehbein. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892 ) Change subject: bsc (WIP): Make socket queue max. length configurable ...................................................................... Patch Set 4: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/2bc3f473_df100096 PS4, Line 7: bsc (WIP): Make socket queue max. length configurable is the patch WIP? then it should be marked WIP in gerrit, imho. Or is it something scheduled for merge? Then it shoudln't contain WIP in the subject/commitlog. IMHO a patch should never contain WIP in the commit message at the point you push it to gerrit. Either it's local WIP (and hence shouldn't go to gerrit). Or it is gerrit-WIP and marked with the related status. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:32:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by laforge

Attention is currently required from: jolly, fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/b924d7bb_0382… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; > What I don't like in the current patch revision is that we end up having testsuite specific stuff in a common module: `ASCI_Event` in this case. IMO, it's cleaner if each testsuite (`MSC_Tests`, `MSC_Tests_Iu`, and the new `BSC_Tests_ASCI`) would define its own COORD port and the related enums/types internally. This may not apply to the `MSC_Tests_Iu`, because it's mostly re-using the test logic from `MSC_Tests`, but I don't see the need for the `MSC_Tests[_Iu]` to have access to ASCI specific port messages. So this would mean that every user of the coordination port would have to derive their own component types with a private port definition, then referring to the private enum type for the messages over that port. Sounds simple, but then also means that they need their own f_init* etc. functions wrapping those of the components derived of to set up that port. It is definitely much cleaner but might be significant additional work. I guess one would have to try it. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: 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: Mon, 31 Jul 2023 11:30:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-trx[master]: ms/va: add test tool and data

by Hoernchen

Hoernchen has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33945 ) Change subject: ms/va: add test tool and data ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33945 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ie38ed4996134e84ad0481872a743299bb442b3db Gerrit-Change-Number: 33945 Gerrit-PatchSet: 12 Gerrit-Owner: Hoernchen <ewild(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: abandon

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-trx[master]: ms: update osmocom-bb

by Hoernchen

Attention is currently required from: fixeria. Hoernchen has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/33927 ) Change subject: ms: update osmocom-bb ...................................................................... Patch Set 6: (1 comment) File Transceiver52M/ms/logging.c: https://gerrit.osmocom.org/c/osmo-trx/+/33927/comment/037051ca_e8b50526 PS6, Line 46: DTRXC > Neither `DTRXC` nor `DTRXD` is really needed here, since osmo-trx-ms does not speak TRXC/TRXD. which does not matter because this is a verbatim copy and there is no need to introduce pontless differences to make diffing difficult... -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/33927 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I6f9fca7a4d6a02e82bf406fd136c5bde96bb93af Gerrit-Change-Number: 33927 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 11:29:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if.cpp: Fix gsmtap not sent in PCU_IF_SAPI_PCH_DT

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34019 ) Change subject: pcu_l1_if.cpp: Fix gsmtap not sent in PCU_IF_SAPI_PCH_DT ...................................................................... pcu_l1_if.cpp: Fix gsmtap not sent in PCU_IF_SAPI_PCH_DT Change-Id: I2cfa0486a3483140ce219b4645e0544e7923870a --- M src/pcu_l1_if.cpp 1 file changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/19/34019/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index f42a3d4..ed64cc1 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -315,6 +315,10 @@ pch_dt.data[0] = (plen << 2) | 0x01; bitvec_pack(block, pch_dt.data + 1); + if (the_pcu->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_PCH)) + gsmtap_send(the_pcu->gsmtap, 0, 0, GSMTAP_CHANNEL_PCH, 0, 0, 0, 0, + pch_dt.data, GSM_MACBLOCK_LEN); + pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_PCH_DT, 0, 0, 0, (uint8_t*)&pch_dt, sizeof(pch_dt)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34019 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2cfa0486a3483140ce219b4645e0544e7923870a Gerrit-Change-Number: 34019 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in osmocom-bb[master]: trxcon/l1sched: implement CSD scheduling support

by fixeria

Attention is currently required from: osmith, Hoernchen, laforge. Hello osmith, Jenkins Builder, Hoernchen, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 to look at the new patch set (#12). Change subject: trxcon/l1sched: implement CSD scheduling support ...................................................................... trxcon/l1sched: implement CSD scheduling support This patch adds support for TCH/[FH]2.4, TCH/[FH]4.8, TCH/F9.6 and TCH/F14.4 (including FACCH). Additional changes made: * enlarge the maximum TCH burst buffer size to 24 * (2 * 58) bytes; * enlarge per-l1cs UL/DL burst masks to hold up to 32 bits; * enlarge per-l1cs DL meas ring buffer to 24 entries; * enlarge L1SCHED_PRIM_TAILROOM from 256 to 512 bytes; * enlarge L1CTL_LENGTH from 256 to 512 bytes; Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Depends: libosmocore.git Ib482817b5f6a4e3c7299f6e0b3841143b60fc93d Depends: libosmocore.git I0c7a9c180dcafe64e6aebe53518d3d11e1f29886 Depends: libosmocore.git I4685376c8deb04db670684c9ebf685ad6fc989fa Related: OS#4396, OS#1572 --- M src/host/trxcon/include/osmocom/bb/l1sched/l1sched.h M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl.c M src/host/trxcon/src/sched_lchan_common.c M src/host/trxcon/src/sched_lchan_desc.c M src/host/trxcon/src/sched_lchan_pdtch.c M src/host/trxcon/src/sched_lchan_tchf.c M src/host/trxcon/src/sched_lchan_tchh.c M src/host/trxcon/src/sched_lchan_xcch.c M src/host/trxcon/src/sched_prim.c 10 files changed, 368 insertions(+), 103 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/22/32922/12 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Gerrit-Change-Number: 32922 Gerrit-PatchSet: 12 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs: remove endianness check

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34018 ) Change subject: jobs: remove endianness check ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa Gerrit-Change-Number: 34018 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 10:21:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/2ff27307_77e5… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; As can be seen from the existing code, we tend to define strings as named constants and then send/match these constants rather than typing strings here and there. This is clearly better because this eliminates problems due to possible typos in strings. ``` COORD.send("CALL_READY"); ... COORD.receive("C[E]LL_READY"); ``` So personally I really like the idea of using (valueless) enums and I vote for them. > The problem with string typos can easiler be solved by definiting const string variables, or enums and converting them enum2str() when sending. The problem is that... There is no `enum2str()` in TTCN-3. What I don't like in the current patch revision is that we end up having testsuite specific stuff in a common module: `ASCI_Event` in this case. IMO, it's cleaner if each testsuite (`MSC_Tests`, `MSC_Tests_Iu`, and the new `BSC_Tests_ASCI`) would define its own COORD port and the related enums/types internally. This may not apply to the `MSC_Tests_Iu`, because it's mostly re-using the test logic from `MSC_Tests`, but I don't see the need for the `MSC_Tests[_Iu]` to have access to ASCI specific port messages. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:57: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

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs: remove endianness check

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 to look at the new patch set (#2). Change subject: jobs: remove endianness check ...................................................................... jobs: remove endianness check Related: OS#6122 Related: https://lists.osmocom.org/hyperkitty/list/openbsc@lists.osmocom.org/thread/… Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa --- D jobs/gerrit-pipeline-endianness.yml M jobs/gerrit-verifications.yml 2 files changed, 11 insertions(+), 134 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/34018/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa Gerrit-Change-Number: 34018 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: Fix potential null ptr dereference in LL-Xid.Ind

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 ) Change subject: llc: Fix potential null ptr dereference in LL-Xid.Ind ...................................................................... llc: Fix potential null ptr dereference in LL-Xid.Ind Closes: Coverity CID#322365 Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b --- M src/llc/llc_ll.c 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/llc/llc_ll.c b/src/llc/llc_ll.c index ad87dba..45675c3 100644 --- a/src/llc/llc_ll.c +++ b/src/llc/llc_ll.c @@ -172,17 +172,22 @@ const struct gprs_llc_xid_field *xid_field_request_l3) { struct osmo_gprs_llc_prim *llc_prim_tx; - llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); - OSMO_ASSERT(llc_prim_tx); + if (xid_field_request_l3) { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); + OSMO_ASSERT(llc_prim_tx); llc_prim_tx->ll.l3_pdu_len = xid_field_request_l3->var.val_len; llc_prim_tx->ll.l3_pdu = msgb_put(llc_prim_tx->oph.msg, llc_prim_tx->ll.l3_pdu_len); if (llc_prim_tx->ll.l3_pdu_len > 0) memcpy(llc_prim_tx->ll.l3_pdu, xid_field_request_l3->var.val, llc_prim_tx->ll.l3_pdu_len); + } else { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, 0); + OSMO_ASSERT(llc_prim_tx); } llc_prim_tx->ll.xid.n201_i = lle->params.n201_i; llc_prim_tx->ll.xid.n201_u = lle->params.n201_u; + return gprs_llc_prim_call_up_cb(llc_prim_tx); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b Gerrit-Change-Number: 34016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Initial selection of packet-access-procedure mode based on or...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 ) Change subject: rlcmac: Initial selection of packet-access-procedure mode based on originating cause ...................................................................... rlcmac: Initial selection of packet-access-procedure mode based on originating cause Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 --- M include/osmocom/gprs/rlcmac/llc_queue.h M src/rlcmac/gre.c M src/rlcmac/llc_queue.c 3 files changed, 43 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/llc_queue.h b/include/osmocom/gprs/rlcmac/llc_queue.h index 7149f76..dd7528c 100644 --- a/include/osmocom/gprs/rlcmac/llc_queue.h +++ b/include/osmocom/gprs/rlcmac/llc_queue.h @@ -27,6 +27,7 @@ struct gprs_llc_prio_queue { enum gprs_rlcmac_radio_priority radio_prio; /* Radio prio of this queue, range (1..4) */ + enum osmo_gprs_rlcmac_llc_sapi sapi; /* LLC SAPI of this queue */ struct gprs_codel codel_state; struct llist_head queue; /* queued LLC DL data. See enum gprs_rlcmac_llc_queue_prio. */ }; @@ -50,6 +51,7 @@ enum osmo_gprs_rlcmac_llc_sapi sapi, enum gprs_rlcmac_radio_priority radio_prio); struct msgb *gprs_rlcmac_llc_queue_dequeue(struct gprs_rlcmac_llc_queue *q, bool can_discard); enum gprs_rlcmac_radio_priority gprs_rlcmac_llc_queue_highest_radio_prio_pending(struct gprs_rlcmac_llc_queue *q); +enum osmo_gprs_rlcmac_llc_sapi gprs_rlcmac_llc_queue_highest_llc_sapi_pending(struct gprs_rlcmac_llc_queue *q); void gprs_rlcmac_llc_queue_merge_prepend(struct gprs_rlcmac_llc_queue *q, struct gprs_rlcmac_llc_queue *old_q); diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index 59cf0f5..0eb6a8c 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -198,6 +198,9 @@ /* Create a new UL TBF and start Packet access procedure to get an UL assignment if needed */ int gprs_rlcmac_entity_start_ul_tbf_pkt_acc_proc_if_needed(struct gprs_rlcmac_entity *gre) { + enum osmo_gprs_rlcmac_llc_sapi tx_sapi; + enum gprs_rlcmac_tbf_ul_ass_type ul_ass_type; + /* TS 44.060 5.3 "In packet idle mode, upper layers may require the * transfer of a upper layer PDU, which implicitly triggers the * establishment of a TBF and the transition to packet transfer mode." */ @@ -212,8 +215,27 @@ gre->ul_tbf = gprs_rlcmac_ul_tbf_alloc(gre); if (!gre->ul_tbf) return -ENOMEM; + + tx_sapi = gprs_rlcmac_llc_queue_highest_radio_prio_pending(gre->llc_queue); + /* 3GPP TS 44.018 3.5.2.1.2 "Initiation of the packet access procedure: channel request" */ + switch (tx_sapi) { + case OSMO_GPRS_RLCMAC_LLC_SAPI_GMM: + /* "If the purpose [...] is to send a Page Response, a Cell update (the mobile + * station was in GMM READY state before the cell reselection) or for any other + * GPRS Mobility Management or GPRS Session Management procedure, the mobile station + * shall request a one phase packet access" */ + ul_ass_type = GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE; + break; + default: + /* "If the purpose [...] is to send user data and the requested RLC mode is + * acknowledged mode, the mobile station shall request either a one phase packet + * access or a single block packet access." */ + /* TODO: We always use 1phase for now... ideally we should decide + * based on amount of Tx data and configured MultiSlot Class? */ + ul_ass_type = GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE; + } /* We always use 1phase for now... */ - return gprs_rlcmac_tbf_ul_ass_start(gre->ul_tbf, GPRS_RLCMAC_TBF_UL_ASS_TYPE_1PHASE); + return gprs_rlcmac_tbf_ul_ass_start(gre->ul_tbf, ul_ass_type); } int gprs_rlcmac_entity_llc_enqueue(struct gprs_rlcmac_entity *gre, diff --git a/src/rlcmac/llc_queue.c b/src/rlcmac/llc_queue.c index 83c926e..d1f923a 100644 --- a/src/rlcmac/llc_queue.c +++ b/src/rlcmac/llc_queue.c @@ -47,6 +47,7 @@ for (i = 0; i < ARRAY_SIZE(q->pq); i++) { for (j = 0; j < ARRAY_SIZE(q->pq[i]); j++) { q->pq[i][j].radio_prio = i; /* enum gprs_rlcmac_radio_priority, range (0..3) */ + q->pq[i][j].sapi = i + 1; /* osmo_gprs_rlcmac_llc_sapi, range (1..11) */ INIT_LLIST_HEAD(&q->pq[i][j].queue); gprs_codel_init(&q->pq[i][j].codel_state); } @@ -222,6 +223,14 @@ return prioq->radio_prio; } +enum osmo_gprs_rlcmac_llc_sapi gprs_rlcmac_llc_queue_highest_llc_sapi_pending(struct gprs_rlcmac_llc_queue *q) +{ + struct gprs_llc_prio_queue *prioq = gprs_rlcmac_llc_queue_find_msg(q); + OSMO_ASSERT(prioq); + return prioq->sapi; +} + + /* Merge old_q messages into q, prepending them. old_q must be freed by the caller. */ void gprs_rlcmac_llc_queue_merge_prepend(struct gprs_rlcmac_llc_queue *q, struct gprs_rlcmac_llc_queue *old_q) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 Gerrit-Change-Number: 34005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: Fix potential null ptr dereference in LL-Xid.Ind

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 ) Change subject: llc: Fix potential null ptr dereference in LL-Xid.Ind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b Gerrit-Change-Number: 34016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:38:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Initial selection of packet-access-procedure mode based on or...

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 ) Change subject: rlcmac: Initial selection of packet-access-procedure mode based on originating cause ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34005 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I930a1fcf23506f75562a6795f9a6e42b187d2974 Gerrit-Change-Number: 34005 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:38:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: ipa: Add segmentation callback

by pespin

Attention is currently required from: arehbein, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33652 ) Change subject: ipa: Add segmentation callback ...................................................................... Patch Set 5: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/33652/comment/fda09d5a_08318f9e PS4, Line 27: #define msgb_ipa_proto(__x) OSMO_MSGB_IPA_CB(__x)->proto > I put `osmo_ipa_msgb_cb*`, because it's in `ipa.h` and not in `msgb. […] I am really not following. You say one thing for the define in line 26 while saying the contrari for defines in lines 27 and 28? really? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I87ef4c7023126b783dd79e7ed47be31e1b76f975 Gerrit-Change-Number: 33652 Gerrit-PatchSet: 5 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:34:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs: remove endianness check

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34018 ) Change subject: jobs: remove endianness check ...................................................................... jobs: remove endianness check Related: https://lists.osmocom.org/hyperkitty/list/openbsc@lists.osmocom.org/thread/… Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa --- D jobs/gerrit-pipeline-endianness.yml M jobs/gerrit-verifications.yml 2 files changed, 10 insertions(+), 134 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/18/34018/1 diff --git a/jobs/gerrit-pipeline-endianness.yml b/jobs/gerrit-pipeline-endianness.yml deleted file mode 100644 index 19b9d61..0000000 --- a/jobs/gerrit-pipeline-endianness.yml +++ /dev/null @@ -1,110 +0,0 @@ -# This script runs struct_endianness.py from libosmocore.git. -# Add project's repositories to jobs/gerrit-verifications.yml. When -# pipeline_endianness is set for that project, the pipeline will call this job. - -- project: - name: gerrit-pipeline-endianness - jobs: - - 'gerrit-pipeline-endianness' - -- job: - name: 'gerrit-pipeline-endianness' - project-type: freestyle - node: osmocom-gerrit - retry-count: 3 # scm checkout - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - description: | - Run <code>struct_endianness.py</code> from libosmocore.git on patches - sent to <a href="https://gerrit.osmocom.org">gerrit</a>. - </br></br> - Related issue: <a href="https://osmocom.org/issues/5884">OS#5884</a> - - parameters: - - string: - name: BRANCH_LIBOSMOCORE - description: | - libosmocore.git branch - default: 'master' - - string: - name: GERRIT_PROJECT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_CHANGE_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_BRANCH - description: set by gerrit verification pipeline job - - string: - name: GERRIT_HOST - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_REVISION - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PORT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REFSPEC - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REPO_URL - description: set by gerrit verification pipeline job - - scm: - - git: - basedir: 'code-from-gerrit' - url: '$GERRIT_REPO_URL' - credentials-id: d5eda5e9-b59d-44ba-88d2-43473cb6e42d - branches: - - $GERRIT_BRANCH - refspec: $GERRIT_REFSPEC - choosing-strategy: gerrit - wipe-workspace: true - skip-tag: true - disable-submodules: true - - builders: - - shell: | - rm -rf libosmocore - git clone \ - --depth=1 \ - --branch="$BRANCH_LIBOSMOCORE" \ - https://gerrit.osmocom.org/libosmocore \ - libosmocore - git -C libosmocore log --oneline - - cd code-from-gerrit - ../libosmocore/contrib/struct_endianness.py - - case "$GERRIT_PROJECT" in - osmocom-bb) - # See https://gerrit.osmocom.org/c/osmocom-bb/+/31403 - EXCLUDE_ARG=":^src/shared/libosmocore" - ;; - esac - - git diff --color=always -- . $EXCLUDE_ARG - - if ! git diff --quiet -- . $EXCLUDE_ARG; then - set +x - echo '\033[1m' # bold font - echo "ERROR: auto-generated big-endian definitions missing or in unexpected format!" - echo - echo "Please run contrib/struct_endianness.py from libosmocore.git on your patch." - echo '\033[0m' # normal font - exit 1 - fi - wrappers: - - ansicolor: - colormap: xterm - - ssh-agent-credentials: - users: - - d5eda5e9-b59d-44ba-88d2-43473cb6e42d - -# vim: expandtab tabstop=2 shiftwidth=2 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index d2aaaae..c4e9e34 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -93,7 +93,6 @@ pipeline_build: true pipeline_lint: true pipeline_binpkgs: "almalinux:8 debian:10 debian:12" - pipeline_endianness: true # in alphabetical order repos: @@ -107,7 +106,6 @@ - docker-playground: pipeline_build: false pipeline_binpkgs: "" - pipeline_endianness: false - libasn1c - libgtpnl @@ -191,7 +189,6 @@ repos_url: '{gerrit_url}/erlang/{repos}' gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo-e1-hardware: @@ -214,7 +211,6 @@ - osmo-ci: pipeline_build: false pipeline_binpkgs: "" - pipeline_endianness: false - osmo-ggsn: a1_name: GTP @@ -231,7 +227,6 @@ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-gsm-manuals: - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo_gsup: @@ -293,7 +288,6 @@ - osmo-python-tests: repos_url: '{gerrit_url}/python/{repos}' gerrit_project: 'python/{repos}' - pipeline_endianness: false pipeline_binpkgs: "debian:10 debian:12" - osmo-sgsn: @@ -315,7 +309,6 @@ gerrit_project: 'erlang/{repos}' cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh' pipeline_binpkgs: "" - pipeline_endianness: false - osmo-sip-connector @@ -418,7 +411,6 @@ ;; esac pipeline_binpkgs: "" - pipeline_endianness: false - osmo-ttcn3-hacks: slave_axis: !!python/tuple [ttcn3] @@ -436,7 +428,6 @@ su build -c 'make compile'; " pipeline_binpkgs: "" - pipeline_endianness: false - dahdi-tools: pipeline_lint: false @@ -471,10 +462,6 @@ distributions must have binary packages in the osmocom:master repository. default: '{obj:pipeline_binpkgs}' - - bool: - name: PIPELINE_ENDIANNESS - description: Run struct_endianness.py from libosmocore.git - default: '{obj:pipeline_endianness}' dsl: | def run_job(display_name, job_name, comment_type=null, distro=null) {{ try {{ @@ -579,17 +566,6 @@ }} }} - stage("Endianness") {{ - when {{ - expression {{ params.PIPELINE_ENDIANNESS }} - }} - steps {{ - script {{ - run_job("endianness", "gerrit-pipeline-endianness") - }} - }} - }} - }} // end of parallel }} // end of Verification stage -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34018 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2358e6bc8189f9c5bdca10aac28032cb7a4667fa Gerrit-Change-Number: 34018 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-ttcn3-hacks[master]: ASCI: Add tests for voice group/broadcast calls at MSC

by pespin

Attention is currently required from: jolly, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 ) Change subject: ASCI: Add tests for voice group/broadcast calls at MSC ...................................................................... Patch Set 2: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979/comment/b7612a08_d14d… PS2, Line 68: inout charstring, CallParameters, ASCI_Event; > I would go the other way around: Why are there strings at all, and not more specific types going thr […] the messages being passed over COORD are in general quite test-specific, and the port shouldn't be seen as a regular protocol-defined port, but simply some sort of synchronization method imho, hence why simply using strings is enough and makes stuff simpler imho. The problem with string typos can easiler be solved by definiting const string variables, or enums and converting them enum2str() when sending. That being said, if others prefer ending up with several unrelated record types being transmitted over that same port I won't be blocking it despite disagreeing in principle. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33979 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: I4bbe739ea55ecf9f7ebf9ee413df69f29aa642f8 Gerrit-Change-Number: 33979 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:31: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

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-trx: bts_supports_cm_data(): allow non-transparent modes

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33935 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo-bts-trx: bts_supports_cm_data(): allow non-transparent modes ...................................................................... osmo-bts-trx: bts_supports_cm_data(): allow non-transparent modes The rate adaptation algorithm is the same for both transparent and non-transparent channel modes. The only difference is that the E-bits in the modified CSD frames carry data, like the D-bits. Change-Id: Ib0d9346d7a8e30b8a8e4b08ee04846ba7d12b3fb Related: OS#1572 --- M src/common/bts.c 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/bts.c b/src/common/bts.c index 1f0040c..40fe354 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -875,11 +875,14 @@ switch (bts->variant) { case BTS_OSMO_TRX: switch (cm->chan_rate) { + /* TODO: RSL_CMOD_CSD_NT_14k5 */ /* TODO: RSL_CMOD_CSD_T_14k4 */ + case RSL_CMOD_CSD_NT_12k0: case RSL_CMOD_CSD_T_9k6: if (cm->chan_rt != RSL_CMOD_CRT_TCH_Bm) return false; /* invalid */ /* fall-through */ + case RSL_CMOD_CSD_NT_6k0: case RSL_CMOD_CSD_T_4k8: case RSL_CMOD_CSD_T_2k4: case RSL_CMOD_CSD_T_1k2: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib0d9346d7a8e30b8a8e4b08ee04846ba7d12b3fb Gerrit-Change-Number: 33935 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110_rtp_encode(): properly set E1/E2/E3 bits

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33934 ) Change subject: csd_v110_rtp_encode(): properly set E1/E2/E3 bits ...................................................................... csd_v110_rtp_encode(): properly set E1/E2/E3 bits The E1/E2/E3 bits are set based on out-of-band knowledge of the current user data rate. The actual bit values are defined in 3GPP TS 44.021, Figure 4 "Coding of data rates". TODO: this is only valid for transparent services, for non-transparent services see 3GPP TS 48.020. TODO: lchan->csd_mode is never set to the actual CSD mode... Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Related: OS#1572 --- M include/osmo-bts/lchan.h M src/common/csd_v110.c M tests/csd/csd_test.c M tests/csd/csd_test.err 4 files changed, 64 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/lchan.h b/include/osmo-bts/lchan.h index a0e99bf..05c395a 100644 --- a/include/osmo-bts/lchan.h +++ b/include/osmo-bts/lchan.h @@ -75,15 +75,17 @@ }; enum lchan_csd_mode { - LCHAN_CSD_M_NT, + LCHAN_CSD_M_NT = 0, LCHAN_CSD_M_T_1200_75, LCHAN_CSD_M_T_600, LCHAN_CSD_M_T_1200, LCHAN_CSD_M_T_2400, + LCHAN_CSD_M_T_4800, LCHAN_CSD_M_T_9600, LCHAN_CSD_M_T_14400, LCHAN_CSD_M_T_29000, LCHAN_CSD_M_T_32000, + _LCHAN_CSD_M_NUM, }; /* State of the SAPIs in the lchan */ diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c index 6800761..9fc7ad3 100644 --- a/src/common/csd_v110.c +++ b/src/common/csd_v110.c @@ -58,6 +58,21 @@ }, }; +/* 3GPP TS 44.021, Figure 4: Coding of data rates (E1/E2/E3 bits) */ +static const uint8_t e1e2e3_map[_LCHAN_CSD_M_NUM][3] = { + [LCHAN_CSD_M_T_600] = { 1, 0, 0 }, + [LCHAN_CSD_M_T_1200] = { 0, 1, 0 }, + [LCHAN_CSD_M_T_2400] = { 1, 1, 0 }, + [LCHAN_CSD_M_T_4800] = { 0, 1, 1 }, + [LCHAN_CSD_M_T_9600] = { 0, 1, 1 }, +#if 0 + [LCHAN_CSD_M_T_19200] = { 0, 1, 1 }, + [LCHAN_CSD_M_T_38400] = { 0, 1, 1 }, + [LCHAN_CSD_M_T_14400] = { 1, 0, 1 }, + [LCHAN_CSD_M_T_28800] = { 1, 0, 1 }, +#endif +}; + int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, const uint8_t *data, size_t data_len) { @@ -86,8 +101,10 @@ else /* desc->num_bits == 36 */ osmo_csd_3k6_decode_frame(&df, &data[i * 36], 36); - /* FIXME: E1 .. E3 must be set by out-of-band knowledge! */ - memset(&df.e_bits[0], 0, 3); + /* E1 .. E3 must set by out-of-band knowledge */ + df.e_bits[0] = e1e2e3_map[lchan->csd_mode][0]; + df.e_bits[1] = e1e2e3_map[lchan->csd_mode][1]; + df.e_bits[2] = e1e2e3_map[lchan->csd_mode][2]; osmo_v110_encode_frame(&ra_bits[i * 80], 80, &df); } diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c index 16995b1..f24331d 100644 --- a/tests/csd/csd_test.c +++ b/tests/csd/csd_test.c @@ -37,6 +37,7 @@ const char *name; enum gsm_chan_t lchan_type; enum gsm48_chan_mode tch_mode; + enum lchan_csd_mode csd_mode; }; static const struct test_case tests[] = { @@ -44,31 +45,37 @@ .name = "TCH/F14.4", .lchan_type = GSM_LCHAN_TCH_F, .tch_mode = GSM48_CMODE_DATA_14k5, + .csd_mode = LCHAN_CSD_M_T_14400, }, { .name = "TCH/F9.6", .lchan_type = GSM_LCHAN_TCH_F, .tch_mode = GSM48_CMODE_DATA_12k0, + .csd_mode = LCHAN_CSD_M_T_9600, }, { .name = "TCH/F4.8", .lchan_type = GSM_LCHAN_TCH_F, .tch_mode = GSM48_CMODE_DATA_6k0, + .csd_mode = LCHAN_CSD_M_T_4800, }, { .name = "TCH/H4.8", .lchan_type = GSM_LCHAN_TCH_H, .tch_mode = GSM48_CMODE_DATA_6k0, + .csd_mode = LCHAN_CSD_M_T_4800, }, { .name = "TCH/F2.4", .lchan_type = GSM_LCHAN_TCH_F, .tch_mode = GSM48_CMODE_DATA_3k6, + .csd_mode = LCHAN_CSD_M_T_2400, }, { .name = "TCH/H2.4", .lchan_type = GSM_LCHAN_TCH_H, .tch_mode = GSM48_CMODE_DATA_3k6, + .csd_mode = LCHAN_CSD_M_T_600, }, }; @@ -99,6 +106,7 @@ struct gsm_lchan lchan = { .type = tc->lchan_type, .tch_mode = tc->tch_mode, + .csd_mode = tc->csd_mode, }; /* populate the data_enc[] buffer with some bits */ diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err index bc9747c..94505dc 100644 --- a/tests/csd/csd_test.err +++ b/tests/csd/csd_test.err @@ -2,65 +2,65 @@ [i] Testing 'TCH/F9.6' (bitnum=240) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf - ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf - ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf - ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf - ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f [i] csd_v110_rtp_decode() returns 240 [i] Testing 'TCH/F4.8' (bitnum=120) [i] csd_v110_rtp_encode() returns 160 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f - ff ff 7f ff 7f ff 7f ff ff 7f 7f 7f 7f ff 7f ff + ff ff 7f ff 7f ff 7f ff ff 7f ff ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f - ff ff 7f ff 7f ff 7f ff ff 7f 7f 7f 7f ff 7f ff + ff ff 7f ff 7f ff 7f ff ff 7f ff ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff [i] csd_v110_rtp_decode() returns 120 [i] Testing 'TCH/H4.8' (bitnum=240) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf - ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf - ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf - ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf - ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf ff 7f 7f bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f [i] csd_v110_rtp_decode() returns 240 [i] Testing 'TCH/F2.4' (bitnum=72) [i] csd_v110_rtp_encode() returns 160 7f 7f 7f 7f 7f 7f 7f 7f ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff - ff 7f 7f ff ff 7f 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f 7f ff ff 7f 7f ff ff ff ff 7f 7f ff 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff 7f 7f 7f 7f 7f 7f 7f 7f ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff - ff 7f 7f ff ff 7f 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f 7f ff ff 7f 7f ff ff ff ff 7f 7f ff 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff [i] csd_v110_rtp_decode() returns 72 [i] Testing 'TCH/H2.4' (bitnum=144) [i] csd_v110_rtp_encode() returns 160 3f 3f 3f 3f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f - bf 7f bf 7f bf 3f 7f 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f ff 3f 7f 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f 3f 3f 3f 3f bf 7f bf 7f - bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 3f 7f 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f ff 3f 7f 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f 3f 3f 3f 3f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f - bf 7f bf 7f bf 3f 7f 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f ff 3f 7f 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f 3f 3f 3f 3f bf 7f bf 7f - bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 3f 7f 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f ff 3f 7f 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f [i] csd_v110_rtp_decode() returns 144 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Gerrit-Change-Number: 33934 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') Since 95407f3f osmo-bts-trx supports scheduling all CSD specific channel rates, however the rate adaptation was missing. On the radio interface we deal with CSD-modified V.110 frames, which need to be converted to normal 80-bit V.110 frames (RA1'/RA1), which in turn need to be batched and sent in RFC4040 "clearmode" 160 octet RTP payloads (RA1/RA2 as per I.460). Note that this patch comments out TCH/F14.4 in bts_supports_cm_data(), so that all channel allocations for this mode would be NACKed. The reason for this is that the rate adaptation functions for TCH/F14.4 are different than the RA1'/RA1 and the RA1/RA2. For more information, see: * 3GPP TS 44.021, section 8 (functions RA1'/RA1) * ITU-T I.460, section 1.1 "Rate adaption of 8, 16 and 32 kbit/s streams" Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Related: OS#1572 --- M .gitignore M configure.ac M include/osmo-bts/Makefile.am A include/osmo-bts/csd_v110.h M src/common/Makefile.am M src/common/bts.c A src/common/csd_v110.c M src/common/l1sap.c M tests/Makefile.am A tests/csd/Makefile.am A tests/csd/csd_test.c A tests/csd/csd_test.err M tests/testsuite.at 13 files changed, 503 insertions(+), 14 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/.gitignore b/.gitignore index bf0f844..34d55b8 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tests/atconfig tests/package.m4 tests/amr/amr_test +tests/csd/csd_test tests/agch/agch_test tests/paging/paging_test tests/cipher/cipher_test diff --git a/configure.ac b/configure.ac index 82074d4..b2b651a 100644 --- a/configure.ac +++ b/configure.ac @@ -445,6 +445,7 @@ tests/power/Makefile tests/meas/Makefile tests/amr/Makefile + tests/csd/Makefile doc/Makefile doc/examples/Makefile doc/manuals/Makefile diff --git a/include/osmo-bts/Makefile.am b/include/osmo-bts/Makefile.am index 0b4058d..cbd0fc3 100644 --- a/include/osmo-bts/Makefile.am +++ b/include/osmo-bts/Makefile.am @@ -24,6 +24,7 @@ tx_power.h \ control_if.h \ cbch.h \ + csd_v110.h \ l1sap.h \ lchan.h \ power_control.h \ diff --git a/include/osmo-bts/csd_v110.h b/include/osmo-bts/csd_v110.h new file mode 100644 index 0000000..f6be0ae --- /dev/null +++ b/include/osmo-bts/csd_v110.h @@ -0,0 +1,23 @@ +#pragma once + +/* RFC4040 "clearmode" RTP payload length */ +#define RFC4040_RTP_PLEN 160 + +struct gsm_lchan; + +struct csd_v110_frame_desc { + uint16_t num_blocks; + uint16_t num_bits; +}; + +struct csd_v110_lchan_desc { + struct csd_v110_frame_desc fr; + struct csd_v110_frame_desc hr; +}; + +extern const struct csd_v110_lchan_desc csd_v110_lchan_desc[256]; + +int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, + const uint8_t *data, size_t data_len); +int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, + const uint8_t *rtp, size_t rtp_len); diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 5cd7909..d13415d 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -51,6 +51,7 @@ bts_ctrl_commands.c \ bts_ctrl_lookup.c \ bts_shutdown_fsm.c \ + csd_v110.c \ l1sap.c \ cbch.c \ power_control.c \ diff --git a/src/common/bts.c b/src/common/bts.c index 7257f37..1f0040c 100644 --- a/src/common/bts.c +++ b/src/common/bts.c @@ -875,7 +875,7 @@ switch (bts->variant) { case BTS_OSMO_TRX: switch (cm->chan_rate) { - case RSL_CMOD_CSD_T_14k4: + /* TODO: RSL_CMOD_CSD_T_14k4 */ case RSL_CMOD_CSD_T_9k6: if (cm->chan_rt != RSL_CMOD_CRT_TCH_Bm) return false; /* invalid */ diff --git a/src/common/csd_v110.c b/src/common/csd_v110.c new file mode 100644 index 0000000..6800761 --- /dev/null +++ b/src/common/csd_v110.c @@ -0,0 +1,157 @@ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 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. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/bits.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm44021.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/isdn/v110.h> + +#include <osmo-bts/csd_v110.h> +#include <osmo-bts/lchan.h> + +/* key is enum gsm48_chan_mode, so assuming a value in range 0..255 */ +const struct csd_v110_lchan_desc csd_v110_lchan_desc[256] = { +#if 0 + [GSM48_CMODE_DATA_14k5] = { + /* TCH/F14.4: 290 bits every 20 ms (14.5 kbit/s) */ + .fr = { .num_blocks = 1, .num_bits = 290 }, + }, +#endif + [GSM48_CMODE_DATA_12k0] = { + /* TCH/F9.6: 4 * 60 bits every 20 ms (12.0 kbit/s) */ + .fr = { .num_blocks = 4, .num_bits = 60 }, + }, + [GSM48_CMODE_DATA_6k0] = { + /* TCH/F4.8: 2 * 60 bits every 20 ms (6.0 kbit/s) */ + .fr = { .num_blocks = 2, .num_bits = 60 }, + /* TCH/H4.8: 4 * 60 bits every 40 ms (6.0 kbit/s) */ + .hr = { .num_blocks = 4, .num_bits = 60 }, + }, + [GSM48_CMODE_DATA_3k6] = { + /* TCH/F2.4: 2 * 36 bits every 20 ms (3.6 kbit/s) */ + .fr = { .num_blocks = 2, .num_bits = 36 }, + /* TCH/H2.4: 4 * 36 bits every 40 ms (3.6 kbit/s) */ + .hr = { .num_blocks = 4, .num_bits = 36 }, + }, +}; + +int csd_v110_rtp_encode(const struct gsm_lchan *lchan, uint8_t *rtp, + const uint8_t *data, size_t data_len) +{ + const struct csd_v110_frame_desc *desc; + ubit_t ra_bits[80 * 4]; + + OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + if (lchan->type == GSM_LCHAN_TCH_F) + desc = &csd_v110_lchan_desc[lchan->tch_mode].fr; + else + desc = &csd_v110_lchan_desc[lchan->tch_mode].hr; + if (OSMO_UNLIKELY(desc->num_blocks == 0)) + return -ENOTSUP; + + /* handle empty/incomplete frames gracefully */ + if (OSMO_UNLIKELY(data_len < (desc->num_blocks * desc->num_bits))) + return -ENODATA; + + /* RA1'/RA1: convert to an intermediate data rate */ + for (unsigned int i = 0; i < desc->num_blocks; i++) { + struct osmo_v110_decoded_frame df; + + /* convert modified V.110 frames to normal V.110 frames */ + if (desc->num_bits == 60) + osmo_csd_12k_6k_decode_frame(&df, &data[i * 60], 60); + else /* desc->num_bits == 36 */ + osmo_csd_3k6_decode_frame(&df, &data[i * 36], 36); + + /* FIXME: E1 .. E3 must be set by out-of-band knowledge! */ + memset(&df.e_bits[0], 0, 3); + + osmo_v110_encode_frame(&ra_bits[i * 80], 80, &df); + } + + /* RA1/RA2: convert from an intermediate rate to 64 kbit/s */ + if (desc->num_blocks == 4) { + /* 4 * 80 bits (16 kbit/s) => 2 bits per octet */ + for (unsigned int i = 0, j = 0; i < RFC4040_RTP_PLEN; i++) { + rtp[i] = (0xff >> 2); + rtp[i] |= (ra_bits[j++] << 7); + rtp[i] |= (ra_bits[j++] << 6); + } + } else { + /* 2 * 80 bits (8 kbit/s) => 1 bit per octet */ + for (unsigned int i = 0; i < RFC4040_RTP_PLEN; i++) { + rtp[i] = (0xff >> 1); + rtp[i] |= (ra_bits[i] << 7); + } + } + + return RFC4040_RTP_PLEN; +} + +int csd_v110_rtp_decode(const struct gsm_lchan *lchan, uint8_t *data, + const uint8_t *rtp, size_t rtp_len) +{ + const struct csd_v110_frame_desc *desc; + ubit_t ra_bits[80 * 4]; + + OSMO_ASSERT(lchan->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + if (lchan->type == GSM_LCHAN_TCH_F) + desc = &csd_v110_lchan_desc[lchan->tch_mode].fr; + else + desc = &csd_v110_lchan_desc[lchan->tch_mode].hr; + if (OSMO_UNLIKELY(desc->num_blocks == 0)) + return -ENOTSUP; + + if (OSMO_UNLIKELY(rtp_len != RFC4040_RTP_PLEN)) + return -EINVAL; + + /* RA1/RA2: convert from 64 kbit/s to an intermediate rate */ + if (desc->num_blocks == 4) { + /* 4 * 80 bits (16 kbit/s) => 2 bits per octet */ + for (unsigned int i = 0, j = 0; i < RFC4040_RTP_PLEN; i++) { + ra_bits[j++] = (rtp[i] >> 7); + ra_bits[j++] = (rtp[i] >> 6) & 0x01; + } + } else { + /* 2 * 80 bits (8 kbit/s) => 1 bit per octet */ + for (unsigned int i = 0; i < RFC4040_RTP_PLEN; i++) + ra_bits[i] = (rtp[i] >> 7); + } + + /* RA1'/RA1: convert to an intermediate data rate */ + for (unsigned int i = 0; i < desc->num_blocks; i++) { + struct osmo_v110_decoded_frame df; + + /* convert modified V.110 frames to normal V.110 frames */ + osmo_v110_decode_frame(&df, &ra_bits[i * 80], 80); + if (desc->num_bits == 60) + osmo_csd_12k_6k_encode_frame(&data[i * 60], 60, &df); + else /* desc->num_bits == 36 */ + osmo_csd_3k6_encode_frame(&data[i * 36], 36, &df); + } + + return desc->num_blocks * desc->num_bits; +} diff --git a/src/common/l1sap.c b/src/common/l1sap.c index 61fb3ee..13d271e 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -58,6 +58,7 @@ #include <osmo-bts/pcuif_proto.h> #include <osmo-bts/cbch.h> #include <osmo-bts/asci.h> +#include <osmo-bts/csd_v110.h> /* determine the CCCH block number based on the frame number */ unsigned int l1sap_fn2ccch_block(uint32_t fn) @@ -1829,9 +1830,27 @@ return 1; } +static void send_ul_rtp_packet_data(struct gsm_lchan *lchan, uint32_t fn, + const uint8_t *data, uint16_t data_len) +{ + uint8_t rtp_pl[RFC4040_RTP_PLEN]; + int rc; + + rc = csd_v110_rtp_encode(lchan, &rtp_pl[0], data, data_len); + if (rc < 0) + return; + + osmo_rtp_send_frame_ext(lchan->abis_ip.rtp_socket, + &rtp_pl[0], sizeof(rtp_pl), + fn_ms_adj(fn, lchan), + lchan->rtp_tx_marker); + /* Only clear the marker bit once we have sent a RTP packet with it */ + lchan->rtp_tx_marker = false; +} + /* a helper function for the logic in l1sap_tch_ind() */ -static void send_ul_rtp_packet(struct gsm_lchan *lchan, uint32_t fn, - const uint8_t *rtp_pl, uint16_t rtp_pl_len) +static void send_ul_rtp_packet_speech(struct gsm_lchan *lchan, uint32_t fn, + const uint8_t *rtp_pl, uint16_t rtp_pl_len) { if (lchan->abis_ip.osmux.use) { lchan_osmux_send_frame(lchan, rtp_pl, rtp_pl_len, @@ -1859,7 +1878,7 @@ else toc = 0x00; msgb_push_u8(msg, toc); - send_ul_rtp_packet(lchan, fn, msg->data, msg->len); + send_ul_rtp_packet_speech(lchan, fn, msg->data, msg->len); } /* A helper function for l1sap_tch_ind(): handling BFI @@ -1884,7 +1903,7 @@ /* did it actually give us some output? */ if (rc > 0) { /* yes, send it out in RTP */ - send_ul_rtp_packet(lchan, fn, ecu_out, rc); + send_ul_rtp_packet_speech(lchan, fn, ecu_out, rc); return; } } @@ -1892,7 +1911,7 @@ /* Are we in rtp continuous-streaming special mode? If so, send out * a BFI packet as zero-length RTP payload. */ if (lchan->ts->trx->bts->rtp_nogaps_mode) { - send_ul_rtp_packet(lchan, fn, NULL, 0); + send_ul_rtp_packet_speech(lchan, fn, NULL, 0); return; } @@ -1948,11 +1967,21 @@ if (lchan->ecu_state) osmo_ecu_frame_in(lchan->ecu_state, false, msg->data, msg->len); /* hand msg to RTP code for transmission */ - if (bts->emit_hr_rfc5993 && lchan->type == GSM_LCHAN_TCH_H && - lchan->tch_mode == GSM48_CMODE_SPEECH_V1) - send_rtp_rfc5993(lchan, fn, msg); - else - send_ul_rtp_packet(lchan, fn, msg->data, msg->len); + switch (lchan->rsl_cmode) { + case RSL_CMOD_SPD_SPEECH: + if (bts->emit_hr_rfc5993 && lchan->type == GSM_LCHAN_TCH_H && + lchan->tch_mode == GSM48_CMODE_SPEECH_V1) + send_rtp_rfc5993(lchan, fn, msg); + else + send_ul_rtp_packet_speech(lchan, fn, msg->data, msg->len); + break; + case RSL_CMOD_SPD_DATA: + send_ul_rtp_packet_data(lchan, fn, msg->data, msg->len); + break; + case RSL_CMOD_SPD_SIGN: + default: /* shall not happen */ + OSMO_ASSERT(0); + } /* if loopback is enabled, also queue received RTP data */ if (lchan->loopback) { /* add new frame to queue, make sure the queue doesn't get too long */ @@ -2247,10 +2276,23 @@ OSMO_ASSERT(0); } - msg = l1sap_msgb_alloc(rtp_pl_len); + msg = l1sap_msgb_alloc(512); if (!msg) return; - memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len); + + if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA) { + int rc = csd_v110_rtp_decode(lchan, msg->tail, + rtp_pl, rtp_pl_len); + if (rc > 0) { + msgb_put(msg, rc); + } else { + msgb_free(msg); + return; + } + } else { + memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len); + } + msgb_pull(msg, sizeof(struct osmo_phsap_prim)); /* Store RTP header Marker bit in control buffer */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 100c5d4..8d175be 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = paging cipher agch misc handover tx_power power meas ta_control amr +SUBDIRS = paging cipher agch misc handover tx_power power meas ta_control amr csd if ENABLE_SYSMOBTS SUBDIRS += sysmobts diff --git a/tests/csd/Makefile.am b/tests/csd/Makefile.am new file mode 100644 index 0000000..2041dd7 --- /dev/null +++ b/tests/csd/Makefile.am @@ -0,0 +1,25 @@ +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include +AM_CFLAGS = \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOCODEC_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOTRAU_CFLAGS) \ + $(LIBOSMONETIF_CFLAGS) \ + $(NULL) +AM_LDFLAGS = -no-install +LDADD = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOCODEC_LIBS) \ + $(LIBOSMOTRAU_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMONETIF_LIBS) \ + $(NULL) + +check_PROGRAMS = csd_test +EXTRA_DIST = csd_test.err + +csd_test_SOURCES = csd_test.c +csd_test_LDADD = $(top_builddir)/src/common/libbts.a $(LDADD) diff --git a/tests/csd/csd_test.c b/tests/csd/csd_test.c new file mode 100644 index 0000000..16995b1 --- /dev/null +++ b/tests/csd/csd_test.c @@ -0,0 +1,138 @@ +/* + * (C) 2023 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Vadim Yanitskiy <vyanitskiy(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 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. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <stdint.h> +#include <errno.h> + +#include <osmocom/core/bits.h> +#include <osmocom/core/utils.h> +#include <osmocom/gsm/gsm_utils.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/isdn/v110.h> + +#include <osmo-bts/csd_v110.h> +#include <osmo-bts/lchan.h> + +#define BBUF_MAX 290 + +struct test_case { + const char *name; + enum gsm_chan_t lchan_type; + enum gsm48_chan_mode tch_mode; +}; + +static const struct test_case tests[] = { + { + .name = "TCH/F14.4", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_14k5, + }, + { + .name = "TCH/F9.6", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_12k0, + }, + { + .name = "TCH/F4.8", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_6k0, + }, + { + .name = "TCH/H4.8", + .lchan_type = GSM_LCHAN_TCH_H, + .tch_mode = GSM48_CMODE_DATA_6k0, + }, + { + .name = "TCH/F2.4", + .lchan_type = GSM_LCHAN_TCH_F, + .tch_mode = GSM48_CMODE_DATA_3k6, + }, + { + .name = "TCH/H2.4", + .lchan_type = GSM_LCHAN_TCH_H, + .tch_mode = GSM48_CMODE_DATA_3k6, + }, +}; + +static void exec_test_case(const struct test_case *tc) +{ + const struct csd_v110_frame_desc *desc; + uint8_t rtp[RFC4040_RTP_PLEN] = { 0 }; + ubit_t data_enc[BBUF_MAX]; + ubit_t data_dec[BBUF_MAX]; + int rc; + + /* obtain a V.110 frame description for the given channel type/rate */ + OSMO_ASSERT(tc->tch_mode < ARRAY_SIZE(csd_v110_lchan_desc)); + if (tc->lchan_type == GSM_LCHAN_TCH_F) + desc = &csd_v110_lchan_desc[tc->tch_mode].fr; + else + desc = &csd_v110_lchan_desc[tc->tch_mode].hr; + + /* total number of bits carried by a radio interface block */ + const unsigned int bit_num = desc->num_bits * desc->num_blocks; + if (bit_num == 0) { + fprintf(stderr, "[i] Skipping '%s' (not implemented)\n", tc->name); + return; + } + + fprintf(stderr, "[i] Testing '%s' (bitnum=%u)\n", tc->name, bit_num); + + struct gsm_lchan lchan = { + .type = tc->lchan_type, + .tch_mode = tc->tch_mode, + }; + + /* populate the data_enc[] buffer with some bits */ + OSMO_ASSERT(bit_num <= BBUF_MAX); + for (unsigned int i = 0; i < bit_num; i++) + data_enc[i] = i & 0x01; + + /* encode an RTP frame and print it */ + rc = csd_v110_rtp_encode(&lchan, &rtp[0], &data_enc[0], bit_num); + fprintf(stderr, "[i] csd_v110_rtp_encode() returns %d\n", rc); + if (rc != RFC4040_RTP_PLEN) + return; + /* print the encoded RTP frame (16 bytes per row) */ + for (unsigned int i = 0; i < sizeof(rtp) / 16; i++) + fprintf(stderr, " %s\n", osmo_hexdump(&rtp[i * 16], 16)); + + /* decode the encoded RTP frame */ + rc = csd_v110_rtp_decode(&lchan, &data_dec[0], &rtp[0], sizeof(rtp)); + fprintf(stderr, "[i] csd_v110_rtp_decode() returns %d\n", rc); + if (rc != bit_num) + return; + /* compare data_dec[] vs data_enc[] */ + for (unsigned int i = 0; i < bit_num; i++) { + if (data_dec[i] == data_enc[i]) + continue; + fprintf(stderr, "[!] Data mismatch @ %03u: D%u vs E%u\n", + i, data_dec[i], data_enc[i]); + } +} + +int main(int argc, char **argv) +{ + for (unsigned int i = 0; i < ARRAY_SIZE(tests); i++) + exec_test_case(&tests[i]); + + return 0; +} diff --git a/tests/csd/csd_test.err b/tests/csd/csd_test.err new file mode 100644 index 0000000..bc9747c --- /dev/null +++ b/tests/csd/csd_test.err @@ -0,0 +1,66 @@ +[i] Skipping 'TCH/F14.4' (not implemented) +[i] Testing 'TCH/F9.6' (bitnum=240) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f +[i] csd_v110_rtp_decode() returns 240 +[i] Testing 'TCH/F4.8' (bitnum=120) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff 7f + ff ff 7f ff 7f ff 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff + ff 7f ff 7f ff 7f ff 7f ff ff 7f ff 7f ff 7f ff +[i] csd_v110_rtp_decode() returns 120 +[i] Testing 'TCH/H4.8' (bitnum=240) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f + 3f 3f 3f 3f bf bf bf bf ff 7f 7f 7f bf bf bf bf + ff 7f 7f 7f bf 3f 7f 7f bf bf bf bf ff 7f 7f 7f + bf bf bf bf ff 7f 7f 7f 3f 3f 3f 3f bf bf bf bf + ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f bf 3f 7f 7f + bf bf bf bf ff 7f 7f 7f bf bf bf bf ff 7f 7f 7f +[i] csd_v110_rtp_decode() returns 240 +[i] Testing 'TCH/F2.4' (bitnum=72) +[i] csd_v110_rtp_encode() returns 160 + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff + 7f 7f 7f 7f 7f 7f 7f 7f ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f 7f 7f ff 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff + ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff ff 7f 7f ff +[i] csd_v110_rtp_decode() returns 72 +[i] Testing 'TCH/H2.4' (bitnum=144) +[i] csd_v110_rtp_encode() returns 160 + 3f 3f 3f 3f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f bf 3f 7f 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f bf 7f bf 7f 3f 3f 3f 3f bf 7f bf 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 3f 7f 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f + 3f 3f 3f 3f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f bf 3f 7f 7f bf 7f bf 7f bf 7f bf 7f + bf 7f bf 7f bf 7f bf 7f 3f 3f 3f 3f bf 7f bf 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 3f 7f 7f + bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f bf 7f +[i] csd_v110_rtp_decode() returns 144 diff --git a/tests/testsuite.at b/tests/testsuite.at index 7e6ec4b..a7012b1 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -70,3 +70,9 @@ cat $abs_srcdir/amr/amr_test.err > experr AT_CHECK([$abs_top_builddir/tests/amr/amr_test], [], [expout], [experr]) AT_CLEANUP + +AT_SETUP([csd]) +AT_KEYWORDS([csd]) +cat $abs_srcdir/csd/csd_test.err > experr +AT_CHECK([$abs_top_builddir/tests/csd/csd_test], [], [ignore], [experr]) +AT_CLEANUP -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 5 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... Patch Set 5: Code-Review+2 (1 comment) File src/common/csd_v110.c: https://gerrit.osmocom.org/c/osmo-bts/+/33832/comment/2ff03e02_0e95c64b PS5, Line 90: memset(&df.e_bits[0], 0, 3); > vty command? Nope, see next commit. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 5 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:28:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110_rtp_encode(): properly set E1/E2/E3 bits

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33934 ) Change subject: csd_v110_rtp_encode(): properly set E1/E2/E3 bits ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33934 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I1a14597dff746cf975140b294400a2cc05badccd Gerrit-Change-Number: 33934 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:26:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in osmo-bts[master]: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode')

by pespin

Attention is currently required from: osmith, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33832 ) Change subject: l1sap: proper rate adaptation for CSD (RFC4040 'clearmode') ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/common/csd_v110.c: https://gerrit.osmocom.org/c/osmo-bts/+/33832/comment/1cff9af8_7ef366f6 PS5, Line 90: memset(&df.e_bits[0], 0, 3); vty command? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33832 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5e3701ad52d5d428fd02caff037881045f2d0a02 Gerrit-Change-Number: 33832 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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: Mon, 31 Jul 2023 09:26:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[master]: bsc (WIP): Make socket queue max. length configurable

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33892 ) Change subject: bsc (WIP): Make socket queue max. length configurable ...................................................................... Patch Set 4: (2 comments) File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/75d5d4f9_f3c3c43d PS1, Line 2491: } > I suppose it's possible to check if the current wqueue length is larger than the new maximum right i […] If you set a maximum len on a queue, you definettly don't want your queue to be in a state where the len is over that maximum. File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/33892/comment/4999ce07_f3d8c2ba PS4, Line 2486: net->pcu_state->upqueue.max_length = net->pcu_sock_wqueue_len_max; use wqueue API which internally drops enqueued messages > max -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic5f19f4613bccaf582997a4d02b689adee083a0b Gerrit-Change-Number: 33892 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:23:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-release-{manuals,tarballs}: set node

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34017 ) Change subject: jobs/osmocom-release-{manuals,tarballs}: set node ...................................................................... jobs/osmocom-release-{manuals,tarballs}: set node Set node to osmocom-master, so these jobs don't run on any node. Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 --- M jobs/osmocom-release-manuals.yml M jobs/osmocom-release-tarballs.yml 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/jobs/osmocom-release-manuals.yml b/jobs/osmocom-release-manuals.yml index 0628377..a120127 100644 --- a/jobs/osmocom-release-manuals.yml +++ b/jobs/osmocom-release-manuals.yml @@ -6,6 +6,7 @@ - job: name: 'Osmocom-release-manuals' + node: osmocom-master project-type: freestyle defaults: global description: | diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 17b7c58..2e6bb04 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -6,6 +6,7 @@ - job-template: name: 'Osmocom-release-tarballs' + node: osmocom-master project-type: freestyle defaults: global description: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 Gerrit-Change-Number: 34017 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: update obs-mirror include list

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34015 ) Change subject: update obs-mirror include list ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34015 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f4103732a6dc3d73ada85482c6a2f806b4100aa Gerrit-Change-Number: 34015 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:16:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-release-{manuals,tarballs}: set node

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34017 ) Change subject: jobs/osmocom-release-{manuals,tarballs}: set node ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 Gerrit-Change-Number: 34017 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:15:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 ) Change subject: pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown ...................................................................... pcu: Introduce test TC_dl_multislot_tbf_ms_class_unknown Related: OS#6118 Change-Id: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 --- M pcu/PCU_Tests.ttcn M pcu/expected-results.xml 2 files changed, 86 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index e381c59..d844736 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3252,6 +3252,75 @@ f_shutdown(__BFILE__, __LINE__, final := true); } +/* Test DL TBF assignment over PACCH if Multislot class is unknown both at PCU + * and SGSN (eg. because MS started 1-phase access and SGSN answered back). + * Since the msclass is unknown, it shouldn't assign multiple timeslots since + * the MS may not support it. Related OS#6118. */ +testcase TC_dl_multislot_tbf_ms_class_unknown() runs on RAW_PCU_Test_CT +{ + var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); + var RlcmacDlBlock dl_block; + var octetstring payload; + var template (value) LlcBlockHdr blk_hdr; + var template (value) LlcBlocks blocks; + var uint32_t sched_fn; + var uint32_t dl_fn; + var template RlcmacDlBlock acknack_tmpl; + var GprsMS ms; + var octetstring data := f_rnd_octstring(10); + + /* Initialize NS/BSSGP side */ + f_init_bssgp(); + + /* Only 1 TRX with 8 PDCH */ + f_PCUIF_PDCHMask_set(info_ind, '11111111'B, 0); + f_PCUIF_PDCHMask_set(info_ind, '00000000'B, (1 .. 7)); + + /* Initialize GPRS MS side */ + f_init_gprs_ms(); + ms := g_ms[0]; /* We only use first MS in this test */ + + /* Initialize the PCU interface abstraction */ + f_init_raw(testcasename(), info_ind); + + /* Establish BSSGP connection to the PCU */ + f_bssgp_establish(); + f_bssgp_client_llgmm_assign(TLLI_UNUSED, ms.tlli); + + /* Establish an Uplink TBF. 1 TS is assigned over AGCH. */ + f_ms_establish_ul_tbf(ms); + + /* Wait until PCU starts requesting for UL block on this TBF: */ + dl_fn := f_ms_wait_usf(ms, nr := f_ms_tx_TsTrxBtsNum(ms)); + sched_fn := f_next_pdch_block(dl_fn); + + /* Send one UL block (with TLLI since we are in One-Phase Access + * contention resolution) and make sure it is ACKED fine. */ + payload := f_rnd_octstring(16); /* 16 bytes fills the llc block (because TLLI takes 4 bytes) */ + blk_hdr := t_RLCMAC_LLCBLOCK_HDR(length_ind := lengthof(payload), + more := false, e := true); + blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) }; + /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ + f_ms_tx_ul_data_blocks_gprs(ms, blocks, cv := 15, with_tlli := true, fn := sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); + + /* UL block should be received in SGSN */ + BSSGP[0].receive(tr_BSSGP_UL_UD(ms.tlli, mp_gb_cfg.bvc[0].cell_id)); + + acknack_tmpl := tr_RLCMAC_UL_ACK_NACK_GPRS(ms.ul_tbf.tfi, + tr_UlAckNackGprs(ms.tlli, + tr_AckNackDescription(final_ack := '0'B))) + f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl, nr := f_ms_tx_TsTrxBtsNum(ms)); + + BSSGP[0].send(ts_BSSGP_DL_UD(ms.tlli, data, racap := omit)); + dl_block := f_ms_rx_pkt_ass_pacch(ms, sched_fn, tr_RLCMAC_DL_PACKET_ASS, nr := f_ms_tx_TsTrxBtsNum(ms)); + if (f_dltbf_num_slots(ms.dl_tbf) != 1) { + setverdict(fail, "Expected 1 PDCH slots allocated but got ", f_dltbf_num_slots(ms.dl_tbf)); + f_shutdown(__BFILE__, __LINE__); + } + + f_shutdown(__BFILE__, __LINE__, final := true); +} + testcase TC_dl_multislot_tbf_ms_class_from_2phase() runs on RAW_PCU_Test_CT { var PCUIF_info_ind info_ind := valueof(ts_PCUIF_INFO_default(c_PCUIF_Flags_noMCS)); var RlcmacDlBlock dl_block; @@ -7436,6 +7505,7 @@ execute( TC_pcuif_fh_pkt_ass_dl() ); execute( TC_multitrx_multims_alloc() ); execute( TC_dl_multislot_tbf_ms_class_from_sgsn() ); + execute( TC_dl_multislot_tbf_ms_class_unknown() ); execute( TC_dl_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_multislot_tbf_ms_class_from_2phase() ); execute( TC_ul_tbf_reestablish_with_pkt_resource_req() ); diff --git a/pcu/expected-results.xml b/pcu/expected-results.xml index eccff6f..2a25934 100644 --- a/pcu/expected-results.xml +++ b/pcu/expected-results.xml @@ -93,6 +93,12 @@ PCU_Tests.ttcn:MASKED TC_dl_multislot_tbf_ms_class_from_sgsn testcase </failure> </testcase> + <testcase classname='PCU_Tests' name='TC_dl_multislot_tbf_ms_class_unknown' time='MASKED'> + <failure type='fail-verdict'>Expected 1 PDCH slots allocated but got 4 + PCU_Tests.ttcn:MASKED PCU_Tests control part + PCU_Tests.ttcn:MASKED TC_dl_multislot_tbf_ms_class_unknown testcase + </failure> + </testcase> <testcase classname='PCU_Tests' name='TC_dl_multislot_tbf_ms_class_from_2phase' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_ul_multislot_tbf_ms_class_from_2phase' time='MASKED'/> <testcase classname='PCU_Tests' name='TC_ul_tbf_reestablish_with_pkt_resource_req' time='MASKED'/> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34004 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: I9af8792fe4c44b5dd1aab5a2d4b7d3c2a2366d12 Gerrit-Change-Number: 34004 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... pcu: Split f_ms_tx_ul_data_block() into helper functions This allows shrinking some tests which wish to send specificaly crafter LlcBlocks (since the way LlcBlocks are created for f_ms_tx_ul_data_block only allows sending data related to the same upper LLC PDU) Change-Id: I81176fa5c7caa2535bcc97eec26833579933ed7a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 57 insertions(+), 42 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 64a39dd..491a496 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -669,6 +669,45 @@ f_ms_tx_data_ind(ms, data, fn, nr := nr); } +function f_ms_tx_ul_data_blocks_gprs(inout GprsMS ms, template (value) LlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := blocks); + if (with_tlli) { + ul_data.data.mac_hdr.tlli_ind := true; + ul_data.data.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + +function f_ms_tx_ul_data_blocks_egprs(inout GprsMS ms, template (value) EgprsLlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn1 := ms.ul_tbf.bsn, + bsn2_offset := 0, + blocks := blocks); + if (with_tlli) { + ul_data.data_egprs.tlli_ind := true; + ul_data.data_egprs.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) @@ -676,29 +715,10 @@ var template (value) RlcmacUlBlock ul_data; if (f_rlcmac_cs_mcs_is_mcs(ms.ul_tbf.tx_cs_mcs)) { - ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn1 := ms.ul_tbf.bsn, - bsn2_offset := 0, - blocks := {t_RLCMAC_LLCBLOCK_EGPRS(payload)}) - if (with_tlli) { - ul_data.data_egprs.tlli_ind := true; - ul_data.data_egprs.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_egprs(ms, {t_RLCMAC_LLCBLOCK_EGPRS(payload)}, cv, with_tlli, fn, nr) } else { - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn := ms.ul_tbf.bsn, - blocks := {t_RLCMAC_LLCBLOCK(payload)}); - if (with_tlli) { - ul_data.data.mac_hdr.tlli_ind := true; - ul_data.data.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_gprs(ms, {t_RLCMAC_LLCBLOCK(payload)}, cv, with_tlli, fn, nr); } - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index c360e97..82ecb57 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3603,7 +3603,6 @@ var PCUIF_info_ind info_ind; var RlcmacDlBlock dl_block; var octetstring payload; - var template (value) RlcmacUlBlock ul_data; var template (value) LlcBlockHdr blk_hdr; var template (value) LlcBlocks blocks; var uint32_t sched_fn; @@ -3644,14 +3643,7 @@ more := false, e := true); blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) }; /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ - ul_data := t_RLCMAC_UL_DATA_TLLI(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks, - tlli := ms.tlli); - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, f_next_pdch_block(sched_fn)); + f_ms_tx_ul_data_blocks_gprs(ms, blocks, cv := 15, with_tlli := true, fn := sched_fn); blocks_sent := blocks_sent + 1; /* UL block should be received in SGSN */ @@ -3662,12 +3654,6 @@ tr_AckNackDescription(final_ack := '0'B))) f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks); - nr := f_ms_tx_TsTrxBtsNum(ms); BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -3683,9 +3669,7 @@ log("ACKING FN ", data_msg.raw.fn, " on FN ", ack_fn); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), ack_fn); } - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { @@ -3703,9 +3687,7 @@ tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 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: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 ) Change subject: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF ...................................................................... pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF Change-Id: I34b31c292c00b6880311906ce6713a8e3c69a0d2 --- M pcu/PCU_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 82ecb57..e381c59 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3198,6 +3198,7 @@ var PacketDlAssign dl_tbf_ass; var RlcmacDlBlock dl_block; var uint32_t poll_fn; + var uint32_t dl_fn; var uint32_t sched_fn; var GprsMS ms; timer T := 5.0; @@ -3224,11 +3225,12 @@ f_ms_establish_ul_tbf(ms); /* Wait until PCU starts requesting for UL block on this TBF: */ - f_ms_wait_usf(ms); + dl_fn := f_ms_wait_usf(ms, nr := f_ms_tx_TsTrxBtsNum(ms)); + sched_fn := f_next_pdch_block(dl_fn); /* Send one UL block (with TLLI since we are in One-Phase Access contention resolution) and make sure it is ACKED fine */ - f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := ms.ul_tbf.start_time_fn, + f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, poll_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 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: I34b31c292c00b6880311906ce6713a8e3c69a0d2 Gerrit-Change-Number: 34003 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... Patch Set 1: (1 comment) File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995/comment/f04ec889_11e8… PS1, Line 672: blocks > Why "blocks" (plural), btw? I see this function is sending exactly one RLC/MAC block. […] this function is not sending exactly one block. It's sending a record of LlcBlocks, because an RLC/MAC block can transport more than 1 LlcBlocks (or segments of them). Another topic is that so far we only call this function to submit 1 Llc block because we don't need sending more for simplicity (there's some test which validates sending several llc blocks in one Rlc/MAC block iirc, and it may be possible to move it to use this API, but that would be another patch which is not really high prio). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 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: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:14:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-release-{manuals,tarballs}: set node

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34017 ) Change subject: jobs/osmocom-release-{manuals,tarballs}: set node ...................................................................... jobs/osmocom-release-{manuals,tarballs}: set node Set node to osmocom-master, so these jobs don't run on any node. Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 --- M jobs/osmocom-release-manuals.yml M jobs/osmocom-release-tarballs.yml 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/34017/1 diff --git a/jobs/osmocom-release-manuals.yml b/jobs/osmocom-release-manuals.yml index 0628377..a120127 100644 --- a/jobs/osmocom-release-manuals.yml +++ b/jobs/osmocom-release-manuals.yml @@ -6,6 +6,7 @@ - job: name: 'Osmocom-release-manuals' + node: osmocom-master project-type: freestyle defaults: global description: | diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 17b7c58..2e6bb04 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -6,6 +6,7 @@ - job-template: name: 'Osmocom-release-tarballs' + node: osmocom-master project-type: freestyle defaults: global description: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 Gerrit-Change-Number: 34017 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by pespin

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 13: (2 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/cbe57ba9_19151a37 PS10, Line 540: osmo_stream_cli_set_addr(osc, "127.0.0.11"); > I don't understand the second part of the sentence... […] What I meant is that in linux for the loopback interface the range 127.0.0.X of addresses don't need to explicitly be assigned to the network interface, they are added automagically when needed. Not critical, just sharing that this may pose problems on other systems. https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/52147af6_055fb052 PS10, Line 621: rc = clock_gettime(CLOCK_MONOTONIC, &start); > What is the advantage of using `alarm()` instead, and how wouldn't I need to register some sort of ( […] The advantage is not mixing the code testing the API with the test-code itself. That makes the test easier to read, easier to extend, easier to debug. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:11:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by pespin

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add and use IPA send function ...................................................................... Patch Set 14: (4 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/414107df_7aa2db2f PS14, Line 387: #define IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER\ missing space before \ https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/a8607de9_bdcca102 PS14, Line 388: IPAC_MSGT_ID_GET,\ same https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/2316bf99_62c7c085 PS14, Line 397: IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER why did this change here? unrelated? https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/c1a202f9_5ccd4db6 PS14, Line 582: osmo_ipa_stream_srv_send(conn, IPAC_PROTO_IPACCESS, -1, m); I still think mixing filling the msgb (just 1-2 API calls) + sending is a bad idea, but since others seem to prefer this way then so be it. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 14 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:06:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 16: (2 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/053cb1f6_4b0b2f69 PS13, Line 829: rc = clock_gettime(CLOCK_MONOTONIC, &start); > See answer to the same comment on change 33197 […] I think I already answered in there that the easiest/best way to timeout the test is to use the alarm() call, to avoid making the test even more complex with mixed calls to clock_gettime and osmo_clock_gettime. Not critical though. File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/9b81ebfc_d4289221 PS16, Line 518: osmo_timer_schedule(&fragmented_send_tl_cli, 0, 125000); why this change in time? seems unrelated? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 16 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:01:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

9 months, 2 weeks

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: Fix potential null ptr dereference in LL-Xid.Ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 ) Change subject: llc: Fix potential null ptr dereference in LL-Xid.Ind ...................................................................... llc: Fix potential null ptr dereference in LL-Xid.Ind Closes: Coverity CID#322365 Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b --- M src/llc/llc_ll.c 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/16/34016/1 diff --git a/src/llc/llc_ll.c b/src/llc/llc_ll.c index ad87dba..45675c3 100644 --- a/src/llc/llc_ll.c +++ b/src/llc/llc_ll.c @@ -172,17 +172,22 @@ const struct gprs_llc_xid_field *xid_field_request_l3) { struct osmo_gprs_llc_prim *llc_prim_tx; - llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); - OSMO_ASSERT(llc_prim_tx); + if (xid_field_request_l3) { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); + OSMO_ASSERT(llc_prim_tx); llc_prim_tx->ll.l3_pdu_len = xid_field_request_l3->var.val_len; llc_prim_tx->ll.l3_pdu = msgb_put(llc_prim_tx->oph.msg, llc_prim_tx->ll.l3_pdu_len); if (llc_prim_tx->ll.l3_pdu_len > 0) memcpy(llc_prim_tx->ll.l3_pdu, xid_field_request_l3->var.val, llc_prim_tx->ll.l3_pdu_len); + } else { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, 0); + OSMO_ASSERT(llc_prim_tx); } llc_prim_tx->ll.xid.n201_i = lle->params.n201_i; llc_prim_tx->ll.xid.n201_u = lle->params.n201_u; + return gprs_llc_prim_call_up_cb(llc_prim_tx); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b Gerrit-Change-Number: 34016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: sort jobs list

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33992 ) Change subject: scripts/jenkins-gerrit: sort jobs list ...................................................................... scripts/jenkins-gerrit: sort jobs list Having two debian entries in there in random order looks weird so sort the job lists. Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index 147faac..e127c4c 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -171,10 +171,10 @@ def get_jobs_list_str(jobs): - ret = "" + lines = [] for job in jobs: - ret += f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n" - return ret + lines += [f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n"] + return "".join(sorted(lines)) def get_comment_result(build_url, notify_on_success): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 Gerrit-Change-Number: 33992 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master,gerrit: don't use bullseye for python2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33993 ) Change subject: jobs/master,gerrit: don't use bullseye for python2 ...................................................................... jobs/master,gerrit: don't use bullseye for python2 openbsc, osmo-e1-recorder, osmo-smlc have been adjusted to not require python2 anymore. Let them use debian 12 for building. Closes: OS#5950 Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 16 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 1324df6..d2aaaae 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -133,7 +133,6 @@ pipeline_binpkgs: "debian:10 debian:12" - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -367,7 +366,6 @@ - osmo-cbc - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) pipeline_binpkgs: "" - gapk: @@ -378,9 +376,7 @@ - osmo-el2tpd: pipeline_binpkgs: "" - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - + - osmo-smlc - osmo-gbproxy - osmo-hnodeb diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4b1609a..6837d78 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,7 +222,6 @@ trigger: master-osmo-trx - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -464,13 +463,11 @@ - osmo-e1d - osmo-cbc - - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-smlc - osmo-gbproxy - osmo-hnodeb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 Gerrit-Change-Number: 33993 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

[M] Change in osmo-ci[master]: jobs/gerrit: refactor pipeline script

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33987 ) Change subject: jobs/gerrit: refactor pipeline script ...................................................................... jobs/gerrit: refactor pipeline script * Deduplicate the code to run a job by moving it to a function. * Print the status of jobs right after they finished, instead of waiting until all jobs are done * Make the status print messages more readable Change-Id: I641a5b483721ce2bbf21bd61d8f4e83faf94ac24 --- M jobs/gerrit-verifications.yml M scripts/jenkins-gerrit/comment_generate.py 2 files changed, 73 insertions(+), 115 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 2bbe261..b77b0ca 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -468,173 +468,114 @@ description: Run struct_endianness.py from libosmocore.git default: '{obj:pipeline_endianness}' dsl: | + def run_job(display_name, job_name, comment_type=null) {{ + try {{ + echo "pipeline_${{display_name}}: running job ${{job_name}}" + + build job: job_name, parameters: [ + string(name: "COMMENT_TYPE", value: comment_type), + string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), + string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), + string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), + string(name: "GERRIT_PATCHSET_NUMBER", value: "${{env.GERRIT_PATCHSET_NUMBER}}"), + string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), + string(name: "GERRIT_PATCHSET_UPLOADER_NAME", value: "${{env.GERRIT_PATCHSET_UPLOADER_NAME}}"), + string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), + string(name: "GERRIT_PROJECT", value: "${{env.GERRIT_PROJECT}}"), + string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), + string(name: "GERRIT_REPO_URL", value: "${{env.REPO_URL}}"), + string(name: "PIPELINE_BUILD_URL", value: "${{env.BUILD_URL}}"), + string(name: "PROJECT_NAME", value: "{repos}"), + ] + echo "pipeline_${{display_name}}: SUCCESS" + }} catch (Exception e) {{ + echo "pipeline_${{display_name}}: FAILED" + }} + }} + pipeline {{ agent none stages {{ stage("Verification") {{ parallel {{ + + // Run the comment job to add the pipeline link to gerrit stage("Start Comment") {{ steps {{ - // Run the comment job to add the pipeline link to gerrit script {{ - // Keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - build job: 'gerrit-verifications-comment', parameters: [ - string(name: "COMMENT_TYPE", value: "start"), - string(name: "GERRIT_PROJECT", value: "${{env.GERRIT_PROJECT}}"), - string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), - string(name: "GERRIT_PATCHSET_NUMBER", value: "${{env.GERRIT_PATCHSET_NUMBER}}"), - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), - string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), - string(name: "GERRIT_PATCHSET_UPLOADER_NAME", value: "${{env.GERRIT_PATCHSET_UPLOADER_NAME}}"), - string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "PIPELINE_BUILD_URL", value: "${{env.BUILD_URL}}"), - ] - }} + run_job("comment_start", "gerrit-verifications-comment", "start") }} }} }} + stage("Build") {{ when {{ expression {{ params.PIPELINE_BUILD }} }} steps {{ script {{ - // Run the build job for this repository and keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - env.PIPELINE_BUILD_PASSED = "0" - build job: 'gerrit-{repos}-build', parameters: [ - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - ] - env.PIPELINE_BUILD_PASSED = "1" - }} + run_job("build", "gerrit-{repos}-build") }} }} }} + stage("Lint") {{ when {{ expression {{ params.PIPELINE_LINT }} }} steps {{ script {{ - // Run the lint job for this repository and keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - env.PIPELINE_LINT_PASSED = "0" - build job: 'gerrit-lint', parameters: [ - string(name: "GERRIT_PROJECT", value: "${{env.GERRIT_PROJECT}}"), - string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), - string(name: "GERRIT_PATCHSET_NUMBER", value: "${{env.GERRIT_PATCHSET_NUMBER}}"), - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), - string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), - string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "GERRIT_REPO_URL", value: "${{env.REPO_URL}}"), - ] - env.PIPELINE_LINT_PASSED = "1" - }} + run_job("lint", "gerrit-lint") }} }} }} + stage("deb") {{ when {{ expression {{ params.PIPELINE_BINPKGS }} }} steps {{ script {{ - // Run the binpkgs job for this repository and keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - env.PIPELINE_DEB_PASSED = "0" - build job: 'gerrit-binpkgs-deb', parameters: [ - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "GERRIT_REPO_URL", value: "${{env.REPO_URL}}"), - string(name: "PROJECT_NAME", value: "{repos}"), - ] - env.PIPELINE_DEB_PASSED = "1" - }} + run_job("deb", "gerrit-binpkgs-deb") }} }} }} + stage("rpm") {{ - when {{ - expression {{ params.PIPELINE_BINPKGS }} - }} - steps {{ - script {{ - // Run the binpkgs job for this repository and keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - env.PIPELINE_RPM_PASSED = "0" - build job: 'gerrit-binpkgs-rpm', parameters: [ - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "GERRIT_REPO_URL", value: "${{env.REPO_URL}}"), - string(name: "PROJECT_NAME", value: "{repos}"), - ] - env.PIPELINE_RPM_PASSED = "1" - }} + when {{ + expression {{ params.PIPELINE_BINPKGS }} + }} + steps {{ + script {{ + run_job("rpm", "gerrit-binpkgs-rpm") }} }} }} + stage("Endianness") {{ when {{ expression {{ params.PIPELINE_ENDIANNESS }} }} steps {{ script {{ - // Run the endianness job for this repository and keep going on failure - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {{ - env.PIPELINE_ENDIANNESS_PASSED = "0" - build job: 'gerrit-pipeline-endianness', parameters: [ - string(name: "GERRIT_PROJECT", value: "${{env.GERRIT_PROJECT}}"), - string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), - string(name: "GERRIT_PATCHSET_NUMBER", value: "${{env.GERRIT_PATCHSET_NUMBER}}"), - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), - string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), - string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "GERRIT_REPO_URL", value: "${{env.REPO_URL}}"), - ] - env.PIPELINE_ENDIANNESS_PASSED = "1" - }} + run_job("endianness", "gerrit-pipeline-endianness") }} }} }} - }} - }} + + }} // end of parallel + }} // end of Verification stage + + // Run the comment job to get successful/failed links and add a + // comment + vote to gerrit stage("Result Comment") {{ steps {{ - echo "PIPELINE_BUILD_PASSED=${{env.PIPELINE_BUILD_PASSED}}" - echo "PIPELINE_LINT_PASSED=${{env.PIPELINE_LINT_PASSED}}" - echo "PIPELINE_DEB_PASSED=${{env.PIPELINE_DEB_PASSED}}" - echo "PIPELINE_RPM_PASSED=${{env.PIPELINE_RPM_PASSED}}" - echo "PIPELINE_ENDIANNESS_PASSED=${{env.PIPELINE_ENDIANNESS_PASSED}}" - - // Run the comment job to get successful/failed links and add a - // comment + vote to gerrit script {{ - build job: 'gerrit-verifications-comment', parameters: [ - string(name: "COMMENT_TYPE", value: "result"), - string(name: "GERRIT_PROJECT", value: "${{env.GERRIT_PROJECT}}"), - string(name: "GERRIT_CHANGE_NUMBER", value: "${{env.GERRIT_CHANGE_NUMBER}}"), - string(name: "GERRIT_PATCHSET_NUMBER", value: "${{env.GERRIT_PATCHSET_NUMBER}}"), - string(name: "GERRIT_BRANCH", value: "${{env.GERRIT_BRANCH}}"), - string(name: "GERRIT_HOST", value: "${{env.GERRIT_HOST}}"), - string(name: "GERRIT_PATCHSET_REVISION", value: "${{env.GERRIT_PATCHSET_REVISION}}"), - string(name: "GERRIT_PATCHSET_UPLOADER_NAME", value: "${{env.GERRIT_PATCHSET_UPLOADER_NAME}}"), - string(name: "GERRIT_PORT", value: "${{env.GERRIT_PORT}}"), - string(name: "GERRIT_REFSPEC", value: "${{env.GERRIT_REFSPEC}}"), - string(name: "PIPELINE_BUILD_URL", value: "${{env.BUILD_URL}}"), - ] + run_job("comment_result", "gerrit-verifications-comment", "result") }} }} }} - // The end result is success if all started jobs were successful, - // and failed otherwise. + }} }} disabled: '{obj:disabled}' diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index 2246fb7..6689ee4 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -9,7 +9,7 @@ jenkins_url = "https://jenkins.osmocom.org" re_start_build = re.compile("Starting building: gerrit-[a-zA-Z-_0-9]* #[0-9]*") -re_result = re.compile("^PIPELINE_[A-Z]*_PASSED=[01]$") +re_result = re.compile("^pipeline_([a-zA-Z-_0-9]*): (SUCCESS|FAILED)$") re_job_type = re.compile("JOB_TYPE=([a-zA-Z-_0-9]*),") @@ -74,14 +74,17 @@ ret[stage] = {"url": job_url, "name": job_name, "id": job_id} # Parse result lines - if re_result.match(line): - stage = line.split("_")[1].lower() + match = re_result.match(line) + if match: + stage = match.group(1) + if stage.startswith("comment_"): + # Jobs that run this script, not relevant for summary + continue assert stage in ret, f"found result for stage {stage}, but" \ " didn't find where it was started. The" \ " re_start_build regex probably needs to be adjusted" \ " to match the related gerrit-*-build job." - passed = line.split("=")[1].rstrip() == "1" - ret[stage]["passed"] = passed + ret[stage]["passed"] = (match.group(2) == "SUCCESS") return ret -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33987 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I641a5b483721ce2bbf21bd61d8f4e83faf94ac24 Gerrit-Change-Number: 33987 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

9 months, 2 weeks

1
0
0 0

2024

2023

2022

gerrit-log July 2023