arehbein submitted this change.
stream: Adapt to new changes
- adapt to def. of struct osmo_io_ops
- eliminate compiler warnings due to change in callback signature
Requires change I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377
Related: OS#5753
Change-Id: I5f9a5ce85efb4ed512ff6ca1f3e170d2ffb2ba22
---
M src/stream.c
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/stream.c b/src/stream.c
index d61a8d6..98a4be9 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -88,7 +88,7 @@
//static int (*segmentation_cbs[_NUM_OSMO_STREAM_PROTOS][_NUM_CB_TYPES])(struct msgb *, int) = {
// [OSMO_STREAM_IPAC][CB_TYPE_SEGM] = ipa_segmentation_cb,
-static int (*segmentation_cbs[_NUM_OSMO_STREAM_PROTOS])(struct msgb *, int) = {
+static int (*segmentation_cbs[_NUM_OSMO_STREAM_PROTOS])(struct msgb *) = {
[OSMO_STREAM_IPAC] = ipa_segmentation_cb,
};
@@ -655,7 +655,7 @@
}
}
-static void stream_cli_iofd_write_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg)
+static void stream_cli_iofd_write_cb(struct osmo_io_fd *iofd, int res, const struct msgb *msg)
{
struct osmo_stream_cli *cli = osmo_iofd_get_data(iofd);
@@ -677,10 +677,6 @@
static struct osmo_io_ops osmo_stream_cli_ioops = {
.read_cb = stream_cli_iofd_read_cb,
.write_cb = stream_cli_iofd_write_cb,
-
- .sendmsg_cb = NULL,
- .recvmsg_cb = NULL,
-
.segmentation_cb = NULL,
};
@@ -1427,7 +1423,7 @@
return;
}
-static void stream_srv_iofd_write_cb(struct osmo_io_fd *iofd, int res, struct msgb *msg)
+static void stream_srv_iofd_write_cb(struct osmo_io_fd *iofd, int res, const struct msgb *msg)
{
struct osmo_stream_srv *conn = osmo_iofd_get_data(iofd);
LOGP(DLINP, LOGL_DEBUG, "connected write\n");
To view, visit change 32809. To unsubscribe, or for help writing mail filters, visit settings.