- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sccp[master]: fix regression in sctp-role / transport-role
by fixeria 29 Feb '24

29 Feb '24

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) Change subject: fix regression in sctp-role / transport-role ...................................................................... Patch Set 2: (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/36114/comment/6232fb6a_7dfc4f93 PS1, Line 7: fix regression in sctp-proto / transport-proto > sctp-role / transport-role Done Patchset: PS1: > if you get around doing it quickly, thanks. I'll be unable to do it before thursday afternoon. Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 29 Feb 2024 10:40:16 +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> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: fix regression in sctp-role / transport-role
by fixeria 29 Feb '24

29 Feb '24

Attention is currently required from: fixeria. fixeria has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: fix regression in sctp-role / transport-role ...................................................................... fix regression in sctp-role / transport-role We saw some fall-out in automatic testing where configs with sctp-role would suddenly save as transport-role. Let's avoid this by keeping sctp-role for users of SCTP. Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Fixes: 4d7e201 "VTY: rename 'sctp-role' to 'transport-role', add an alias" Related: SYS#5424, OS#6380 --- M src/osmo_ss7_vty.c M tests/vty/ss7_asp_test.vty 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/14/36114/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36114?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ic666b62948880445e030c637298d4e369b4c7e8e Gerrit-Change-Number: 36114 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream_{client,server} example: Cleanup on exit
by Jenkins Builder 29 Feb '24

29 Feb '24

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email ) Change subject: stream_{client,server} example: Cleanup on exit ...................................................................... Patch Set 1: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14753): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/012d5f51_9c9e8ac0 PS1, Line 172: while(!quit) { space required before the open parenthesis '(' File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14753): https://gerrit.osmocom.org/c/libosmo-netif/+/36124/comment/8004315e_484954f5 PS1, Line 189: while(!quit) { space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 Gerrit-Change-Number: 36124 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Thu, 29 Feb 2024 08:29:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_cli: Correctly setup and free osmo_io client instance
by jolly 29 Feb '24

29 Feb '24

Attention is currently required from: jolly, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email ) Change subject: stream_cli: Correctly setup and free osmo_io client instance ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I91a6a76b9ff96034a7b333edf87af27490202932 Gerrit-Change-Number: 35979 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Feb 2024 08:28:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_{cli,srv}: Fix memory leak, if sending a message fails
by jolly 29 Feb '24

29 Feb '24

Attention is currently required from: jolly, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35926?usp=email ) Change subject: stream_{cli,srv}: Fix memory leak, if sending a message fails ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35926?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I627a71b4f0183cd83835c328a5cdd67a413ae614 Gerrit-Change-Number: 35926 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 29 Feb 2024 08:28:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Initialize outmsg in stream_iofd_sctp_send_msgb()
by jolly 29 Feb '24

29 Feb '24

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36122?usp=email ) Change subject: stream: Initialize outmsg in stream_iofd_sctp_send_msgb() ...................................................................... stream: Initialize outmsg in stream_iofd_sctp_send_msgb() Uninitialized fields ont outmsg may cause undefined behaviour inside subsequent function calls. Related: OS#5753 Change-Id: If4c8239c17deceeb56f64ebaff435df1e9d782cd --- M src/stream.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/22/36122/1 diff --git a/src/stream.c b/src/stream.c index 409e3fe..f4755e0 100644 --- a/src/stream.c +++ b/src/stream.c @@ -326,7 +326,7 @@ */ int stream_iofd_sctp_send_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags) { - struct msghdr outmsg; + struct msghdr outmsg = {}; char outcmsg[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))]; struct sctp_sndrcvinfo *sinfo; struct cmsghdr *cmsg; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36122?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: If4c8239c17deceeb56f64ebaff435df1e9d782cd Gerrit-Change-Number: 36122 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: osmo_io: make use of osmo_iofd_get_ioops()
by jolly 29 Feb '24

29 Feb '24

Attention is currently required from: laforge. jolly has uploaded a new patch set (#2) to the change originally created by laforge. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36077?usp=email ) The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: osmo_io: make use of osmo_iofd_get_ioops() ...................................................................... osmo_io: make use of osmo_iofd_get_ioops() This avoids resetting the callbacks with the wrong ones in the SCTP case. Change-Id: Id3cb11bc0000299faa79d980de8abc1980916d70 Depends: libosmocore.git Change-Id I03398c811b9534f50c6644b21eea89a04be29fb0 --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/77/36077/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36077?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id3cb11bc0000299faa79d980de8abc1980916d70 Gerrit-Change-Number: 36077 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream_{client,server} example: Cleanup on exit
by jolly 29 Feb '24

29 Feb '24

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email ) Change subject: stream_{client,server} example: Cleanup on exit ...................................................................... stream_{client,server} example: Cleanup on exit In order to detect memory leaks while debugging, stream server/client and keyboard is closed on exit. Related: OS#5753 Change-Id: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 36 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/24/36124/1 diff --git a/examples/stream-client.c b/examples/stream-client.c index 97aaa1c..d57dc12 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -32,9 +32,12 @@ static struct osmo_stream_cli *conn; +static bool quit = false; + void sighandler(int foo) { LOGP(DSTREAMTEST, LOGL_NOTICE, "closing stream.\n"); + quit = true; exit(EXIT_SUCCESS); } @@ -162,9 +165,17 @@ exit(EXIT_FAILURE); } + signal(SIGINT, sighandler); + LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop\n"); - while(1) { + while(!quit) { osmo_select_main(0); } + + signal(SIGINT, SIG_DFL); + + osmo_fd_unregister(kbd_ofd); + + osmo_stream_cli_destroy(conn); } diff --git a/examples/stream-server.c b/examples/stream-server.c index d0647b7..49d52a7 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -35,11 +35,12 @@ static struct osmo_stream_srv_link *srv; static struct osmo_stream_srv *conn; +bool quit = false; void sighandler(int foo) { LOGP(DSTREAMTEST, LOGL_NOTICE, "closing STREAMSERVER.\n"); - exit(EXIT_SUCCESS); + quit = true; } int read_cb(struct osmo_stream_srv *conn, struct msgb *msg) @@ -181,9 +182,17 @@ osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, srv, 0); osmo_fd_register(kbd_ofd); + signal(SIGINT, sighandler); + LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop on %s\n", osmo_stream_srv_link_get_sockname(srv)); - while(1) { + while(!quit) { osmo_select_main(0); } + + signal(SIGINT, SIG_DFL); + + osmo_fd_unregister(kbd_ofd); + + osmo_stream_srv_link_destroy(srv); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36124?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9dbb7f46b2a798e88ad4df8ff73c6ee40c07b843 Gerrit-Change-Number: 36124 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_cli: Do not try to send msg, if not connected
by jolly 29 Feb '24

29 Feb '24

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email ) Change subject: stream_cli: Do not try to send msg, if not connected ...................................................................... stream_cli: Do not try to send msg, if not connected Related: OS#5753 Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 --- M src/stream_cli.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/23/36123/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 3544e14..f9e52a0 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -995,6 +995,12 @@ OSMO_ASSERT(cli); OSMO_ASSERT(msg); + if (cli->state != STREAM_CLI_STATE_CONNECTED) { + LOGSCLI(cli, LOGL_ERROR, "Not connected with srv.\n"); + msgb_free(msg); + return; + } + switch (cli->mode) { case OSMO_STREAM_MODE_OSMO_FD: msgb_enqueue(&cli->tx_queue, msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 Gerrit-Change-Number: 36123 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_{cli,srv}: Free received messages when not forwarded
by jolly 29 Feb '24

29 Feb '24

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36125?usp=email ) Change subject: stream_{cli,srv}: Free received messages when not forwarded ...................................................................... stream_{cli,srv}: Free received messages when not forwarded If a message is not forwarded (to a read callback function, it must be freed, to prevent memory leaks. The message musst be freed before calling osmo_stream_srv_destroy() or stream_cli_handle_connecting(), because within the function calls the client/server instance may get destroyed and the message is 'owned' by it. Calling msgb_free(msg) afterwards may result in double free bug. Related: OS#5753 Change-Id: Ic043f11cdba0df9e0b78cac8db7206800098e0ba --- M src/stream_cli.c M src/stream_srv.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/25/36125/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index f9e52a0..61fb4b7 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -439,6 +439,7 @@ switch (cli->state) { case STREAM_CLI_STATE_CONNECTING: + msgb_free(msg); stream_cli_handle_connecting(cli, res); break; case STREAM_CLI_STATE_CONNECTED: @@ -447,6 +448,8 @@ /* Forward message to read callback, also if the connection failed. */ if (cli->iofd_read_cb) cli->iofd_read_cb(cli, msg); + else + msgb_free(msg); break; default: osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state); @@ -488,6 +491,7 @@ switch (cli->state) { case STREAM_CLI_STATE_CONNECTING: + msgb_free(msg); stream_cli_handle_connecting(cli, res); break; case STREAM_CLI_STATE_CONNECTED: @@ -496,6 +500,8 @@ /* Forward message to read callback, also if the connection failed. */ if (cli->iofd_read_cb) cli->iofd_read_cb(cli, msg); + else + msgb_free(msg); break; default: osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state); diff --git a/src/stream_srv.c b/src/stream_srv.c index f82a9a0..852154a 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -562,6 +562,7 @@ if (OSMO_UNLIKELY(res <= 0)) { /* This connection is dead, destroy it. */ + msgb_free(msg); osmo_stream_srv_destroy(conn); } else { if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { @@ -609,6 +610,7 @@ if (OSMO_UNLIKELY(res <= 0)) { /* This connection is dead, destroy it. */ + msgb_free(msg); osmo_stream_srv_destroy(conn); } else { if (conn->flags & OSMO_STREAM_SRV_F_FLUSH_DESTROY) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36125?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic043f11cdba0df9e0b78cac8db7206800098e0ba Gerrit-Change-Number: 36125 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

2026

2025

2024

2023

2022

gerrit-log