- gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: tests/gsm0808: fix assert()s in test_gsm0808_dec_cell_id_list_srvcc()
by fixeria 12 Dec '23

12 Dec '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35324?usp=email ) Change subject: tests/gsm0808: fix assert()s in test_gsm0808_dec_cell_id_list_srvcc() ...................................................................... tests/gsm0808: fix assert()s in test_gsm0808_dec_cell_id_list_srvcc() Change-Id: I6aa901fd706c74fe86b65a474c1d82803f28eeb4 Fixes: CID#274663 --- M tests/gsm0808/gsm0808_test.c 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c index aa086a2..ed99245 100644 --- a/tests/gsm0808/gsm0808_test.c +++ b/tests/gsm0808/gsm0808_test.c @@ -1296,8 +1296,8 @@ rc = gsm0808_dec_cell_id_list2(&dec_cil, enc_cil, sizeof(enc_cil)); OSMO_ASSERT(rc == sizeof(enc_cil)); - OSMO_ASSERT(dec_cil.id_discr = CELL_IDENT_SAI); - OSMO_ASSERT(dec_cil.id_list_len = 1); + OSMO_ASSERT(dec_cil.id_discr == CELL_IDENT_SAI); + OSMO_ASSERT(dec_cil.id_list_len == 1); } static void test_gsm0808_enc_dec_cell_id_list_lac(void) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35324?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: I6aa901fd706c74fe86b65a474c1d82803f28eeb4 Gerrit-Change-Number: 35324 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: tests/iuup: fix assert()s in test_decode_passive_init_2_rfci_no_iptis()
by fixeria 12 Dec '23

12 Dec '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35325?usp=email ) Change subject: tests/iuup: fix assert()s in test_decode_passive_init_2_rfci_no_iptis() ...................................................................... tests/iuup: fix assert()s in test_decode_passive_init_2_rfci_no_iptis() We should not be doing the actual logic inside the assert statements. Change-Id: I3bbf4e602c25c5aaced609e9834d6b053688194d Fixes: CID#274664, CID#274679 --- M tests/iuup/iuup_test.c 1 file changed, 18 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index e40b9e7..f3aba66 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -727,14 +727,18 @@ rnp = osmo_iuup_rnl_prim_alloc(iuup_test_ctx, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, IUUP_MSGB_SIZE); rnp->u.config = def_configure_req; rnp->u.config.active = false; - OSMO_ASSERT((rc = osmo_iuup_rnl_prim_down(iui, rnp)) == 0); + + rc = osmo_iuup_rnl_prim_down(iui, rnp); + OSMO_ASSERT(rc == 0); /* Send Init: */ tnp = osmo_iuup_tnl_prim_alloc(iuup_test_ctx, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_INDICATION, IUUP_MSGB_SIZE); tnp->oph.msg->l2h = msgb_put(tnp->oph.msg, sizeof(iuup_init)); hdr14 = (struct iuup_pdutype14_hdr *)msgb_l2(tnp->oph.msg); memcpy(hdr14, iuup_init, sizeof(iuup_init)); - OSMO_ASSERT((rc = osmo_iuup_tnl_prim_up(iui, tnp)) == 0); + + rc = osmo_iuup_tnl_prim_up(iui, tnp); + OSMO_ASSERT(rc == 0); osmo_iuup_instance_free(iui); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35325?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: I3bbf4e602c25c5aaced609e9834d6b053688194d Gerrit-Change-Number: 35325 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: tests/lapd: fix wrong size passed in test_lapdm_contention_resolution()
by fixeria 12 Dec '23

12 Dec '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35323?usp=email ) Change subject: tests/lapd: fix wrong size passed in test_lapdm_contention_resolution() ...................................................................... tests/lapd: fix wrong size passed in test_lapdm_contention_resolution() We should be passing size of the cm[] array, not size of a pointer! Change-Id: I0a878570e3a3d4e57ff44a7bc460ddb0a1b08558 Fixes: CID#274662 --- M tests/lapd/lapd_test.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c index 2f2a7f4..f2fccf8 100644 --- a/tests/lapd/lapd_test.c +++ b/tests/lapd/lapd_test.c @@ -506,7 +506,7 @@ cm2 = malloc(sizeof(cm)); memcpy(cm2, cm, sizeof(cm)); cm2[0] += 1; - send_sabm(&bts_to_ms_channel, 0, cm2, sizeof(cm2)); + send_sabm(&bts_to_ms_channel, 0, cm2, sizeof(cm)); free(cm2); rc = dequeue_prim(&bts_to_ms_channel.lapdm_dcch, &pp, "DCCH"); OSMO_ASSERT(rc == -ENODEV); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35323?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: I0a878570e3a3d4e57ff44a7bc460ddb0a1b08558 Gerrit-Change-Number: 35323 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: tests/lapd: fix wrong size passed in test_lapdm_contention_resolution()
by daniel 12 Dec '23

12 Dec '23

Attention is currently required from: fixeria, jolly, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35323?usp=email ) Change subject: tests/lapd: fix wrong size passed in test_lapdm_contention_resolution() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35323?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: I0a878570e3a3d4e57ff44a7bc460ddb0a1b08558 Gerrit-Change-Number: 35323 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Dec 2023 13:57:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp: reserve once byte for '\0' in mgcp_do_read()
by daniel 12 Dec '23

12 Dec '23

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35322?usp=email ) Change subject: mgcp: reserve once byte for '\0' in mgcp_do_read() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35322?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: Icc878af7f671213bb516af62cb601914d86ff808 Gerrit-Change-Number: 35322 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Dec 2023 13:38:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: coverity: build osmo-hnbgw with '--enable-pfcp'
by fixeria 12 Dec '23

12 Dec '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/35331?usp=email ) Change subject: coverity: build osmo-hnbgw with '--enable-pfcp' ...................................................................... coverity: build osmo-hnbgw with '--enable-pfcp' This should improve the analysis depth for osmo-hnbgw. Change-Id: I33b44a1c2ffde80b000b41b78569ff2f55bc98ed --- M coverity/build_Osmocom.sh 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/31/35331/1 diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh index 3bf9d4b..61bd2b7 100755 --- a/coverity/build_Osmocom.sh +++ b/coverity/build_Osmocom.sh @@ -103,7 +103,8 @@ build_default osmo-smlc build_default osmo-cbc build_default osmo-hnodeb -build_default osmo-hnbgw +build_default osmo-hnbgw \ + --enable-pfcp build_default osmo-bsc-nat # GMR -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I33b44a1c2ffde80b000b41b78569ff2f55bc98ed Gerrit-Change-Number: 35331 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-mgw[master]: mgcp: simplify getting msgb tail in mgcp_msg_terminate_nul()
by daniel 12 Dec '23

12 Dec '23

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/35321?usp=email ) Change subject: mgcp: simplify getting msgb tail in mgcp_msg_terminate_nul() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/35321?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: I4f4b0f792bbeef94a5449c4a5843628a703a3d54 Gerrit-Change-Number: 35321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Dec 2023 13:26:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN
by pespin 12 Dec '23

12 Dec '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35330?usp=email ) Change subject: socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN ...................................................................... socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN These values end up being used by API users of osmo_sock_multiaddr_get_name_buf() and osmo_multiaddr_ip_and_port_snprintf(). Change-Id: I18a0e1a652a3e8ef3e97154355eb1d07a14ef0bd --- M include/osmocom/core/socket.h M src/core/socket.c 2 files changed, 27 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 0f4a8bd..ea73cda 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -16,9 +16,20 @@ #include <osmocom/core/defs.h> +/*! maximum number of local or remote addresses supported by an osmo_sock instance */ +#define OSMO_SOCK_MAX_ADDRS 32 + /*! maximum length of a socket name ("r=1.2.3.4:123<->l=5.6.7.8:987") */ #define OSMO_SOCK_NAME_MAXLEN (2 + INET6_ADDRSTRLEN + 1 + 5 + 3 + 2 + INET6_ADDRSTRLEN + 1 + 5 + 1) +/*! maximum length of a multi-address socket peer (endpoint) name: (5.6.7.8|::9):987 + * char '(' + OSMO_STREAM_MAX_ADDRS - 1 addr separators + chars "):" + port buffer + char '\0' + */ +#define OSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN (INET6_ADDRSTRLEN * OSMO_SOCK_MAX_ADDRS + INET6_ADDRSTRLEN + 2 + 6 + 1) +/*! maximum length of a multia-address socket name ("r=(::2|1.2.3.4):123<->l=(5.6.7.8|::9):987") */ +#define OSMO_SOCK_MULTIADDR_NAME_MAXLEN (OSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN + 7) + + struct sockaddr_in; struct sockaddr; struct osmo_fd; @@ -108,9 +119,6 @@ #define GET_OSMO_SOCK_F_PRIO(f) (((f) >> 16) & 0xff) -/*! maximum number of local or remote addresses supported by an osmo_sock instance */ -#define OSMO_SOCK_MAX_ADDRS 32 - int osmo_sock_init(uint16_t family, uint16_t type, uint8_t proto, const char *host, uint16_t port, unsigned int flags); diff --git a/src/core/socket.c b/src/core/socket.c index c497088..ce73cd8 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2020,14 +2020,14 @@ /*! Format multiple IP addresses and/or port number into a combined string buffer * \param[out] str Destination string buffer. - * \param[in] str_len sizeof(str). + * \param[in] str_len sizeof(str), usually OSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN. * \param[out] ip Pointer to memory holding ip_cnt consecutive buffers of size ip_len. * \param[out] ip_cnt length ip array pointer. on return it contains the number of addresses found. * \param[in] ip_len length of each of the string buffer in the the ip array. * \param[out] port number (will be printed in when not NULL). * \return String length as returned by snprintf(), or negative on error. * - * This API expectes an ip array as the one filled in by + * This API expects an ip array as the one filled in by * osmo_sock_multiaddr_get_ip_and_port(), and hence it's a good companion for * that API. */ @@ -2065,7 +2065,7 @@ /*! Get address/port information on socket in provided string buffer, like "r=1.2.3.4:5<->l=6.7.8.9:10". * This does not include braces like osmo_sock_get_name(). * \param[out] str Destination string buffer. - * \param[in] str_len sizeof(str). + * \param[in] str_len sizeof(str), usually OSMO_SOCK_MULTIADDR_NAME_MAXLEN. * \param[in] fd File descriptor of socket. * \param[in] fd IPPROTO of the socket, eg: IPPROTO_SCTP. * \return String length as returned by snprintf(), or negative on error. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35330?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: I18a0e1a652a3e8ef3e97154355eb1d07a14ef0bd Gerrit-Change-Number: 35330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN
by daniel 12 Dec '23

12 Dec '23

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35330?usp=email ) Change subject: socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35330?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: I18a0e1a652a3e8ef3e97154355eb1d07a14ef0bd Gerrit-Change-Number: 35330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Dec 2023 13:21:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream_srv_link: osmo_stream_srv_link_get_sockname() now returns the ...
by fixeria 12 Dec '23

12 Dec '23

Attention is currently required from: laforge, osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35287?usp=email ) Change subject: stream_srv_link: osmo_stream_srv_link_get_sockname() now returns the full set of addresses ...................................................................... Patch Set 3: (1 comment) File src/stream_srv.c: https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/90c7e23c_94a6a750 PS3, Line 371: NULL in case of error > the fact that the implementation internally doesn't fail right now doesn't mean I should change the […] But you're actually changing the API: this function does not return NULL on error anymore, but would print the error into the output buffer. I am fine with keeping `\returns ... NULL in case of error`, but the `<error>` behavior should definitely be documented. The caller would need to do `strcmp(ret, "<sockname-error>") == 0` instead of `ret == NULL` after your patch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35287?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: I216502a9aeafe638940f110bc9fddf2504b2ac3a Gerrit-Change-Number: 35287 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Dec 2023 13:21:09 +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

1 0

2026

2025

2024

2023

2022

gerrit-log