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

[S] Change in libosmo-sccp[master]: asp,xua_srv: Use new osmo_stream API to request sockopt SCTP AUTH/ASC...

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34352?usp=email ) Change subject: asp,xua_srv: Use new osmo_stream API to request sockopt SCTP AUTH/ASCONF SUPPORTED ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34352?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: I16c97fc148792aa3e39b7414899660990c39dfff Gerrit-Change-Number: 34352 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Sep 2023 07:45:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add new stream_{cli,srv_link} parameters to set SCTP_INITMSG ...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34348?usp=email ) Change subject: stream: Add new stream_{cli,srv_link} parameters to set SCTP_INITMSG sockopt values ...................................................................... Patch Set 2: Code-Review+1 (2 comments) File include/osmocom/netif/stream.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34348/comment/0f33effa_b8c242b7 PS2, Line 48: OSMO_STREAM_SRV_LINK_PAR_SCTP_INIT_NUM_OSTREAMS Specify the value type (`uint16_t`) in comments like above? https://gerrit.osmocom.org/c/libosmo-netif/+/34348/comment/dbbd361e_449132ae PS2, Line 122: OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS Specify the value type (`uint16_t`) in comments like above? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34348?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: I5343c7659881b29e0201e72badbc2d07e1ef2dca Gerrit-Change-Number: 34348 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Sep 2023 07:37:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Introduce API to set several transport parameters

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34347?usp=email ) Change subject: stream: Introduce API to set several transport parameters ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34347?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: I2607c1c926a625986cd851adc65dd8b4de83d6ab Gerrit-Change-Number: 34347 Gerrit-PatchSet: 2 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Sep 2023 07:26:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Use new libosmocore API osmo_sock_init2_multiaddr2()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34345?usp=email ) Change subject: stream: Use new libosmocore API osmo_sock_init2_multiaddr2() ...................................................................... stream: Use new libosmocore API osmo_sock_init2_multiaddr2() Use the new API available in libosmocore to set sockopts related to ASCONF SCTP features. The old flag OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED has been dropped. This only affects master builds since there's no release ever done with that flag defined. Depends: libosmocore.git Change-Id I1f6fd09a79b0a2bd794e5669d933be25bbf1eeaa Related: SYS#6501 Related: SYS#6558 Change-Id: I2b2073de72625b4f4f99892179c9406163d28592 --- M TODO-RELEASE M src/stream_cli.c M src/stream_srv.c 3 files changed, 57 insertions(+), 8 deletions(-) Approvals: pespin: Looks good to me, approved; Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index a4b381f..830e77b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,5 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmocore >1.8.0 osmo_iofd +libosmocore >1.8.0 osmo_iofd, osmo_sock_init2_multiaddr2() stream NEW API osmo_stream_srv_link_set_name(), osmo_stream_srv_set_name(), osmo_stream_cli_set_name() \ No newline at end of file diff --git a/src/stream_cli.c b/src/stream_cli.c index b5ef66c..8f18bfb 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -733,6 +733,9 @@ */ int osmo_stream_cli_open2(struct osmo_stream_cli *cli, int reconnect) { +#ifdef HAVE_LIBSCTP + struct osmo_sock_init2_multiaddr_pars ma_pars; +#endif int ret; /* we are reconfiguring this socket, close existing first. */ @@ -744,10 +747,18 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - ret = osmo_sock_init2_multiaddr(AF_UNSPEC, SOCK_STREAM, cli->proto, + ma_pars = (struct osmo_sock_init2_multiaddr_pars){ + .sctp = { + .version = 0, + .sockopt_auth_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + .sockopt_asconf_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + } + }; + ret = osmo_sock_init2_multiaddr2(AF_UNSPEC, SOCK_STREAM, cli->proto, (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port, (const char **)cli->addr, cli->addrcnt, cli->port, - OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK|OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED); + OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK, + &ma_pars); break; #endif default: @@ -805,6 +816,9 @@ * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { +#ifdef HAVE_LIBSCTP + struct osmo_sock_init2_multiaddr_pars ma_pars; +#endif int ret, fd = -1; /* we are reconfiguring this socket, close existing first. */ @@ -823,10 +837,18 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - ret = osmo_sock_init2_multiaddr(cli->sk_domain, cli->sk_type, cli->proto, + ma_pars = (struct osmo_sock_init2_multiaddr_pars){ + .sctp = { + .version = 0, + .sockopt_auth_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + .sockopt_asconf_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + } + }; + ret = osmo_sock_init2_multiaddr2(cli->sk_domain, cli->sk_type, cli->proto, (const char **)cli->local_addr, cli->local_addrcnt, cli->local_port, (const char **)cli->addr, cli->addrcnt, cli->port, - OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK|OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED); + OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_BIND|OSMO_SOCK_F_NONBLOCK, + &ma_pars); break; #endif default: diff --git a/src/stream_srv.c b/src/stream_srv.c index f46175b..9818864 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -387,6 +387,9 @@ * \return negative on error, 0 on success */ int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link) { +#ifdef HAVE_LIBSCTP + struct osmo_sock_init2_multiaddr_pars ma_pars; +#endif int ret; if (link->ofd.fd >= 0) { @@ -409,9 +412,16 @@ switch (link->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - ret = osmo_sock_init2_multiaddr(link->sk_domain, link->sk_type, link->proto, - (const char **)link->addr, link->addrcnt, link->port, - NULL, 0, 0, OSMO_SOCK_F_BIND|OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED); + ma_pars = (struct osmo_sock_init2_multiaddr_pars){ + .sctp = { + .version = 0, + .sockopt_auth_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + .sockopt_asconf_supported = {.set = true, .abort_on_failure = false, .value = 1 }, + } + }; + ret = osmo_sock_init2_multiaddr2(link->sk_domain, link->sk_type, link->proto, + (const char **)link->addr, link->addrcnt, link->port, + NULL, 0, 0, OSMO_SOCK_F_BIND, &ma_pars); break; #endif default: -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34345?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: I2b2073de72625b4f4f99892179c9406163d28592 Gerrit-Change-Number: 34345 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Use new libosmocore API osmo_sock_init2_multiaddr2()

by pespin

Attention is currently required from: fixeria. pespin has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34345?usp=email ) Change subject: stream: Use new libosmocore API osmo_sock_init2_multiaddr2() ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34345?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: I2b2073de72625b4f4f99892179c9406163d28592 Gerrit-Change-Number: 34345 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Use new libosmocore API osmo_sock_init2_multiaddr2()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34345?usp=email ) Change subject: stream: Use new libosmocore API osmo_sock_init2_multiaddr2() ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34345?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: I2b2073de72625b4f4f99892179c9406163d28592 Gerrit-Change-Number: 34345 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Sep 2023 23:09:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Use new libosmocore API osmo_sock_init2_multiaddr2()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34345?usp=email ) Change subject: stream: Use new libosmocore API osmo_sock_init2_multiaddr2() ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Merging, the OBS failures are due to not waiting enough for new libosmocore to rebuild. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34345?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: I2b2073de72625b4f4f99892179c9406163d28592 Gerrit-Change-Number: 34345 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Sep 2023 23:09:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Support setsokopt SCTP_INITMSG in osmo_sock_init2_multiaddr2()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34346?usp=email ) Change subject: socket: Support setsokopt SCTP_INITMSG in osmo_sock_init2_multiaddr2() ...................................................................... socket: Support setsokopt SCTP_INITMSG in osmo_sock_init2_multiaddr2() This allows setting several socket paramets which can only be set before SCTP INIT phase (connect()). Since no release with osmo_sock_init2_multiaddr2() happened yet, we are allowed to extend struct osmo_sock_init2_multiaddr_pars without bumping the version field. Related: SYS#6558 Change-Id: Ibc55932d954279927d1e70ccce1e8bf32b180d44 --- M include/osmocom/core/socket.h M src/core/socket.c 2 files changed, 83 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index ba986f8..bbf828f 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -130,6 +130,18 @@ bool abort_on_failure; uint32_t value; } sockopt_asconf_supported; + struct { + bool set; + bool abort_on_failure; + bool num_ostreams_present; + bool max_instreams_present; + bool max_attempts_present; + bool max_init_timeo_present; + uint16_t num_ostreams_value; + uint16_t max_instreams_value; + uint16_t max_attempts_value; + uint16_t max_init_timeo_value; + } sockopt_initmsg; } sctp; }; }; diff --git a/src/core/socket.c b/src/core/socket.c index 65da203..024757f 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -726,6 +726,46 @@ #endif } +static int setsockopt_sctp_initmsg(int fd, const struct osmo_sock_init2_multiaddr_pars *pars) +{ + if (!pars->sctp.sockopt_initmsg.num_ostreams_present && + !pars->sctp.sockopt_initmsg.max_instreams_present && + !pars->sctp.sockopt_initmsg.max_attempts_present && + !pars->sctp.sockopt_initmsg.max_init_timeo_present) + return 0; /* nothing to set/do */ + +#ifdef SCTP_INITMSG + struct sctp_initmsg si = {0}; + socklen_t si_len = sizeof(si); + int rc; + + /* If at least one field not present, obtain current value from kernel: */ + if (!pars->sctp.sockopt_initmsg.num_ostreams_present || + !pars->sctp.sockopt_initmsg.max_instreams_present || + !pars->sctp.sockopt_initmsg.max_attempts_present || + !pars->sctp.sockopt_initmsg.max_init_timeo_present) { + rc = getsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &si, &si_len); + if (rc < 0) + return rc; + } + + if (pars->sctp.sockopt_initmsg.num_ostreams_present) + si.sinit_num_ostreams = pars->sctp.sockopt_initmsg.num_ostreams_value; + if (pars->sctp.sockopt_initmsg.max_instreams_present) + si.sinit_max_instreams = pars->sctp.sockopt_initmsg.max_instreams_value; + if (pars->sctp.sockopt_initmsg.max_attempts_present) + si.sinit_max_attempts = pars->sctp.sockopt_initmsg.max_attempts_value; + if (pars->sctp.sockopt_initmsg.max_init_timeo_present) + si.sinit_max_init_timeo = pars->sctp.sockopt_initmsg.max_init_timeo_value; + + return setsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &si, sizeof(si)); +#else +#pragma message "setsockopt(SCTP_INITMSG) not supported! some SCTP features may not be available!" + LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_INITMSG), skipping\n"); + return -ENOTSUP +#endif +} + /*! Initialize a socket (including bind and/or connect) with multiple local or remote addresses. * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM @@ -907,6 +947,20 @@ } } + if (pars && pars->sctp.sockopt_initmsg.set) { + rc = setsockopt_sctp_initmsg(sfd, pars); + if (rc < 0) { + int err = errno; + multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt); + LOGP(DLGLOBAL, LOGL_ERROR, + "cannot setsockopt(SCTP_INITMSG) socket: %s:%u: %s\n", + strbuf, local_port, strerror(err)); + if (pars->sctp.sockopt_initmsg.abort_on_failure) + goto ret_close; + /* do not fail, some parameters will be left as the global default */ + } + } + /* Build array of addresses taking first entry for each host. TODO: Ideally we should use backtracking storing last used indexes and trying next combination if connect() fails .*/ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34346?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: Ibc55932d954279927d1e70ccce1e8bf32b180d44 Gerrit-Change-Number: 34346 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Remove OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED, add osmo_sock_init2...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34344?usp=email ) Change subject: socket: Remove OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED, add osmo_sock_init2_multiaddr2() ...................................................................... socket: Remove OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED, add osmo_sock_init2_multiaddr2() The OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED flag was added recently to enable use of ASCONF in osmo_sock_inti2_multiaddr. Since we didn't release yet, we are still in time to get rid of this flag. It turns out that we'll want to add more features which must be set before SCTP INIT (connect()) time, like setsockopt SCTP_INITMSG, which in turn contains a struct with several parameters. Hence, adding flags for all those makes no sense. Instead, add a new API which allows passing an extensible struct which allows much more fine-grained setup from the caller. The new struct "pars" parameter is non-const on purpose, in order to be able to extend the struct in the future if we wish to get/obtain some data from the socket. Related: SYS#6501 Related: SYS#6558 Change-Id: I1f6fd09a79b0a2bd794e5669d933be25bbf1eeaa --- M TODO-RELEASE M include/osmocom/core/socket.h M src/core/libosmocore.map M src/core/socket.c 4 files changed, 105 insertions(+), 13 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index f78104e..2d9e32e 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -17,4 +17,5 @@ libosmogsm MODIFY osmo_auth_impl callback function signature change. No known external users libosmogsm ADD osmo_auth_c2 libosmogsm ADD OSMO_AUTH_ALG_TUAK -libosmogsm ADD new API msgb_tv32_push() \ No newline at end of file +libosmogsm ADD new API msgb_tv32_push() +libosmocore ADD osmo_sock_init2_multiaddr2() \ No newline at end of file diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index c68bb6f..ba986f8 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -14,6 +14,8 @@ #include <arpa/inet.h> +#include <osmocom/core/defs.h> + /*! 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) @@ -94,8 +96,6 @@ #define OSMO_SOCK_F_NO_MCAST_ALL (1 << 4) /*! use SO_REUSEADDR on UDP ports (required for multicast) */ #define OSMO_SOCK_F_UDP_REUSEADDR (1 << 5) -/*! use SCTP_AUTH_SUPPORTED + SCTP_ASCONF_SUPPORTED on SCTP socket (required for ASCONF / Peer Primary Address feature) */ -#define OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED (1 << 6) /*! use OSMO_SOCK_F_DSCP(x) to set IP DSCP 'x' for packets transmitted on the socket */ #define OSMO_SOCK_F_DSCP(x) (((x)&0x3f) << 24) @@ -116,9 +116,32 @@ const char *local_host, uint16_t local_port, const char *remote_host, uint16_t remote_port, unsigned int flags); +struct osmo_sock_init2_multiaddr_pars { + union { + struct { + uint8_t version; /* set to 0 */ + struct { + bool set; + bool abort_on_failure; + uint32_t value; + } sockopt_auth_supported; + struct { + bool set; + bool abort_on_failure; + uint32_t value; + } sockopt_asconf_supported; + } sctp; + }; +}; int osmo_sock_init2_multiaddr(uint16_t family, uint16_t type, uint8_t proto, const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port, - const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags); + const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags) + OSMO_DEPRECATED_OUTSIDE("Use osmo_sock_init2_multiaddr2() instead"); +int osmo_sock_init2_multiaddr2(uint16_t family, uint16_t type, uint8_t proto, + const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port, + const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, + unsigned int flags, struct osmo_sock_init2_multiaddr_pars *pars); + int osmo_sock_init_osa(uint16_t type, uint8_t proto, const struct osmo_sockaddr *local, diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 99be86c..c0e164b 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -419,6 +419,7 @@ osmo_sock_init; osmo_sock_init2; osmo_sock_init2_multiaddr; +osmo_sock_init2_multiaddr2; osmo_sock_init2_ofd; osmo_sock_init_ofd; osmo_sock_init_osa; diff --git a/src/core/socket.c b/src/core/socket.c index 3c2ba50..65da203 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -696,33 +696,33 @@ return 0; } -static int setsockopt_sctp_auth_supported(int fd) +static int setsockopt_sctp_auth_supported(int fd, uint32_t val) { #ifdef SCTP_AUTH_SUPPORTED struct sctp_assoc_value assoc_val = { .assoc_id = SCTP_FUTURE_ASSOC, - .assoc_value = 1, + .assoc_value = val, }; return setsockopt(fd, IPPROTO_SCTP, SCTP_AUTH_SUPPORTED, &assoc_val, sizeof(assoc_val)); #else #pragma message "setsockopt(SCTP_AUTH_SUPPORTED) not supported! some SCTP features may not be available!" LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_AUTH_SUPPORTED), skipping\n"); - return 0; + return -ENOTSUP; #endif } -static int setsockopt_sctp_asconf_supported(int fd) +static int setsockopt_sctp_asconf_supported(int fd, uint32_t val) { #ifdef SCTP_ASCONF_SUPPORTED struct sctp_assoc_value assoc_val = { .assoc_id = SCTP_FUTURE_ASSOC, - .assoc_value = 1, + .assoc_value = val, }; return setsockopt(fd, IPPROTO_SCTP, SCTP_ASCONF_SUPPORTED, &assoc_val, sizeof(assoc_val)); #else #pragma message "setsockopt(SCTP_ASCONF_SUPPORTED) not supported! some SCTP features may not be available!" LOGP(DLGLOBAL, LOGL_NOTICE, "Built without support for setsockopt(SCTP_ASCONF_SUPPORTED), skipping\n"); - return 0; + return -ENOTSUP; #endif } @@ -750,6 +750,38 @@ const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port, const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, unsigned int flags) +{ + return osmo_sock_init2_multiaddr2(family, type, proto, local_hosts, local_hosts_cnt, local_port, + remote_hosts, remote_hosts_cnt, remote_port, flags, NULL); +} + +/*! Initialize a socket (including bind and/or connect) with multiple local or remote addresses. + * \param[in] family Address Family like AF_INET, AF_INET6, AF_UNSPEC + * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM + * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP + * \param[in] local_hosts array of char pointers (strings), each containing local host name or IP address in string form + * \param[in] local_hosts_cnt length of local_hosts (in items) + * \param[in] local_port local port number in host byte order + * \param[in] remote_host array of char pointers (strings), each containing remote host name or IP address in string form + * \param[in] remote_hosts_cnt length of remote_hosts (in items) + * \param[in] remote_port remote port number in host byte order + * \param[in] flags flags like \ref OSMO_SOCK_F_CONNECT + * \param[in] pars Extra parameters for multi-address specific protocols, such as SCTP. Can be NULL. + * \returns socket file descriptor on success; negative on error + * + * This function is similar to \ref osmo_sock_init2(), but can be passed an + * array of local or remote addresses for protocols supporting multiple + * addresses per socket, like SCTP (currently only one supported). This function + * should not be used by protocols not supporting this kind of features, but + * rather \ref osmo_sock_init2() should be used instead. + * See \ref osmo_sock_init2() for more information on flags and general behavior. + * + * pars: If "pars" parameter is passed to the function, sctp.version shall be set to 0. + */ +int osmo_sock_init2_multiaddr2(uint16_t family, uint16_t type, uint8_t proto, + const char **local_hosts, size_t local_hosts_cnt, uint16_t local_port, + const char **remote_hosts, size_t remote_hosts_cnt, uint16_t remote_port, + unsigned int flags, struct osmo_sock_init2_multiaddr_pars *pars) { struct addrinfo *res_loc[OSMO_SOCK_MAX_ADDRS], *res_rem[OSMO_SOCK_MAX_ADDRS]; @@ -769,6 +801,9 @@ if (proto != IPPROTO_SCTP) return -ENOTSUP; + if (pars && pars->sctp.version != 0) + return -EINVAL; + if ((flags & (OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT)) == 0) { LOGP(DLGLOBAL, LOGL_ERROR, "invalid: you have to specify either " "BIND or CONNECT flags\n"); @@ -841,26 +876,32 @@ goto ret_close; } - if (flags & OSMO_SOCK_F_SCTP_ASCONF_SUPPORTED) { + if (pars && pars->sctp.sockopt_auth_supported.set) { /* RFC 5061 4.2.7: ASCONF also requires AUTH feature. */ - rc = setsockopt_sctp_auth_supported(sfd); + rc = setsockopt_sctp_auth_supported(sfd, pars->sctp.sockopt_auth_supported.value); if (rc < 0) { int err = errno; multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt); LOGP(DLGLOBAL, LOGL_ERROR, "cannot setsockopt(SCTP_AUTH_SUPPORTED) socket: %s:%u: %s\n", strbuf, local_port, strerror(err)); + if (pars->sctp.sockopt_auth_supported.abort_on_failure) + goto ret_close; /* do not fail, some features such as Peer Primary Address won't be available * unless configured system-wide through sysctl */ } + } - rc = setsockopt_sctp_asconf_supported(sfd); + if (pars && pars->sctp.sockopt_asconf_supported.set) { + rc = setsockopt_sctp_asconf_supported(sfd, pars->sctp.sockopt_asconf_supported.value); if (rc < 0) { int err = errno; multiaddr_snprintf(strbuf, sizeof(strbuf), local_hosts, local_hosts_cnt); LOGP(DLGLOBAL, LOGL_ERROR, "cannot setsockopt(SCTP_ASCONF_SUPPORTED) socket: %s:%u: %s\n", strbuf, local_port, strerror(err)); + if (pars->sctp.sockopt_asconf_supported.abort_on_failure) + goto ret_close; /* do not fail, some features such as Peer Primary Address won't be available * unless configured system-wide through sysctl */ } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34344?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: I1f6fd09a79b0a2bd794e5669d933be25bbf1eeaa Gerrit-Change-Number: 34344 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[S] Change in libosmo-sccp[master]: asp,xua_srv: Use new osmo_stream API to request sockopt SCTP AUTH/ASC...

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34352?usp=email ) Change subject: asp,xua_srv: Use new osmo_stream API to request sockopt SCTP AUTH/ASCONF SUPPORTED ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I need a +2 on this one so I can merge it together with libosmocore + libosmo-netif patches. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34352?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: I16c97fc148792aa3e39b7414899660990c39dfff Gerrit-Change-Number: 34352 Gerrit-PatchSet: 2 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Sun, 10 Sep 2023 23:00:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023