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

[S] Change in osmo-mgw[master]: mgw: do not fail MGCP on codec mismatch

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email ) Change subject: mgw: do not fail MGCP on codec mismatch ...................................................................... mgw: do not fail MGCP on codec mismatch Before this patch, when an CRCX+MDCX wants to set a codec list that has no match with the codecs for the other conn of that same endpoint, osmo-mgw returns an MGCP "FAIL" response. When a client wants to change the codec, it has to do that one RTP port at a time. So osmo-mgw *must* allow to configure an MGCP conn with a codec choice that mismatches the other conn. This is crucial to allow codec negotiation in osmo-msc: if MO has already assigned a specific codec, and later wants to re-assign to the codec that MT has chosen, the codec needs to be changed at osmo-mgw. Still fail if one side has no codecs -- the only reason is that changing this makes mgcp_test.c fail. (When the first CRCX arrives, how can the other side have a codec; so this behavior may change in the future.) Related: OS#6293 Related: osmo-msc I8760feaa8598047369ef8c3ab2673013bac8ac8a Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 --- M src/libosmo-mgcp/mgcp_codec.c 1 file changed, 39 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/02/35302/1 diff --git a/src/libosmo-mgcp/mgcp_codec.c b/src/libosmo-mgcp/mgcp_codec.c index 0fd1f61..47aba1e 100644 --- a/src/libosmo-mgcp/mgcp_codec.c +++ b/src/libosmo-mgcp/mgcp_codec.c @@ -475,7 +475,18 @@ } } - return -EINVAL; + LOGP(DLMGCP, LOGL_ERROR, "no matching codec found\n"); + if (conn_dst->end.codecs_assigned) + conn_dst->end.codec = &conn_dst->end.codecs[0]; + else + return -EINVAL; + + if (conn_src->end.codecs_assigned) + conn_src->end.codec = &conn_src->end.codecs[0]; + else + return -EINVAL; + + return 0; } /* Check if the codec has a specific AMR mode (octet-aligned or bandwith-efficient) set. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35302?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I3d1163fe622bdd7dc42a485f796072524ab39db9 Gerrit-Change-Number: 35302 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_test: fix false negatives in test output

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email ) Change subject: mgcp_test: fix false negatives in test output ...................................................................... mgcp_test: fix false negatives in test output If one test fails, do not print failure for all following tests as well. Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 --- M tests/mgcp/mgcp_test.c 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/03/35303/1 diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c index a43d47a..b3c111f 100644 --- a/tests/mgcp/mgcp_test.c +++ b/tests/mgcp/mgcp_test.c @@ -2145,7 +2145,7 @@ static void test_mgcp_codec_decide(void) { int i; - bool ok = true; + bool ok_all = true; printf("\nTesting mgcp_codec_find_convertible()\n"); for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_find_convertible_cases); i++) { @@ -2154,6 +2154,7 @@ int rc; int conn_i; int c; + bool ok = true; printf("#%d: %s\n", i, t->descr); @@ -2194,9 +2195,12 @@ printf(" ===> SUCCESS: codec decision as expected!\n"); else printf(" ===> FAIL: unexpected codec decision!\n"); + + if (!ok) + ok_all = false; } - OSMO_ASSERT(ok); + OSMO_ASSERT(ok_all); } void test_conn_id_matching(void) -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35303?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I196880b4b34a672ef45042c25f89bc1684363567 Gerrit-Change-Number: 35303 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-mgw[master]: tweak DEBUG log

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email ) Change subject: tweak DEBUG log ...................................................................... tweak DEBUG log Printing the debug log line a little later will include the MGCP verb information. Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 --- M src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c 1 file changed, 14 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/04/35304/1 diff --git a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c index 105e54b..7912e7c 100644 --- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c +++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c @@ -686,11 +686,11 @@ osmo_strlcpy(cleared_ci.mgcp_ci_str, ci->mgcp_ci_str, sizeof(cleared_ci.mgcp_ci_str)); *ci = cleared_ci; - LOG_CI_VERB(ci, LOGL_DEBUG, "notify=%s\n", osmo_fsm_inst_name(ci->notify.fi)); - if (verb_info) ci->verb_info = *verb_info; + LOG_CI_VERB(ci, LOGL_DEBUG, "notify=%s\n", osmo_fsm_inst_name(ci->notify.fi)); + if (ep->endpoint[0]) { if (ci->verb_info.endpoint[0] && strcmp(ci->verb_info.endpoint, ep->endpoint)) LOG_CI(ci, LOGL_ERROR, -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35304?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icb230cf4d623cdbc4ab52bd52d2a72525c0168c7 Gerrit-Change-Number: 35304 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

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

by jolly

Attention is currently required from: fixeria. jolly 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 09 Dec 2023 09:53:59 +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]: layer23: fix incorrect check in gsm_arfcn_refer_pcs()

by jolly

Attention is currently required from: fixeria. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35298?usp=email ) Change subject: layer23: fix incorrect check in gsm_arfcn_refer_pcs() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35298?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: I1f4107bdbb0f696ed3bd3cceaa94353ebe69f78f Gerrit-Change-Number: 35298 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 09 Dec 2023 09:22:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: tests/soft_uart: cosmetic: improve readability of the test output

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35296?usp=email to look at the new patch set (#3). Change subject: tests/soft_uart: cosmetic: improve readability of the test output ...................................................................... tests/soft_uart: cosmetic: improve readability of the test output Change-Id: Icf5410f0b292d41532e0cbd17e6ca0509c76cbd5 --- M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 102 insertions(+), 61 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/35296/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35296?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: Icf5410f0b292d41532e0cbd17e6ca0509c76cbd5 Gerrit-Change-Number: 35296 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: tests/soft_uart: cosmetic: improve readability of the test output

by Jenkins Builder

Attention is currently required from: fixeria. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35296?usp=email ) Change subject: tests/soft_uart: cosmetic: improve readability of the test output ...................................................................... Patch Set 2: (1 comment) File tests/soft_uart/soft_uart_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13001): https://gerrit.osmocom.org/c/libosmocore/+/35296/comment/6adc0bab_b6cad6db PS2, Line 30: } while(0) space required before the open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35296?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: Icf5410f0b292d41532e0cbd17e6ca0509c76cbd5 Gerrit-Change-Number: 35296 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sat, 09 Dec 2023 08:26:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: fix l3par check in gprs_llc_lle_generate_xid()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35300?usp=email ) Change subject: llc: fix l3par check in gprs_llc_lle_generate_xid() ...................................................................... llc: fix l3par check in gprs_llc_lle_generate_xid() A NULL pointer dereference is possible if this function is called with l3par being NULL, but l3par_len being greater than 0. Change-Id: I80c18a45a248b85901d455bfb17e81734fa5961d Fixes: CID#300602 --- M src/llc/llc.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/00/35300/1 diff --git a/src/llc/llc.c b/src/llc/llc.c index 48d1ba6..f8c6ba1 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -475,7 +475,7 @@ xid_fields[2].type = OSMO_GPRS_LLC_XID_T_N201_I; xid_fields[2].val = lle->params.n201_i; - if (l3par_len > 0) { + if (l3par != NULL && l3par_len > 0) { xid_fields[3].type = OSMO_GPRS_LLC_XID_T_L3_PAR; xid_fields[3].var.val_len = l3par_len; if (l3par_len > 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35300?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I80c18a45a248b85901d455bfb17e81734fa5961d Gerrit-Change-Number: 35300 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: fix unsigned rc in gprs_llc_lle_tx_xid_resp()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/35299?usp=email ) Change subject: llc: fix unsigned rc in gprs_llc_lle_tx_xid_resp() ...................................................................... llc: fix unsigned rc in gprs_llc_lle_tx_xid_resp() Change-Id: I724a1052fff2a43484c8bbf58b115d0769050191 Fixes: CID#300608 --- M src/llc/llc.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/99/35299/1 diff --git a/src/llc/llc.c b/src/llc/llc.c index dc1a7b6..48d1ba6 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -534,10 +534,10 @@ int gprs_llc_lle_tx_xid_resp(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len) { uint8_t bytes_response[1024]; - unsigned int rc, i; + int rc; /* Replace the SNDCP L3 xid_field with response from our upper layer: */ - for (i = 0; i < lle->rx_xid_len; i++) { + for (unsigned int i = 0; i < lle->rx_xid_len; i++) { struct gprs_llc_xid_field *xid_field_l3; if (lle->rx_xid[i].type != OSMO_GPRS_LLC_XID_T_L3_PAR) continue; -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/35299?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I724a1052fff2a43484c8bbf58b115d0769050191 Gerrit-Change-Number: 35299 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]: layer23: fix incorrect check in gsm_arfcn_refer_pcs()

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35298?usp=email ) Change subject: layer23: fix incorrect check in gsm_arfcn_refer_pcs() ...................................................................... layer23: fix incorrect check in gsm_arfcn_refer_pcs() Change-Id: I1f4107bdbb0f696ed3bd3cceaa94353ebe69f78f Fixes: 046ee64e3dd7bf285d0e965996bde47acae53099 Fixes: CID#336542 --- M src/host/layer23/src/common/sysinfo.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/98/35298/1 diff --git a/src/host/layer23/src/common/sysinfo.c b/src/host/layer23/src/common/sysinfo.c index 7fdc6ff..efbc519 100644 --- a/src/host/layer23/src/common/sysinfo.c +++ b/src/host/layer23/src/common/sysinfo.c @@ -70,7 +70,7 @@ uint16_t gsm_arfcn_refer_pcs(uint16_t cell_arfcn, const struct gsm48_sysinfo *cell_s, uint16_t arfcn) { /* If ARFCN is not one of the overlapping channel of PCS and DCS. */ - if (arfcn < 512 && arfcn > 810) + if (arfcn < 512 || arfcn > 810) return arfcn; /* If the 'cell' does not refer to PCS. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35298?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: I1f4107bdbb0f696ed3bd3cceaa94353ebe69f78f Gerrit-Change-Number: 35298 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023