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

[S] Change in libosmocore[master]: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOC...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35233?usp=email ) Change subject: socket: osmo_sock_init2_multiaddr2(): Apply params too if no OSMO_SOCK_F_BIND flag set ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: might benefit from a slightly longer commit log message -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35233?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: Ia32510e8db1de0cc0dc36cebf8a94f09e44fda70 Gerrit-Change-Number: 35233 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Dec 2023 20:25:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: fix encoding of the IP address

by lynxis lazus

Attention is currently required from: lynxis lazus. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: epdg_gtpc_s2b: fix encoding of the IP address ...................................................................... epdg_gtpc_s2b: fix encoding of the IP address Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c --- M src/epdg_gtpc_s2b.erl M src/gtp_utils.erl 2 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/19/35219/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35219?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I6a96f5d62fa0b327a462670e40cc6a42cf6b2d3c Gerrit-Change-Number: 35219 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: epdg_gtpc_s2b: add TLV Serving Network

by lynxis lazus

Attention is currently required from: lynxis lazus, pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by pespin, Verified+1 by Jenkins Builder Change subject: epdg_gtpc_s2b: add TLV Serving Network ...................................................................... epdg_gtpc_s2b: add TLV Serving Network The open5gs requires Serving Network TLV. Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 --- M src/epdg_gtpc_s2b.erl A src/gtp_utils.erl 2 files changed, 63 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/18/35218/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35218?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I2a9459859fc660e6433cd8178ab9d1f92ae74fc0 Gerrit-Change-Number: 35218 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Reimplement osmo_sock_init2_multiaddr()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35232?usp=email ) Change subject: socket: Reimplement osmo_sock_init2_multiaddr() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: lgtm, thanks! -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35232?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: I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd Gerrit-Change-Number: 35232 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Dec 2023 20:24:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: tests/socket: Avoid keeping unneeded sockets open during next test cases

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35231?usp=email ) Change subject: tests/socket: Avoid keeping unneeded sockets open during next test cases ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35231?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: I59cde0843545428e2bc490cc9470b76cbd7f8393 Gerrit-Change-Number: 35231 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Dec 2023 20:21:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: gsup: fix error log message

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35236?usp=email ) Change subject: gsup: fix error log message ...................................................................... gsup: fix error log message The error happened in auth info and not in PDP info Change-Id: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 --- M src/gsm/gsup.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/36/35236/1 diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 4e09ac8..4e18ddb 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -266,7 +266,7 @@ parse_error: LOGP(DLGSUP, LOGL_ERROR, - "GSUP IE type %d, length %zu invalid in PDP info\n", iei, value_len); + "GSUP IE type %d, length %zu invalid in auth info\n", iei, value_len); return -1; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35236?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: I37ac6b5d7d34ba2ab0f83bcc1701b86b1a245014 Gerrit-Change-Number: 35236 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: gsup: add support for IPV4/IPV6 in PDP info

by lynxis lazus

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35237?usp=email ) Change subject: gsup: add support for IPV4/IPV6 in PDP info ...................................................................... gsup: add support for IPV4/IPV6 in PDP info The IPV4/IPV6 in the PDP will be used by the ePDG to send back the allocated IP from the PGW. Further it could be used at a later point to assign static IPs, saved in the HLR/HSS. Change-Id: I17ccbe8b78e92e2f03c18e4e42e8b62f0a7bcbd1 --- M include/osmocom/gsm/gsup.h M src/gsm/gsup.c 2 files changed, 56 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/37/35237/1 diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h index 6e7fcf0..3edbdd0 100644 --- a/include/osmocom/gsm/gsup.h +++ b/include/osmocom/gsm/gsup.h @@ -47,6 +47,7 @@ #include <osmocom/gsm/protocol/gsm_08_08.h> #include <osmocom/gsm/gsm_utils.h> #include <osmocom/crypt/auth.h> +#include <sys/socket.h> #define OSMO_GSUP_PORT 4222 @@ -77,6 +78,8 @@ OSMO_GSUP_ACCESS_POINT_NAME_IE = 0x12, OSMO_GSUP_PDP_QOS_IE = 0x13, OSMO_GSUP_CHARG_CHAR_IE = 0x14, + OSMO_GSUP_IPV4_IE = 0x15, + OSMO_GSUP_IPV6_IE = 0x16, OSMO_GSUP_RAND_IE = 0x20, OSMO_GSUP_SRES_IE = 0x21, OSMO_GSUP_KC_IE = 0x22, @@ -277,6 +280,14 @@ const uint8_t *pdp_charg_enc; /*! length (in octets) of pdp_charg_enc */ size_t pdp_charg_enc_len; + /*! True if pdp_ipv4 is set */ + bool pdp_ipv4_set; + /*! IPv4 address of the PDP context */ + struct in_addr pdp_ipv4; + /*! True if pdp_ipv6 is set */ + bool pdp_ipv6_set; + /*! IPv6 address of the PDP context */ + struct in6_addr pdp_ipv6; }; enum osmo_gsup_message_class { diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c index 4e18ddb..9bdd1f5 100644 --- a/src/gsm/gsup.c +++ b/src/gsm/gsup.c @@ -133,11 +133,10 @@ uint8_t tag; uint8_t *value; size_t value_len; + enum osmo_gsup_iei iei; /* specific parts */ while (data_len > 0) { - enum osmo_gsup_iei iei; - rc = osmo_shift_tlv(&data, &data_len, &tag, &value, &value_len); if (rc < 0) return -GMM_CAUSE_PROTO_ERR_UNSPEC; @@ -169,6 +168,20 @@ pdp_info->pdp_charg_enc_len = value_len; break; + case OSMO_GSUP_IPV4_IE: + if (value_len != sizeof(pdp_info->pdp_ipv4)) + goto parse_error; + memcpy(&pdp_info->pdp_ipv4, value, value_len); + pdp_info->pdp_ipv4_set = 1; + break; + + case OSMO_GSUP_IPV6_IE: + if (value_len != sizeof(pdp_info->pdp_ipv6)) + goto parse_error; + memcpy(&pdp_info->pdp_ipv6, value, value_len); + pdp_info->pdp_ipv6_set = 1; + break; + default: LOGP(DLGSUP, LOGL_ERROR, "GSUP IE type %d not expected in PDP info\n", iei); @@ -177,6 +190,12 @@ } return 0; + +parse_error: + LOGP(DLGSUP, LOGL_ERROR, + "GSUP IE type %d, length %zu invalid in PDP info\n", iei, value_len); + + return -1; } static int decode_auth_info(uint8_t *data, size_t data_len, @@ -623,6 +642,16 @@ pdp_info->pdp_charg_enc_len, pdp_info->pdp_charg_enc); } + if (pdp_info->pdp_ipv4_set) { + msgb_tlv_put(msg, OSMO_GSUP_IPV4_IE, + sizeof(pdp_info->pdp_ipv4), &pdp_info->pdp_ipv4); + } + + if (pdp_info->pdp_ipv6_set) { + msgb_tlv_put(msg, OSMO_GSUP_IPV6_IE, + sizeof(pdp_info->pdp_ipv6), &pdp_info->pdp_ipv6); + } + /* Update length field */ *len_field = msgb_length(msg) - old_len; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35237?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: I17ccbe8b78e92e2f03c18e4e42e8b62f0a7bcbd1 Gerrit-Change-Number: 35237 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in ...osmo-epdg[master]: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA

by pespin

Attention is currently required from: lynxis lazus. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email ) Change subject: dia: 3gpp_ts29_273_s6b: add missing *[ AVP ] to AAA ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35216?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: I934c87e912882ddef1cbac1466dec66c72b9c77c Gerrit-Change-Number: 35216 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 05 Dec 2023 19:05:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Fix opening sctp client socket if no local address set

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35235?usp=email ) Change subject: stream_cli: Fix opening sctp client socket if no local address set ...................................................................... stream_cli: Fix opening sctp client socket if no local address set Properly call osmo_sock_init2_multiaddr2() to use default binding address if user of osmo_stream_cli didn't set one on the object through the API. osmo_sock_init2_multiaddr2() was also borken under that scenario until recently (see Depends below). Until now, users of osmo_stream for SCTP (mainly libosmo-sccp) relied on always setting a proper local address to overcome this limitation. Depends: libosmocore.git Change-Id I2641fbaca6f477404b094dbc53c0c1a3dd3fd2fd Related: OS#6279 Change-Id: I0d9d0e48690c915f7b51ad09f452e551e01368b5 --- M src/stream_cli.c 1 file changed, 32 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/35/35235/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 1e7ebeb..4f2963d 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -838,7 +838,9 @@ * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { - int ret, fd = -1; + int ret, flags; + int fd = -1; + unsigned int local_addrcnt; /* we are reconfiguring this socket, close existing first. */ if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_get_fd(cli) >= 0) @@ -856,11 +858,18 @@ switch (cli->proto) { #ifdef HAVE_LIBSCTP case IPPROTO_SCTP: + local_addrcnt = cli->local_addrcnt; + flags = OSMO_SOCK_F_CONNECT|OSMO_SOCK_F_NONBLOCK; + if (cli->local_addrcnt > 0 || cli->local_port > 0) { /* explicit bind required? */ + flags |= OSMO_SOCK_F_BIND; + /* If no local addr configured, use local_addr[0]=NULL by default when creating the socket. */ + if (cli->local_addrcnt == 0) + local_addrcnt = 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->local_addr, 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, - &cli->ma_pars); + flags, &cli->ma_pars); break; #endif default: -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35235?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: I0d9d0e48690c915f7b51ad09f452e551e01368b5 Gerrit-Change-Number: 35235 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in libosmo-netif[master]: examples/stream-* try to support SCTP when called with "-s" argument

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35234?usp=email ) Change subject: examples/stream-* try to support SCTP when called with "-s" argument ...................................................................... examples/stream-* try to support SCTP when called with "-s" argument Change-Id: I4137cdf1e21cb669b632fe5c126ec27475d98400 --- M examples/stream-client.c M examples/stream-server.c 2 files changed, 44 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/34/35234/1 diff --git a/examples/stream-client.c b/examples/stream-client.c index 6781c72..e42748f 100644 --- a/examples/stream-client.c +++ b/examples/stream-client.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <netinet/in.h> #include <osmocom/core/select.h> #include <osmocom/core/talloc.h> @@ -89,10 +90,21 @@ return 0; } -int main(void) +int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; - int rc; + bool use_sctp = false; + int opt, rc; + + while ((opt = getopt(argc, argv, "s")) != -1) { + switch (opt) { + case 's': + use_sctp = true; + break; + default: + break; + } + } tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test"); msgb_talloc_ctx_init(tall_test, 0); @@ -111,12 +123,16 @@ osmo_stream_cli_set_name(conn, "stream_client"); osmo_stream_cli_set_addr(conn, "127.0.0.1"); osmo_stream_cli_set_port(conn, 10000); + if (use_sctp) + osmo_stream_cli_set_proto(conn, IPPROTO_SCTP); + osmo_stream_cli_set_connect_cb(conn, connect_cb); osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb); osmo_stream_cli_set_read_cb2(conn, read_cb); - if (osmo_stream_cli_open(conn) < 0) { - fprintf(stderr, "cannot open cli\n"); + rc = osmo_stream_cli_open(conn); + if (rc < 0) { + fprintf(stderr, "cannot open cli: %d\n", rc); exit(EXIT_FAILURE); } diff --git a/examples/stream-server.c b/examples/stream-server.c index 8aa8b9b..9faf307 100644 --- a/examples/stream-server.c +++ b/examples/stream-server.c @@ -117,9 +117,21 @@ return 0; } -int main(void) +int main(int argc, char **argv) { struct osmo_fd *kbd_ofd; + bool use_sctp = false; + int opt; + + while ((opt = getopt(argc, argv, "s")) != -1) { + switch (opt) { + case 's': + use_sctp = true; + break; + default: + break; + } + } tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test"); msgb_talloc_ctx_init(tall_test, 0); @@ -137,6 +149,8 @@ } osmo_stream_srv_link_set_addr(srv, "127.0.0.1"); osmo_stream_srv_link_set_port(srv, 10000); + if (use_sctp) + osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP); osmo_stream_srv_link_set_accept_cb(srv, accept_cb); if (osmo_stream_srv_link_open(srv) < 0) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35234?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: I4137cdf1e21cb669b632fe5c126ec27475d98400 Gerrit-Change-Number: 35234 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023