March 2024 - gerrit-log - lists.osmocom.org

[S] Change in libosmocore[master]: ctrl: Don't expose write_queue in ctrl_cmd_send() api

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36143?usp=email ) Change subject: ctrl: Don't expose write_queue in ctrl_cmd_send() api ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36143?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: Ic81af56e7ea6921ba39168727ef64c308e9c6754 Gerrit-Change-Number: 36143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Sat, 02 Mar 2024 20:30:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmo-bsc[master]: CBSP: Port over to use osmo_io via libosmo-netif

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email ) Change subject: CBSP: Port over to use osmo_io via libosmo-netif ...................................................................... CBSP: Port over to use osmo_io via libosmo-netif Change-Id: Icce412e6ee69366c7b131c9bc1d51e8d44204917 Depends: libosmocore.git Change-Id I5e922c54b3431d759b38e81e55076125c5a34008 Related: OS#5755 --- M TODO-RELEASE M src/osmo-bsc/cbsp_link.c 2 files changed, 21 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/46/36146/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 7a7ec22..91e8dae 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -8,3 +8,4 @@ # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line libosmocore > 1.9.0 working (compiling) OSMO_SOCKADDR_STR_FMT_ARGS_NOT_NULL +libosmocore > 1.9.0 we use the new osmo_cbsp_segmentation_cb diff --git a/src/osmo-bsc/cbsp_link.c b/src/osmo-bsc/cbsp_link.c index 849b802..98f25d3 100644 --- a/src/osmo-bsc/cbsp_link.c +++ b/src/osmo-bsc/cbsp_link.c @@ -54,7 +54,6 @@ static int cbsp_srv_closed_cb(struct osmo_stream_srv *conn) { struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn); - //struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); LOGP(DCBS, LOGL_NOTICE, "CBSP Server lost connection from %s\n", cbc->server.sock_name); talloc_free(cbc->server.sock_name); @@ -63,29 +62,11 @@ return 0; } -static int cbsp_srv_cb(struct osmo_stream_srv *conn) +static int cbsp_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_srv_get_data(conn); - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); struct osmo_cbsp_decoded *decoded; - struct msgb *msg; - int rc; - /* READ */ - rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->server.msg); - if (rc <= 0) { - if (rc == -EAGAIN || rc == -EINTR) { - /* more data needs to be read */ - return 0; - } else if (rc == -EPIPE || rc == -ECONNRESET) { - /* lost connection */ - } else if (rc == 0) { - /* connection closed */ - } - osmo_stream_srv_destroy(conn); - cbc->server.srv = NULL; - return -EBADF; - } OSMO_ASSERT(msg); decoded = osmo_cbsp_decode(conn, msg); if (decoded) { @@ -117,12 +98,15 @@ return -1; } - srv = osmo_stream_srv_create(cbc, link, fd, cbsp_srv_cb, cbsp_srv_closed_cb, cbc); + srv = osmo_stream_srv_create2(cbc, link, fd, cbc); if (!srv) { LOGP(DCBS, LOGL_ERROR, "Unable to create stream server for %s\n", osmo_sock_get_name2(fd)); return -1; } + osmo_stream_srv_set_read_cb(srv, cbsp_srv_read_cb); + osmo_stream_srv_set_closed_cb(srv, cbsp_srv_closed_cb); + osmo_stream_srv_set_segmentation_cb(srv, osmo_cbsp_segmentation_cb); cbc->server.srv = srv; if (cbc->server.sock_name) @@ -141,11 +125,10 @@ static int cbsp_client_connect_cb(struct osmo_stream_cli *cli) { struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli); - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli); if (cbc->client.sock_name) talloc_free(cbc->client.sock_name); - cbc->client.sock_name = osmo_sock_get_name(cbc, ofd->fd); + cbc->client.sock_name = osmo_sock_get_name(cbc, osmo_stream_cli_get_fd(cli)); LOGP(DCBS, LOGL_NOTICE, "CBSP Client connected to CBC: %s\n", cbc->client.sock_name); @@ -165,28 +148,11 @@ return 0; } -static int cbsp_client_read_cb(struct osmo_stream_cli *cli) +static int cbsp_client_read_cb(struct osmo_stream_cli *cli, struct msgb *msg) { struct bsc_cbc_link *cbc = osmo_stream_cli_get_data(cli); - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli); struct osmo_cbsp_decoded *decoded; - struct msgb *msg = NULL; - int rc; - /* READ */ - rc = osmo_cbsp_recv_buffered(cbc, ofd->fd, &msg, &cbc->client.msg); - if (rc <= 0) { - if (rc == -EAGAIN || rc == -EINTR) { - /* more data needs to be read */ - return 0; - } else if (rc == -EPIPE || rc == -ECONNRESET) { - /* lost connection */ - } else if (rc == 0) { - /* connection closed */ - } - osmo_stream_cli_reconnect(cli); - return -EBADF; - } OSMO_ASSERT(msg); decoded = osmo_cbsp_decode(cli, msg); if (decoded) { @@ -244,7 +210,8 @@ osmo_stream_cli_set_data(cbc->client.cli, cbc); osmo_stream_cli_set_connect_cb(cbc->client.cli, cbsp_client_connect_cb); osmo_stream_cli_set_disconnect_cb(cbc->client.cli, cbsp_client_disconnect_cb); - osmo_stream_cli_set_read_cb(cbc->client.cli, cbsp_client_read_cb); + osmo_stream_cli_set_read_cb2(cbc->client.cli, cbsp_client_read_cb); + osmo_stream_cli_set_segmentation_cb(cbc->client.cli, osmo_cbsp_segmentation_cb); } /* CBC side */ osmo_stream_cli_set_addr(cbc->client.cli, cbc->client.remote_addr.ip); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/36146?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icce412e6ee69366c7b131c9bc1d51e8d44204917 Gerrit-Change-Number: 36146 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation ...................................................................... cbsp: Add osmo_cbsp_segmentation_cb for message segmentation This call-back can for example be used as segmentation call-back for libosmo-netif stream_cli/stream_srv or directly for osmo_io. Related: OS#5755 Change-Id: I5e922c54b3431d759b38e81e55076125c5a34008 --- M include/osmocom/gsm/cbsp.h M src/gsm/cbsp.c M src/gsm/libosmogsm.map 3 files changed, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/36145/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36145?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: I5e922c54b3431d759b38e81e55076125c5a34008 Gerrit-Change-Number: 36145 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36145?usp=email ) Change subject: cbsp: Add osmo_cbsp_segmentation_cb for message segmentation ...................................................................... cbsp: Add osmo_cbsp_segmentation_cb for message segmentation This call-back can for example be used as segmentation call-back for libosmo-netif stream_cli/stream_srv or directly for osmo_io. Related: OS#5755 Change-Id: I5e922c54b3431d759b38e81e55076125c5a34008 --- M include/osmocom/gsm/cbsp.h M src/gsm/cbsp.c M src/gsm/libosmogsm.map 3 files changed, 34 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/45/36145/1 diff --git a/include/osmocom/gsm/cbsp.h b/include/osmocom/gsm/cbsp.h index 536c54d..efa4ce6 100644 --- a/include/osmocom/gsm/cbsp.h +++ b/include/osmocom/gsm/cbsp.h @@ -312,3 +312,4 @@ struct osmo_cbsp_decoded *osmo_cbsp_decoded_alloc(void *ctx, enum cbsp_msg_type msg_type); int osmo_cbsp_recv_buffered(void *ctx, int fd, struct msgb **rmsg, struct msgb **tmp_msg); +int osmo_cbsp_segmentation_cb(struct msgb *msg); diff --git a/src/gsm/cbsp.c b/src/gsm/cbsp.c index 28852f6..90541e3 100644 --- a/src/gsm/cbsp.c +++ b/src/gsm/cbsp.c @@ -1567,6 +1567,25 @@ return rc; } +/*! call-back function to segment the data at message boundaries. + * Returns the size of the next message. If it returns -EAGAIN or a value larger than msgb_length() (message + * is incomplete), the caller (e.g. osmo_io) has to wait for more data to be read. */ +int osmo_cbsp_segmentation_cb(struct msgb *msg) +{ + const struct cbsp_header *h; + int len; + + if (msgb_length(msg) < sizeof(*h)) + return -EAGAIN; + + h = (const struct cbsp_header *) msg->data; + msg->l2h = msg->data + sizeof(*h); + /* then read the length as specified in the header */ + len = h->len[0] << 16 | h->len[1] << 8 | h->len[2]; + + return sizeof(*h) + len; +} + /*! value_string[] for enum osmo_cbsp_cause. */ const struct value_string osmo_cbsp_cause_names[] = { { OSMO_CBSP_CAUSE_PARAM_NOT_RECOGNISED, "Parameter-not-recognised" }, diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index db2dbcb..2c4c621 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -793,6 +793,7 @@ osmo_cbsp_decode; osmo_cbsp_recv_buffered; osmo_cbsp_errstr; +osmo_cbsp_segmentation_cb; osmo_i460_demux_in; osmo_i460_mux_enqueue; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36145?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: I5e922c54b3431d759b38e81e55076125c5a34008 Gerrit-Change-Number: 36145 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in osmo-bts[master]: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email ) Change subject: sysmobts_mgr_temp: Migrate to ctrl_cmd_send2() ...................................................................... sysmobts_mgr_temp: Migrate to ctrl_cmd_send2() ctrl_cmd_send() is now a deprecated API function. Change-Id: I663669a1bcf7b58d6a6175cbb51c333f5cfaedd7 Depends: libosmocore.git Change-Id Ic81af56e7ea6921ba39168727ef64c308e9c6754 --- M TODO-RELEASE M src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c 2 files changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/44/36144/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 2bbfab5..96426a5 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line libosmogsm >1.9.0 added new PRIM_INFO to include/osmocom/gsm/l1sap.h libosmogsm >1.9.0 use of RLP code in libosmogsm +libosmoctrl >1.9.0 use ctrl_cmd_send2() diff --git a/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c b/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c index 02d3245..eea6879 100644 --- a/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c +++ b/src/osmo-bts-sysmo/misc/sysmobts_mgr_temp.c @@ -233,7 +233,7 @@ rep->variable = "oml-alert"; rep->value = oml_alert; LOGP(DTEMP, LOGL_ERROR, "OML alert sent: %d\n", - ctrl_cmd_send(&ctrl->write_queue, rep)); + ctrl_cmd_send2(ctrl, rep)); talloc_free(rep); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/36144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I663669a1bcf7b58d6a6175cbb51c333f5cfaedd7 Gerrit-Change-Number: 36144 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: ctrl: Don't expose write_queue in ctrl_cmd_send() api

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/36143?usp=email ) Change subject: ctrl: Don't expose write_queue in ctrl_cmd_send() api ...................................................................... ctrl: Don't expose write_queue in ctrl_cmd_send() api ctrl_cmd_send() should always have taken a 'struct ctrl_connection' as argument, not directly its write_queue member. Let's offer a ctrl_cmd_send2() which fixes the problem, and deprecate the old ctrl_cmd_send(). Related: OS#5751 Change-Id: Ic81af56e7ea6921ba39168727ef64c308e9c6754 --- M include/osmocom/ctrl/control_cmd.h M include/osmocom/ctrl/control_if.h M src/ctrl/control_cmd.c M src/ctrl/control_if.c M src/ctrl/libosmoctrl.map 5 files changed, 35 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/43/36143/1 diff --git a/include/osmocom/ctrl/control_cmd.h b/include/osmocom/ctrl/control_cmd.h index d9408be..6422710 100644 --- a/include/osmocom/ctrl/control_cmd.h +++ b/include/osmocom/ctrl/control_cmd.h @@ -124,7 +124,6 @@ int ctrl_cmd_exec(vector vline, struct ctrl_cmd *command, vector node, void *data); int ctrl_cmd_install(enum ctrl_node_type node, struct ctrl_cmd_element *cmd); -int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd); int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd); struct ctrl_cmd *ctrl_cmd_parse3(void *ctx, struct msgb *msg, bool *parse_failed); struct ctrl_cmd *ctrl_cmd_parse2(void *ctx, struct msgb *msg); diff --git a/include/osmocom/ctrl/control_if.h b/include/osmocom/ctrl/control_if.h index 98cd100..e262d9e 100644 --- a/include/osmocom/ctrl/control_if.h +++ b/include/osmocom/ctrl/control_if.h @@ -28,7 +28,8 @@ }; -int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd); +int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd) OSMO_DEPRECATED("Use ctrl_cmd_send2() instead."); +int ctrl_cmd_send2(struct ctrl_connection *ccon, struct ctrl_cmd *cmd); int ctrl_cmd_send_trap(struct ctrl_handle *ctrl, const char *name, char *value); struct ctrl_handle *ctrl_handle_alloc(void *ctx, void *data, ctrl_cmd_lookup lookup); struct ctrl_handle *ctrl_handle_alloc2(void *ctx, void *data, diff --git a/src/ctrl/control_cmd.c b/src/ctrl/control_cmd.c index dec19b9..db20551 100644 --- a/src/ctrl/control_cmd.c +++ b/src/ctrl/control_cmd.c @@ -31,6 +31,7 @@ #include <unistd.h> #include <osmocom/ctrl/control_cmd.h> +#include <osmocom/ctrl/control_if.h> #include <osmocom/core/msgb.h> #include <osmocom/core/talloc.h> @@ -647,7 +648,7 @@ cmd->type = CTRL_TYPE_ERROR; } - rc = ctrl_cmd_send(&cmd->ccon->write_queue, cmd); + rc = ctrl_cmd_send2(cmd->ccon, cmd); talloc_free(cmd); llist_del(&cd->list); diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c index 94b8975..c265c3a 100644 --- a/src/ctrl/control_if.c +++ b/src/ctrl/control_if.c @@ -106,18 +106,28 @@ llist_for_each_entry(ccon, &ctrl->ccon_list, list_entry) { if (ccon == cmd->ccon) continue; - if (ctrl_cmd_send(&ccon->write_queue, cmd)) + if (ctrl_cmd_send2(ccon, cmd)) ret++; } return ret; } -/*! Encode a CTRL command and append it to the given write queue +/*! Encode a CTRL command and append it to the given ctrl_connection * \param[inout] queue write queue to which encoded \a cmd shall be appended * \param[in] cmd decoded command representation * \returns 0 in case of success; negative on error */ int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd) { + struct ctrl_connection *ccon = container_of(queue, struct ctrl_connection, write_queue); + return ctrl_cmd_send2(ccon, cmd); +} + +/*! Encode a CTRL command and append it to the given ctrl_connection + * \param[inout] queue write queue to which encoded \a cmd shall be appended + * \param[in] cmd decoded command representation + * \returns 0 in case of success; negative on error */ +int ctrl_cmd_send2(struct ctrl_connection *ccon, struct ctrl_cmd *cmd) +{ int ret; struct msgb *msg; @@ -130,7 +140,7 @@ ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_CTRL); ipa_prepend_header(msg, IPAC_PROTO_OSMO); - ret = osmo_wqueue_enqueue(queue, msg); + ret = osmo_wqueue_enqueue(&ccon->write_queue, msg); if (ret != 0) { LOGP(DLCTRL, LOGL_ERROR, "Failed to enqueue the command.\n"); msgb_free(msg); @@ -464,7 +474,7 @@ send_reply: /* There is a reply or error that should be reported back to the sender. */ - ctrl_cmd_send(&ccon->write_queue, cmd); + ctrl_cmd_send2(ccon, cmd); just_free: talloc_free(cmd); return 0; diff --git a/src/ctrl/libosmoctrl.map b/src/ctrl/libosmoctrl.map index 306ad3f..3418e62 100644 --- a/src/ctrl/libosmoctrl.map +++ b/src/ctrl/libosmoctrl.map @@ -15,6 +15,7 @@ ctrl_cmd_parse2; ctrl_cmd_parse3; ctrl_cmd_send; +ctrl_cmd_send2; ctrl_cmd_send_to_all; ctrl_cmd_send_trap; ctrl_cmd_trap; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36143?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: Ic81af56e7ea6921ba39168727ef64c308e9c6754 Gerrit-Change-Number: 36143 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in osmo-mgw[master]: migrate mgcp_client from osmo_wqueue to osmo_io

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/36142?usp=email ) Change subject: migrate mgcp_client from osmo_wqueue to osmo_io ...................................................................... migrate mgcp_client from osmo_wqueue to osmo_io The new osmo_io framework means that we can [optionally] make use of the io_uring backend, which greatly reduces the syscall load compared to the legacy osmo_wqueue + osmo_select_main + read/write. We only use features already present in the intiial osmo_io support of libosmocore 1.9.0, so no entry in TODO-RELEASE is needed. Closes: OS#5754 Related: OS#5755 Change-Id: I766224da4691695c023d4d08d042a4bbeba05e47 --- M include/osmocom/mgcp_client/mgcp_client_internal.h M src/libosmo-mgcp-client/mgcp_client.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 74 insertions(+), 54 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/42/36142/1 diff --git a/include/osmocom/mgcp_client/mgcp_client_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 423c00e..26fbc7d 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -1,6 +1,6 @@ #pragma once -#include <osmocom/core/write_queue.h> +#include <osmocom/core/osmo_io.h> #include <osmocom/core/timer.h> #define MSGB_CB_MGCP_TRANS_ID 0 @@ -13,7 +13,7 @@ struct mgcp_client { struct mgcp_client_conf actual; - struct osmo_wqueue wq; + struct osmo_io_fd *iofd; mgcp_trans_id_t next_trans_id; struct llist_head responses_pending; struct mgcp_client_pool_member *pool_member; diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 489ce69..2d1a77b 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -781,55 +781,54 @@ return rc; } -static int mgcp_do_read(struct osmo_fd *fd) +static void mgcp_read_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) { - struct mgcp_client *mgcp = fd->data; - struct msgb *msg; - int ret; + struct mgcp_client *mgcp = osmo_iofd_get_data(iofd); - msg = msgb_alloc_headroom(4096, 128, "mgcp_from_gw"); - if (!msg) { - LOGPMGW(mgcp, LOGL_ERROR, "Failed to allocate MGCP message.\n"); - return -1; - } - - /* msgb_tailroom() is basically (4096 - 128); -1 is for '\0' */ - ret = read(fd->fd, msg->data, msgb_tailroom(msg) - 1); - if (ret <= 0) { + if (res <= 0) { LOGPMGW(mgcp, LOGL_ERROR, "Failed to read: %s: %d='%s'\n", - osmo_sock_get_name2(fd->fd), errno, strerror(errno)); + osmo_iofd_get_name(iofd), errno, strerror(errno)); msgb_free(msg); - return -1; + return; } - msg->l2h = msgb_put(msg, ret); - ret = mgcp_client_rx(mgcp, msg); + msg->l2h = msg->head; + mgcp_client_rx(mgcp, msg); talloc_free(msg); - return ret; } -static int mgcp_do_write(struct osmo_fd *fd, struct msgb *msg) +static int mgcp_do_write(struct mgcp_client *mgcp, struct msgb *msg) { int ret; - struct mgcp_client *mgcp = fd->data; LOGPMGW(mgcp, LOGL_DEBUG, "Tx MGCP: %s: len=%u '%s'...\n", - osmo_sock_get_name2(fd->fd), msg->len, + osmo_iofd_get_name(mgcp->iofd), msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); - ret = write(fd->fd, msg->data, msg->len); - if (OSMO_UNLIKELY(ret != msg->len)) - LOGPMGW(mgcp, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", - osmo_sock_get_name2(fd->fd), errno, strerror(errno), - msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); + ret = osmo_iofd_write_msgb(mgcp->iofd, msg); + if (ret < 0) + msgb_free(msg); /* Re-arm the keepalive Tx timer: */ if (mgcp->actual.keepalive.req_interval_sec > 0) osmo_timer_schedule(&mgcp->keepalive_tx_timer, mgcp->actual.keepalive.req_interval_sec, 0); + return ret; } +static void mgcp_write_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg) +{ + struct mgcp_client *mgcp = osmo_iofd_get_data(iofd); + + if (OSMO_UNLIKELY(res != msg->len)) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed to Tx MGCP: %s: %d='%s'; msg: len=%u '%s'...\n", + osmo_iofd_get_name(mgcp->iofd), errno, strerror(errno), + msg->len, osmo_escape_str((const char *)msg->data, OSMO_MIN(42, msg->len))); + } +} + + static const char *_mgcp_client_name_append_domain(const struct mgcp_client *mgcp, const char *name) { static char endpoint[MGCP_ENDPOINT_MAXLEN]; @@ -941,11 +940,6 @@ if (conf->description) mgcp->actual.description = talloc_strdup(mgcp, conf->description); - osmo_wqueue_init(&mgcp->wq, 1024); - mgcp->wq.read_cb = mgcp_do_read; - mgcp->wq.write_cb = mgcp_do_write; - osmo_fd_setup(&mgcp->wq.bfd, -1, OSMO_FD_READ, osmo_wqueue_bfd_cb, mgcp, 0); - memcpy(&mgcp->actual.keepalive, &conf->keepalive, sizeof(conf->keepalive)); osmo_timer_setup(&mgcp->keepalive_tx_timer, mgcp_client_keepalive_tx_timer_cb, mgcp); osmo_timer_setup(&mgcp->keepalive_rx_timer, mgcp_client_keepalive_rx_timer_cb, mgcp); @@ -953,6 +947,11 @@ return mgcp; } +static const struct osmo_io_ops mgcp_clnt_ioops = { + .read_cb = mgcp_read_cb, + .write_cb = mgcp_write_cb, +}; + /*! Initialize client connection (opens socket) * \param[in,out] mgcp MGCP client descriptor. * \returns 0 on success, -EINVAL on error. */ @@ -968,19 +967,28 @@ return -EINVAL; } - rc = osmo_sock_init2_ofd(&mgcp->wq.bfd, AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, - mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, - OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); + rc = osmo_sock_init2(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, mgcp->actual.local_addr, + mgcp->actual.local_port, mgcp->actual.remote_addr, mgcp->actual.remote_port, + OSMO_SOCK_F_BIND | OSMO_SOCK_F_CONNECT); if (rc < 0) { LOGPMGW(mgcp, LOGL_FATAL, "Failed to initialize socket %s:%u -> %s:%u for MGW: %s\n", mgcp->actual.local_addr ? mgcp->actual.local_addr : "(any)", mgcp->actual.local_port, mgcp->actual.remote_addr ? mgcp->actual.local_addr : "(any)", mgcp->actual.remote_port, strerror(errno)); - goto error_close_fd; + goto error_free; } - LOGPMGW(mgcp, LOGL_INFO, "MGW connection: %s\n", osmo_sock_get_name2(mgcp->wq.bfd.fd)); + mgcp->iofd = osmo_iofd_setup(mgcp, rc, osmo_sock_get_name2(rc), OSMO_IO_FD_MODE_READ_WRITE, + &mgcp_clnt_ioops, mgcp); + if (!mgcp->iofd) + goto error_close_fd; + + LOGPMGW(mgcp, LOGL_INFO, "MGW connection: %s\n", osmo_iofd_get_name(mgcp->iofd)); + + osmo_iofd_register(mgcp->iofd, -1); + osmo_iofd_set_alloc_info(mgcp->iofd, 4096, 128); + osmo_iofd_set_txqueue_max_length(mgcp->iofd, 1024); /* If configured, send a DLCX message to the endpoints that are configured to * be reset on startup. Usually this is a wildcarded endpoint. */ @@ -1006,9 +1014,10 @@ osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0); return 0; + error_close_fd: - close(mgcp->wq.bfd.fd); - mgcp->wq.bfd.fd = -1; + close(rc); +error_free: return rc; } @@ -1025,8 +1034,6 @@ * \returns 0 on success, -EINVAL on error. */ void mgcp_client_disconnect(struct mgcp_client *mgcp) { - struct osmo_wqueue *wq; - if (!mgcp) { LOGP(DLMGCP, LOGL_FATAL, "MGCP client not initialized properly\n"); return; @@ -1037,13 +1044,9 @@ osmo_timer_del(&mgcp->keepalive_tx_timer); mgcp->conn_up = false; - wq = &mgcp->wq; - osmo_wqueue_clear(wq); - LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_sock_get_name2(wq->bfd.fd)); - if (osmo_fd_is_registered(&wq->bfd)) - osmo_fd_unregister(&wq->bfd); - close(wq->bfd.fd); - wq->bfd.fd = -1; + osmo_iofd_txqueue_clear(mgcp->iofd); + LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_iofd_get_name(mgcp->iofd)); + osmo_iofd_free(mgcp->iofd); } /*! Get the IP-Aaddress of the associated MGW as string. @@ -1197,10 +1200,9 @@ goto mgcp_tx_error; } - rc = osmo_wqueue_enqueue(&mgcp->wq, msg); + rc = mgcp_do_write(mgcp, msg); if (rc) { LOGPMGW(mgcp, LOGL_FATAL, "Could not queue message to MGW\n"); - msgb_free(msg); goto mgcp_tx_error; } else LOGPMGW(mgcp, LOGL_DEBUG, "Queued %u bytes for MGW\n", diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index d57447c..9acb621 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -322,7 +322,7 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.req_interval_sec = atoi(argv[0]); - if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ + if (mgcp->iofd) { /* UDP MGCP socket connected */ if (mgcp->actual.keepalive.req_interval_sec > 0) { /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_tx_timer, mgcp->actual.keepalive.req_interval_sec, 0); @@ -375,7 +375,7 @@ /* If client already exists, apply the change immediately if possible: */ mgcp->actual.keepalive.timeout_sec = atoi(argv[0]); - if (mgcp->wq.bfd.fd != -1) { /* UDP MGCP socket connected */ + if (mgcp->iofd) { /* UDP MGCP socket connected */ if (mgcp->actual.keepalive.timeout_sec > 0) { /* Re-schedule: */ osmo_timer_schedule(&mgcp->keepalive_rx_timer, mgcp->actual.keepalive.timeout_sec, 0); @@ -680,7 +680,7 @@ const struct mgcp_client *cli = pool_member->client; vty_out(vty, "%% MGW %s%s", mgcp_client_pool_member_name(pool_member), VTY_NEWLINE); vty_out(vty, "%% MGCP link: %s,%s%s", - cli && cli->wq.bfd.fd != -1 ? "connected" : "disconnected", + cli && cli->iofd ? "connected" : "disconnected", cli && cli->conn_up ? ((cli->actual.keepalive.timeout_sec > 0) ? "UP" : "MAYBE") : "DOWN", -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/36142?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: I766224da4691695c023d4d08d042a4bbeba05e47 Gerrit-Change-Number: 36142 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_c...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36132?usp=email ) Change subject: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_connected() ...................................................................... osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_connected() If it fails, do not set the IOFD_FLAG_NOTIFY_CONNECTED flag and log an error message. Closes: Coverity CID#349579 Change-Id: I34e8cc9a2b9df0c624841e5f9268a15c32418da1 --- M src/core/osmo_io_uring.c 1 file changed, 17 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index cb636da..b174b22 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -496,8 +496,10 @@ if (!IOFD_FLAG_ISSET(iofd, IOFD_FLAG_NOTIFY_CONNECTED)) { osmo_fd_setup(&iofd->u.uring.connect_ofd, iofd->fd, OSMO_FD_WRITE, iofd_uring_connected_cb, iofd, 0); - osmo_fd_register(&iofd->u.uring.connect_ofd); - IOFD_FLAG_SET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); + if (osmo_fd_register(&iofd->u.uring.connect_ofd) < 0) + LOGPIO(iofd, LOGL_ERROR, "Failed to register FD for connect event.\n"); + else + IOFD_FLAG_SET(iofd, IOFD_FLAG_NOTIFY_CONNECTED); } } else iofd_uring_write_enable(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36132?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: I34e8cc9a2b9df0c624841e5f9268a15c32418da1 Gerrit-Change-Number: 36132 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_c...

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36132?usp=email ) Change subject: osmo_io_uring: Check if osmo_fd_register fails at iofd_uring_notify_connected() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36132?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: I34e8cc9a2b9df0c624841e5f9268a15c32418da1 Gerrit-Change-Number: 36132 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Sat, 02 Mar 2024 10:16:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_cli: Do not try to send msg, if not connected

by laforge

Attention is currently required from: jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/36123?usp=email ) Change subject: stream_cli: Do not try to send msg, if not connected ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/stream_cli.c: https://gerrit.osmocom.org/c/libosmo-netif/+/36123/comment/e041ae26_cd2e9bc8 PS4, Line 998: if (cli->state != STREAM_CLI_STATE_CONNECTED) { > Is this really a problem? or will the socket enqueue the data and transmit it automatically after co […] I think with the osmo_fd mode it is indeed just enqueued in our own internal write_queue which might be drained once connect is complete. However, for osmo_io, there is no in-application/library write_queue. Instead we immediately submit the write into the io_uring submission queue. It's illegal to do a write on a socket before it is connected. See https://pubs.opengroup.org/onlinepubs/9699919799/functions/write.html: [ECONNRESET] A write was attempted on a socket that is not connected. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/36123?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: I9e5f5db9b45615dacb05115c4de8ff3f715815c8 Gerrit-Change-Number: 36123 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 02 Mar 2024 09:33:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2024