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

[S] Change in libosmocore[master]: osmo_io: Document expectation that segmentation_cb() can modify msgb
by daniel 11 Jul '23

11 Jul '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33685 ) Change subject: osmo_io: Document expectation that segmentation_cb() can modify msgb ...................................................................... osmo_io: Document expectation that segmentation_cb() can modify msgb This is used for parsing e.g. the ipa header and setting msg->cb. Guard against segmentation_cb changing msg->data in iofd_handle_segmentation(). Change-Id: Idd2115baae98a7818aabb26232d4423d2d48fb5c --- M include/osmocom/core/osmo_io.h M src/core/osmo_io.c 2 files changed, 25 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/85/33685/1 diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index 932b909..81f13f2 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -46,7 +46,10 @@ * Needs to return the size of the next message. If it returns * -EAGAIN or a value larger than msgb_length() (message is incomplete) * osmo_io will wait for more data to be read. Other negative values - * cause the msg to be discarded. */ + * cause the msg to be discarded. If a full message was received the msgb + * will be trimmed to size and forwarded to the read call-back. All parsing + * done to the msgb by the segmentation_cb() for that message will be preserved + * (e.g. setting lxh or msgb->cb). */ int (*segmentation_cb)(struct msgb *msg); }; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index fdb9e32..8217316 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -226,6 +226,9 @@ int extra_len, received_len; struct msgb *msg_pending; + /* Save the start of message before segmentation_cb (which could change it) */ + uint8_t *data = msg->data; + received_len = msgb_length(msg); if (!iofd->io_ops.segmentation_cb) { @@ -258,12 +261,14 @@ /* msgb contains more than one segment */ /* Copy the trailing data over */ msg_pending = iofd_msgb_alloc(iofd); - memcpy(msgb_data(msg_pending), msgb_data(msg) + expected_len, extra_len); + memcpy(msgb_data(msg_pending), data + expected_len, extra_len); msgb_put(msg_pending, extra_len); *pending_out = msg_pending; - /* Trim the original msgb to size */ - msgb_trim(msg, expected_len); + /* Trim the original msgb to size. Don't use msgb_trim because we need to reference + * msg->data from before it might have been modified by the segmentation_cb(). */ + msg->len = expected_len; + msg->tail = data + expected_len; return IOFD_SEG_ACT_HANDLE_MORE; defer: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33685 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Idd2115baae98a7818aabb26232d4423d2d48fb5c Gerrit-Change-Number: 33685 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: osmo_io: Add function to change the tx_queue size
by daniel 11 Jul '23

11 Jul '23

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33686 ) Change subject: osmo_io: Add function to change the tx_queue size ...................................................................... osmo_io: Add function to change the tx_queue size Change-Id: If3d1de8bffe1123002515878655ea9e02b482888 --- M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c 3 files changed, 20 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/33686/1 diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index 81f13f2..6416cf5 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -85,6 +85,7 @@ const struct osmo_sockaddr *dest); void osmo_iofd_set_alloc_info(struct osmo_io_fd *iofd, unsigned int size, unsigned int headroom); +void osmo_iofd_set_txqueue_size(struct osmo_io_fd *iofd, unsigned int size); void *osmo_iofd_get_data(const struct osmo_io_fd *iofd); void osmo_iofd_set_data(struct osmo_io_fd *iofd, void *data); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 50be67c..d9b3697 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -268,6 +268,7 @@ osmo_iofd_set_data; osmo_iofd_set_ioops; osmo_iofd_set_priv_nr; +osmo_iofd_set_txqueue_size; osmo_iofd_setup; osmo_iofd_txqueue_clear; osmo_iofd_txqueue_len; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 8217316..cab3457 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -542,6 +542,15 @@ iofd->msgb_alloc.size = size; } +/*! Set the maximum number of messages enqueued for sending + * \param[in] iofd the file descriptor + * \param[in] size the maximum size of the transmit queue + */ +void osmo_iofd_set_txqueue_size(struct osmo_io_fd *iofd, unsigned int size) +{ + iofd->tx_queue.max_length = size; +} + /*! Get the associated user-data from an iofd * \param[in] iofd the file descriptor * \returns the data that was previously set with \ref osmo_iofd_setup() -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If3d1de8bffe1123002515878655ea9e02b482888 Gerrit-Change-Number: 33686 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: rua: also match on RUA Disconnect without RANAP payload
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33490 ) Change subject: rua: also match on RUA Disconnect without RANAP payload ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33490 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: Ia0b89e9198794d196a88040ee89bdf24f3b08ae0 Gerrit-Change-Number: 33490 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:59:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-ttcn3-hacks[master]: hnbgw: add CN pool tests
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 ) Change subject: hnbgw: add CN pool tests ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33486 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: I027a059faed3f140f8801f84338956cd004043b5 Gerrit-Change-Number: 33486 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:58:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add role and sctp-role in osmo-stp.cfg
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33669 ) Change subject: hnbgw: add role and sctp-role in osmo-stp.cfg ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33669 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: I1019c1d4ebb6183a389c655ea6716bfb0255721a Gerrit-Change-Number: 33669 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:58:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: add role and sctp-role in osmo-stp.cfg
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33669 ) Change subject: hnbgw: add role and sctp-role in osmo-stp.cfg ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: this should be purely cosmetic, right? On osmo-stp, sctp-server and role=sg should be the only sane default. @pespin? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33669 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: I1019c1d4ebb6183a389c655ea6716bfb0255721a Gerrit-Change-Number: 33669 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:57:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: bts/BTS_Tests.default: bump default PCUIF version to 11
by fixeria 11 Jul '23

11 Jul '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33684 ) Change subject: bts/BTS_Tests.default: bump default PCUIF version to 11 ...................................................................... bts/BTS_Tests.default: bump default PCUIF version to 11 Without this change I cannot run BTS_Tests manually anymore: Local verdict of MTC: fail reason: "BTS_Tests.ttcn:480 : Invalid PCU Version/BTS Number received" Change-Id: If0046b44adb93fba7dced1ce06d5ddb9d7c75269 Fixes: 3b4abb86 "BTS_Tests: Add support for PCUIF protocol version 11" --- M bts/BTS_Tests.default 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/84/33684/1 diff --git a/bts/BTS_Tests.default b/bts/BTS_Tests.default index 0657b65..7c5230b 100644 --- a/bts/BTS_Tests.default +++ b/bts/BTS_Tests.default @@ -29,7 +29,7 @@ [MODULE_PARAMETERS] Osmocom_VTY_Functions.mp_prompt_prefix := "OsmoBTS"; -PCUIF_Types.mp_pcuif_version := 10; +PCUIF_Types.mp_pcuif_version := 11; # Configuration for each individual transceiver BTS_Tests.mp_trx_pars := { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33684 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: If0046b44adb93fba7dced1ce06d5ddb9d7c75269 Gerrit-Change-Number: 33684 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: hnbgw: CN links: implement 'allow attach'
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 ) Change subject: hnbgw: CN links: implement 'allow attach' ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33485 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: I5c9db4b31298ca9855b4390481a709f863459172 Gerrit-Change-Number: 33485 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:57:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: hnbgw: call f_start_hnbs() by default
by laforge 11 Jul '23

11 Jul '23

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 ) Change subject: hnbgw: call f_start_hnbs() by default ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33482 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: I2b29ce66aee0b2d57fa26e6110f06292c481ab6b Gerrit-Change-Number: 33482 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Jul 2023 14:56:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: S1AP_Emulation: remove stray comment
by laforge 11 Jul '23

11 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33636 ) Change subject: S1AP_Emulation: remove stray comment ...................................................................... S1AP_Emulation: remove stray comment Related: OS#5760 Change-Id: I55bfced12d573081311c55d363bfe7bd02fc816f --- M library/S1AP_Emulation.ttcn 1 file changed, 10 insertions(+), 2 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index 6221bf8..a907483 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -94,8 +94,6 @@ EUTRAN_CGI cgi optional, TAI tai optional, NAS_UE_State nus - - //hexstring imsi optional }; type component S1AP_Emulation_CT { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33636 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: I55bfced12d573081311c55d363bfe7bd02fc816f Gerrit-Change-Number: 33636 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0