- gerrit-log - lists.osmocom.org

[L] Change in osmo-mgw[master]: mgw: CRCX: Split mgcp header pars parsing into a previous step
by pespin 16 Jan '25

16 Jan '25

Attention is currently required from: daniel, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email ) Change subject: mgw: CRCX: Split mgcp header pars parsing into a previous step ...................................................................... Patch Set 5: (1 comment) File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/39224/comment/4f29ee5f_ef2e9b8c?usp… : PS4, Line 710: if (osmux_init(trunk) < 0) { > I agree that the endp is only marginally related and could be omitted from logging context. […] That means making even more changes in this commit, so no, I'll keep it there in here. Please understand this is a patchset already changing a lot of stuff and that further steps of work can (and will) be done later. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ee5158c254213203830fe9c38de11c15b4b19c1 Gerrit-Change-Number: 39224 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Jan 2025 13:59:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[L] Change in osmo-mgw[master]: mgw: CRCX: Split mgcp header pars parsing into a previous step
by pespin 16 Jan '25

16 Jan '25

Attention is currently required from: daniel, laforge, neels. pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email ) Change subject: mgw: CRCX: Split mgcp header pars parsing into a previous step ...................................................................... Patch Set 5: (3 comments) File include/osmocom/mgcp/mgcp_protocol.h: https://gerrit.osmocom.org/c/osmo-mgw/+/39224/comment/8e66f61b_c4c8050b?usp… : PS4, Line 7: #define MGCP_PARSE_HDR_PARS_OSMUX_CID_WILDCARD (-1) > i disagree with that position. […] Neels, what are you talking about? You say you want me to add an enum with one or two fields and let aside the other 2^16 values? Or you want me to add 2^16 values to the enum? enums are meant for closed sets of values, not to cover int ranges with specific 2 values.... File src/libosmo-mgcp/mgcp_msg.c: https://gerrit.osmocom.org/c/osmo-mgw/+/39224/comment/a7aef3e8_dcc2a2f8?usp… : PS4, Line 257: LOGP(DLMGCP, LOGL_NOTICE, "wrong MGCP option format: '%s'\n", line); > What i would like to see is that the parsing code returns error messages to the caller. […] As already mentioned, I submitted a patch improving this at the end, so I guess it's fine now? File src/libosmo-mgcp/mgcp_protocol.c: https://gerrit.osmocom.org/c/osmo-mgw/+/39224/comment/01169e4e_cad6ee3e?usp… : PS4, Line 846: case -523: > (you don't agree?) I already changed this to be negative as requested by daniel, so no, I won't spend time changing it into positive values again. Feel free to spend your own time doing that after your patchset is merged if you think it's worth it. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/39224?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3ee5158c254213203830fe9c38de11c15b4b19c1 Gerrit-Change-Number: 39224 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Jan 2025 13:57:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/master,gerrit: use io_uring seccomp profile
by osmith 16 Jan '25

16 Jan '25

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/39355?usp=email ) Change subject: jobs/master,gerrit: use io_uring seccomp profile ...................................................................... jobs/master,gerrit: use io_uring seccomp profile Use the seccomp profile not only in ttcn3 testsuites, but also in master-builds and gerrit-verifications so we can test io_uring there too. CI happened to work without this for libosmocore on build4 because of a specific docker version where io_uring was not yet (fully?) disabled in the default seccomp profile. It did not work without this patch on build5 where we currently have a newer docker version. Related: OS#6405, OS#6186 Related: docker-playground I27567c2a5d9543c3509c316226c082ab950c5ebc Change-Id: I71df7f7eeb79b831fb67d2cda377cf1d0619b93d --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 857a944..9691250 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -46,11 +46,13 @@ sequential: false # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # seccomp profile is needed for io_uring (OS#6405) # Documentation for variables (keep in sync!): # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verificatio… docker_run: | docker run --rm=true \ --cap-add SYS_PTRACE \ + --security-opt seccomp=$HOME/osmo-ci/_docker_playground/seccomp_profile.json \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ @@ -70,6 +72,7 @@ docker run --rm=true \ --cap-add SYS_PTRACE \ + --security-opt seccomp=$HOME/osmo-ci/_docker_playground/seccomp_profile.json \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e JOB_NAME="$JOB_NAME" \ diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 69f4b70..969f2c7 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -19,11 +19,13 @@ sequential: false # most common build invocation # SYS_PTRACE is needed for ASAN (https://github.com/google/sanitizers/issues/764) + # seccomp profile is needed for io_uring (OS#6405) # Documentation for variables (keep in sync!): # https://osmocom.org/projects/osmocom-servers/wiki/Jenkins_build_verificatio… docker_run: | docker run --rm=true \ --cap-add SYS_PTRACE \ + --security-opt seccomp=$HOME/osmo-ci/_docker_playground/seccomp_profile.json \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e IS_MASTER_BUILD=1 \ @@ -48,6 +50,7 @@ docker run --rm=true \ --cap-add SYS_PTRACE \ + --security-opt seccomp=$HOME/osmo-ci/_docker_playground/seccomp_profile.json \ -e ASCIIDOC_WARNINGS_CHECK="1" \ -e HOME=/build \ -e IS_MASTER_BUILD=1 \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I71df7f7eeb79b831fb67d2cda377cf1d0619b93d Gerrit-Change-Number: 39355 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jobs/master,gerrit: use io_uring seccomp profile
by pespin 16 Jan '25

16 Jan '25

Attention is currently required from: neels, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/39355?usp=email ) Change subject: jobs/master,gerrit: use io_uring seccomp profile ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/39355?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I71df7f7eeb79b831fb67d2cda377cf1d0619b93d Gerrit-Change-Number: 39355 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 16 Jan 2025 13:49:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in libosmocore[pespin/rel-1.10.0]: osmo_io: Improve osmo_iofd_notify_connected() documentation
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39348?usp=email ) Change subject: osmo_io: Improve osmo_iofd_notify_connected() documentation ...................................................................... osmo_io: Improve osmo_iofd_notify_connected() documentation The mentioned scenario happens when using osmo_stream_cli inside libosmo-abis BTS code connecting to an osmo-bsc in the loopback interface. The client sends SYN and the server sends SYN+ACK and then quickly sends an IPA ID GET. Change-Id: Ica20a050b98d117995a5b625b23ab9faa61aabee (cherry picked from commit 59753c57a5d084549b43e63e3f0a0f6b4d21d766) --- M src/core/osmo_io.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 98d8ef3..9c93e25 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -994,12 +994,22 @@ /*! Request notification of the user if/when a client socket is connected. * Calling this function will request osmo_io to notify the user (via - * write call-back) once a non-blocking outbound connect() of the - * socket completes. + * write call-back with res=0 and msgb=NULL) once a non-blocking outbound + * connect() of the socket completes. * * This only works for connection oriented sockets in either * OSMO_IO_FD_MODE_READ_WRITE or OSMO_IO_FD_MODE_RECVMSG_SENDMSG mode. * + * The fact that the write call-back is called with msgb=NULL can be used to + * distinguish before this "connected" notification and a socket write failure. + * + * If the server transmits data quick enough after accepting the connection, + * it may happen that a read call-back is triggered towards the user before this + * special write-callback, since both events may come together from the kernel. + * Hence under those scenarios where server starts the communication, it is + * important not to assume or require that the write-callback(res=0, msgb=NULL) + * will be the first one triggered. + * * \param[in] iofd the file descriptor */ void osmo_iofd_notify_connected(struct osmo_io_fd *iofd) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39348?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: Ica20a050b98d117995a5b625b23ab9faa61aabee Gerrit-Change-Number: 39348 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[pespin/rel-1.10.0]: osmo_io: segmentation cb: Initialize null ptr every iteration
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39349?usp=email ) Change subject: osmo_io: segmentation cb: Initialize null ptr every iteration ...................................................................... osmo_io: segmentation cb: Initialize null ptr every iteration Change-Id: I0fcaa6afb9cf2f88243280f01c278fa2d72e69a6 (cherry picked from commit 37caff62cf4dea1a01dfd030b2d268f7d3f2215c) --- M src/core/osmo_io.c 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved neels: Looks good to me, but someone else must approve diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 9c93e25..cef9bec 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -328,7 +328,7 @@ void iofd_handle_segmented_read(struct osmo_io_fd *iofd, struct msgb *msg, int rc) { int res; - struct msgb *pending = NULL; + struct msgb *pending; OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); @@ -338,6 +338,7 @@ } do { + pending = NULL; res = iofd_handle_segmentation(iofd, msg, &pending); if (res != IOFD_SEG_ACT_DEFER || rc < 0) iofd->io_ops.read_cb(iofd, rc, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39349?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: I0fcaa6afb9cf2f88243280f01c278fa2d72e69a6 Gerrit-Change-Number: 39349 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[pespin/rel-1.10.0]: osmo_io: iofd_msgb_alloc(): Allow allocating msgb of len=0xffff
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39350?usp=email ) Change subject: osmo_io: iofd_msgb_alloc(): Allow allocating msgb of len=0xffff ...................................................................... osmo_io: iofd_msgb_alloc(): Allow allocating msgb of len=0xffff Fixes: 8857f3b79826efe19d216cfd911490ffa81df02b Change-Id: I6f9125916a301414301587f84fc3db98549a2f3f (cherry picked from commit 6cd7abdf16c4f99db05a6f86a557b567a0f187ad) --- M src/core/osmo_io.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved neels: Looks good to me, but someone else must approve diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index cef9bec..7b5c64a 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -172,7 +172,7 @@ { uint16_t headroom = iofd->msgb_alloc.headroom; - OSMO_ASSERT(iofd->msgb_alloc.size < 0xffff - headroom); + OSMO_ASSERT(iofd->msgb_alloc.size <= 0xffff - headroom); return msgb_alloc_headroom_c(iofd, iofd->msgb_alloc.size + headroom, headroom, "osmo_io_msgb"); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39350?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: I6f9125916a301414301587f84fc3db98549a2f3f Gerrit-Change-Number: 39350 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[pespin/rel-1.10.0]: Bump version: 1.10.0.6-eeed5 → 1.10.1
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39351?usp=email ) Change subject: Bump version: 1.10.0.6-eeed5 → 1.10.1 ...................................................................... Bump version: 1.10.0.6-eeed5 → 1.10.1 Change-Id: I04235b6d290e57d125a45533006927b212a8f2ff --- M debian/changelog M src/core/Makefile.am M src/gsm/Makefile.am 3 files changed, 16 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index f80c4e4..deda8f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libosmocore (1.10.1) unstable; urgency=medium + + [ Vadim Yanitskiy ] + * gsm48_encode_bearer_cap(): properly set 'Structure' in octet 4 + + [ Pau Espin Pedrol ] + * osmo_io: Increase default queue max_length from 32 to 1024 + * gsmtap: Increase txqueue max_length from 64 to 1024 + * osmo_io: Improve osmo_iofd_notify_connected() documentation + * osmo_io: segmentation cb: Initialize null ptr every iteration + * osmo_io: iofd_msgb_alloc(): Allow allocating msgb of len=0xffff + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Wed, 15 Jan 2025 17:31:58 +0100 + libosmocore (1.10.0) unstable; urgency=medium [ Mychaela N. Falconia ] diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 96e6460..ff9d0dd 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=22:0:0 +LIBVERSION=22:1:0 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(TALLOC_CFLAGS) $(PTHREAD_CFLAGS) $(LIBSCTP_CFLAGS) $(LIBMNL_CFLAGS) $(URING_CFLAGS) diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 8c70473..f29f6d2 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -1,7 +1,7 @@ # This is _NOT_ the library release version, it's an API version. # Please read chapter "Library interface versions" of the libtool documentation # before making any modifications: https://www.gnu.org/software/libtool/manual/html_node/Versioning.html -LIBVERSION=21:0:1 +LIBVERSION=21:1:1 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include AM_CFLAGS = -Wall $(TALLOC_CFLAGS) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39351?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: I04235b6d290e57d125a45533006927b212a8f2ff Gerrit-Change-Number: 39351 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in libosmocore[pespin/rel-1.10.0]: gsmtap: Increase txqueue max_length from 64 to 1024
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39347?usp=email ) Change subject: gsmtap: Increase txqueue max_length from 64 to 1024 ...................................................................... gsmtap: Increase txqueue max_length from 64 to 1024 The default value may be too low for main loop iterations writing a lot of output. Increase it to a saner value. Change-Id: Ie737e1d060ea3ee48631604bbae1b8b84cf787b9 (cherry picked from commit 5edb7d54a8265ad6f44afdd0d07eda041f54ed98) --- M src/core/gsmtap_util.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/gsmtap_util.c b/src/core/gsmtap_util.c index b64c7b0..62d3ffa 100644 --- a/src/core/gsmtap_util.c +++ b/src/core/gsmtap_util.c @@ -496,8 +496,8 @@ if (osmo_iofd_register(gti->out, gti->wq.bfd.fd) < 0) goto err_cleanup; - /* osmo write queue previously used was set up with value of 64 */ - osmo_iofd_set_txqueue_max_length(gti->out, 64); + /* Use a big enough tx queue to avoid gsmtap messages being dropped: */ + osmo_iofd_set_txqueue_max_length(gti->out, 1024); } return gti; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39347?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: Ie737e1d060ea3ee48631604bbae1b8b84cf787b9 Gerrit-Change-Number: 39347 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[S] Change in libosmocore[pespin/rel-1.10.0]: gsm48_encode_bearer_cap(): properly set 'Structure' in octet 4
by pespin 16 Jan '25

16 Jan '25

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/39345?usp=email ) Change subject: gsm48_encode_bearer_cap(): properly set 'Structure' in octet 4 ...................................................................... gsm48_encode_bearer_cap(): properly set 'Structure' in octet 4 Before commit 714843a45 we hard-coded octet 4 to 0xb8, then we started hard-coding it to 0x88. Neither is correct. According to 3GPP TS 43.010, Annex A.1 "Attribute definition and their values", attribute 'Structure' can take two values: * Service data unit integrity, which is ** applicable for connection element "non transparent"; * Unstructured, which is ** applicable for connection element "transparent". This commit changes the output of tests/gsm0408/gsm0408_test: * Test `CSD 2400/V.22bis/transparent' is now passing. * csd_9600_v110_lv[] revert octet 4 back to 0xb8. Change-Id: I563becfdae75e22de3b5e5de3c810334a74e7ffb Fixes: 714843a45 ("gsm48_ie.c: change bearer cap structure in outgoing CSD calls") Related: OS#5730 (cherry picked from commit aec32dbf288715f102a544d991fe16765642d862) --- M src/gsm/gsm48_ie.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.err M tests/gsm0408/gsm0408_test.ok 4 files changed, 19 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified neels: Looks good to me, but someone else must approve diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c index b95609f..7a41ae8 100644 --- a/src/gsm/gsm48_ie.c +++ b/src/gsm/gsm48_ie.c @@ -339,8 +339,23 @@ case GSM48_BCAP_ITCAP_3k1_AUDIO: case GSM48_BCAP_ITCAP_FAX_G3: lv[i++] |= 0x80; /* last IE of octet 3 etc */ - /* octet 4 */ - lv[i++] = 0x88; + /* octet 4 + * 1... .... = Extension: No Extension + * .0.. .... = Compression: Not Allowed + * ..xx .... = Structure: (see below) + * .... 1... = Duplex mode: Full + * .... .0.. = Configuration: Point-to-point + * .... ..0. = NIRR: No meaning is associated with this value + * .... ...0 = Establishment: Demand + * + * For connection element "non transparent": + * ..00 .... = Structure: Service data unit integrity (0) + * For connection element "transparent": + * ..11 .... = Structure: Unstructured (3) */ + if ((bcap->data.transp & 0x01) == 0) + lv[i++] = 0x88 | (0x03 << 4); + else + lv[i++] = 0x88; /* octet 5 */ lv[i++] = 0x80 | ((bcap->data.rate_adaption & 3) << 3) | (bcap->data.sig_access & 7); diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 8a89357..7456ed8 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -31,7 +31,7 @@ #include <osmocom/core/msgb.h> -static const uint8_t csd_9600_v110_lv[] = { 0x07, 0xa1, 0x88, 0x89, 0x21, 0x15, 0x63, 0x80 }; +static const uint8_t csd_9600_v110_lv[] = { 0x07, 0xa1, 0xb8, 0x89, 0x21, 0x15, 0x63, 0x80 }; static const struct gsm_mncc_bearer_cap bcap_csd_9600_v110 = { .transfer = GSM48_BCAP_ITCAP_UNR_DIG_INF, diff --git a/tests/gsm0408/gsm0408_test.err b/tests/gsm0408/gsm0408_test.err index 0102de0..8aeda3e 100644 --- a/tests/gsm0408/gsm0408_test.err +++ b/tests/gsm0408/gsm0408_test.err @@ -1,6 +1,3 @@ -Incorrect encoded result of CSD 2400/V.22bis/transparent: - should: 07 a2 b8 81 21 13 43 83 - is: 07 a2 88 81 21 13 43 83 Incorrect encoded result of Speech, without octet 3a: should: 01 a0 is: 02 20 80 diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok index 721e2c5..3580591 100644 --- a/tests/gsm0408/gsm0408_test.ok +++ b/tests/gsm0408/gsm0408_test.ok @@ -1,6 +1,6 @@ Test `CSD 9600/V.110/transparent' passed Test `CSD 4800/RLP/non-transparent' passed -Test `CSD 2400/V.22bis/transparent' failed +Test `CSD 2400/V.22bis/transparent' passed Test `Speech, all codecs' passed Test `Speech, without octet 3a' failed Simple TMSI encoding test....passed -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/39345?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: pespin/rel-1.10.0 Gerrit-Change-Id: I563becfdae75e22de3b5e5de3c810334a74e7ffb Gerrit-Change-Number: 39345 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log