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

[S] Change in osmo-mgw[master]: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/34350?usp=email ) Change subject: mgcp_client_fsm: explain member param in struct mgcp_conn_peer better ...................................................................... mgcp_client_fsm: explain member param in struct mgcp_conn_peer better The struct member param specifies additional codec parameters. Let's improve its explaination. Change-Id: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Related: OS#5723 --- M include/osmocom/mgcp_client/mgcp_client_fsm.h 1 file changed, 15 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/50/34350/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_fsm.h b/include/osmocom/mgcp_client/mgcp_client_fsm.h index 0a5b8d5..245e0a7 100644 --- a/include/osmocom/mgcp_client/mgcp_client_fsm.h +++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h @@ -58,8 +58,8 @@ * address is set. If != MGCP_CONN_NONE, force this conn mode. */ enum mgcp_connection_mode conn_mode; - /*! If the codec requires additional format parameters (fmtp), those cann be set here, see also - * mgcp_common.h */ + /*! Global codec params. In case the codec requires additional format parameters (fmtp), those cann be set + * here, see also mgcp_common.h. The format parameters will be applied on all codecs where applicable. */ bool param_present; struct mgcp_codec_param param; }; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/34350?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: Iea4dc1e72fccaa464ce503fae88b5d8a867b1d19 Gerrit-Change-Number: 34350 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34347?usp=email ) Change subject: stream: Introduce API to set several transport parameters ...................................................................... stream: Introduce API to set several transport parameters This will allow extending capabilitites to set different parameters at the lower layers as we need them. This commit changes the behavior of osmo_stream_{cli,srv_link}: It now doesn't enable by default SCTP AUTH/ASCONF features using setsockopt. It is left up to the user of the API (libosmo-sccp in this case) to set it. Since this unilateral use of setsockopt() has only been added recently and we didn't release yet, it's fine changing it. libosmo-sccp will be changed to unconditionally set its using setsockopt. It is left up to the user of the API (libosmo-sccp in this case) to set it. Related: SYS#6501 Related: SYS#6558 Change-Id: I2607c1c926a625986cd851adc65dd8b4de83d6ab --- M TODO-RELEASE M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 4 files changed, 107 insertions(+), 34 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/47/34347/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 830e77b..084ca67 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,4 +8,5 @@ # 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, 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 +stream NEW API osmo_stream_srv_link_set_name(), osmo_stream_srv_set_name(), osmo_stream_cli_set_name() +stream NEW API osmo_stream_srv_link_set_param(), osmo_stream_cli_set_param() diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 6240205..f78df8a 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -2,6 +2,7 @@ #include <stdbool.h> #include <stdint.h> +#include <unistd.h> #include <osmocom/core/msgb.h> @@ -41,6 +42,14 @@ int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link); void osmo_stream_srv_link_close(struct osmo_stream_srv_link *link); +enum osmo_stream_srv_link_param { + OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ + OSMO_STREAM_SRV_LINK_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ +}; + +int osmo_stream_srv_link_set_param(struct osmo_stream_srv_link *link, enum osmo_stream_srv_link_param par, + void *val, size_t val_len); + /*! \brief Osmocom Stream Server: Single connection accept()ed via \ref * osmo_stream_srv_link */ struct osmo_stream_srv; @@ -105,4 +114,12 @@ void osmo_stream_cli_clear_tx_queue(struct osmo_stream_cli *cli); +enum osmo_stream_cli_param { + OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ + OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ +}; + +int osmo_stream_cli_set_param(struct osmo_stream_cli *cli, enum osmo_stream_cli_param par, + void *val, size_t val_len); + /*! @} */ diff --git a/src/stream_cli.c b/src/stream_cli.c index 8f18bfb..16d033e 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -122,6 +122,7 @@ void *data; int flags; int reconnect_timeout; + struct osmo_sock_init2_multiaddr_pars ma_pars; }; void osmo_stream_cli_close(struct osmo_stream_cli *cli); @@ -420,6 +421,8 @@ cli->reconnect_timeout = 5; /* default is 5 seconds. */ INIT_LLIST_HEAD(&cli->tx_queue); + cli->ma_pars.sctp.version = 0; + return cli; } @@ -733,9 +736,6 @@ */ 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. */ @@ -747,18 +747,11 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - 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, - &ma_pars); + &cli->ma_pars); break; #endif default: @@ -816,9 +809,6 @@ * \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. */ @@ -837,18 +827,11 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - 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, - &ma_pars); + &cli->ma_pars); break; #endif default: @@ -1018,4 +1001,32 @@ } } +int osmo_stream_cli_set_param(struct osmo_stream_cli *cli, enum osmo_stream_cli_param par, void *val, size_t val_len) +{ + OSMO_ASSERT(cli); + uint8_t val8; + + switch (par) { + case OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + val8 = *(uint8_t *)val; + cli->ma_pars.sctp.sockopt_auth_supported.set = true; + cli->ma_pars.sctp.sockopt_auth_supported.abort_on_failure = val8 > 1; + cli->ma_pars.sctp.sockopt_auth_supported.value = (val8 == 1 || val8 == 3) ? 1 : 0; + break; + case OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + val8 = *(uint8_t *)val; + cli->ma_pars.sctp.sockopt_asconf_supported.set = true; + cli->ma_pars.sctp.sockopt_asconf_supported.abort_on_failure = val8 > 1; + cli->ma_pars.sctp.sockopt_asconf_supported.value = (val8 == 1 || val8 == 3) ? 1 : 0; + break; + default: + return -ENOENT; + }; + return 0; +} + /*! @} */ diff --git a/src/stream_srv.c b/src/stream_srv.c index 9818864..e64142e 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -95,6 +95,7 @@ int (*accept_cb)(struct osmo_stream_srv_link *srv, int fd); void *data; int flags; + struct osmo_sock_init2_multiaddr_pars ma_pars; }; static int _setsockopt_nosigpipe(struct osmo_stream_srv_link *link, int new_fd) @@ -191,6 +192,8 @@ link->proto = IPPROTO_TCP; osmo_fd_setup(&link->ofd, -1, OSMO_FD_READ | OSMO_FD_WRITE, osmo_stream_srv_link_ofd_cb, link, 0); + link->ma_pars.sctp.version = 0; + return link; } @@ -387,9 +390,6 @@ * \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) { @@ -412,16 +412,9 @@ switch (link->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: - 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); + NULL, 0, 0, OSMO_SOCK_F_BIND, &link->ma_pars); break; #endif default: @@ -472,6 +465,35 @@ link->ofd.fd = -1; } +int osmo_stream_srv_link_set_param(struct osmo_stream_srv_link *link, enum osmo_stream_srv_link_param par, + void *val, size_t val_len) +{ + OSMO_ASSERT(link); + uint8_t val8; + + switch (par) { + case OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + val8 = *(uint8_t *)val; + link->ma_pars.sctp.sockopt_auth_supported.set = true; + link->ma_pars.sctp.sockopt_auth_supported.abort_on_failure = val8 > 1; + link->ma_pars.sctp.sockopt_auth_supported.value = (val8 == 1 || val8 == 3) ? 1 : 0; + break; + case OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED: + if (!val || val_len != sizeof(uint8_t)) + return -EINVAL; + val8 = *(uint8_t *)val; + link->ma_pars.sctp.sockopt_asconf_supported.set = true; + link->ma_pars.sctp.sockopt_asconf_supported.abort_on_failure = val8 > 1; + link->ma_pars.sctp.sockopt_asconf_supported.value = (val8 == 1 || val8 == 3) ? 1 : 0; + break; + default: + return -ENOENT; + }; + return 0; +} + #define OSMO_STREAM_SRV_F_FLUSH_DESTROY (1 << 0) struct osmo_stream_srv { -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Add new stream_cli parameters to set SCTP_INITMSG sockopt values

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34348?usp=email ) Change subject: stream: Add new stream_cli parameters to set SCTP_INITMSG sockopt values ...................................................................... stream: Add new stream_cli parameters to set SCTP_INITMSG sockopt values This will allow osmo_stream users (like libosmo-sccp) to set SCTP_INITMSG related parameters, like number on inbound/outbound streams, connect attempts, connect timeout. Related: SYS#6558 Change-Id: I5343c7659881b29e0201e72badbc2d07e1ef2dca --- M include/osmocom/netif/stream.h M src/stream_cli.c 2 files changed, 46 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/48/34348/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index f78df8a..b2ca1ca 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -117,6 +117,10 @@ enum osmo_stream_cli_param { OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_AUTH_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ OSMO_STREAM_CLI_PAR_SCTP_SOCKOPT_ASCONF_SUPPORTED, /* uint8_t: 0 disable, 1 enable, 2 force disable, 3 force enable */ + OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS, + OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS, + OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS, + OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT, }; int osmo_stream_cli_set_param(struct osmo_stream_cli *cli, enum osmo_stream_cli_param par, diff --git a/src/stream_cli.c b/src/stream_cli.c index 16d033e..23e1900 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -1023,6 +1023,34 @@ cli->ma_pars.sctp.sockopt_asconf_supported.abort_on_failure = val8 > 1; cli->ma_pars.sctp.sockopt_asconf_supported.value = (val8 == 1 || val8 == 3) ? 1 : 0; break; + case OSMO_STREAM_CLI_PAR_SCTP_INIT_NUM_OSTREAMS: + if (!val || val_len != sizeof(uint16_t)) + return -EINVAL; + cli->ma_pars.sctp.sockopt_initmsg.set = true; + cli->ma_pars.sctp.sockopt_initmsg.num_ostreams_present = true; + cli->ma_pars.sctp.sockopt_initmsg.num_ostreams_value = *(uint16_t *)val; + break; + case OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_INSTREAMS: + if (!val || val_len != sizeof(uint16_t)) + return -EINVAL; + cli->ma_pars.sctp.sockopt_initmsg.set = true; + cli->ma_pars.sctp.sockopt_initmsg.max_instreams_present = true; + cli->ma_pars.sctp.sockopt_initmsg.max_instreams_value = *(uint16_t *)val; + break; + case OSMO_STREAM_CLI_PAR_SCTP_INIT_MAX_ATTEMPTS: + if (!val || val_len != sizeof(uint16_t)) + return -EINVAL; + cli->ma_pars.sctp.sockopt_initmsg.set = true; + cli->ma_pars.sctp.sockopt_initmsg.max_attempts_present = true; + cli->ma_pars.sctp.sockopt_initmsg.max_attempts_value = *(uint16_t *)val; + break; + case OSMO_STREAM_CLI_PAR_SCTP_INIT_TIMEOUT: + if (!val || val_len != sizeof(uint16_t)) + return -EINVAL; + cli->ma_pars.sctp.sockopt_initmsg.set = true; + cli->ma_pars.sctp.sockopt_initmsg.max_init_timeo_present = true; + cli->ma_pars.sctp.sockopt_initmsg.max_init_timeo_value = *(uint16_t *)val; + break; default: return -ENOENT; }; -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

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

by osmith

Attention is currently required from: fixeria, laforge, pespin. osmith 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+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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Sep 2023 12:33:37 +0000 Gerrit-HasComments: No 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 osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34346?usp=email ) Change subject: socket: Support setsokopt SCTP_INITMSG in osmo_sock_init2_multiaddr2() ...................................................................... Patch Set 2: Code-Review+1 -- 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: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Sep 2023 12:32:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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 osmith

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on 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() ...................................................................... Patch Set 3: Code-Review+1 -- 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-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Sep 2023 12:30:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: OBS: build_binpkg: support debian:testing

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34342?usp=email ) Change subject: OBS: build_binpkg: support debian:testing ...................................................................... OBS: build_binpkg: support debian:testing Change-Id: I71de94ef34c3ccc3610643bd8861b78cccd266a5 --- M scripts/obs/data/build_binpkg.Dockerfile 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/scripts/obs/data/build_binpkg.Dockerfile b/scripts/obs/data/build_binpkg.Dockerfile index 49cdc96..4d4b185 100644 --- a/scripts/obs/data/build_binpkg.Dockerfile +++ b/scripts/obs/data/build_binpkg.Dockerfile @@ -53,8 +53,9 @@ # Add master repository, where packages immediately get updated after merging # patches to master. +# sed: first letter uppercase (testing -> Testing) RUN set -x; \ - VERSION="$(echo "$DISTRO" | cut -d : -f 2)"; \ + VERSION="$(echo "$DISTRO" | cut -d : -f 2 | sed 's/./\u&/')"; \ case "$DISTRO" in \ debian:*) \ apt-key add /tmp/Release.key && \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34342?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: I71de94ef34c3ccc3610643bd8861b78cccd266a5 Gerrit-Change-Number: 34342 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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 osmo-ci[master]: OBS: exit() -> sys.exit()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34343?usp=email ) Change subject: OBS: exit() -> sys.exit() ...................................................................... OBS: exit() -> sys.exit() As pointed out in code review, sys.exit() should be used instead of exit() from site. https://docs.python.org/3/library/constants.html#exit says: > The site module (which is imported automatically during startup, > except if the -S command-line option is given) adds several > constants to the built-in namespace. They are useful for the > interactive interpreter shell and should not be used in programs. Change-Id: Ia9d355e660afd1ad3c60064900d8be66e8e1d385 --- M scripts/obs/build_binpkg.py M scripts/obs/build_srcpkg.py M scripts/obs/lib/__init__.py M scripts/obs/lib/docker.py M scripts/obs/lib/osc.py M scripts/obs/lib/srcpkg.py M scripts/obs/sync_obs_projects.py M scripts/obs/update_obs_project.py 8 files changed, 39 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/scripts/obs/build_binpkg.py b/scripts/obs/build_binpkg.py index 67a4bec..f3b4bcf 100755 --- a/scripts/obs/build_binpkg.py +++ b/scripts/obs/build_binpkg.py @@ -3,9 +3,10 @@ # Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> import argparse import fnmatch +import lib import multiprocessing import os -import lib +import sys import lib.binpkg_deb import lib.config import lib.docker @@ -57,7 +58,7 @@ if not os.path.exists(srcdir): print(f"ERROR: {args.package}: no srcpkg found, run build_srcpkg.py" " first!") - exit(1) + sys.exit(1) bindir = f"{lib.config.path_temp}/binpkgs" lib.run_cmd(["rm", "-rf", bindir]) diff --git a/scripts/obs/build_srcpkg.py b/scripts/obs/build_srcpkg.py index 0ec1958..a5feeea 100755 --- a/scripts/obs/build_srcpkg.py +++ b/scripts/obs/build_srcpkg.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> import argparse +import sys import lib import lib.config import lib.docker @@ -26,7 +27,7 @@ if not args.meta and not args.package: print("ERROR: specify -m and/or a package. See -h for help.") - exit(1) + sys.exit(1) lib.set_args(args) diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py index 842dd41..1f686e5 100644 --- a/scripts/obs/lib/__init__.py +++ b/scripts/obs/lib/__init__.py @@ -98,7 +98,7 @@ if not ok: print("Either install them or use the -d argument to run in docker") - exit(1) + sys.exit(1) def set_proper_package_name(package): @@ -117,7 +117,7 @@ print(f"ERROR: unknown package: {package}") print("See packages_osmocom and packages_other in obs/lib/config.py") - exit(1) + sys.exit(1) def exit_error_cmd(completed, error_msg): diff --git a/scripts/obs/lib/docker.py b/scripts/obs/lib/docker.py index 4f9f981..779099b 100644 --- a/scripts/obs/lib/docker.py +++ b/scripts/obs/lib/docker.py @@ -55,7 +55,7 @@ return os.path.realpath(ret) print("ERROR: couldn't find ~/.oscrc. Put it there or set OSCRC.") - exit(1) + sys.exit(1) def run_in_docker_and_exit(script_path, add_oscrc=False, @@ -75,7 +75,7 @@ if not shutil.which("docker"): print("ERROR: docker is not installed") - exit(1) + sys.exit(1) if not distro: distro = lib.config.docker_distro_default @@ -116,4 +116,4 @@ print(f"docker: running: {script_path} inside docker") ret = subprocess.run(cmd) - exit(ret.returncode) + sys.exit(ret.returncode) diff --git a/scripts/obs/lib/osc.py b/scripts/obs/lib/osc.py index 656783e..20a63b5 100644 --- a/scripts/obs/lib/osc.py +++ b/scripts/obs/lib/osc.py @@ -6,6 +6,7 @@ import os import shlex import shutil +import sys import lib import lib.config @@ -22,7 +23,7 @@ print("ERROR: oscrc does not exist, please create one as explained in the" " README.") - exit(1) + sys.exit(1) def set_apiurl(url, obs_proj=None): @@ -32,7 +33,7 @@ if obs_proj is not None: if ":" not in obs_proj: print(f"ERROR: this doesn't look like a valid OBS project: {obs_proj}") - exit(1) + sys.exit(1) proj = obs_proj apiurl = url diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index b97bbf8..13404a7 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -4,6 +4,7 @@ import glob import os import pathlib +import sys import lib.config import lib.debian import lib.rpm_spec @@ -42,7 +43,7 @@ print(f"ERROR: {project}.git doesn't have a git-version-gen script and" " couldn't find libosmocore.git's copy of the script here either: " + ret) - exit(1) + sys.exit(1) def get_git_version(project): diff --git a/scripts/obs/sync_obs_projects.py b/scripts/obs/sync_obs_projects.py index 85ceba3..cc4635a 100755 --- a/scripts/obs/sync_obs_projects.py +++ b/scripts/obs/sync_obs_projects.py @@ -8,6 +8,7 @@ import os import shlex import shutil +import sys import xml.etree.ElementTree import lib @@ -75,7 +76,7 @@ if not ok: print("Either install them or use the -d argument to run in docker") - exit(1) + sys.exit(1) def generate_prjconf_header(project): diff --git a/scripts/obs/update_obs_project.py b/scripts/obs/update_obs_project.py index eee58a7..a456218 100755 --- a/scripts/obs/update_obs_project.py +++ b/scripts/obs/update_obs_project.py @@ -3,6 +3,7 @@ # Copyright 2022 sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> import argparse import os +import sys import traceback import lib import lib.config @@ -185,7 +186,7 @@ print(f"Deleted: {len(srcpkgs_deleted)}") if not srcpkgs_failed_build and not srcpkgs_failed_upload: - exit(0) + sys.exit(0) print() print("List of failed packages:") @@ -194,7 +195,7 @@ for package in srcpkgs_failed_upload: print(f"* {package} (srcpkg upload)") - exit(1) + sys.exit(1) def validate_args(args): @@ -202,7 +203,7 @@ # git repository before trying to update/delete a package from OBS if args.delete and args.feed != "master": print("ERROR: --delete can only be used with --feed=master") - exit(1) + sys.exit(1) def main(): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34343?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: Ia9d355e660afd1ad3c60064900d8be66e8e1d385 Gerrit-Change-Number: 34343 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(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

Attention is currently required from: fixeria, laforge, osmith. Hello Jenkins Builder, fixeria, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34344?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/34344/3 -- 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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

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

Attention is currently required from: fixeria, laforge, osmith. pespin has posted comments on 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() ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I'd like to get this patch and the libosmo-netif related patch before creating a new release, to avoid breaking the API after the release. https://gerrit.osmocom.org/c/libosmo-netif/+/34345 -- 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: 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: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Sep 2023 11:47:09 +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