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
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
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
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
Attention is currently required from: neels.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35329?usp=email )
Change subject: rua: validate correct RUA ctx state per RUA message type
......................................................................
Patch Set 2: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35329?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Ie359fcada98fb19f56015cf462e6d8c039f5fce5
Gerrit-Change-Number: 35329
Gerrit-PatchSet: 2
Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Dec 2023 13:14:07 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35284?usp=email )
Change subject: vty: Introduce show cs7 instance asp-assoc-status
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35284?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: I96ef4c0500991c9b86ab5991fb338ea20a18ff33
Gerrit-Change-Number: 35284
Gerrit-PatchSet: 1
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 13:13:30 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
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:
(1 comment)
Patchset:
PS2:
> Check SYS#6636
Thanks! Doesn't seem to be this commit, but in the issue the output of `show cs7 instance 0 asp` seems to be a bit weird:
```
asp-dyn-2 as-rkm-1 ASP_ACTIVE m3ua sg server (::ffff:192.168.30.1|::ffff:127.0.0.1|::ffff:192.168.123.1|::1):2905 [::1%1]:51114
asp-dyn-3 as-rkm-2 ASP_ACTIVE m3ua sg server (::ffff:192.168.30.1|::ffff:127.0.0.1|::ffff:192.168.123.1|::1):2905 [::1%1]:55729
```
Note the ::1%1 which is not there in the other commands:
```
OsmoSTP> show cs7 instance 0 asp-remaddr
ASP Name Remote IP Address & Port State CWND SRTT RTO MTU
------------ ---------------------------------------------- ----------------------- -------- -------- -------- --------
ipa-asp-0 [::ffff:127.0.0.2]:20000 TCP_ESTABLISHED 10 20 203333 65535
asp-dyn-1 [::ffff:127.0.0.2]:3000 SCTP_ACTIVE 131064 7 1000 65532
asp-dyn-1 [::1]:3000 SCTP_ACTIVE 262128 0 1000 65536
asp-dyn-2 [::1]:51114 SCTP_ACTIVE 131072 0 1000 65536
asp-dyn-3 [::1]:55729 SCTP_ACTIVE 131072 0 1000 65536
```
--
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 13:10:59 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: fixeria, laforge, 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:
(4 comments)
File src/stream_srv.c:
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/f5d0d3b2_5dff3ce7
PS3, Line 89: char sockname[OSMO_STREAM_MAX_ADDRS * INET6_ADDRSTRLEN + OSMO_STREAM_MAX_ADDRS + 2 + 6 + 1];
> I'm not sure it's worth it, it's not like you are using it everywhere, and it's really related to th […]
I ended up adding it here: https://gerrit.osmocom.org/c/libosmocore/+/35330 socket: Introduce defines OSMO_SOCK_MULTIADDR_{PEER_STR,NAME}_MAXLEN
I will rework these commits once that one is merged.
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/5cf1a9af_af644580
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 […]
* result mixed with an error message: better than return silently a truncated output.
* may not even fit: need_more_bufs is printed in the event not enough buffers were provided to obtain the list of addresses, not if the output buffer is not long enough. IIRC right now the kernel has a limit of 32 addresses at SCTP level, so in general we are save here. But in the event something is really wrong in really big setups, better print this.
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/6395e0dd_df5056b2
PS3, Line 371: NULL in case of error
> this is no longer true
the fact that the implementation internally doesn't fail right now doesn't mean I should change the API. I think it's good to keep users checking for errors in APIs which may change implementations, like this one.
https://gerrit.osmocom.org/c/libosmo-netif/+/35287/comment/7b9a158e_74d821bc
PS3, Line 467: get_local_sockname_buf
> Do we want to check return value against NULL here? […]
what would you suggest to do instead? I don't see anything interesting/worth here.
--
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: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Dec 2023 13:08:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: osmith <osmith(a)sysmocom.de>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment