laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/35062?usp=email ) 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(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/35062/1 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 05fb9fc..6677d34 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; @@ -687,7 +687,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: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange