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

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email ) Change subject: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test ...................................................................... BTS_Tests_LAPDm.TC_nr_seq_error: Fix test Related: OS#5968 Change-Id: I4cdff6ab607e158d4956a1bd87f74e9e75579cff --- M bts/BTS_Tests_LAPDm.ttcn 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn index b4c2c33..2e984d1 100644 --- a/bts/BTS_Tests_LAPDm.ttcn +++ b/bts/BTS_Tests_LAPDm.ttcn @@ -801,6 +801,11 @@ /* SAPI = 0, C = 1, P = 0, M = 0, L = N201, N(S) = 0, N(R) = 1. * */ LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_I(sapi, c_r:=cr_MO_CMD, p:=false, nr:=1, ns:=0, l3:=l3_mo))); + /* LAPD indicates the data and then indicates error with sequence error cause. */ + RSL.receive(tr_RSL_DATA_IND(g_chan_nr, link_id, l3_mo)); + RSL.receive(tr_RSL_ERROR_IND(g_chan_nr, link_id, '07'O)); + /* Release RSL link. */ + RSL.send(ts_RSL_REL_REQ(g_chan_nr, link_id)); /* The BTS may: a) send a DISC frame within N200×T200; */ /* DISC SAPI = 0, C = 0, P = 1, M = 0, L = 0. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cdff6ab607e158d4956a1bd87f74e9e75579cff Gerrit-Change-Number: 35047 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email ) Change subject: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cdff6ab607e158d4956a1bd87f74e9e75579cff Gerrit-Change-Number: 35047 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 22 Nov 2023 12:24:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling ...................................................................... Patch Set 12: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?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: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 12 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: Wed, 22 Nov 2023 12:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmo-netif[master]: Introduce generic osmo_stream_{cli,srv}_get_fd() API

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email ) Change subject: Introduce generic osmo_stream_{cli,srv}_get_fd() API ...................................................................... Introduce generic osmo_stream_{cli,srv}_get_fd() API The old osmo_stream_{cli,srv}_get_ofd() API only works for streams in OSMO_FD mode. However, it is legitimate for an application wanting to get low-level access to the file descriptor, for example to issue some {get,set}sockopt() calls on it. Change-Id: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab Related: OS#5753 --- M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 3 files changed, 45 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index a24244c..218b635 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -64,6 +64,7 @@ void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn); struct osmo_stream_srv_link *osmo_stream_srv_get_master(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); void osmo_stream_srv_destroy(struct osmo_stream_srv *conn); void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn); @@ -96,6 +97,7 @@ void *osmo_stream_cli_get_data(struct osmo_stream_cli *cli); 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); 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 ef571cc..1e7ebeb 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -210,7 +210,11 @@ } } -static inline int osmo_stream_cli_fd(const struct osmo_stream_cli *cli) +/*! \brief Get file descriptor of the stream client socket + * \param[in] cli Stream Client of which we want to obtain the file descriptor + * \returns File descriptor or negative in case of error */ +int +osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli) { switch (cli->mode) { case OSMO_STREAM_MODE_OSMO_FD: @@ -314,7 +318,7 @@ #ifdef SO_NOSIGPIPE int ret; int val = 1; - ret = setsockopt(osmo_stream_cli_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); + ret = setsockopt(osmo_stream_cli_get_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); if (ret < 0) LOGSCLI(cli, LOGL_ERROR, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); return ret; @@ -328,7 +332,7 @@ int error, ret = res; socklen_t len = sizeof(error); - int fd = osmo_stream_cli_fd(cli); + int fd = osmo_stream_cli_get_fd(cli); OSMO_ASSERT(fd >= 0); if (ret < 0) { @@ -347,7 +351,7 @@ osmo_fd_write_disable(&cli->ofd); /* Update sockname based on socket info: */ - osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_fd(cli)); + osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_get_fd(cli)); LOGSCLI(cli, LOGL_INFO, "connection established\n"); cli->state = STREAM_CLI_STATE_CONNECTED; @@ -683,7 +687,7 @@ { static char buf[OSMO_SOCK_NAME_MAXLEN]; - osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_fd(cli)); + osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_get_fd(cli)); return buf; } @@ -837,7 +841,7 @@ int ret, fd = -1; /* we are reconfiguring this socket, close existing first. */ - if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_fd(cli) >= 0) + if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_get_fd(cli) >= 0) osmo_stream_cli_close(cli); cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; diff --git a/src/stream_srv.c b/src/stream_srv.c index 36e21cc..42b04ad 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -838,6 +838,24 @@ return &conn->ofd; } +/*! \brief Get File Descriptor of the stream server + * \param[in] conn Stream Server + * \returns file descriptor or negative on error */ +int +osmo_stream_srv_get_fd(const struct osmo_stream_srv *conn) +{ + switch (conn->mode) { + case OSMO_STREAM_MODE_OSMO_FD: + return conn->ofd.fd; + case OSMO_STREAM_MODE_OSMO_IO: + if (conn->iofd) + return osmo_iofd_get_fd(conn->iofd); + default: + break; + } + return -EINVAL; +} + /*! \brief Get 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/+/35072?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: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab Gerrit-Change-Number: 35072 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[M] Change in libosmo-netif[master]: Introduce generic osmo_stream_{cli,srv}_get_fd() API

by laforge

Attention is currently required from: daniel. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email ) Change subject: Introduce generic osmo_stream_{cli,srv}_get_fd() API ...................................................................... Patch Set 3: Code-Review+2 (1 comment) Patchset: PS3: re-adding daniels +1 from patch version 1 (only cosmetic changes since) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35072?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: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab Gerrit-Change-Number: 35072 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Nov 2023 12:21:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG...

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND ...................................................................... osmo_io: rename unsupported SCTP mode to OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND The two functions of the SCTP socket interface we use in osmo-* are sctp_send() and sctp_recvmsg(). We do not use sctp_sendmsg() at all, so let's make sure the mode is named correctly. Change-Id: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15 Related: OS#5751 --- M include/osmocom/core/osmo_io.h M src/core/osmo_io.c M src/core/osmo_io_poll.c 3 files changed, 19 insertions(+), 5 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index b3d248f..46e1a53 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -21,8 +21,8 @@ OSMO_IO_FD_MODE_READ_WRITE, /*! use recvfrom() / sendto() calls */ OSMO_IO_FD_MODE_RECVFROM_SENDTO, - /*! emulate sctp_recvmsg() and sctp_sendmsg() */ - OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG, + /*! emulate sctp_recvmsg() and sctp_send() */ + OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND, }; enum osmo_io_backend { diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 649bf73..1a8c01d 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -337,7 +337,7 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd->io_ops.recvfrom_cb(iofd, rc, msg, &hdr->osa); break; - case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: /* TODO Implement */ OSMO_ASSERT(false); break; @@ -688,7 +688,7 @@ else osmo_iofd_ops.read_disable(iofd); break; - case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: default: OSMO_ASSERT(0); } diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index a9aaea4..2c1e422 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -98,7 +98,7 @@ case OSMO_IO_FD_MODE_RECVFROM_SENDTO: iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa); break; - case OSMO_IO_FD_MODE_SCTP_RECVMSG_SENDMSG: + case OSMO_IO_FD_MODE_SCTP_RECVMSG_SEND: OSMO_ASSERT(false); break; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35062?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: Ie2d1c7ce6f211dbe025a0e843ad733443102ea15 Gerrit-Change-Number: 35062 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35063?usp=email ) Change subject: osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() ...................................................................... osmo_io: Reject unknown/unsupported modes in osmo_iofd_setup() The current code does not check the value range of the 'mode' parameter and would later run into OSMO_ASSERT(), rather than rejecting such a mode from the very beginning. Change-Id: I10dd612487638f456d0ad59c2cca203f1e098da3 Related: OS#5751 --- M src/core/osmo_io.c 1 file changed, 26 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 1a8c01d..8507f46 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -445,7 +445,18 @@ struct osmo_io_fd *osmo_iofd_setup(const void *ctx, int fd, const char *name, enum osmo_io_fd_mode mode, const struct osmo_io_ops *ioops, void *data) { - struct osmo_io_fd *iofd = talloc_zero(ctx, struct osmo_io_fd); + struct osmo_io_fd *iofd; + + /* reject unsupported/unknown modes */ + switch (mode) { + case OSMO_IO_FD_MODE_READ_WRITE: + case OSMO_IO_FD_MODE_RECVFROM_SENDTO: + break; + default: + return NULL; + } + + iofd = talloc_zero(ctx, struct osmo_io_fd); if (!iofd) return NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35063?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: I10dd612487638f456d0ad59c2cca203f1e098da3 Gerrit-Change-Number: 35063 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: io_uring: add some more source code comments/docs

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35061?usp=email ) Change subject: io_uring: add some more source code comments/docs ...................................................................... io_uring: add some more source code comments/docs Change-Id: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a --- M src/core/osmo_io.c M src/core/osmo_io_internal.h M src/core/osmo_io_uring.c 3 files changed, 30 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index f23986f..649bf73 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -323,6 +323,10 @@ iofd->pending = pending; } +/*! completion handler: Called by osmo_io backend after a given I/O operation has completed + * \param[in] iofd I/O file-descriptor on which I/O has completed + * \param[in] msg message buffer containing data related to completed I/O + * \param[in] hdr serialized msghdr containing state of completed I/O */ void iofd_handle_recv(struct osmo_io_fd *iofd, struct msgb *msg, int rc, struct iofd_msghdr *hdr) { talloc_steal(iofd->msgb_alloc.ctx, msg); diff --git a/src/core/osmo_io_internal.h b/src/core/osmo_io_internal.h index 5b7ab90..73a81e1 100644 --- a/src/core/osmo_io_internal.h +++ b/src/core/osmo_io_internal.h @@ -111,16 +111,24 @@ }; -/* serialized version of 'struct msghdr' employed by sendmsg/recvmsg */ +/*! serialized version of 'struct msghdr' employed by sendmsg/recvmsg */ struct iofd_msghdr { + /*! entry into osmo_io_fd.tx_queue.msg_queue */ struct llist_head list; enum iofd_msg_action action; + /*! the 'struct msghdr' we are wrapping/ecapsulating here */ struct msghdr hdr; + /*! socket address of the remote peer */ struct osmo_sockaddr osa; + /*! io-vector we need to pass as argument to sendmsg/recvmsg; is set up + * to point into msg below */ struct iovec iov[1]; + /*! flags we pass as argument to sendmsg / recvmsg */ int flags; + /*! message-buffer containing data for this I/O operation */ struct msgb *msg; + /*! I/O file descriptor on which we perform this I/O operation */ struct osmo_io_fd *iofd; }; diff --git a/src/core/osmo_io_uring.c b/src/core/osmo_io_uring.c index a6395fe..abeea79 100644 --- a/src/core/osmo_io_uring.c +++ b/src/core/osmo_io_uring.c @@ -59,6 +59,8 @@ static __thread struct osmo_io_uring g_ring; static void iofd_uring_cqe(struct io_uring *ring); + +/*! read call-back for eventfd notifying us if entries are in the completion queue */ static int iofd_uring_poll_cb(struct osmo_fd *ofd, unsigned int what) { struct io_uring *ring = ofd->data; @@ -157,6 +159,7 @@ iofd->u.uring.read_msghdr = msghdr; } +/*! completion call-back for READ/RECVFROM */ static void iofd_uring_handle_recv(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -179,6 +182,7 @@ static int iofd_uring_submit_tx(struct osmo_io_fd *iofd); +/*! completion call-back for WRITE/SENDTO */ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -220,10 +224,12 @@ out: iofd->u.uring.write_msghdr = NULL; + /* submit the next to-be-transmitted message for this file descriptor */ if (iofd->u.uring.write_enabled && !IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED)) iofd_uring_submit_tx(iofd); } +/*! handle completion of a single I/O message */ static void iofd_uring_handle_completion(struct iofd_msghdr *msghdr, int res) { struct osmo_io_fd *iofd = msghdr->iofd; @@ -250,6 +256,7 @@ talloc_free(iofd); } +/*! process all pending completion queue entries in given io_uring */ static void iofd_uring_cqe(struct io_uring *ring) { int rc; @@ -274,6 +281,7 @@ } } +/*! will submit the next to-be-transmitted message for given iofd */ static int iofd_uring_submit_tx(struct osmo_io_fd *iofd) { struct io_uring_sqe *sqe; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35061?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: I8ba77a18b51f67a9edbd1fa488b9791f8bf6e40a Gerrit-Change-Number: 35061 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 7 months

1
0
0 0

[S] Change in osmo-bsc[master]: use X6 timer for REL ACK, not T3111

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35088?usp=email ) Change subject: use X6 timer for REL ACK, not T3111 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35088?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: Ibd118fa23e5deb4381bc31b11a7b495f57901d6c Gerrit-Change-Number: 35088 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Nov 2023 12:18:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: add new osmo_sockaddr_from_str_and_uint() function

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35085?usp=email ) Change subject: add new osmo_sockaddr_from_str_and_uint() function ...................................................................... add new osmo_sockaddr_from_str_and_uint() function The function is basically a shortcut for getaddrinfo with storing the output data into our 'struct osmo_sockaddr'. Change-Id: I6b5c0bf8ca97e6358d992fb2ff45ffd53ba15197 Related: SYS#6657 --- M include/osmocom/core/socket.h M src/core/libosmocore.map M src/core/socket.c M tests/socket/socket_test.c M tests/socket/socket_test.ok 5 files changed, 52 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index db55863..03f1d39 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -74,6 +74,7 @@ int osmo_sockaddr_to_octets(uint8_t *dst, size_t dst_maxlen, const struct osmo_sockaddr *os); int osmo_sockaddr_from_octets(struct osmo_sockaddr *os, const void *src, size_t src_len); +int osmo_sockaddr_from_str_and_uint(struct osmo_sockaddr *osa_out, const char *ipstr, uint16_t port); int osmo_sockaddr_netmask_to_prefixlen(const struct osmo_sockaddr *addr); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index ae8a068..3d6aa42 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -374,6 +374,7 @@ osmo_signal_unregister_handler; osmo_sockaddr_cmp; osmo_sockaddr_from_octets; +osmo_sockaddr_from_str_and_uint; osmo_sockaddr_in_to_str_and_uint; osmo_sockaddr_is_any; osmo_sockaddr_is_local; diff --git a/src/core/socket.c b/src/core/socket.c index fa5fb88..1dc8e46 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1662,6 +1662,27 @@ } } +/*! Convert an IP address string (and port number) into a 'struct osmo_sockaddr'. + * \param[out] osa_out caller-allocated osmo_sockaddr storage + * \param[in] ipstr IP[v4,v6] address in string format + * \param[in] port port number (host byte order) + * \returns 0 on success; negative on error. */ +int osmo_sockaddr_from_str_and_uint(struct osmo_sockaddr *osa_out, const char *ipstr, uint16_t port) +{ + struct addrinfo *ai = addrinfo_helper(AF_UNSPEC, 0, 0, ipstr, port, true); + + if (!ai) + return -EIO; + + if (ai->ai_addrlen > sizeof(*osa_out)) + return -ENOSPC; + + memcpy(&osa_out->u.sa, ai->ai_addr, ai->ai_addrlen); + freeaddrinfo(ai); + + return 0; +} + /*! Initialize a unix domain socket (including bind/connect) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index ddb6926..34130b2 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -315,6 +315,7 @@ const char *result; struct osmo_sockaddr localhost4 = {}; struct osmo_sockaddr localhost6 = {}; + struct osmo_sockaddr osa = {}; localhost4.u.sin = (struct sockaddr_in){ .sin_family = AF_INET, @@ -383,6 +384,18 @@ result = osmo_sockaddr_to_str(&localhost6); printf("Checking osmo_sockaddr_to_str_buf long IPv6 port static buffer\n"); OSMO_ASSERT(!strncmp("[2003:1234:5678:90ab:cdef:1234:4321:4321]:23420", result, sizeof(buf))); + + printf("Checking osmo_sockaddr_from_str_and_uint for 0.0.0.0\n"); + OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "0.0.0.0", 1234) == 0); + OSMO_ASSERT(osmo_sockaddr_is_any(&osa)); + + printf("Checking osmo_sockaddr_from_str_and_uint for ::\n"); + OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "::", 1234) == 0); + OSMO_ASSERT(osmo_sockaddr_is_any(&osa)); + + printf("Checking osmo_sockaddr_from_str_and_uint for 1.2.3.4\n"); + OSMO_ASSERT(osmo_sockaddr_from_str_and_uint(&osa, "1.2.3.4", 1234) == 0); + OSMO_ASSERT(!osmo_sockaddr_is_any(&osa)); } static void test_osa_netmask_prefixlen(void) diff --git a/tests/socket/socket_test.ok b/tests/socket/socket_test.ok index 236c011..2b1c100 100644 --- a/tests/socket/socket_test.ok +++ b/tests/socket/socket_test.ok @@ -31,3 +31,6 @@ Checking osmo_sockaddr_to_str_buf long IPv6 Checking osmo_sockaddr_to_str_buf long IPv6 port Checking osmo_sockaddr_to_str_buf long IPv6 port static buffer +Checking osmo_sockaddr_from_str_and_uint for 0.0.0.0 +Checking osmo_sockaddr_from_str_and_uint for :: +Checking osmo_sockaddr_from_str_and_uint for 1.2.3.4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35085?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: I6b5c0bf8ca97e6358d992fb2ff45ffd53ba15197 Gerrit-Change-Number: 35085 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023