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

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > There's no backward compatibility anyway, since the tests also expect SBc-AP to be present in any ca […] So that means the -latest will be failing for the next X months until we release a new version. And AFAICS, it's already failing (all tests red). Was it discussed somewhere and decided to not care? Or maybe you're planning to tag a new release of osmo-cbc after the SBcAP work is done? I am asking because usually we do care about backwards compatibility. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 13:25:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by osmith

Attention is currently required from: laforge, pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 13:05:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: Move struct cbc bring up code to its won file and functions

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28734 ) Change subject: Move struct cbc bring up code to its won file and functions ...................................................................... Move struct cbc bring up code to its won file and functions This way it's clear and we have in one place all the related code that neds to be run at a given time. Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 --- M include/osmocom/cbc/cbc_data.h M include/osmocom/cbc/debug.h M src/Makefile.am A src/cbc_data.c M src/cbc_main.c 5 files changed, 98 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/34/28734/1 diff --git a/include/osmocom/cbc/cbc_data.h b/include/osmocom/cbc/cbc_data.h index d96e5ca..d3a8319 100644 --- a/include/osmocom/cbc/cbc_data.h +++ b/include/osmocom/cbc/cbc_data.h @@ -79,6 +79,8 @@ }; extern struct cbc *g_cbc; +struct cbc *cbc_alloc(void *ctx); +int cbc_start(struct cbc *cbc); /* rest_api.c */ int rest_api_init(void *ctx, const char *bind_addr, uint16_t port); diff --git a/include/osmocom/cbc/debug.h b/include/osmocom/cbc/debug.h index 1ec0a8e..025419e 100644 --- a/include/osmocom/cbc/debug.h +++ b/include/osmocom/cbc/debug.h @@ -1,6 +1,7 @@ #pragma once enum { + DMAIN, DCBSP, DSBcAP, DREST, diff --git a/src/Makefile.am b/src/Makefile.am index 32cccd7..e72b20b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,7 @@ bin_PROGRAMS = osmo-cbc osmo_cbc_SOURCES = \ + cbc_data.c \ cbc_main.c \ cbc_message.c \ cbc_peer.c \ diff --git a/src/cbc_data.c b/src/cbc_data.c new file mode 100644 index 0000000..6f0db6c --- /dev/null +++ b/src/cbc_data.c @@ -0,0 +1,84 @@ +/* Osmocom CBC (Cell Broacast Centre) */ + +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * All Rights Reserved + * Author: Pau Espin Pedrol <pespin(a)sysmocom.de> + * + * SPDX-License-Identifier: AGPL-3.0+ + * + * 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 Affero 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 <string.h> +#include <errno.h> + +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> + +#include <osmocom/cbc/cbc_data.h> +#include <osmocom/cbc/cbsp_link.h> +#include <osmocom/cbc/sbcap_link.h> +#include <osmocom/cbc/rest_it_op.h> +#include <osmocom/cbc/debug.h> + +struct cbc *cbc_alloc(void *ctx) +{ + struct cbc *cbc; + + cbc = talloc_zero(ctx, struct cbc); + INIT_LLIST_HEAD(&g_cbc->peers); + INIT_LLIST_HEAD(&g_cbc->messages); + INIT_LLIST_HEAD(&g_cbc->expired_messages); + cbc->config.cbsp.local_host = talloc_strdup(cbc, "127.0.0.1"); + cbc->config.cbsp.local_port = CBSP_TCP_PORT; + /* g_cbc->config.sbcap local_host set up during VTY (and vty_go_parent) */ + cbc->config.sbcap.local_port = SBcAP_SCTP_PORT; + cbc->config.ecbe.local_host = talloc_strdup(cbc, "127.0.0.1"); + cbc->config.ecbe.local_port = 12345; + + LOGP(DREST, LOGL_INFO, "Main thread tid: %lu\n", pthread_self()); + cbc->it_q.rest2main = osmo_it_q_alloc(cbc, "rest2main", 10, rest2main_read_cb, NULL); + OSMO_ASSERT(cbc->it_q.rest2main); + osmo_fd_register(&cbc->it_q.rest2main->event_ofd); + + return cbc; +} + +int cbc_start(struct cbc *cbc) +{ + void *tall_rest_ctx; + int rc; + + tall_rest_ctx = talloc_named_const(cbc, 0, "REST"); + + if (!(g_cbc->cbsp.mgr = cbc_cbsp_mgr_create(cbc))) { + LOGP(DMAIN, LOGL_ERROR, "Error binding CBSP port\n"); + return -EIO; + } + + if (!(g_cbc->sbcap.mgr = cbc_sbcap_mgr_create(cbc))) { + LOGP(DMAIN, LOGL_ERROR, "Error binding SBc-AP port\n"); + return -EIO; + } + + rc = rest_api_init(tall_rest_ctx, cbc->config.ecbe.local_host, cbc->config.ecbe.local_port); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Error binding ECBE port\n"); + return -EIO; + } + return 0; +} diff --git a/src/cbc_main.c b/src/cbc_main.c index cd80e31..4ad59b6 100644 --- a/src/cbc_main.c +++ b/src/cbc_main.c @@ -45,9 +45,6 @@ #include <osmocom/vty/misc.h> #include <osmocom/cbc/debug.h> -#include <osmocom/cbc/rest_it_op.h> -#include <osmocom/cbc/cbsp_link.h> -#include <osmocom/cbc/sbcap_link.h> #include <osmocom/cbc/cbc_data.h> #include <osmocom/cbc/cbc_vty.h> @@ -55,6 +52,13 @@ struct cbc *g_cbc; static const struct log_info_cat log_info_cat[] = { + [DMAIN] = { + .name = "DMAIN", + .description = "Main logging category", + .color = "\033[1;30m", + .enabled = 1, + .loglevel = LOGL_NOTICE, + }, [DCBSP] = { .name = "DCBSP", .description = "Cell Broadcast Service Protocol (CBC-BSC)", @@ -234,27 +238,16 @@ int main(int argc, char **argv) { - void *tall_rest_ctx; int rc; tall_cbc_ctx = talloc_named_const(NULL, 1, "osmo-cbc"); - tall_rest_ctx = talloc_named_const(tall_cbc_ctx, 0, "REST"); msgb_talloc_ctx_init(tall_cbc_ctx, 0); osmo_init_logging2(tall_cbc_ctx, &log_info); log_enable_multithread(); osmo_stats_init(tall_cbc_ctx); vty_init(&vty_info); - g_cbc = talloc_zero(tall_cbc_ctx, struct cbc); - INIT_LLIST_HEAD(&g_cbc->peers); - INIT_LLIST_HEAD(&g_cbc->messages); - INIT_LLIST_HEAD(&g_cbc->expired_messages); - g_cbc->config.cbsp.local_host = talloc_strdup(g_cbc, "127.0.0.1"); - g_cbc->config.cbsp.local_port = CBSP_TCP_PORT; - /* g_cbc->config.sbcap local_host set up during VTY (and vty_go_parent) */ - g_cbc->config.sbcap.local_port = SBcAP_SCTP_PORT; - g_cbc->config.ecbe.local_host = talloc_strdup(g_cbc, "127.0.0.1"); - g_cbc->config.ecbe.local_port = 12345; + g_cbc = cbc_alloc(tall_cbc_ctx); cbc_vty_init(); @@ -276,26 +269,9 @@ exit(1); } - if (!(g_cbc->cbsp.mgr = cbc_cbsp_mgr_create(tall_cbc_ctx))) { - perror("Error binding CBSP port"); + rc = cbc_start(g_cbc); + if (rc < 0) exit(1); - } - - if (!(g_cbc->sbcap.mgr = cbc_sbcap_mgr_create(tall_cbc_ctx))) { - perror("Error binding SBc-AP port\n"); - exit(1); - } - - rc = rest_api_init(tall_rest_ctx, g_cbc->config.ecbe.local_host, g_cbc->config.ecbe.local_port); - if (rc < 0) { - perror("Error binding ECBE port"); - exit(1); - } - - LOGP(DREST, LOGL_INFO, "Main thread tid: %lu\n", pthread_self()); - g_cbc->it_q.rest2main = osmo_it_q_alloc(g_cbc, "rest2main", 10, rest2main_read_cb, NULL); - OSMO_ASSERT(g_cbc->it_q.rest2main); - osmo_fd_register(&g_cbc->it_q.rest2main->event_ofd); signal(SIGUSR1, &signal_handler); signal(SIGUSR2, &signal_handler); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I00fe755340664d4ca4a5cfdcae8d4cd33b2f40a1 Gerrit-Change-Number: 28734 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Actually, what's missing is some sed magic ensuring backwards compatibility with ttcn3-cbc-test-late […] There's no backward compatibility anyway, since the tests also expect SBc-AP to be present in any case, which latest version of osmo-cbc doesn't support. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:57:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: Actually, what's missing is some sed magic ensuring backwards compatibility with ttcn3-cbc-test-latest. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:47:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmo-cbc[master]: vty: Define peer proto during 'peer' node cmd

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28718 ) Change subject: vty: Define peer proto during 'peer' node cmd ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28718 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I47756dddd8f9b8450ba14c914614fd2391d5486e Gerrit-Change-Number: 28718 Gerrit-PatchSet: 3 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:46:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in docker-playground[master]: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format

by fixeria

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28733 ) Change subject: ttcn3-cbc: Adapt osmo-cbc 'peer' node to new format ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3654acdf4b68886133af7f418726903f3fee57eb Gerrit-Change-Number: 28733 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: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 22 Jul 2022 12:44:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 1 month

1
0
0 0

Change in osmocom-bb[master]: trxcon: l1ctl_server_{start,shutdown}() -> l1ctl_server_{alloc,free}()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28729 ) Change subject: trxcon: l1ctl_server_{start,shutdown}() -> l1ctl_server_{alloc,free}() ...................................................................... trxcon: l1ctl_server_{start,shutdown}() -> l1ctl_server_{alloc,free}() l1ctl_server_start() does not actually start the server, it simply allocates memory and initializes it. l1ctl_server_shutdown() does the opposite. Let's use more precise symbol names. Change-Id: Ie039abdff3911c5b566c760b26c31203824c5764 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 3 files changed, 6 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h index 003d146..94c0a9c 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -54,8 +54,8 @@ void *priv; }; -struct l1ctl_server *l1ctl_server_start(void *ctx, const struct l1ctl_server_cfg *cfg); -void l1ctl_server_shutdown(struct l1ctl_server *server); +struct l1ctl_server *l1ctl_server_alloc(void *ctx, const struct l1ctl_server_cfg *cfg); +void l1ctl_server_free(struct l1ctl_server *server); int l1ctl_client_send(struct l1ctl_client *client, struct msgb *msg); void l1ctl_client_conn_close(struct l1ctl_client *client); diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index 8d57fff..8827900 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -206,7 +206,7 @@ talloc_free(client); } -struct l1ctl_server *l1ctl_server_start(void *ctx, const struct l1ctl_server_cfg *cfg) +struct l1ctl_server *l1ctl_server_alloc(void *ctx, const struct l1ctl_server_cfg *cfg) { struct l1ctl_server *server; int rc; @@ -239,7 +239,7 @@ return server; } -void l1ctl_server_shutdown(struct l1ctl_server *server) +void l1ctl_server_free(struct l1ctl_server *server) { LOGP(DL1C, LOGL_NOTICE, "Shutdown L1CTL server\n"); diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 7fa774d..1e12293 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -563,7 +563,7 @@ .conn_close_cb = &l1ctl_conn_close_cb, }; - server = l1ctl_server_start(tall_trxcon_ctx, &server_cfg); + server = l1ctl_server_alloc(tall_trxcon_ctx, &server_cfg); if (server == NULL) { rc = EXIT_FAILURE; goto exit; @@ -587,7 +587,7 @@ exit: if (server != NULL) - l1ctl_server_shutdown(server); + l1ctl_server_free(server); /* Deinitialize logging */ log_fini(); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28729 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie039abdff3911c5b566c760b26c31203824c5764 Gerrit-Change-Number: 28729 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmocom-bb[master]: trxcon: fix NULL pointer dereference in trx_if_open()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28727 ) Change subject: trxcon: fix NULL pointer dereference in trx_if_open() ...................................................................... trxcon: fix NULL pointer dereference in trx_if_open() Change-Id: Id40e758f6736773f7695c02bdb8974ee422b2e63 Related: CID#275253 --- M src/host/trxcon/src/trx_if.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index dd679f2..d7e28c6 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -704,14 +704,14 @@ /* Try to allocate memory */ trx = talloc_zero(trxcon, struct trx_instance); if (!trx) { - LOGPFSML(trx->fi, LOGL_ERROR, "Failed to allocate memory\n"); + LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate memory\n"); return NULL; } /* Allocate a new dedicated state machine */ trx->fi = osmo_fsm_inst_alloc_child(&trx_fsm, trxcon->fi, TRX_EVENT_OFFLINE); if (trx->fi == NULL) { - LOGPFSML(trx->fi, LOGL_ERROR, "Failed to allocate an instance " + LOGPFSML(trxcon->fi, LOGL_ERROR, "Failed to allocate an instance " "of FSM '%s'\n", trx_fsm.name); talloc_free(trx); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28727 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id40e758f6736773f7695c02bdb8974ee422b2e63 Gerrit-Change-Number: 28727 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

Change in osmocom-bb[master]: trxcon: allocate memory in l1ctl_server_start()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28728 ) Change subject: trxcon: allocate memory in l1ctl_server_start() ...................................................................... trxcon: allocate memory in l1ctl_server_start() Calling l1ctl_server_shutdown() whenever the server is not initialized will result in accessing uninitialized values. This can happen if we goto exit before l1ctl_server_start() was called. Initializing the server with zeroes is not an option, because we need to initilize llist_head and osmo_fd structures with proper values. Allocate and initialize struct l1ctl_server in l1ctl_server_start(), deinitialize and free() in l1ctl_server_shutdown(). Change-Id: Idf13914fd0b0ae09b2ce5ece1f4203ebcae05d6e Related: CID#275254 --- M src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h M src/host/trxcon/src/l1ctl_server.c M src/host/trxcon/src/trxcon.c 3 files changed, 16 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h index 84420f2..003d146 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/l1ctl_server.h @@ -24,8 +24,6 @@ struct l1ctl_server_cfg { /* UNIX socket path to listen on */ const char *sock_path; - /* talloc context to be used for new clients */ - void *talloc_ctx; /* maximum number of connected clients */ unsigned int num_clients_max; /* functions to be called on various events */ @@ -56,8 +54,7 @@ void *priv; }; -int l1ctl_server_start(struct l1ctl_server *server, - const struct l1ctl_server_cfg *cfg); +struct l1ctl_server *l1ctl_server_start(void *ctx, const struct l1ctl_server_cfg *cfg); void l1ctl_server_shutdown(struct l1ctl_server *server); int l1ctl_client_send(struct l1ctl_client *client, struct msgb *msg); diff --git a/src/host/trxcon/src/l1ctl_server.c b/src/host/trxcon/src/l1ctl_server.c index 6047bed..8d57fff 100644 --- a/src/host/trxcon/src/l1ctl_server.c +++ b/src/host/trxcon/src/l1ctl_server.c @@ -128,7 +128,7 @@ return -ENOMEM; } - client = talloc_zero(server->cfg->talloc_ctx, struct l1ctl_client); + client = talloc_zero(server, struct l1ctl_client); if (client == NULL) { LOGP(DL1C, LOGL_ERROR, "Failed to allocate an L1CTL client\n"); close(client_fd); @@ -206,13 +206,16 @@ talloc_free(client); } -int l1ctl_server_start(struct l1ctl_server *server, - const struct l1ctl_server_cfg *cfg) +struct l1ctl_server *l1ctl_server_start(void *ctx, const struct l1ctl_server_cfg *cfg) { + struct l1ctl_server *server; int rc; LOGP(DL1C, LOGL_NOTICE, "Init L1CTL server (sock_path=%s)\n", cfg->sock_path); + server = talloc(ctx, struct l1ctl_server); + OSMO_ASSERT(server != NULL); + *server = (struct l1ctl_server) { .clients = LLIST_HEAD_INIT(server->clients), .cfg = cfg, @@ -230,10 +233,10 @@ LOGP(DL1C, LOGL_ERROR, "Could not create UNIX socket: %s\n", strerror(errno)); talloc_free(server); - return rc; + return NULL; } - return 0; + return server; } void l1ctl_server_shutdown(struct l1ctl_server *server) @@ -254,4 +257,6 @@ close(server->ofd.fd); server->ofd.fd = -1; } + + talloc_free(server); } diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 9f672e8..7fa774d 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -508,7 +508,7 @@ int main(int argc, char **argv) { struct l1ctl_server_cfg server_cfg; - struct l1ctl_server server; + struct l1ctl_server *server = NULL; int rc = 0; printf("%s", COPYRIGHT); @@ -557,14 +557,14 @@ /* Start the L1CTL server */ server_cfg = (struct l1ctl_server_cfg) { .sock_path = app_data.bind_socket, - .talloc_ctx = tall_trxcon_ctx, .num_clients_max = 1, /* only one connection for now */ .conn_read_cb = &l1ctl_rx_cb, .conn_accept_cb = &l1ctl_conn_accept_cb, .conn_close_cb = &l1ctl_conn_close_cb, }; - if (l1ctl_server_start(&server, &server_cfg) != 0) { + server = l1ctl_server_start(tall_trxcon_ctx, &server_cfg); + if (server == NULL) { rc = EXIT_FAILURE; goto exit; } @@ -586,7 +586,8 @@ osmo_select_main(0); exit: - l1ctl_server_shutdown(&server); + if (server != NULL) + l1ctl_server_shutdown(server); /* Deinitialize logging */ log_fini(); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idf13914fd0b0ae09b2ce5ece1f4203ebcae05d6e Gerrit-Change-Number: 28728 Gerrit-PatchSet: 1 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022