Attention is currently required from: fixeria.
daniel has posted comments on 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()
......................................................................
Patch Set 1: Code-Review+2
--
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: 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:03:15 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: daniel.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35281?usp=email )
Change subject: vty: Introduce show cs7 instance asp-remaddr
......................................................................
Patch Set 2:
(1 comment)
Patchset:
PS2:
> Could you show include some VTY example output in the commit message?
Check SYS#6636
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35281?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ie5ac1d0ee74d2b977b1f5319cd88566df7994fd0
Gerrit-Change-Number: 35281
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Dec 2023 13:02:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( 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(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/30/35330/1
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-MessageType: newchange
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:
(3 comments)
File src/stream_srv.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/9843106a_da6d1729
PS3, Line 364: "<need-more-bufs!>"
This string (or some part of it) may not make it to the output buffer if there is not enough room in `hostbuf[][]`. Do you think it's fine to return a result mixed up with an error message, which may not even fit?
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/18818ce0_e0d91e9c
PS3, Line 371: NULL in case of error
this is no longer true
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/9e50c074_1132561f
PS3, Line 467: get_local_sockname_buf
Do we want to check return value against NULL here?
Or somehow make sure that we do not end up with `link->sockname` being `<some-error>`.
--
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 12:58:43 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: pespin.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35281?usp=email )
Change subject: vty: Introduce show cs7 instance asp-remaddr
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
Patchset:
PS2:
Could you show include some VTY example output in the commit message?
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35281?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ie5ac1d0ee74d2b977b1f5319cd88566df7994fd0
Gerrit-Change-Number: 35281
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Dec 2023 12:58:11 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
pespin 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/f682d163_62a805ea
PS3, Line 89: char sockname[OSMO_STREAM_MAX_ADDRS * INET6_ADDRSTRLEN + OSMO_STREAM_MAX_ADDRS + 2 + 6 + 1];
> I see this magic combination being used again in https://gerrit.osmocom.org/c/libosmo-sccp/+/35242. […]
I'm not sure it's worth it, it's not like you are using it everywhere, and it's really related to the output string.
--
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: osmith <osmith(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Dec 2023 12:35:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: comment