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

[M] Change in libosmocore[master]: tests/it_q: add tc_enqueue/dequeue testcase

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35293?usp=email ) Change subject: tests/it_q: add tc_enqueue/dequeue testcase ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35293?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie0edbf00e656fbe231952bdbccfd37d143e8b2b1 Gerrit-Change-Number: 35293 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Dec 2023 11:19:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: core: fix wrong logic in _osmo_it_q_dequeue()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35294?usp=email ) Change subject: core: fix wrong logic in _osmo_it_q_dequeue() ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35294?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I63094df73b166b549616c869ad908e9f4f7d46d1 Gerrit-Change-Number: 35294 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Dec 2023 11:19:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in osmocom-bb[master]: virt_phy: fix checking stderr_target in ms_log_init()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35310?usp=email ) Change subject: virt_phy: fix checking stderr_target in ms_log_init() ...................................................................... virt_phy: fix checking stderr_target in ms_log_init() Checking the stderr makes a little sense, since it's an integer value (usually equal to 2). The actual intention, most likely, was to check 'stderr_target' against NULL. Change-Id: Id597f766142f928135f9fd2b7cf4d69de7bc72f0 Related: OS#6299 --- M src/host/virt_phy/src/logging.c 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/10/35310/1 diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 0a1b2a4..19951ef 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -113,8 +113,7 @@ log_init(&ms_log_info, NULL); stderr_target = log_target_create_stderr(); - if (!stderr) - return -1; + OSMO_ASSERT(stderr_target != NULL); log_add_target(stderr_target); log_set_all_filter(stderr_target, 1); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35310?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id597f766142f928135f9fd2b7cf4d69de7bc72f0 Gerrit-Change-Number: 35310 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmocom-bb[master]: virt_phy: use osmo_init_logging2() to init logging

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35311?usp=email ) Change subject: virt_phy: use osmo_init_logging2() to init logging ...................................................................... virt_phy: use osmo_init_logging2() to init logging Change-Id: Iaaaa3b0c1aaea8d96b760938a4638eaa0dd65bc7 Related: OS#6299 --- M src/host/virt_phy/include/osmocom/bb/virtphy/logging.h M src/host/virt_phy/src/logging.c M src/host/virt_phy/src/virtphy.c 3 files changed, 23 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/11/35311/1 diff --git a/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h index 48f7ed5..1727453 100644 --- a/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h +++ b/src/host/virt_phy/include/osmocom/bb/virtphy/logging.h @@ -16,5 +16,5 @@ extern const struct log_info ms_log_info; -int ms_log_init(char *cat_mask); +int ms_log_init(void *ctx, const char *cat_mask); const char *getL1ctlPrimName(uint8_t type); diff --git a/src/host/virt_phy/src/logging.c b/src/host/virt_phy/src/logging.c index 19951ef..fc37205 100644 --- a/src/host/virt_phy/src/logging.c +++ b/src/host/virt_phy/src/logging.c @@ -107,24 +107,21 @@ /** * Initialize the logging system for the virtual physical layer. */ -int ms_log_init(char *cat_mask) +int ms_log_init(void *ctx, const char *cat_mask) { - struct log_target *stderr_target; + int rc; - log_init(&ms_log_info, NULL); - stderr_target = log_target_create_stderr(); - OSMO_ASSERT(stderr_target != NULL); + rc = osmo_init_logging2(ctx, &ms_log_info); + OSMO_ASSERT(rc == 0); - log_add_target(stderr_target); - log_set_all_filter(stderr_target, 1); - //log_set_log_level(stderr_target, 1); - log_set_print_filename2(stderr_target, LOG_FILENAME_PATH); - log_set_use_color(stderr_target, 0); - log_set_print_timestamp(stderr_target, 1); - log_set_print_category_hex(stderr_target, 0); - log_set_print_category(stderr_target, 1); + //log_set_log_level(osmo_stderr_target, 1); + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_PATH); + log_set_use_color(osmo_stderr_target, 0); + log_set_print_timestamp(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); if (cat_mask) - log_parse_category_mask(stderr_target, cat_mask); + log_parse_category_mask(osmo_stderr_target, cat_mask); return 0; } diff --git a/src/host/virt_phy/src/virtphy.c b/src/host/virt_phy/src/virtphy.c index 005ae2d..0aa21ad 100644 --- a/src/host/virt_phy/src/virtphy.c +++ b/src/host/virt_phy/src/virtphy.c @@ -242,7 +242,7 @@ /* init loginfo */ handle_options(argc, argv); - ms_log_init(log_mask); + ms_log_init(tall_vphy_ctx, log_mask); l1gprs_logging_init(DGPRS); LOGP(DVIRPHY, LOGL_INFO, "Virtual physical layer starting up...\n"); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35311?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iaaaa3b0c1aaea8d96b760938a4638eaa0dd65bc7 Gerrit-Change-Number: 35311 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: logging: fix NULL pointer dereference in _output_buf()

by laforge

Attention is currently required from: fixeria, manawyrm, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35309?usp=email ) Change subject: logging: fix NULL pointer dereference in _output_buf() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7ec9badf525e03e54e10b725d820c636eaa3fd1c Gerrit-Change-Number: 35309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Dec 2023 11:17:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: logging: fix NULL pointer dereference in _output_buf()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35309?usp=email ) Change subject: logging: fix NULL pointer dereference in _output_buf() ...................................................................... logging: fix NULL pointer dereference in _output_buf() In the _output_buf() we explicitly initialize only the 'buf' and 'len' fields of the struct osmo_strbuf, leaving the 'pos' field implicitly initialized to NULL. Later, in this function, 'sb.pos' is passed to ctime_r() and strlen(), leading to a NULL pointer dereference (segfault) in certain scenarios. This situation can occur when color logging is disabled or when a specific logging subsystem has no associated color. Any application using libosmocore's logging API would crash with the following config: log stderr logging filter all 1 logging timestamp 1 logging color 0 Fix this by initializing the 'pos' field explicitly. Change-Id: I7ec9badf525e03e54e10b725d820c636eaa3fd1c Fixes: d71331bc "logging: fix nul octets in log output / use osmo_strbuf" Fixes: CID#336550 --- M src/core/logging.c 1 file changed, 29 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/35309/1 diff --git a/src/core/logging.c b/src/core/logging.c index 0d215f4..6941f9b 100644 --- a/src/core/logging.c +++ b/src/core/logging.c @@ -488,7 +488,7 @@ { int ret; const char *c_subsys = NULL; - struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + struct osmo_strbuf sb = { .buf = buf, .pos = buf, .len = buf_len }; /* safety net in case of encountering errors and returning nothing */ buf[0] = '\0'; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7ec9badf525e03e54e10b725d820c636eaa3fd1c Gerrit-Change-Number: 35309 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-msc[master]: SDP/MGCP: pass octet-align=1 for AMR / pass all fmtp

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35307?usp=email ) Change subject: SDP/MGCP: pass octet-align=1 for AMR / pass all fmtp ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: needs to merge the mgw patch first, see 'Depends' -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ief9225c9bcf7525a9a0a07c282ffb8cc0d092186 Gerrit-Change-Number: 35307 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Sun, 10 Dec 2023 06:48:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP

by neels

Attention is currently required from: neels. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: verbosely log MNCC and SDP ...................................................................... verbosely log MNCC and SDP Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 52 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/08/35308/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... Patch Set 1: (2 comments) File src/mncc.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13025): https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308/comment/c30ebc52_7f… PS1, Line 1072: gsm_mncc = (void*)buf; "(foo*)" should be "(foo *)" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13025): https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308/comment/9ed2d2db_ed… PS1, Line 1077: gsm_mncc_rtp = (void*)buf; "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Sun, 10 Dec 2023 06:41:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... verbosely log MNCC and SDP Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 52 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/08/35308/1 diff --git a/src/mncc.c b/src/mncc.c index ed36085..e97b42d 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -134,12 +134,14 @@ { int rc; + LOGP(DMNCC, LOGL_DEBUG, "tx MNCC %s with SDP=%s\n", osmo_mncc_name(mncc->msg_type), + osmo_quote_str(mncc->sdp, -1)); + /* * TODO: we need to put cause in here for release or such? shall we return a * static struct? */ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); - LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", mncc->callref); close_connection(conn); @@ -160,8 +162,10 @@ { int rc; + LOGP(DMNCC, LOGL_DEBUG, "tx MNCC %s with SDP=%s\n", osmo_mncc_name(rtp->msg_type), + osmo_quote_str(rtp->sdp, -1)); + rc = write(conn->fd.fd, rtp, sizeof(*rtp)); - LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); close_connection(conn); @@ -1035,6 +1039,9 @@ uint32_t msg_type; int rc; struct mncc_connection *conn = fd->data; + const struct gsm_mncc *gsm_mncc; + const struct gsm_mncc_rtp *gsm_mncc_rtp; + const char *sdp = NULL; rc = read(fd->fd, buf, sizeof(buf)); if (rc <= 0) { @@ -1049,8 +1056,38 @@ memcpy(&msg_type, buf, 4); - LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n", osmo_mncc_name(msg_type)); + /* Log about the received MNCC message */ + switch (msg_type) { + case MNCC_SETUP_IND: + case MNCC_DISC_IND: + case MNCC_REL_IND: + case MNCC_REJ_IND: + case MNCC_REL_CNF: + case MNCC_SETUP_COMPL_IND: + case MNCC_SETUP_CNF: + case MNCC_CALL_CONF_IND: + case MNCC_ALERT_IND: + case MNCC_HOLD_IND: + case MNCC_RETRIEVE_IND: + gsm_mncc = (void*)buf; + sdp = gsm_mncc->sdp; + break; + case MNCC_RTP_CREATE: + case MNCC_RTP_CONNECT: + gsm_mncc_rtp = (void*)buf; + sdp = gsm_mncc_rtp->sdp; + break; + default: + break; + } + if (sdp) + LOGP(DMNCC, LOGL_DEBUG, "rx MNCC %s with SDP=%s\n", osmo_mncc_name(msg_type), + osmo_quote_str(sdp, -1)); + else + LOGP(DMNCC, LOGL_DEBUG, "rx MNCC %s\n", osmo_mncc_name(msg_type)); + + /* Handle the received MNCC message */ switch (msg_type) { case MNCC_SOCKET_HELLO: check_hello(conn, buf, rc); diff --git a/src/sdp.c b/src/sdp.c index 7e632c3..ed57031 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -322,7 +322,7 @@ sdp = sdp_session(parser); if (!sdp) { - LOGP(DSIP, LOGL_ERROR, "leg(%p) no sdp session\n", other); + LOGP(DSIP, LOGL_INFO, "leg(%p) no SDP session in %s, returning SDP unchanged\n", other, osmo_quote_str(sdp_data, -1)); sdp_parser_free(parser); return talloc_strdup(leg, sdp_data); } diff --git a/src/sip.c b/src/sip.c index 0c8130f..99bab9f 100644 --- a/src/sip.c +++ b/src/sip.c @@ -358,8 +358,8 @@ void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { - LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) %p\n", - nua_event_name(event), status, phrase, hmagic); + LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) SDP(%s) %p\n", + nua_event_name(event), status, phrase, sip_get_sdp(sip), hmagic); if (event == nua_r_invite) { struct sip_call_leg *leg; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023