pespin has uploaded this change for review.

View Change

stream: Undeprecate osmo_stream_srv_set_segmentation_cb()

It has been decided that it's convenient to use the older
segmentation_cb() callback when user wants to segment traffic which
doesn't require any external pointer (like IPA), since then less glue
code is needed to call the relevant segmentation functions.

Change-Id: Icec7ed9e16eb92a2384c16ff5b3e7011205e767c
---
M include/osmocom/netif/stream.h
M src/stream_cli.c
M src/stream_srv.c
3 files changed, 2 insertions(+), 5 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/12/39412/1

diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h
index 83f17d7..91a9b5e 100644
--- a/include/osmocom/netif/stream.h
+++ b/include/osmocom/netif/stream.h
@@ -140,7 +140,7 @@
 void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn);
 void osmo_stream_srv_set_data(struct osmo_stream_srv *conn, void *data);
 
-void osmo_stream_srv_set_segmentation_cb(struct osmo_stream_srv *conn, osmo_stream_srv_segmentation_cb_t segmentation_cb) OSMO_DEPRECATED("Use osmo_stream_srv_set_segmentation_cb2() instead");
+void osmo_stream_srv_set_segmentation_cb(struct osmo_stream_srv *conn, osmo_stream_srv_segmentation_cb_t segmentation_cb);
 void osmo_stream_srv_set_segmentation_cb2(struct osmo_stream_srv *conn, osmo_stream_srv_segmentation_cb2_t segmentation_cb2);
 
 void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg);
@@ -228,7 +228,7 @@
 void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, osmo_stream_cli_disconnect_cb_t disconnect_cb);
 void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, osmo_stream_cli_read_cb_t read_cb);
 void osmo_stream_cli_set_read_cb2(struct osmo_stream_cli *cli, osmo_stream_cli_read_cb2_t read_cb);
-void osmo_stream_cli_set_segmentation_cb(struct osmo_stream_cli *cli, osmo_stream_cli_segmentation_cb_t segmentation_cb) OSMO_DEPRECATED("Use osmo_stream_cli_set_segmentation_cb2() instead");
+void osmo_stream_cli_set_segmentation_cb(struct osmo_stream_cli *cli, osmo_stream_cli_segmentation_cb_t segmentation_cb);
 void osmo_stream_cli_set_segmentation_cb2(struct osmo_stream_cli *cli, osmo_stream_cli_segmentation_cb2_t segmentation_cb2);
 void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli);
 bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli);
diff --git a/src/stream_cli.c b/src/stream_cli.c
index 586b1b0..6628ad7 100644
--- a/src/stream_cli.c
+++ b/src/stream_cli.c
@@ -821,7 +821,6 @@
  *  \param[in,out] cli Stream Client to modify
  *  \param[in] segmentation_cb Target segmentation callback
  *
- * DEPRECATED: Use osmo_cli_set_segmentation_cb2() instead.
  */
 void osmo_stream_cli_set_segmentation_cb(struct osmo_stream_cli *cli,
 					 osmo_stream_cli_segmentation_cb_t segmentation_cb)
diff --git a/src/stream_srv.c b/src/stream_srv.c
index 261539b..05f780c 100644
--- a/src/stream_srv.c
+++ b/src/stream_srv.c
@@ -1104,8 +1104,6 @@
  *  \param[in,out] conn Target Stream Server to modify
  *  \param[in] segmentation_cb Segmentation callback to be set
  *
- *  DEPRECATED: Use osmo_stream_srv_set_segmentation_cb2() instead.
- *
  *  A segmentation call-back can optionally be used when a packet based protocol (like TCP) is used within a
  *  STREAM style socket that does not preserve message boundaries within the stream.  If a segmentation
  *  call-back is given, the osmo_stream_srv library code will makes sure that the read_cb called only for

To view, visit change 39412. To unsubscribe, or for help writing mail filters, visit settings.