- gerrit-log - lists.osmocom.org

[S] Change in libosmo-sccp[master]: Use same msgb allocation size like before osmo_io introduction
by laforge 16 Mar '24

16 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/36315?usp=email ) Change subject: Use same msgb allocation size like before osmo_io introduction ...................................................................... Use same msgb allocation size like before osmo_io introduction In Change-Id Ia1910f3b99d918ec2a34d5304c3f40ba015c25c9 we introduced osmo_io support for xUA + IPA. However, when we did that, the msgb allocation sizes of libosmo-sigtran were neglected, and rather the defaults of osmo_io used. This commit returns libosmo-sigtran to the exact msgb allocation + headroom sizes used before the osmo_io migration. Related: OS#5752 Closes: OS#6403 Depends: libosmo-netif.git Change-Id Ie19c8294ddb12dfe5e0fd44e047c47e6f9cbd384 Change-Id: I0c6dcff4523e4c04aae43a4585b5e0c3617ef1a6 --- M src/m3ua.c M src/osmo_ss7_asp.c M src/osmo_ss7_xua_srv.c M src/xua_internal.h 4 files changed, 29 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/15/36315/1 diff --git a/src/m3ua.c b/src/m3ua.c index f4dbf76..fcbc759 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -310,9 +310,6 @@ (mdh->ni & 0x3 << 6); } -#define M3UA_MSG_SIZE 2048 -#define M3UA_MSG_HEADROOM 512 - struct msgb *m3ua_msgb_alloc(const char *name) { if (!name) diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 92b3a5b..1f45749 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -43,6 +43,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> #include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/netif/stream.h> #include <osmocom/netif/ipa.h> @@ -900,6 +901,8 @@ if (fd < 0) return fd; + osmo_iofd_set_alloc_info(osmo_stream_cli_get_iofd(cli), M3UA_MSG_SIZE, M3UA_MSG_HEADROOM); + /* update the socket name */ talloc_free(asp->sock_name); asp->sock_name = osmo_sock_get_name(asp, fd); diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c index eeb6768..473826f 100644 --- a/src/osmo_ss7_xua_srv.c +++ b/src/osmo_ss7_xua_srv.c @@ -43,6 +43,7 @@ #include <osmocom/core/msgb.h> #include <osmocom/core/socket.h> #include <osmocom/core/sockaddr_str.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/netif/stream.h> #include <osmocom/netif/ipa.h> @@ -80,6 +81,8 @@ return -1; } + osmo_iofd_set_alloc_info(osmo_stream_srv_get_iofd(srv), M3UA_MSG_SIZE, M3UA_MSG_HEADROOM); + switch (oxs->cfg.proto) { case OSMO_SS7_ASP_PROT_IPA: osmo_stream_srv_set_read_cb(srv, ss7_asp_ipa_srv_conn_rx_cb); diff --git a/src/xua_internal.h b/src/xua_internal.h index b6b33af..d4b16f9 100644 --- a/src/xua_internal.h +++ b/src/xua_internal.h @@ -4,6 +4,9 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/xua_msg.h> +#define M3UA_MSG_SIZE 2048 +#define M3UA_MSG_HEADROOM 512 + struct osmo_sccp_addr; struct m3ua_data_hdr; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/36315?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: I0c6dcff4523e4c04aae43a4585b5e0c3617ef1a6 Gerrit-Change-Number: 36315 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: introduce osmo_stream_cli_get_iofd() API
by laforge 16 Mar '24

16 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36314?usp=email ) Change subject: introduce osmo_stream_cli_get_iofd() API ...................................................................... introduce osmo_stream_cli_get_iofd() API Using this, a user can obtain the osmo_io_fd, for example in order to perform configuration like osmo_iofd_set_alloc_info() or osmo_iofd_set_txqueue_max_length(). Change-Id: Ie19c8294ddb12dfe5e0fd44e047c47e6f9cbd384 --- M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 3 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/14/36314/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 1d97530..61bc1ad 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -109,6 +109,7 @@ const char *osmo_stream_srv_get_sockname(const struct osmo_stream_srv *conn); struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv); int osmo_stream_srv_get_fd(const struct osmo_stream_srv *srv); +struct osmo_io_fd *osmo_stream_srv_get_iofd(const struct osmo_stream_srv *srv); void osmo_stream_srv_destroy(struct osmo_stream_srv *conn); void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn); @@ -177,6 +178,7 @@ char *osmo_stream_cli_get_sockname(const struct osmo_stream_cli *cli); struct osmo_fd *osmo_stream_cli_get_ofd(struct osmo_stream_cli *cli); int osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli); +struct osmo_io_fd *osmo_stream_cli_get_iofd(const struct osmo_stream_cli *cli); void osmo_stream_cli_set_connect_cb(struct osmo_stream_cli *cli, int (*connect_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int (*disconnect_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli)); diff --git a/src/stream_cli.c b/src/stream_cli.c index ca60e25..784aa84 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -222,6 +222,17 @@ return -EINVAL; } +/*! Retrieve osmo_io descriptor of the stream client socket. + * This function must not be called on a stream client in legacy osmo_fd mode! + * \param[in] cli Stream Client of which we want to obtain the file descriptor + * \returns osmo_io_fd of stream client. */ +struct osmo_io_fd * +osmo_stream_cli_get_iofd(const struct osmo_stream_cli *cli) +{ + OSMO_ASSERT(cli->mode == OSMO_STREAM_MODE_OSMO_IO); + return cli->iofd; +} + static void osmo_stream_cli_read(struct osmo_stream_cli *cli) { LOGSCLI(cli, LOGL_DEBUG, "message received\n"); diff --git a/src/stream_srv.c b/src/stream_srv.c index 3220b9e..a02c1c2 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -1037,6 +1037,17 @@ return -EINVAL; } +/*! Retrieve osmo_io descriptor of the stream server socket. + * This function must not be called on a stream server in legacy osmo_fd mode! + * \param[in] srv Stream Server of which we want to obtain the osmo_io descriptor + * \returns osmo_io_fd of stream server. */ +struct osmo_io_fd * +osmo_stream_srv_get_iofd(const struct osmo_stream_srv *srv) +{ + OSMO_ASSERT(srv->mode == OSMO_STREAM_MODE_OSMO_IO); + return srv->iofd; +} + /*! Retrieve the master (Link) from a Stream Server. * \param[in] conn Stream Server of which we want to know the Link * \returns Link through which the given Stream Server is established */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36314?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: Ie19c8294ddb12dfe5e0fd44e047c47e6f9cbd384 Gerrit-Change-Number: 36314 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-iuh[master]: Add ranap_decode_rab_releaseditemies_fromlist()
by laforge 16 Mar '24

16 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36309?usp=email ) Change subject: Add ranap_decode_rab_releaseditemies_fromlist() ...................................................................... Add ranap_decode_rab_releaseditemies_fromlist() This function is analogous to existing ranap_decode_*_itemies_fromlist() which we already had. This is needed in an upcoming osmo-hnbgw patchset where we need to parse the ReleasedItems in order to track RAB release progess in order to gather KPIs on RAB release. Change-Id: I328819c650fc6cefe735093a846277b4f03e6b29 --- M include/osmocom/ranap/ranap_common.h M src/ranap_common.c 2 files changed, 44 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/ranap/ranap_common.h b/include/osmocom/ranap/ranap_common.h index 5727c0d..0da7b10 100644 --- a/include/osmocom/ranap/ranap_common.h +++ b/include/osmocom/ranap/ranap_common.h @@ -661,3 +661,8 @@ int ranap_decode_rab_setupormodifyitemfirst( RANAP_RAB_SetupOrModifyItemFirst_t *raB_SetupOrModifyItemFirst, ANY_t *any_p); + +/* There is no generated decoder available, this is a custom one */ +int ranap_decode_rab_releaseditemies_fromlist( + RANAP_RAB_ReleasedItemIEs_t *raB_ReleasedItemIEs, + ANY_t *any_p); diff --git a/src/ranap_common.c b/src/ranap_common.c index f264ac0..2c99ecd 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -628,6 +628,29 @@ return decoded; } +int ranap_decode_rab_releaseditemies_fromlist(RANAP_RAB_ReleasedItemIEs_t *raB_ReleasedItemIEs, ANY_t *any_p) +{ + RANAP_RAB_ReleasedItem_t *ranaP_RABReleasedItem_p = NULL; + int decoded; + + assert(any_p != NULL); + assert(raB_ReleasedItemIEs != NULL); + + memset(raB_ReleasedItemIEs, 0, sizeof(RANAP_RAB_ReleasedItemIEs_t)); + RANAP_DEBUG("Decoding message RANAP_RAB_ReleasedItemIEs (%s:%d)\n", __FILE__, __LINE__); + decoded = ANY_to_type_aper(any_p, &asn_DEF_RANAP_RAB_ReleasedItem, (void **)&ranaP_RABReleasedItem_p); + if (decoded < 0) { + LOGP(DRANAP, LOGL_ERROR, "Decoding of IE raB_ReleasedItem failed\n"); + return -1; + } + if (asn1_xer_print) + xer_fprint(stdout, &asn_DEF_RANAP_RAB_ReleasedItem, ranaP_RABReleasedItem_p); + memcpy(&raB_ReleasedItemIEs->raB_ReleasedItem, ranaP_RABReleasedItem_p, sizeof(RANAP_RAB_ReleasedItem_t)); + FREEMEM(ranaP_RABReleasedItem_p); + + return decoded; +} + int ranap_decode_rab_setupormodifyitemfirst( RANAP_RAB_SetupOrModifyItemFirst_t *raB_SetupOrModifyItemFirst, ANY_t *any_p) -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I328819c650fc6cefe735093a846277b4f03e6b29 Gerrit-Change-Number: 36309 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-iuh[master]: ranap_common: fix pointer type in ranap_decode_rab_releaseitemies_fro...
by laforge 16 Mar '24

16 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36310?usp=email ) Change subject: ranap_common: fix pointer type in ranap_decode_rab_releaseitemies_fromlist() ...................................................................... ranap_common: fix pointer type in ranap_decode_rab_releaseitemies_fromlist() This looked like a copy+paste mistake in Change-Id I4fc88402a863bc1482947985f759d3a26eea4164 Related: OS#5152 Change-Id: I16286c6f13dc4e8d5c6a7f0efacd22bafe04b0a5 --- M src/ranap_common.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/ranap_common.c b/src/ranap_common.c index 2c99ecd..68c3d2d 100644 --- a/src/ranap_common.c +++ b/src/ranap_common.c @@ -607,7 +607,7 @@ int ranap_decode_rab_releaseitemies_fromlist(RANAP_RAB_ReleaseItemIEs_t *raB_ReleaseItemIEs, ANY_t *any_p) { - RANAP_RAB_FailedItem_t *ranaP_RABReleaseItem_p = NULL; + RANAP_RAB_ReleaseItem_t *ranaP_RABReleaseItem_p = NULL; int decoded; assert(any_p != NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36310?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I16286c6f13dc4e8d5c6a7f0efacd22bafe04b0a5 Gerrit-Change-Number: 36310 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-iuh[master]: ranap_common: fix pointer type in ranap_decode_rab_releaseitemies_fro...
by laforge 16 Mar '24

16 Mar '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36310?usp=email ) Change subject: ranap_common: fix pointer type in ranap_decode_rab_releaseitemies_fromlist() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36310?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I16286c6f13dc4e8d5c6a7f0efacd22bafe04b0a5 Gerrit-Change-Number: 36310 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Mar 2024 07:39:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-iuh[master]: Add ranap_decode_rab_releaseditemies_fromlist()
by laforge 16 Mar '24

16 Mar '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/36309?usp=email ) Change subject: Add ranap_decode_rab_releaseditemies_fromlist() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/36309?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I328819c650fc6cefe735093a846277b4f03e6b29 Gerrit-Change-Number: 36309 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 16 Mar 2024 07:39:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: osmo_io: Massive improvement of API documentation
by fixeria 16 Mar '24

16 Mar '24

Attention is currently required from: jolly, laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36288?usp=email ) Change subject: osmo_io: Massive improvement of API documentation ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36288?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: I6315cfc7ff34a0f8971517edf035e1efcef3ed5c Gerrit-Change-Number: 36288 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 16 Mar 2024 04:20:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Dont use __linux__ but !EMBEDDED
by fixeria 16 Mar '24

16 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36287?usp=email ) Change subject: osmo_io: Dont use __linux__ but !EMBEDDED ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36287?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: I260443ba3cd0bb81dade434208dea4ea70fe8ad8 Gerrit-Change-Number: 36287 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 16 Mar 2024 04:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Dont use __linux__ but !EMBEDDED
by pespin 15 Mar '24

15 Mar '24

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36287?usp=email ) Change subject: osmo_io: Dont use __linux__ but !EMBEDDED ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36287?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: I260443ba3cd0bb81dade434208dea4ea70fe8ad8 Gerrit-Change-Number: 36287 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 20:35:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmocore[master]: osmo_io: Massive improvement of API documentation
by pespin 15 Mar '24

15 Mar '24

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36288?usp=email ) Change subject: osmo_io: Massive improvement of API documentation ...................................................................... Patch Set 4: (1 comment) File src/core/osmo_io.c: https://gerrit.osmocom.org/c/libosmocore/+/36288/comment/126333a6_b0d7dde7 PS4, Line 831: * queue. The iofd tself is not freed and can be assigned a new file descriptor with osmo_iofd_register() typo: itself -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36288?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: I6315cfc7ff34a0f8971517edf035e1efcef3ed5c Gerrit-Change-Number: 36288 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Mar 2024 20:34:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log