osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 1
Code Issues Releases Wiki Activity

osmo_io: Use local variable to reference msghdr->msg 

Change-Id: I336ef7a5460dd18bf8e0f4ac5e97747f9fec5a35
This commit is contained in:
Daniel Willmann 2023-08-30 17:18:34 +02:00 committed by laforge
parent f39c23f918
commit ec7d491589
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/osmo_io_uring.c
View File

@ -182,6 +182,7 @@ static int iofd_uring_submit_tx(struct osmo_io_fd *iofd);
static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
{
struct osmo_io_fd *iofd = msghdr->iofd;
struct msgb *msg = msghdr->msg;
if (IOFD_FLAG_ISSET(iofd, IOFD_FLAG_CLOSED))
goto out_free;
@ -189,27 +190,27 @@ static void iofd_uring_handle_tx(struct iofd_msghdr *msghdr, int rc)
/* Error during write */
if (rc < 0) {
if (msghdr->action == IOFD_ACT_WRITE)
iofd->io_ops.write_cb(iofd, rc, msghdr->msg);
iofd->io_ops.write_cb(iofd, rc, msg);
else if (msghdr->action == IOFD_ACT_SENDTO)
iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa);
iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa);
else
OSMO_ASSERT(0);
goto out_free;
}
/* Incomplete write */
if (rc < msgb_length(msghdr->msg)) {
if (rc < msgb_length(msg)) {
/* Re-enqueue remaining data */
msgb_pull(msghdr->msg, rc);
msghdr->iov[0].iov_len = msgb_length(msghdr->msg);
msgb_pull(msg, rc);
msghdr->iov[0].iov_len = msgb_length(msg);
iofd_txqueue_enqueue_front(iofd, msghdr);
goto out;
}
if (msghdr->action == IOFD_ACT_WRITE)
iofd->io_ops.write_cb(iofd, rc, msghdr->msg);
iofd->io_ops.write_cb(iofd, rc, msg);
else if (msghdr->action == IOFD_ACT_SENDTO)
iofd->io_ops.sendto_cb(iofd, rc, msghdr->msg, &msghdr->osa);
iofd->io_ops.sendto_cb(iofd, rc, msg, &msghdr->osa);
else
OSMO_ASSERT(0);