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

[S] Change in osmo-bsc[master]: gsm_data: fix wrong variable set in gsm_pchan2chan_nr()
by pespin 08 Dec '23

08 Dec '23

Attention is currently required from: fixeria, laforge, neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email ) Change subject: gsm_data: fix wrong variable set in gsm_pchan2chan_nr() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9c7c2e46e24dab0b721221e9adcbbae2ca56d23 Gerrit-Change-Number: 35288 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Dec 2023 19:11:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2()
by fixeria 08 Dec '23

08 Dec '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35290?usp=email ) Change subject: socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35290?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: I06b810fde7bf750fcb42d6d9e6223883e26f5f0b Gerrit-Change-Number: 35290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Dec 2023 19:08:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2()
by pespin 08 Dec '23

08 Dec '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35290?usp=email ) Change subject: socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2() ...................................................................... socket: Fix uninitialized mem ptr free in osmo_sock_init2_multiaddr2() The goto tag was wrong, probably due to a copy-paste mistype while reimplementing the function. Closes: Coverity CID#336546 Change-Id: I06b810fde7bf750fcb42d6d9e6223883e26f5f0b --- M src/core/socket.c 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/90/35290/1 diff --git a/src/core/socket.c b/src/core/socket.c index c600732..5b7489d 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -905,7 +905,7 @@ if (family == AF_INET && loc_has_v6only_addr) { LOGP(DLGLOBAL, LOGL_ERROR, "Cannot bind an IPv6 address to an AF_INET socket\n"); rc = -EINVAL; - goto ret_freeaddrinfo; + goto ret_freeaddrinfo_loc; } } /* figure out remote side of socket */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35290?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: I06b810fde7bf750fcb42d6d9e6223883e26f5f0b Gerrit-Change-Number: 35290 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr()
by fixeria 08 Dec '23

08 Dec '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35289?usp=email ) Change subject: gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr() ...................................................................... gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr() Change-Id: Ic9370d8d7f13cce0f9c6e60a920d04161a7d6844 --- M src/osmo-bsc/gsm_data.c 1 file changed, 16 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/35289/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 4d77e75..b11607e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -460,22 +460,20 @@ if (vamos_is_secondary) cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs; else - cbits = 0x01; + cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; break; case GSM_PCHAN_PDCH: if (lchan_nr != 0) return -EINVAL; - cbits = RSL_CHAN_OSMO_PDCH >> 3; + cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; break; case GSM_PCHAN_TCH_H: if (lchan_nr >= 2) return -EINVAL; if (vamos_is_secondary) cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr); - else { - cbits = 0x02; - cbits += lchan_nr; - } + else + cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: @@ -488,21 +486,19 @@ lchan_nr = 0; else if (lchan_nr > 4) return -EINVAL; - cbits = 0x04; - cbits += lchan_nr; + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: if (lchan_nr >= 8) return -EINVAL; - cbits = 0x08; - cbits += lchan_nr; + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); break; default: case GSM_PCHAN_CCCH: if (lchan_nr != 0) return -EINVAL; - cbits = 0x10; + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9370d8d7f13cce0f9c6e60a920d04161a7d6844 Gerrit-Change-Number: 35289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: gsm_data: fix wrong variable set in gsm_pchan2chan_nr()
by fixeria 08 Dec '23

08 Dec '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email ) Change subject: gsm_data: fix wrong variable set in gsm_pchan2chan_nr() ...................................................................... gsm_data: fix wrong variable set in gsm_pchan2chan_nr() I believe the actual intention was to reset the 'lchan_nr' variable, and not the 'chan_nr'. The 'lchan_nr' is used to compose the 'cbits': cbits = 0x04; cbits += lchan_nr; If the value is 4, then the result is: cbits = 0x04 + 4 = 0x08 which corresponds to SDCCH8 (not SDCCH4), and is clearly wrong. Change-Id: Ic9c7c2e46e24dab0b721221e9adcbbae2ca56d23 Fixes: ec1b5a0e9 "gsm_ts2chan_nr(): add assertions for lchan_nr" Fixes: CID#336586 --- M src/osmo-bsc/gsm_data.c 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/88/35288/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 580fa84..4d77e75 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -485,8 +485,8 @@ * See osmo-bts-xxx/oml.c:opstart_compl(). */ if (lchan_nr == CCCH_LCHAN) - chan_nr = 0; - else if (lchan_nr >= 4) + lchan_nr = 0; + else if (lchan_nr > 4) return -EINVAL; cbits = 0x04; cbits += lchan_nr; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35288?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9c7c2e46e24dab0b721221e9adcbbae2ca56d23 Gerrit-Change-Number: 35288 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

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

08 Dec '23

pespin has uploaded this change for review. ( 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 ...................................................................... stream_srv_link: osmo_stream_srv_link_get_sockname() now returns the full set of addresses As a result, internal stream_srv_link logging will also show the whole set of listening addresses. This is mostly fine since it mainly happens only once, during connection accept(), and this way it provides full view of where from and where to the client connected. Related: SYS#5581 Change-Id: I216502a9aeafe638940f110bc9fddf2504b2ac3a --- M src/stream_srv.c 1 file changed, 47 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/87/35287/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 0dca10a..98b996b 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -85,7 +85,7 @@ struct osmo_stream_srv_link { struct osmo_fd ofd; char *name; - char sockname[OSMO_SOCK_NAME_MAXLEN]; + char sockname[OSMO_STREAM_MAX_ADDRS * INET6_ADDRSTRLEN + OSMO_STREAM_MAX_ADDRS + 2 + 6 + 1]; char *addr[OSMO_STREAM_MAX_ADDRS]; uint8_t addrcnt; uint16_t port; @@ -338,22 +338,42 @@ return link->data; } +/* Similar to osmo_sock_multiaddr_get_name_buf(), but aimed at listening sockets (only local part): */ +static char *get_local_sockname_buf(char *buf, size_t buf_len, int fd, int proto) +{ + char hostbuf[OSMO_STREAM_MAX_ADDRS][INET6_ADDRSTRLEN]; + size_t num_hostbuf = ARRAY_SIZE(hostbuf); + char portbuf[6]; + struct osmo_strbuf sb = { .buf = buf, .len = buf_len }; + bool need_more_bufs; + int rc; + + rc = osmo_sock_multiaddr_get_ip_and_port(fd, proto, &hostbuf[0][0], + &num_hostbuf, sizeof(hostbuf[0]), + portbuf, sizeof(portbuf), true); + if (rc < 0) + return NULL; + + need_more_bufs = num_hostbuf > ARRAY_SIZE(hostbuf); + if (need_more_bufs) + num_hostbuf = ARRAY_SIZE(hostbuf); + OSMO_STRBUF_APPEND(sb, osmo_multiaddr_ip_and_port_snprintf, + &hostbuf[0][0], num_hostbuf, sizeof(hostbuf[0]), portbuf); + if (need_more_bufs) + OSMO_STRBUF_PRINTF(sb, "<need-more-bufs!>"); + + return buf; +} + /*! \brief Get description of the stream server link e. g. 127.0.0.1:1234 * \param[in] link Stream Server Link to examine * \returns Link description or NULL in case of error */ char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link) { - static char buf[INET6_ADDRSTRLEN + 6]; - int rc = osmo_sock_get_local_ip(link->ofd.fd, buf, INET6_ADDRSTRLEN); - if (rc < 0) - return NULL; + static char buf[sizeof(link->sockname)]; - buf[strnlen(buf, INET6_ADDRSTRLEN + 6)] = ':'; - - rc = osmo_sock_get_local_ip_port(link->ofd.fd, buf + strnlen(buf, INET6_ADDRSTRLEN + 6), 6); - if (rc < 0) - return NULL; - + if (!get_local_sockname_buf(buf, sizeof(buf), link->ofd.fd, link->proto)) + OSMO_STRLCPY_ARRAY(buf, "<sockname-error>"); return buf; } @@ -443,7 +463,7 @@ return -EIO; } - OSMO_STRLCPY_ARRAY(link->sockname, osmo_stream_srv_link_get_sockname(link)); + get_local_sockname_buf(link->sockname, sizeof(link->sockname), link->ofd.fd, link->proto); return 0; } -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_cli: Introduce API osmo_stream_srv_get_sockname()
by pespin 08 Dec '23

08 Dec '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/libosmo-netif/+/35286?usp=email ) Change subject: stream_cli: Introduce API osmo_stream_srv_get_sockname() ...................................................................... stream_cli: Introduce API osmo_stream_srv_get_sockname() Similar to what osmo_stream_srv_link and osmo_stream_cli already have. Change-Id: I171befd1fdf40c3cbb3fc7e4c3eedf82128b0712 Related: SYS#5580 --- M TODO-RELEASE M include/osmocom/netif/stream.h M src/stream_srv.c 3 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/86/35286/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35286?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: I171befd1fdf40c3cbb3fc7e4c3eedf82128b0712 Gerrit-Change-Number: 35286 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream_cli: Introduce API osmo_stream_srv_get_sockname()
by pespin 08 Dec '23

08 Dec '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35286?usp=email ) Change subject: stream_cli: Introduce API osmo_stream_srv_get_sockname() ...................................................................... stream_cli: Introduce API osmo_stream_srv_get_sockname() Similar to what osmo_stream_srv_link and osmo_stream_cli already have. Change-Id: I171befd1fdf40c3cbb3fc7e4c3eedf82128b0712 Related: SYS#5580 --- M include/osmocom/netif/stream.h M src/stream_srv.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/86/35286/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 681f9ec..2e6aa97 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -64,6 +64,7 @@ void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, int (*closed_cb)(struct osmo_stream_srv *conn)); void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn); struct osmo_stream_srv_link *osmo_stream_srv_get_master(struct osmo_stream_srv *conn); +const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn); struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv); int osmo_stream_srv_get_fd(const struct osmo_stream_srv *srv); void osmo_stream_srv_destroy(struct osmo_stream_srv *conn); diff --git a/src/stream_srv.c b/src/stream_srv.c index f5a0b42..0dca10a 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -836,6 +836,19 @@ return conn->data; } +/*! \brief Get the stream server socket description. + * \param[in] cli Stream Server to examine + * \returns Socket description or NULL in case of error */ +const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn) +{ + static char buf[OSMO_STREAM_MAX_ADDRS * OSMO_SOCK_NAME_MAXLEN]; + + osmo_sock_multiaddr_get_name_buf(buf, sizeof(buf), + osmo_stream_srv_get_fd(conn), conn->srv->proto); + + return buf; +} + /*! \brief Get Osmocom File Descriptor of the stream server * \param[in] conn Stream Server * \returns Pointer to \ref osmo_fd */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35286?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: I171befd1fdf40c3cbb3fc7e4c3eedf82128b0712 Gerrit-Change-Number: 35286 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_cli: osmo_stream_cli_get_sockname() now returns the full set o...
by pespin 08 Dec '23

08 Dec '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/35285?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: stream_cli: osmo_stream_cli_get_sockname() now returns the full set of addresses ...................................................................... stream_cli: osmo_stream_cli_get_sockname() now returns the full set of addresses This is used by API callers, and internally to log connected/disconnected events. Related: SYS#5581 Change-Id: I249ee7cad824cf971faabe06d10de2426c1b0c8b --- M TODO-RELEASE M src/stream_cli.c 2 files changed, 18 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/85/35285/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35285?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: I249ee7cad824cf971faabe06d10de2426c1b0c8b Gerrit-Change-Number: 35285 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream_cli: osmo_stream_cli_get_sockname() now returns the full set o...
by pespin 08 Dec '23

08 Dec '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35285?usp=email ) Change subject: stream_cli: osmo_stream_cli_get_sockname() now returns the full set of addresses ...................................................................... stream_cli: osmo_stream_cli_get_sockname() now returns the full set of addresses This is used by API callers, and internally to log connected/disconnected events. Related: SYS#5581 Change-Id: I249ee7cad824cf971faabe06d10de2426c1b0c8b --- M src/stream_cli.c 1 file changed, 16 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/85/35285/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 4f2963d..1b9994c 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -685,9 +685,10 @@ * \returns Socket description or NULL in case of error */ char *osmo_stream_cli_get_sockname(const struct osmo_stream_cli *cli) { - static char buf[OSMO_SOCK_NAME_MAXLEN]; + static char buf[OSMO_STREAM_MAX_ADDRS * OSMO_SOCK_NAME_MAXLEN]; - osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_get_fd(cli)); + osmo_sock_multiaddr_get_name_buf(buf, sizeof(buf), + osmo_stream_cli_get_fd(cli), cli->proto); return buf; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35285?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: I249ee7cad824cf971faabe06d10de2426c1b0c8b Gerrit-Change-Number: 35285 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

2025

2024

2023

2022

gerrit-log December 2023