Osmocom Open Build Service

libosmo-netif.spec Deleted

@@ -1,88 +0,0 @@
-#
-# spec file for package libosmo-netif
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name:           libosmo-netif
-Requires: osmocom-latest
-Version: 1.4.0
-Release:        0
-Summary:        Osmocom library for muxed audio
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Utilities
-URL:            https://osmocom.org/projects/libosmo-netif
-Source: libosmo-netif_1.4.0.tar.xz
-Source1: rpmlintrc
-BuildRequires:  automake
-BuildRequires:  libtool >= 2
-BuildRequires:  lksctp-tools-devel
-BuildRequires:  pkgconfig >= 0.20
-BuildRequires:  pkgconfig(libosmocore) >= 1.9.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires:  pkgconfig(libosmocodec) >= 1.9.0
-
-%description
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif11
-Requires: osmocom-latest
-Summary:        Osmocom library for muxed audio
-License:        AGPL-3.0-or-later
-Group:          System/Libraries
-
-%description -n libosmonetif11
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif-devel
-Requires: osmocom-latest
-Summary:        Development files for the Osmocom muxed audio library
-License:        AGPL-3.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmonetif11 = %{version}
-
-%description -n libosmonetif-devel
-Network interface demuxer library for OsmoCom projects.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-netif.
-
-%prep
-%setup -n libosmo-netif -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fiv
-%configure --enable-shared --disable-static --includedir="%{_includedir}/%{name}"
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post   -n libosmonetif11 -p /sbin/ldconfig
-%postun -n libosmonetif11 -p /sbin/ldconfig
-
-%files -n libosmonetif11
-%{_libdir}/libosmonetif.so.11*
-
-%files -n libosmonetif-devel
-%license COPYING
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/osmocom
-%{_includedir}/%{name}/osmocom/netif/
-%{_libdir}/libosmonetif.so
-%{_libdir}/pkgconfig/libosmo-netif.pc
-
-%changelog

libosmo-netif_1.4.0.tar.xz/contrib/libosmo-netif.spec.in Deleted

@@ -1,87 +0,0 @@
-#
-# spec file for package libosmo-netif
-#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-Name:           libosmo-netif
-Requires: osmocom-latest
-Version:        @VERSION@
-Release:        0
-Summary:        Osmocom library for muxed audio
-License:        GPL-2.0-or-later
-Group:          Productivity/Telephony/Utilities
-URL:            https://osmocom.org/projects/libosmo-netif
-Source:         %{name}-%{version}.tar.xz
-BuildRequires:  automake
-BuildRequires:  libtool >= 2
-BuildRequires:  lksctp-tools-devel
-BuildRequires:  pkgconfig >= 0.20
-BuildRequires:  pkgconfig(libosmocore) >= 1.9.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.9.0
-BuildRequires:  pkgconfig(libosmocodec) >= 1.9.0
-
-%description
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif11
-Requires: osmocom-latest
-Summary:        Osmocom library for muxed audio
-License:        AGPL-3.0-or-later
-Group:          System/Libraries
-
-%description -n libosmonetif11
-Network interface demuxer library for OsmoCom projects.
-
-%package -n libosmonetif-devel
-Requires: osmocom-latest
-Summary:        Development files for the Osmocom muxed audio library
-License:        AGPL-3.0-or-later
-Group:          Development/Libraries/C and C++
-Requires:       libosmonetif11 = %{version}
-
-%description -n libosmonetif-devel
-Network interface demuxer library for OsmoCom projects.
-
-This subpackage contains libraries and header files for developing
-applications that want to make use of libosmo-netif.
-
-%prep
-%setup -q
-
-%build
-echo "%{version}" >.tarball-version
-autoreconf -fiv
-%configure --enable-shared --disable-static --includedir="%{_includedir}/%{name}"
-make %{?_smp_mflags}
-
-%install
-%make_install
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%check
-make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
-
-%post   -n libosmonetif11 -p /sbin/ldconfig
-%postun -n libosmonetif11 -p /sbin/ldconfig
-
-%files -n libosmonetif11
-%{_libdir}/libosmonetif.so.11*
-
-%files -n libosmonetif-devel
-%license COPYING
-%dir %{_includedir}/%{name}
-%dir %{_includedir}/%{name}/osmocom
-%{_includedir}/%{name}/osmocom/netif/
-%{_libdir}/libosmonetif.so
-%{_libdir}/pkgconfig/libosmo-netif.pc
-
-%changelog

libosmo-netif_1.4.0.dsc -> libosmo-netif_1.5.0.dsc Changed

@@ -2,21 +2,21 @@
 Source: libosmo-netif
 Binary: libosmonetif11, libosmo-netif-dev, libosmo-netif-doc, libosmo-netif-dbg
 Architecture: any all
-Version: 1.4.0
+Version: 1.5.0
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
 Standards-Version: 3.9.6
 Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
-Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.9.0), pkg-config, libpcap0.8-dev, libsctp-dev
+Build-Depends: debhelper (>= 10), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, doxygen, libosmocore-dev (>= 1.10.0), pkg-config, libpcap0.8-dev, libsctp-dev
 Package-List:
  libosmo-netif-dbg deb debug extra arch=any
  libosmo-netif-dev deb libdevel optional arch=any
  libosmo-netif-doc deb doc optional arch=all
  libosmonetif11 deb libs optional arch=any
 Checksums-Sha1:
- 6000513b1c6ecc605ffb1741089a304ceb7f406a 187720 libosmo-netif_1.4.0.tar.xz
+ 56f5f5a505ecd2d6112143c7d222555b5baa9f49 194716 libosmo-netif_1.5.0.tar.xz
 Checksums-Sha256:
- 24eed47dc650822cc84fae35ace4b18b837c8e82427e788b271e96469cdfe4d9 187720 libosmo-netif_1.4.0.tar.xz
+ 84b90facdbe135354a4edcf6accdd5444149577f61be34956d50e71aec21be4a 194716 libosmo-netif_1.5.0.tar.xz
 Files:
- 53c29e93fce3fd8cddefe8c745988dfd 187720 libosmo-netif_1.4.0.tar.xz
+ 8ac0328d19fa24ad80eca62d000bb77c 194716 libosmo-netif_1.5.0.tar.xz

libosmo-netif_1.4.0.tar.xz/.tarball-version -> libosmo-netif_1.5.0.tar.xz/.tarball-version Changed

libosmo-netif_1.4.0.tar.xz/Doxyfile.in -> libosmo-netif_1.5.0.tar.xz/Doxyfile.in Changed

@@ -150,7 +150,7 @@
 # comments will behave just like regular Qt-style comments
 # (thus requiring an explicit @brief command for a brief description.)
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then Doxygen will
 # interpret the first line (until the first dot) of a Qt-style
@@ -158,7 +158,7 @@
 # will behave just like regular Qt-style comments (thus requiring
 # an explicit \brief command for a brief description.)
 
-QT_AUTOBRIEF           = NO
+QT_AUTOBRIEF           = YES
 
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///
@@ -328,13 +328,13 @@
 # If the EXTRACT_STATIC tag is set to YES all static members of a file
 # will be included in the documentation.
 
-EXTRACT_STATIC         = YES
+EXTRACT_STATIC         = NO
 
 # If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
 # defined locally in source files will be included in the documentation.
 # If set to NO only classes defined in header files are included.
 
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 
 # This flag is only useful for Objective-C code. When set to YES local
 # methods, which are defined in the implementation section but not in

libosmo-netif_1.4.0.tar.xz/Makefile.am -> libosmo-netif_1.5.0.tar.xz/Makefile.am Changed

libosmo-netif_1.4.0.tar.xz/README.md -> libosmo-netif_1.5.0.tar.xz/README.md Changed

libosmo-netif_1.4.0.tar.xz/TODO-RELEASE -> libosmo-netif_1.5.0.tar.xz/TODO-RELEASE Changed

@@ -1,9 +1,9 @@
 # When cleaning up this file: bump API version in corresponding Makefile.am and rename corresponding debian/lib*.install
-# according to https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
-# In short:
+# according to https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_release
+# In short: https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html#Updating-version-info
 # LIBVERSION=c:r:a
 # If the library source code has changed at all since the last update, then increment revision: c:r + 1:a.
-# If any interfaces have been added, removed, or changed since the last update: c + 1:0:0.
+# If any interfaces have been added, removed, or changed since the last update: c + 1:0:a.
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public release: c:r:0.
-#library	what		description / commit summary line
+#library	what			description / commit summary line

libosmo-netif_1.4.0.tar.xz/configure.ac -> libosmo-netif_1.5.0.tar.xz/configure.ac Changed

libosmo-netif_1.4.0.tar.xz/debian/changelog -> libosmo-netif_1.5.0.tar.xz/debian/changelog Changed

@@ -1,3 +1,78 @@
+libosmo-netif (1.5.0) unstable; urgency=medium
+
+   arehbein 
+  * ipa: Don't break strict aliasing rule
+  * stream_srv: Set io_fd pointer to NULL after freeing
+  * stream_test: Disable nagling
+  * stream: Add client-side (segmentation) support for IPA
+  * stream (test): Fix Coverity CID 323456
+  * stream: Add and use helper function osmo_ipa_push_headers()
+  * stream_test: Improve mem mgmt, fix connection mgmt
+  * stream_test: Fix memleaks
+
+   Daniel Willmann 
+  * stream_srv: Fix connection error handling
+  * stream_srv: Make osmo_stream_srv_clear_tx_queue() aware of osmo_io
+  * stream_test: Increase log level to debug
+
+   Harald Welte 
+  * stream_srv: osmo_stream_srv_get_ofd() works only in OSMO_FD mode
+  * Introduce generic osmo_stream_{cli,srv}_get_fd() API
+  * examples/stream-*: Support SCTP when called with "-s" argument
+  * examples/stream-{server,client}: Generate talloc report on SIGUSR1
+  * stream_{cli,srv}: Add support for SCTP in OSMO_IO mode
+  * osmo_io: make use of osmo_iofd_get_ioops()
+  * osmo_stream_cli_send(): Drop data if client is not connected yet
+  * Makefile.am: Fix dependency: rebuild doxygen on src/include changes
+  * docs: Enable AUTOBRIEF feauture in doxygen
+  * docs: Use \defgroup and avoid repeated boilerplate text
+  * docs: Don't export documentation about static (internal) functions
+  * Ensure osmo_stream_{cli,srv}_recv() is used only in osmo_fd mode
+  * docs: More verbose stream_{cli,srv} API documentation/manual
+  * docs: Don't export internal structs declared in src files
+  * docs: Split Stream Server and Stream Client into separate groups
+  * docs: jibuf: Prevent internal #defines being documented
+  * Makefile.am: Remove $(SOURCES) which is not defined anywhere
+  * introduce osmo_stream_cli_get_iofd() API
+  * docs: various osmux API documentation updates
+  * docs: Improve/clean-up doxygen for datagram.ch
+
+   Pau Espin Pedrol 
+  * stream_cli: Fix opening sctp client socket if no local address set
+  * stream: Add missing osmo_stream_srv_link_get_fd() API
+  * netif: sctp.h: Introduce value_string for enum sctp_spinfo_state
+  * netif: sctp.h: Introduce value_string for enum sctp_sstat_state
+  * stream_cli: osmo_stream_cli_get_sockname() now returns the full set of addresses
+  * stream_cli: Introduce API osmo_stream_srv_get_sockname()
+  * stream_srv_link: osmo_stream_srv_link_get_sockname() now returns the full set of addresses
+  * osmo_prim_srv_send: assert prim_srv is not NULL
+  * stream: Add osmo_stream_*_get_name() APIs
+  * prim: Introduce osmo_prim_srv{_link}_set_name APIs
+  * stream_srv: Fix retrieve of srv_link sockname for AF_UNIX sockets
+  * examples/ipa-stream-client: Fix memleaks in read_cb()
+  * stream_cli: Remove unused write_cb field
+  * stream: Define types for each API callback
+  * tests/stream: Fix missing msgb_free()
+  * stream_{cli,srv}: Add 'res' param to read_cb2
+
+   Vadim Yanitskiy 
+  * build: include git-version-gen into the release tarball
+  * osmo_stream_cli_write(): fix double-free of msgb
+  * README.md: cosmetic: fix a typo
+
+   Andreas Eversberg 
+  * examples/stream-*: Add options, to set local/remote peer
+  * stream_{cli,srv}: Fix memory leak, if sending a message fails
+  * stream_{cli,srv}: Free received messages when not forwarded
+  * stream_cli: Correctly setup and free osmo_io client instance
+  * stream_{client,server} example: Cleanup on exit
+  * stream_cli.c: Handle read / recvfrom error and close connection
+
+   Oliver Smith 
+  * contrib: remove rpm spec file
+
+ -- Oliver Smith <osmith@sysmocom.de>  Wed, 24 Jul 2024 11:58:42 +0200
+
 libosmo-netif (1.4.0) unstable; urgency=medium
 
    Max

libosmo-netif_1.4.0.tar.xz/debian/control -> libosmo-netif_1.5.0.tar.xz/debian/control Changed

libosmo-netif_1.4.0.tar.xz/examples/ipa-stream-client.c -> libosmo-netif_1.5.0.tar.xz/examples/ipa-stream-client.c Changed

@@ -93,9 +93,7 @@
 		msg_sent->num = i;
 		llist_add(&msg_sent->head, &msg_sent_list);
 
-		ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_MGCP);
-		osmo_ipa_msg_push_header(msg, IPAC_PROTO_OSMO);
-
+		osmo_ipa_msg_push_headers(msg, osmo_ipa_msgb_cb_proto(msg), osmo_ipa_msgb_cb_proto_ext(msg));
 		osmo_stream_cli_send(conn, msg);
 
 		LOGP(DIPATEST, LOGL_DEBUG, "enqueueing msg %d of "
@@ -104,19 +102,26 @@
 	return 0;
 }
 
-static int read_cb(struct osmo_stream_cli *conn, struct msgb *msg)
+static int read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg)
 {
-	LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (len=%d)\n", msgb_length(msg));
+	int num;
+	struct msg_sent *cur, *tmp, *found = NULL;
+
+	LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (payload len=%d)\n", msgb_length(msg));
+
+	if (res <= 0) {
+		LOGP(DIPATEST, LOGL_ERROR, "Event with no data! %d\n", res);
+		msgb_free(msg);
+		return 0;
+	}
 
 	if (osmo_ipa_process_msg(msg) < 0) {
 		LOGP(DIPATEST, LOGL_ERROR, "bad IPA message\n");
+		msgb_free(msg);
 		return 0;
 	}
 
-	int num;
-	struct msg_sent *cur, *tmp, *found = NULL;
-
-	num = ntohl(*((int *)(msg->data + sizeof(struct ipa_head) + sizeof(struct ipa_head_ext))));
+	num = osmo_load32be(msg->data);
 	LOGP(DLINP, LOGL_DEBUG, "received msg number %d\n", num);
 
 	llist_for_each_entry_safe(cur, tmp, &msg_sent_list, head) {
@@ -139,6 +144,7 @@
 		LOGP(DLINP, LOGL_ERROR,
 			"message %d not found!\n", num);
 	}
+	msgb_free(msg);
 	return 0;
 }
 
@@ -184,6 +190,8 @@
 		exit(EXIT_FAILURE);
 	}
 
+	osmo_stream_cli_set_segmentation_cb(conn, osmo_ipa_segmentation_cb);
+
 	LOGP(DIPATEST, LOGL_NOTICE, "Entering main loop\n");
 
 	while(1) {

libosmo-netif_1.4.0.tar.xz/examples/ipa-stream-server.c -> libosmo-netif_1.5.0.tar.xz/examples/ipa-stream-server.c Changed

libosmo-netif_1.4.0.tar.xz/examples/stream-client.c -> libosmo-netif_1.5.0.tar.xz/examples/stream-client.c Changed

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <netinet/in.h>
 
 #include <osmocom/core/select.h>
 #include <osmocom/core/talloc.h>
@@ -31,10 +32,13 @@
 
 static struct osmo_stream_cli *conn;
 
+static bool quit = false;
+
 void sighandler(int foo)
 {
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "closing stream.\n");
-	exit(EXIT_SUCCESS);
+	quit = true;
+	signal(SIGINT, SIG_DFL);
 }
 
 static int connect_cb(struct osmo_stream_cli *conn)
@@ -50,10 +54,17 @@
 	return 0;
 }
 
-static int read_cb(struct osmo_stream_cli *conn, struct msgb *msg)
+static int read_cb(struct osmo_stream_cli *conn, int res, struct msgb *msg)
 {
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");
 
+	if (res < 0) {
+		LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message (res = %d)\n", res);
+		msgb_free(msg);
+		return 0;
+	}
+
+
 	LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d bytes: %s\n", msg->len, msgb_hexdump(msg));
 
 	msgb_free(msg);
@@ -82,17 +93,43 @@
 	ptr = msgb_put(msg, ret);
 	memcpy(ptr, buf, ret);
 
-	osmo_stream_cli_send(conn, msg);
+	LOGP(DSTREAMTEST, LOGL_NOTICE, "sending %d bytes message: %s\n", msg->len, msgb_hexdump(msg));
 
-	LOGP(DSTREAMTEST, LOGL_NOTICE, "sent %d bytes message: %s\n", msg->len, msgb_hexdump(msg));
+	osmo_stream_cli_send(conn, msg);
 
 	return 0;
 }
 
-int main(void)
+static void signal_handler(int signum)
+{
+	switch (signum) {
+	case SIGUSR1:
+		talloc_report_full(tall_test, stdout);
+		break;
+	}
+}
+
+int main(int argc, char **argv)
 {
 	struct osmo_fd *kbd_ofd;
-	int rc;
+	bool use_sctp = false;
+	const char *use_remote_addr = "127.0.0.1";
+	int opt, rc;
+
+	while ((opt = getopt(argc, argv, "sr:")) != -1) {
+		switch (opt) {
+		case 's':
+			use_sctp = true;
+			break;
+		case 'r':
+			use_remote_addr = optarg;
+			break;
+		default:
+			exit(0);
+		}
+	}
+
+	signal(SIGUSR1, &signal_handler);
 
 	tall_test = talloc_named_const(NULL, 1, "osmo_stream_cli_test");
 	msgb_talloc_ctx_init(tall_test, 0);
@@ -109,14 +146,17 @@
 		exit(EXIT_FAILURE);
 	}
 	osmo_stream_cli_set_name(conn, "stream_client");
-	osmo_stream_cli_set_addr(conn, "127.0.0.1");
+	osmo_stream_cli_set_addr(conn, use_remote_addr);
 	osmo_stream_cli_set_port(conn, 10000);
+	if (use_sctp)
+		osmo_stream_cli_set_proto(conn, IPPROTO_SCTP);
 	osmo_stream_cli_set_connect_cb(conn, connect_cb);
 	osmo_stream_cli_set_disconnect_cb(conn, disconnect_cb);
 	osmo_stream_cli_set_read_cb2(conn, read_cb);
 
-	if (osmo_stream_cli_open(conn) < 0) {
-		fprintf(stderr, "cannot open cli\n");
+	rc = osmo_stream_cli_open(conn);
+	if (rc < 0) {
+		fprintf(stderr, "cannot open cli: %d\n", rc);
 		exit(EXIT_FAILURE);
 	}
 
@@ -132,9 +172,15 @@
 		exit(EXIT_FAILURE);
 	}
 
+	signal(SIGINT, sighandler);
+
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop\n");
 
-	while(1) {
+	while (!quit) {
 		osmo_select_main(0);
 	}
+
+	osmo_fd_unregister(kbd_ofd);
+
+	osmo_stream_cli_destroy(conn);
 }

libosmo-netif_1.4.0.tar.xz/examples/stream-server.c -> libosmo-netif_1.5.0.tar.xz/examples/stream-server.c Changed

@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <osmocom/core/select.h>
 #include <osmocom/core/socket.h>
@@ -35,17 +36,29 @@
 static struct osmo_stream_srv_link *srv;
 static struct osmo_stream_srv *conn;
 
+bool quit = false;
 
 void sighandler(int foo)
 {
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "closing STREAMSERVER.\n");
-	exit(EXIT_SUCCESS);
+	quit = true;
+	signal(SIGINT, SIG_DFL);
 }
 
-int read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg)
 {
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "receiving message from stream... ");
 
+	if (res <= 0) {
+		if (res < 0)
+			LOGPC(DSTREAMTEST, LOGL_ERROR, "cannot receive message: %s\n", strerror(-res));
+		else
+			LOGPC(DSTREAMTEST, LOGL_ERROR, "client closed connection\n");
+		msgb_free(msg);
+		osmo_stream_srv_destroy(conn);
+		return -EBADF;
+	}
+
 	LOGPC(DSTREAMTEST, LOGL_NOTICE, "got %d bytes: %s\n", msg->len, msgb_hexdump(msg));
 
 	msgb_free(msg);
@@ -112,14 +125,41 @@
 	memcpy(ptr, buf, ret);
 	osmo_stream_srv_send(conn, msg);
 
-	LOGP(DSTREAMTEST, LOGL_NOTICE, "message of %d bytes sent\n", msg->len);
+	LOGP(DSTREAMTEST, LOGL_NOTICE, "message of %d bytes sent\n", ret);
 
 	return 0;
 }
 
-int main(void)
+static void signal_handler(int signum)
+{
+	switch (signum) {
+	case SIGUSR1:
+		talloc_report(tall_test, stderr);
+		break;
+	}
+}
+
+int main(int argc, char **argv)
 {
 	struct osmo_fd *kbd_ofd;
+	bool use_sctp = false;
+	const char *use_local_addr = "127.0.0.1";
+	int opt;
+
+	while ((opt = getopt(argc, argv, "sl:")) != -1) {
+		switch (opt) {
+		case 's':
+			use_sctp = true;
+			break;
+		case 'l':
+			use_local_addr = optarg;
+			break;
+		default:
+			exit(0);
+		}
+	}
+
+	signal(SIGUSR1, &signal_handler);
 
 	tall_test = talloc_named_const(NULL, 1, "osmo_stream_srv_test");
 	msgb_talloc_ctx_init(tall_test, 0);
@@ -135,8 +175,10 @@
 		fprintf(stderr, "cannot create server link\n");
 		exit(EXIT_FAILURE);
 	}
-	osmo_stream_srv_link_set_addr(srv, "127.0.0.1");
+	osmo_stream_srv_link_set_addr(srv, use_local_addr);
 	osmo_stream_srv_link_set_port(srv, 10000);
+	if (use_sctp)
+		osmo_stream_srv_link_set_proto(srv, IPPROTO_SCTP);
 	osmo_stream_srv_link_set_accept_cb(srv, accept_cb);
 
 	if (osmo_stream_srv_link_open(srv) < 0) {
@@ -152,9 +194,15 @@
 	osmo_fd_setup(kbd_ofd, STDIN_FILENO, OSMO_FD_READ, kbd_cb, srv, 0);
 	osmo_fd_register(kbd_ofd);
 
+	signal(SIGINT, sighandler);
+
 	LOGP(DSTREAMTEST, LOGL_NOTICE, "Entering main loop on %s\n", osmo_stream_srv_link_get_sockname(srv));
 
-	while(1) {
+	while (!quit) {
 		osmo_select_main(0);
 	}
+
+	osmo_fd_unregister(kbd_ofd);
+
+	osmo_stream_srv_link_destroy(srv);
 }

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/datagram.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/datagram.h Changed

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/ipa.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/ipa.h Changed

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/osmux.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/osmux.h Changed

@@ -15,7 +15,8 @@
 
 #define OSMUX_DEFAULT_PORT 1984
 
-/* OSmux header:
+/*! \struct osmux_hdr
+ * OSmux header:
  *
  *	rtp_m (1 bit):		RTP M field (RFC3550, RFC4867)
  *	ft (2 bits):		0=signalling, 1=voice, 2=dummy
@@ -32,6 +33,7 @@
 #define OSMUX_FT_VOICE_AMR	1
 #define OSMUX_FT_DUMMY		2
 
+/*! Osmux protocol header */
 struct osmux_hdr {
 #if OSMO_IS_LITTLE_ENDIAN
 	uint8_t amr_q:1,
@@ -56,9 +58,9 @@
 	uint8_t data0;
 } __attribute__((packed));
 
-/* one to handle all existing RTP flows */
+/*! one to handle all existing RTP flows */
 struct osmux_in_handle {
-	/* Initial Osmux seqnum for each circuit, set during osmux_xfrm_input_open_circuit() */
+	/*! Initial Osmux seqnum for each circuit, set during osmux_xfrm_input_open_circuit() */
 	uint8_t osmux_seq;
 	uint8_t batch_factor;
 	uint16_t batch_size;
@@ -79,7 +81,7 @@
 
 typedef struct msgb *(*rtp_msgb_alloc_cb_t)(void *rtp_msgb_alloc_priv_data,
 					    unsigned int msg_len);
-/* one per OSmux circuit_id, ie. one per RTP flow. */
+/*! one per OSmux circuit_id, ie. one per RTP flow. */
 struct osmux_out_handle {
 	uint16_t rtp_seq;
 	uint32_t rtp_timestamp;
@@ -94,6 +96,7 @@
 	void *rtp_msgb_alloc_cb_data; /* Opaque data pointer set by user and passed in rtp_msgb_alloc_cb() */
 };
 
+/*! return pointer to osmux payload (behind osmux_hdr) */
 static inline uint8_t *osmux_get_payload(struct osmux_hdr *osmuxh)
 {
 	return (uint8_t *)osmuxh + sizeof(struct osmux_hdr);

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/prim.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/prim.h Changed

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/sctp.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/sctp.h Changed

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/stream.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/stream.h Changed

@@ -6,9 +6,7 @@
 
 #include <osmocom/core/msgb.h>
 
-/*! \addtogroup stream
- *  @{
- */
+/*! \file stream.h */
 
 /*! \brief Access SCTP flags from the msgb control buffer */
 #define OSMO_STREAM_SCTP_MSG_FLAGS_NOTIFICATION 0x80 /* sctp_recvmsg() flags=MSG_NOTIFICATION, msgb_data() contains "union sctp_notification*" */
@@ -19,13 +17,58 @@
 /*! \brief Access the SCTP Stream ID from the msgb control buffer */
 #define msgb_sctp_stream(msg)           (msg)->cb4
 
+/*! \defgroup stream_srv Osmocom Stream Server
+ *  @{
+ *
+ *  This code is intended to abstract any server-side use of stream-type sockets, such as TCP and SCTP.
+ *
+ *  The Osmocom stream socket helper is an abstraction layer for connected SOCK_STREAM/SOCK_SEQPACKET sockets.
+ *  It encapsulates common functionality like binding, accepting client connections, etc.
+ *
+ *  osmo_stream_srv can operate in two different modes:
+ *  1. The legacy mode using osmo_fd (from libosmocore)
+ *  2. The modern (2023) mode using osmo_io (from libosmocore)
+ *
+ *  For any new applications, you definitely should use the modern mode, as it provides you with a higher
+ *  layer of abstraction and allows you to perform efficient I/O using the io_uring backend of osmo_io.
+ *
+ *  The two main objects are osmo_stream_srv_link (main server accept()ing incoming connections) and
+ *  osmo_stream_srv (a single given connection from a remote client).
+ *
+ *  A typical stream_srv usage would look like this:
+ *
+ *  * create new osmo_stream_srv_link using osmo_stream_srv_link_create()
+ *  * call osmo_stream_srv_link_set_addr() to set local bind address/port
+ *  * call osmo_stream_srv_link_set_accept_cb() to register the accept call-back
+ *  * optionally call further osmo_stream_srv_link_set_*() functions
+ *  * call osmo_stream_srv_link_open() to create socket and start listening
+ *
+ *  Whenever a client connects to your listening socket, the connection will now be automatically accept()ed
+ *  and the registered accept_cb call-back called.  From within that accept_cb, you then
+ *  * call osmo_stream_srv_create() to create a osmo_stream_srv for that specific connection
+ *  * call osmo_stream_srv_set_read_cb() to register the read call-back for incoming data
+ *  * call osmo_stream_srv_set_closed_cb() to register the closed call-back
+ *  * call osmo_stream_srv_set_data() to associate opaque application-layer state
+ *
+ *  Whenever data from a client arrives on a connection, your registered read_cb will be called together
+ *  with a message buffer containing the received data. Ownership of the message buffer is transferred
+ *  into the call-back, i.e. in your application.  It's your responsibility to eventually msgb_free()
+ *  it after usage.
+ *
+ *  Whenever your application wants to transmit something to a given connection, it uses the
+ *  osmo_stream_srv_send() function.
+ */
+
 /*! \brief Osmocom Stream Server Link: A server socket listening/accepting */
 struct osmo_stream_srv_link;
 
+typedef int (*osmo_stream_srv_link_accept_cb_t)(struct osmo_stream_srv_link *link, int fd);
+
 struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx);
 void osmo_stream_srv_link_destroy(struct osmo_stream_srv_link *link);
 
 void osmo_stream_srv_link_set_name(struct osmo_stream_srv_link *link, const char *name);
+const char *osmo_stream_srv_link_get_name(const struct osmo_stream_srv_link *link);
 void osmo_stream_srv_link_set_nodelay(struct osmo_stream_srv_link *link, bool nodelay);
 void osmo_stream_srv_link_set_addr(struct osmo_stream_srv_link *link, const char *addr);
 int osmo_stream_srv_link_set_addrs(struct osmo_stream_srv_link *link, const char **addr, size_t addrcnt);
@@ -33,11 +76,12 @@
 void osmo_stream_srv_link_set_proto(struct osmo_stream_srv_link *link, uint16_t proto);
 int osmo_stream_srv_link_set_type(struct osmo_stream_srv_link *link, int type);
 int osmo_stream_srv_link_set_domain(struct osmo_stream_srv_link *link, int domain);
-void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, int (*accept_cb)(struct osmo_stream_srv_link *link, int fd));
+void osmo_stream_srv_link_set_accept_cb(struct osmo_stream_srv_link *link, osmo_stream_srv_link_accept_cb_t accept_cb);
 void osmo_stream_srv_link_set_data(struct osmo_stream_srv_link *link, void *data);
 void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link);
 char *osmo_stream_srv_link_get_sockname(const struct osmo_stream_srv_link *link);
 struct osmo_fd *osmo_stream_srv_link_get_ofd(struct osmo_stream_srv_link *link);
+int osmo_stream_srv_link_get_fd(const struct osmo_stream_srv_link *link);
 bool osmo_stream_srv_link_is_opened(const struct osmo_stream_srv_link *link);
 int osmo_stream_srv_link_open(struct osmo_stream_srv_link *link);
 void osmo_stream_srv_link_close(struct osmo_stream_srv_link *link);
@@ -56,31 +100,97 @@
  * osmo_stream_srv_link */
 struct osmo_stream_srv;
 
-struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, int fd, int (*read_cb)(struct osmo_stream_srv *conn), int (*closed_cb)(struct osmo_stream_srv *conn), void *data);
+typedef int (*osmo_stream_srv_read_cb_t)(struct osmo_stream_srv *conn);
+typedef int (*osmo_stream_srv_closed_cb_t)(struct osmo_stream_srv *conn);
+
+/*! Completion call-back function when something was read from from the stream client socket.
+ * \paramin conn Stream Server that got receive event.
+ * \paramin res return value of the read()/recvmsg()/... call, or -errno in case of error.
+ * \paramin msg message buffer containing the read data. Ownership is transferred to the
+ * call-back, and it must make sure to msgb_free() it eventually! */
+typedef int (*osmo_stream_srv_read_cb2_t)(struct osmo_stream_srv *conn, int res, struct msgb *msg);
+
+typedef int (*osmo_stream_srv_segmentation_cb_t)(struct msgb *msg);
+
+struct osmo_stream_srv *osmo_stream_srv_create(void *ctx, struct osmo_stream_srv_link *link, int fd,
+					       osmo_stream_srv_read_cb_t read_cb,
+					       osmo_stream_srv_closed_cb_t closed_cb,
+					       void *data);
 struct osmo_stream_srv *osmo_stream_srv_create2(void *ctx, struct osmo_stream_srv_link *link, int fd, void *data);
 void osmo_stream_srv_set_name(struct osmo_stream_srv *conn, const char *name);
-void osmo_stream_srv_set_read_cb(struct osmo_stream_srv *conn, int (*read_cb)(struct osmo_stream_srv *conn, struct msgb *msg));
-void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, int (*closed_cb)(struct osmo_stream_srv *conn));
+const char *osmo_stream_srv_get_name(const struct osmo_stream_srv *conn);
+void osmo_stream_srv_set_read_cb(struct osmo_stream_srv *conn, osmo_stream_srv_read_cb2_t read_cb);
+void osmo_stream_srv_set_closed_cb(struct osmo_stream_srv *conn, osmo_stream_srv_closed_cb_t close_cb);
 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);
+const char *osmo_stream_srv_get_sockname(const 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);
+struct osmo_io_fd *osmo_stream_srv_get_iofd(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);
 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,
-					int (*segmentation_cb)(struct msgb *msg));
+void osmo_stream_srv_set_segmentation_cb(struct osmo_stream_srv *conn, osmo_stream_srv_segmentation_cb_t segmentation_cb);
 
 void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg);
 int osmo_stream_srv_recv(struct osmo_stream_srv *conn, struct msgb *msg);
 
 void osmo_stream_srv_clear_tx_queue(struct osmo_stream_srv *conn);
 
+/*! @} */
+
+/*! \defgroup stream_cli Osmocom Stream Client
+ *  @{
+ *
+ *  This code is intended to abstract any client use of stream-type sockets, such as TCP and SCTP
+ *
+ *  An osmo_stream_cli represents a client implementation of a SOCK_STREAM or SOCK_SEQPACKET socket. It
+ *  contains all the common logic like non-blocking outbound connect to a remote server, re-connecting after
+ *  disconnect or connect failure, etc.
+ *
+ *  osmo_stream_cli can operate in two different modes:
+ *  1. The legacy mode using osmo_fd (from libosmocore)
+ *  2. The modern (2023) mode using osmo_io_fd (from libosmocore)
+ *
+ *  For any new applications, you definitely should use the modern mode, as it provides you with a higher
+ *  layer of abstraction and allows you to perform efficient I/O using the io_uring backend of osmo_io.
+ *
+ *  A typical usage of osmo_stream_cli would look as follows:
+ *
+ *  * call osmo_stream_cli_create() to create a new osmo_stream_cli
+ *  * call osmo_stream_cli_set_addr() / osmo_stream_cli_set_port() to specify the remote address/port to connect to
+ *  * optionally call further functions of the osmo_stream_cli_set_*() family
+ *  * call osmo_stream_cli_set_connect_cb() to register the call-back called on completion of outbound connect()
+ *  * call osmo_stream_cli_set_read_cb2() to register the call-back called when incoming data has been read
+ *  * call osmo_stream_cli_open() to open the connection (start outbound connect process)
+ *
+ *  Once the connection is established, your connect_cb is called to notify you.
+ *
+ *  You may send data to the connection using osmo_tream_cli_send().
+ *
+ *  Any received inbound data on the connection is reported vie the read_cb.
+ */
+
 /*! \brief Osmocom Stream Client: Single client connection */
 struct osmo_stream_cli;
 
+typedef int (*osmo_stream_cli_connect_cb_t)(struct osmo_stream_cli *cli);
+typedef int (*osmo_stream_cli_disconnect_cb_t)(struct osmo_stream_cli *cli);
+typedef int (*osmo_stream_cli_read_cb_t)(struct osmo_stream_cli *cli);
+
+/*! Completion call-back function when something was read from from the stream client socket.
+ * \paramin cli Stream Client that got receive event.
+ * \paramin res return value of the read()/recvmsg()/... call, or -errno in case of error.
+ * \paramin msg message buffer containing the read data. Ownership is transferred to the
+ * call-back, and it must make sure to msgb_free() it eventually! */
+typedef int (*osmo_stream_cli_read_cb2_t)(struct osmo_stream_cli *cli, int res, struct msgb *msg);
+
+typedef int (*osmo_stream_cli_segmentation_cb_t)(struct msgb *msg);
+
 void osmo_stream_cli_set_name(struct osmo_stream_cli *cli, const char *name);
+const char *osmo_stream_cli_get_name(const struct osmo_stream_cli *cli);
 void osmo_stream_cli_set_nodelay(struct osmo_stream_cli *cli, bool nodelay);
 void osmo_stream_cli_set_addr(struct osmo_stream_cli *cli, const char *addr);
 int osmo_stream_cli_set_addrs(struct osmo_stream_cli *cli, const char **addr, size_t addrcnt);
@@ -96,10 +206,13 @@
 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);
-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));
-void osmo_stream_cli_set_read_cb2(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli, struct msgb *msg));
+int osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli);
+struct osmo_io_fd *osmo_stream_cli_get_iofd(const struct osmo_stream_cli *cli);
+void osmo_stream_cli_set_connect_cb(struct osmo_stream_cli *cli, osmo_stream_cli_connect_cb_t connect_cb);
+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);

libosmo-netif_1.4.0.tar.xz/include/osmocom/netif/stream_private.h -> libosmo-netif_1.5.0.tar.xz/include/osmocom/netif/stream_private.h Changed

libosmo-netif_1.4.0.tar.xz/src/Makefile.am -> libosmo-netif_1.5.0.tar.xz/src/Makefile.am Changed

libosmo-netif_1.4.0.tar.xz/src/datagram.c -> libosmo-netif_1.5.0.tar.xz/src/datagram.c Changed

libosmo-netif_1.4.0.tar.xz/src/ipa.c -> libosmo-netif_1.5.0.tar.xz/src/ipa.c Changed

libosmo-netif_1.4.0.tar.xz/src/jibuf.c -> libosmo-netif_1.5.0.tar.xz/src/jibuf.c Changed

libosmo-netif_1.4.0.tar.xz/src/osmux.c -> libosmo-netif_1.5.0.tar.xz/src/osmux.c Changed

libosmo-netif_1.4.0.tar.xz/src/osmux_input.c -> libosmo-netif_1.5.0.tar.xz/src/osmux_input.c Changed

@@ -28,23 +28,6 @@
 
 #include <arpa/inet.h>
 
-/*! \addtogroup osmux Osmocom Multiplex Protocol
- *  @{
- *
- *  This code implements a variety of utility functions related to the
- *  OSMUX user-plane multiplexing protocol, an efficient alternative to
- *  plain UDP/RTP streams for voice transport in back-haul of cellular
- *  networks.
- *
- *  For information about the OSMUX protocol design, please see the
- *  OSMUX reference manual at
- *  http://ftp.osmocom.org/docs/latest/osmux-reference.pdf
- */
-
-/*! \file osmux_input.c
- *  \brief Osmocom multiplex protocol helpers (input)
- */
-
 /* This allows you to debug osmux message transformations (spamming) */
 #if 0
 #define DEBUG_MSG		0
@@ -68,6 +51,22 @@
 	LOGMUXLK_(link, lvl, "CID=%" PRIu8 ",batched=%u/%u " fmt, \
 		  (circuit)->ccid, (circuit)->nmsgs, (link)->h->batch_factor, ## args)
 
+/*! \addtogroup osmux Osmocom Multiplex Protocol
+ *  @{
+ *
+ *  This code implements a variety of utility functions related to the
+ *  OSMUX user-plane multiplexing protocol, an efficient alternative to
+ *  plain UDP/RTP streams for voice transport in back-haul of cellular
+ *  networks.
+ *
+ *  For information about the OSMUX protocol design, please see the
+ *  OSMUX reference manual at
+ *  http://ftp.osmocom.org/docs/latest/osmux-reference.pdf
+ */
+
+/*! \file osmux_input.c
+ *  \brief Osmocom multiplex protocol helpers (input)
+ */
 
 static void *osmux_ctx;
 
@@ -698,6 +697,7 @@
 	return 0;
 }
 
+static unsigned int next_default_name_idx = 0;
 /*! \brief Allocate a new osmux in handle (osmux source, tx side)
  *  \paramin ctx talloc context to use when allocating the returned struct
  *  \return Allocated osmux in handle
@@ -708,7 +708,6 @@
  * stack outgoing network Osmux messages.
  * Returned pointer can be freed with regular talloc_free, all pending messages
  * in queue and all internal data will be freed. */
-static unsigned int next_default_name_idx = 0;
 struct osmux_in_handle *osmux_xfrm_input_alloc(void *ctx)
 {
 	struct osmux_in_handle *h;
@@ -735,7 +734,7 @@
 	return h;
 }
 
-/* DEPRECATED: Use osmux_xfrm_input_alloc() instead */
+/*! \deprecated: Use osmux_xfrm_input_alloc() instead */
 void osmux_xfrm_input_init(struct osmux_in_handle *h)
 {
 	struct osmux_link *link;
@@ -849,7 +848,7 @@
 	osmux_link_del_circuit(link, circuit);
 }
 
-/* DEPRECATED: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */
+/*! \deprecated: Use talloc_free() instead (will call osmux_xfrm_input_talloc_destructor()) */
 void osmux_xfrm_input_fini(struct osmux_in_handle *h)
 {
 	(void)osmux_xfrm_input_talloc_destructor(h);

libosmo-netif_1.4.0.tar.xz/src/osmux_output.c -> libosmo-netif_1.5.0.tar.xz/src/osmux_output.c Changed

@@ -27,6 +27,12 @@
 
 #include <arpa/inet.h>
 
+/* delta time between two RTP messages (in microseconds) */
+#define DELTA_RTP_MSG		20000
+/* delta time between two RTP messages (in samples, 8kHz) */
+#define DELTA_RTP_TIMESTAMP	160
+
+
 /*! \addtogroup osmux Osmocom Multiplex Protocol
  *  @{
  *
@@ -43,12 +49,6 @@
 /*! \file osmux_output.c
  *  \brief Osmocom multiplex protocol helpers (output)
  */
-
-/* delta time between two RTP messages (in microseconds) */
-#define DELTA_RTP_MSG		20000
-/* delta time between two RTP messages (in samples, 8kHz) */
-#define DELTA_RTP_TIMESTAMP	160
-
 static uint32_t osmux_ft_dummy_size(uint8_t amr_ft, uint8_t batch_factor)
 {
 	return sizeof(struct osmux_hdr) + (osmo_amr_bytes(amr_ft) * batch_factor);
@@ -330,14 +330,14 @@
 	return h;
 }
 
-/* DEPRECATED: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */
+/*! \deprecated: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */
 void osmux_xfrm_output_init2(struct osmux_out_handle *h, uint32_t rtp_ssrc, uint8_t rtp_payload_type)
 {
 	memset(h, 0, sizeof(*h));
 	_osmux_xfrm_output_init(h, rtp_ssrc, rtp_payload_type);
 }
 
-/* DEPRECATED: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */
+/*! \deprecated: Use osmux_xfrm_output_alloc() and osmux_xfrm_output_set_rtp_*() instead */
 void osmux_xfrm_output_init(struct osmux_out_handle *h, uint32_t rtp_ssrc)
 {
 	/* backward compatibility with old users, where 98 was harcoded in osmux_rebuild_rtp()  */

libosmo-netif_1.4.0.tar.xz/src/prim.c -> libosmo-netif_1.5.0.tar.xz/src/prim.c Changed

libosmo-netif_1.4.0.tar.xz/src/sctp.c -> libosmo-netif_1.5.0.tar.xz/src/sctp.c Changed

libosmo-netif_1.4.0.tar.xz/src/stream.c -> libosmo-netif_1.5.0.tar.xz/src/stream.c Changed

@@ -51,19 +51,7 @@
 
 #include <osmocom/netif/sctp.h>
 
-
-/*! \addtogroup stream Osmocom Stream Socket
- *  @{
- *
- *  This code is intended to abstract any use of stream-type sockets,
- *  such as TCP and SCTP.  It offers both server and client side
- *  implementations, fully integrated with the libosmocore select loop
- *  abstraction.
- */
-
-/*! \file stream.c
- *  \brief Osmocom stream socket helpers
- */
+/*! \cond private */
 
 #ifdef HAVE_LIBSCTP
 
@@ -209,25 +197,19 @@
 }
 
 #ifdef HAVE_LIBSCTP
-#define LOGPFX(pfx, level, fmt, args...) \
-	LOGP(DLINP, level, "%s " fmt, pfx, ## args)
-int stream_sctp_recvmsg_wrapper(int fd, struct msgb *msg, const char *log_pfx)
+static int stream_sctp_recvmsg_trailer(const char *log_pfx, struct msgb *msg, int ret, const struct sctp_sndrcvinfo *sinfo, int flags)
 {
-	struct sctp_sndrcvinfo sinfo;
-	int flags = 0;
-	int ret;
-	uint8_t *data = msg->tail;
-
-	ret = sctp_recvmsg(fd, data, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags);
 	msgb_sctp_msg_flags(msg) = 0;
-	msgb_sctp_ppid(msg) = ntohl(sinfo.sinfo_ppid);
-	msgb_sctp_stream(msg) = sinfo.sinfo_stream;
+	if (OSMO_LIKELY(sinfo)) {
+		msgb_sctp_ppid(msg) = ntohl(sinfo->sinfo_ppid);
+		msgb_sctp_stream(msg) = sinfo->sinfo_stream;
+	}
 
 	if (flags & MSG_NOTIFICATION) {
 		char buf512;
 		struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) };
 		int logl = LOGL_INFO;
-		union sctp_notification *notif = (union sctp_notification *)data;
+		union sctp_notification *notif = (union sctp_notification *) msg->data;
 
 		OSMO_STRBUF_PRINTF(sb, "%s NOTIFICATION %s flags=0x%x", log_pfx,
 				   osmo_sctp_sn_type_str(notif->sn_header.sn_type), notif->sn_header.sn_flags);
@@ -283,9 +265,76 @@
 		LOGP(DLINP, logl, "%s\n", buf);
 		return ret;
 	}
+
+	if (OSMO_UNLIKELY(ret > 0 && !sinfo))
+		LOGP(DLINP, LOGL_ERROR, "%s sctp_recvmsg without SNDRCV cmsg?!?\n", log_pfx);
+
 	return ret;
 }
-#endif
 
+/*! wrapper for regular synchronous sctp_recvmsg(3) */
+int stream_sctp_recvmsg_wrapper(int fd, struct msgb *msg, const char *log_pfx)
+{
+	struct sctp_sndrcvinfo sinfo;
+	int flags = 0;
+	int ret;
+
+	ret = sctp_recvmsg(fd, msg->tail, msgb_tailroom(msg), NULL, NULL, &sinfo, &flags);
+	return stream_sctp_recvmsg_trailer(log_pfx, msg, ret, &sinfo, flags);
+}
+
+/*! wrapper for osmo_io asynchronous recvmsg response */
+int stream_iofd_sctp_recvmsg_trailer(struct osmo_io_fd *iofd, struct msgb *msg, int ret, const struct msghdr *msgh)
+{
+	const struct sctp_sndrcvinfo *sinfo = NULL;
+	struct cmsghdr *cmsg = NULL;
+
+	for (cmsg = CMSG_FIRSTHDR((struct msghdr *) msgh); cmsg != NULL;
+		cmsg = CMSG_NXTHDR((struct msghdr *) msgh, cmsg)) {
+		if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) {
+			sinfo = (const struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+			break;
+		}
+	}
+
+	return stream_sctp_recvmsg_trailer(osmo_iofd_get_name(iofd), msg, ret, sinfo, msgh->msg_flags);
+}
+
+/*! Send a message through a connected SCTP socket, similar to sctp_sendmsg().
+ *
+ *  Appends the message to the internal transmit queue.
+ *  If the function returns success (0), it will take ownership of the msgb and
+ *  internally call msgb_free() after the write request completes.
+ *  In case of an error the msgb needs to be freed by the caller.
+ *
+ *  \paramin iofd file descriptor to write to
+ *  \paramin msg message buffer to send; uses msgb_sctp_ppid/msg_sctp_stream
+ *  \paramin sendmsg_flags Flags to pass to the send call
+ *  \returns 0 in case of success; a negative value in case of error
+ */
+int stream_iofd_sctp_send_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendmsg_flags)
+{
+	struct msghdr outmsg = {};
+	char outcmsgCMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
+	struct sctp_sndrcvinfo *sinfo;
+	struct cmsghdr *cmsg;
+
+	outmsg.msg_control = outcmsg;
+	outmsg.msg_controllen = sizeof(outcmsg);
+
+	cmsg = CMSG_FIRSTHDR(&outmsg);
+	cmsg->cmsg_level = IPPROTO_SCTP;
+	cmsg->cmsg_type = SCTP_SNDRCV;
+	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
+
+	outmsg.msg_controllen = cmsg->cmsg_len;
+	sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
+	memset(sinfo, 0, sizeof(struct sctp_sndrcvinfo));
+	sinfo->sinfo_ppid =  htonl(msgb_sctp_ppid(msg));
+	sinfo->sinfo_stream = msgb_sctp_stream(msg);
+
+	return osmo_iofd_sendmsg_msgb(iofd, msg, sendmsg_flags, &outmsg);
+}
+#endif
 
-/*! @} */
+/*! \endccond */

libosmo-netif_1.4.0.tar.xz/src/stream_cli.c -> libosmo-netif_1.5.0.tar.xz/src/stream_cli.c Changed

@@ -51,18 +51,7 @@
 
 #include <osmocom/netif/sctp.h>
 
-
-/*! \addtogroup stream Osmocom Stream Socket (client side)
- *  @{
- *
- *  This code is intended to abstract any use of stream-type sockets,
- *  such as TCP and SCTP.  It offers client side implementation,
- * fully integrated with the libosmocore select loop abstraction.
- */
-
-/*! \file stream_cli.c
- *  \brief Osmocom stream socket helpers (client side)
- */
+/*! \file stream_cli.c */
 
 #define LOGSCLI(cli, level, fmt, args...) \
 	LOGP(DLINP, level, "CLICONN(%s,%s){%s} " fmt, \
@@ -114,11 +103,11 @@
 	int				sk_domain;
 	int				sk_type;
 	uint16_t			proto;
-	int (*connect_cb)(struct osmo_stream_cli *cli);
-	int (*disconnect_cb)(struct osmo_stream_cli *cli);
-	int (*read_cb)(struct osmo_stream_cli *cli);
-	int (*iofd_read_cb)(struct osmo_stream_cli *cli, struct msgb *msg);
-	int (*write_cb)(struct osmo_stream_cli *cli);
+	osmo_stream_cli_connect_cb_t	connect_cb;
+	osmo_stream_cli_disconnect_cb_t	disconnect_cb;
+	osmo_stream_cli_read_cb_t	read_cb;
+	osmo_stream_cli_read_cb2_t	iofd_read_cb;
+	osmo_stream_cli_segmentation_cb_t segmentation_cb;
 	void				*data;
 	int				flags;
 	int				reconnect_timeout;
@@ -127,7 +116,11 @@
 
 void osmo_stream_cli_close(struct osmo_stream_cli *cli);
 
-/*! \brief Re-connect an Osmocom Stream Client
+/*! \addtogroup stream_cli
+ *  @{
+ */
+
+/*! Re-connect an Osmocom Stream Client.
  *  If re-connection is enabled for this client
  *  (which is the case unless negative timeout was explicitly set via osmo_stream_cli_set_reconnect_timeout() call),
  *  we close any existing connection (if any) and schedule a re-connect timer */
@@ -146,7 +139,7 @@
 	osmo_timer_schedule(&cli->timer, cli->reconnect_timeout, 0);
 }
 
-/*! \brief Check if Osmocom Stream Client is in connected state
+/*! Check if Osmocom Stream Client is in connected state.
  *  \paramin cli Osmocom Stream Client
  *  \return true if connected, false otherwise
  */
@@ -160,7 +153,8 @@
 	if (!cli->iofd)
 		return;
 
-	osmo_iofd_close(cli->iofd);
+	osmo_iofd_free(cli->iofd);
+	cli->iofd = NULL;
 }
 
 static void osmo_stream_cli_close_ofd(struct osmo_stream_cli *cli)
@@ -172,7 +166,7 @@
 	cli->ofd.fd = -1;
 }
 
-/*! \brief Close an Osmocom Stream Client
+/*! Close an Osmocom Stream Client.
  *  \paramin cli Osmocom Stream Client to be closed
  *  We unregister the socket fd from the osmocom select() loop
  *  abstraction and close the socket */
@@ -209,7 +203,11 @@
 	}
 }
 
-static inline int osmo_stream_cli_fd(const struct osmo_stream_cli *cli)
+/*! Retrieve file descriptor of the stream client socket.
+ *  \paramin 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:
@@ -223,6 +221,18 @@
 	return -EINVAL;
 }
 
+/*! Retrieve osmo_io descriptor of the stream client socket.
+ *  This function must not be called on a stream client in legacy osmo_fd mode!
+ *  The iofd is only valid once/after osmo_stream_cli_open() has successfully returned.
+ *  \paramin cli Stream Client of which we want to obtain the file descriptor
+ *  \returns osmo_io_fd of stream client, or NULL if stream not yet opened. */
+struct osmo_io_fd *
+osmo_stream_cli_get_iofd(const struct osmo_stream_cli *cli)
+{
+	OSMO_ASSERT(cli->mode == OSMO_STREAM_MODE_OSMO_IO);
+	return cli->iofd;
+}
+
 static void osmo_stream_cli_read(struct osmo_stream_cli *cli)
 {
 	LOGSCLI(cli, LOGL_DEBUG, "message received\n");
@@ -298,6 +308,7 @@
 		}
 		msgb_free(msg);
 		osmo_stream_cli_reconnect(cli);
+		return 0;
 	}
 
 	msgb_free(msg);
@@ -313,7 +324,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;
@@ -327,7 +338,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) {
@@ -346,7 +357,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;
@@ -397,7 +408,7 @@
 
 static void cli_timer_cb(void *data);
 
-/*! \brief Create an Osmocom stream client
+/*! Create an Osmocom stream client.
  *  \paramin ctx talloc context from which to allocate memory
  *  This function allocates a new \ref osmo_stream_cli and initializes
  *  it with default values (5s reconnect timer, TCP protocol)
@@ -419,6 +430,7 @@
 	cli->state = STREAM_CLI_STATE_CLOSED;
 	osmo_timer_setup(&cli->timer, cli_timer_cb, cli);
 	cli->reconnect_timeout = 5;	/* default is 5 seconds. */
+	cli->segmentation_cb = NULL;
 	INIT_LLIST_HEAD(&cli->tx_queue);
 
 	cli->ma_pars.sctp.version = 0;
@@ -432,13 +444,29 @@
 
 	switch (cli->state) {
 	case STREAM_CLI_STATE_CONNECTING:
+		msgb_free(msg);
 		stream_cli_handle_connecting(cli, res);
 		break;
 	case STREAM_CLI_STATE_CONNECTED:
-		if (res == 0)
+		switch (res) {
+		case -EPIPE:
+		case -ECONNRESET:
+			LOGSCLI(cli, LOGL_ERROR, "lost connection with srv (%d)\n", res);
+			osmo_stream_cli_reconnect(cli);
+			break;
+		case 0:
+			LOGSCLI(cli, LOGL_NOTICE, "connection closed with srv\n");
 			osmo_stream_cli_reconnect(cli);
-		else if (cli->iofd_read_cb)
-			cli->iofd_read_cb(cli, msg);
+			break;
+		default:
+			LOGSCLI(cli, LOGL_DEBUG, "received %d bytes from srv\n", res);
+			break;
+		}
+		/* Notify user of new data or error: */
+		if (cli->iofd_read_cb)
+			cli->iofd_read_cb(cli, res, msg);
+		else
+			msgb_free(msg);
 		break;
 	default:
 		osmo_panic("%s() called with unexpected state %d\n", __func__, cli->state);
@@ -464,14 +492,60 @@
 	}
 }
 
-static struct osmo_io_ops osmo_stream_cli_ioops = {

libosmo-netif_1.4.0.tar.xz/src/stream_srv.c -> libosmo-netif_1.5.0.tar.xz/src/stream_srv.c Changed

@@ -28,6 +28,7 @@
 #include <time.h>
 #include <sys/fcntl.h>
 #include <sys/socket.h>
+#include <sys/un.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
@@ -51,18 +52,7 @@
 
 #include <osmocom/netif/sctp.h>
 
-
-/*! \addtogroup stream Osmocom Stream Socket (server side)
- *  @{
- *
- *  This code is intended to abstract any use of stream-type sockets,
- *  such as TCP and SCTP.  It offers server side implementation,
- *  fully integrated with the libosmocore select loop abstraction.
- */
-
-/*! \file stream_srv.c
- *  \brief Osmocom stream socket helpers (server side)
- */
+/*! \file stream_srv.c */
 
 #define LOGSLNK(link, level, fmt, args...) \
 	LOGP(DLINP, level, "SRV(%s,%s) " fmt, \
@@ -85,14 +75,14 @@
 struct osmo_stream_srv_link {
 	struct osmo_fd		ofd;
 	char			*name;
-	char			socknameOSMO_SOCK_NAME_MAXLEN;
+	char			socknameOSMO_SOCK_MULTIADDR_PEER_STR_MAXLEN;
 	char			*addrOSMO_STREAM_MAX_ADDRS;
 	uint8_t			addrcnt;
 	uint16_t		port;
 	int			sk_domain;
 	int			sk_type;
 	uint16_t		proto;
-	int (*accept_cb)(struct osmo_stream_srv_link *srv, int fd);
+	osmo_stream_srv_link_accept_cb_t accept_cb;
 	void			*data;
 	int			flags;
 	struct osmo_sock_init2_multiaddr_pars ma_pars;
@@ -173,11 +163,14 @@
 	return ret;
 }
 
-/*! \brief Create an Osmocom Stream Server Link
- *  A Stream Server Link is the listen()+accept() "parent" to individual
- *  Stream Servers
+/*! \addtogroup stream_srv
+ *  @{
+ */
+
+/*! Create an Osmocom Stream Server Link.
+ *  A Stream Server Link is the listen()+accept() "parent" to individual connections from remote clients.
  *  \paramin ctx talloc allocation context
- *  \returns Stream Server Link with default values (TCP)
+ *  \returns Stream Server Link with default values (AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP)
  */
 struct osmo_stream_srv_link *osmo_stream_srv_link_create(void *ctx)
 {
@@ -197,8 +190,9 @@
 	return link;
 }
 
-/*! \brief Set a name on the srv_link object (used during logging)
- *  \paramin link server link whose name is to be set
+/*! Set a name on the srv_link object (used during logging).
+ *  \paramin link server link whose name is to be set.  The name is copied into the osmo_stream_srv_link, so
+ *  the caller memory is not required to be valid beyond the call of this function.
  *  \paramin name the name to be set on link
  */
 void osmo_stream_srv_link_set_name(struct osmo_stream_srv_link *link, const char *name)
@@ -206,7 +200,16 @@
 	osmo_talloc_replace_string(link, &link->name, name);
 }
 
-/*! \brief Set the NODELAY socket option to avoid Nagle-like behavior
+/*! Retrieve name previously set on the srv_link object (see osmo_stream_srv_link_set_name()).
+ *  \paramin link server link whose name is to be retrieved
+ *  \returns The name to be set on link; NULL if never set
+ */
+const char *osmo_stream_srv_link_get_name(const struct osmo_stream_srv_link *link)
+{
+	return link->name;
+}
+
+/*! Set the NODELAY socket option to avoid Nagle-like behavior.
  *  Setting this to nodelay=true will automatically set the NODELAY
  *  socket option on any socket established via this server link, before
  *  calling the accept_cb()
@@ -221,7 +224,8 @@
 		link->flags &= ~OSMO_STREAM_SRV_F_NODELAY;
 }
 
-/*! \brief Set the local address to which we bind
+/*! Set the local address to which we bind.
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin addr Local IP address
  */
@@ -231,8 +235,9 @@
 	osmo_stream_srv_link_set_addrs(link, &addr, 1);
 }
 
-/*! \brief Set the local address set to which we bind.
+/*! Set the local address set to which we bind.
  *  Useful for protocols allowing bind on more than one address (such as SCTP)
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin addr Local IP address
  *  \return negative on error, 0 on success
@@ -256,7 +261,8 @@
 	return 0;
 }
 
-/*! \brief Set the local port number to which we bind
+/*! Set the local port number to which we bind.
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin port Local port number
  */
@@ -267,7 +273,8 @@
 	link->flags |= OSMO_STREAM_SRV_F_RECONF;
 }
 
-/*! \brief Set the protocol for the stream server link
+/*! Set the protocol for the stream server link.
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin proto Protocol (like IPPROTO_TCP (default), IPPROTO_SCTP, ...)
  */
@@ -280,7 +287,8 @@
 }
 
 
-/*! \brief Set the socket type for the stream server link
+/*! Set the socket type for the stream server link.
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin type Socket Type (like SOCK_STREAM (default), SOCK_SEQPACKET, ...)
  *  \returns zero on success, negative on error.
@@ -299,7 +307,8 @@
 	return 0;
 }
 
-/*! \brief Set the socket type for the stream server link
+/*! Set the socket type for the stream server link.
+ *  Any changes to this setting will only become active upon next (re)connect.
  *  \paramin link Stream Server Link to modify
  *  \paramin type Socket Domain (like AF_UNSPEC (default for IP), AF_UNIX, AF_INET, ...)
  *  \returns zero on success, negative on error.
@@ -320,7 +329,7 @@
 	return 0;
 }
 
-/*! \brief Set application private data of the stream server link
+/*! Set application private data of the stream server link.
  *  \paramin link Stream Server Link to modify
  *  \paramin data User-specific data (available in call-back functions) */
 void
@@ -330,7 +339,7 @@
 	link->data = data;
 }
 
-/*! \brief Get application private data of the stream server link
+/*! Retrieve application private data of the stream server link.
  *  \paramin link Stream Server Link to modify
  *  \returns Application private data, as set by \ref osmo_stream_cli_set_data() */
 void *osmo_stream_srv_link_get_data(struct osmo_stream_srv_link *link)
@@ -338,26 +347,75 @@
 	return link->data;
 }
 
-/*! \brief Get description of the stream server link e. g. 127.0.0.1:1234
+/* Similar to osmo_sock_multiaddr_get_name_buf(), but aimed at listening sockets (only local part): */
+static char *get_local_sockname_buf(char *buf, size_t buf_len, const struct osmo_stream_srv_link *link)
+{
+	struct osmo_strbuf sb = { .buf = buf, .len = buf_len };
+	int rc;
+
+	if (buf_len > 0)
+		buf0 = '\0';
+
+	switch (link->sk_domain) {
+	case AF_UNSPEC:
+		/* we assume INET(6) by default upon link creation: */
+	case AF_INET:
+	case AF_INET6:
+	{
+		char hostbufOSMO_STREAM_MAX_ADDRSINET6_ADDRSTRLEN;
+		size_t num_hostbuf = ARRAY_SIZE(hostbuf);
+		char portbuf6;
+		bool need_more_bufs;
+		rc = osmo_sock_multiaddr_get_ip_and_port(link->ofd.fd, link->proto, &hostbuf00,
+							 &num_hostbuf, sizeof(hostbuf0),
+							 portbuf, sizeof(portbuf), true);

libosmo-netif_1.4.0.tar.xz/tests/stream/stream_test.c -> libosmo-netif_1.5.0.tar.xz/tests/stream/stream_test.c Changed

@@ -121,6 +121,7 @@
 		osmo_stream_cli_set_data(cli, msg);
 		CLI_SND(cli, "Doh, responding to server :-D");
 	}
+	msgb_free(msg);
 
 	return 0;
 }
@@ -299,6 +300,7 @@
 			   than it must be subsequent (after reconnect) call */
 			request_test_stop(srv);
 		}
+		msgb_free(msg);
 		osmo_stream_srv_destroy(srv);
 		return -EINVAL;
 	} else {
@@ -340,10 +342,17 @@
 		       bool autoreconnect)
 {
 	struct timeval tv;
-	struct osmo_stream_cli *cli = make_client(ctx, host, port, autoreconnect);
+	struct osmo_stream_cli *cli;
+	if (osmo_stream_srv_link_open(lnk) < 0) {
+		printf("Unable to open server\n");
+		osmo_stream_srv_link_destroy(lnk);
+		return;
+	}
+	cli = make_client(ctx, host, port, autoreconnect);
 	if (!cli)
 		return;
 
+
 	printf("=======================================\n");
 	printf("Client/Server entering %s event loop...\n", ASTR(autoreconnect));
 	printf("=======================================\n");
@@ -368,6 +377,7 @@
 	}
 
 	osmo_stream_cli_destroy(cli);
+	osmo_stream_srv_link_close(lnk);
 	printf("{%lu.%06lu} %s test complete.\n\n", tv.tv_sec, tv.tv_usec, ASTR(autoreconnect));
 }
 
@@ -384,12 +394,17 @@
 	IPAC_PROTO_IPACCESS,
 	IPAC_MSGT_PONG
 };
+#define IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER \
+	IPAC_MSGT_ID_GET, \
+	0x01, IPAC_IDTAG_UNITNAME
+static const uint8_t ipac_msg_idreq_payload = {
+	IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER
+};
 #define IPAC_MSG_ID_REQ_LEN 0x03
 static const uint8_t ipac_msg_idreq = {
 	0x00, IPAC_MSG_ID_REQ_LEN,
 	IPAC_PROTO_IPACCESS,
-	IPAC_MSGT_ID_GET,
-	0x01, IPAC_IDTAG_UNITNAME
+	IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER
 };
 #define ipac_msg_idreq_third (sizeof(ipac_msg_idreq)/3)
 #define ipac_msg_idreq_last_third (sizeof(ipac_msg_idreq) - 2 * ipac_msg_idreq_third)
@@ -487,19 +502,23 @@
 
 static struct osmo_timer_list fragmented_send_tl_cli;
 
-static int test_segm_ipa_stream_srv_cli_read_cb(struct osmo_stream_cli *osc, struct msgb *msg)
+static int test_segm_ipa_stream_srv_cli_read_cb(struct osmo_stream_cli *osc, int res, struct msgb *msg)
 {
 	unsigned char *data;
-	struct ipa_head *h = (struct ipa_head *) msg->data;
-	uint8_t ipac_msg_type = ((uint8_t *)h)sizeof(struct ipa_head);
-	struct msgb *reply = msgb_alloc_headroom(128, 0, "IPA reply");
-	if (reply == NULL) {
-		fprintf(stderr, "Cannot allocate message\n");
-		return -ENOMEM;
+	struct ipa_head *h = (struct ipa_head *) msg->l1h;
+	uint8_t ipac_msg_type = *msg->data;
+	struct msgb *reply;
+
+	if (res < 0) {
+		fprintf(stderr, "cannot receive message (res = %d)\n", res);
+		msgb_free(msg);
+		return -ENOMSG;
 	}
-	LOGCLI(osc, "Received message from stream (total len = %" PRIu16 ")\n", msgb_length(msg));
+
+	LOGCLI(osc, "Received message from stream (payload len = %" PRIu16 ")\n", msgb_length(msg));
 	if (ipac_msg_type < 0 || 5 < ipac_msg_type) {
 		fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipac_msg_type);
+		msgb_free(msg);
 		return -ENOMSG;
 	}
 	LOGCLI(osc, "\tType: %s\n", IPAC_MSG_TYPESipac_msg_type);
@@ -507,6 +526,11 @@
 		LOGCLI(osc, "Got IPAC_MSGT_ID_GET from server\n");
 		LOGCLI(osc, "(%u + 2/3) -cli Appending: Second third of IPAC_MSGT_ID_GET\n",
 		       test_segm_ipa_stream_srv_msglognum_cli);
+		reply = msgb_alloc_headroom(128, 0, "IPA reply");
+		if (reply == NULL) {
+			fprintf(stderr, "Cannot allocate message\n");
+			return -ENOMEM;
+		}
 		data = msgb_put(reply, ipac_msg_idreq_third);
 		memcpy(data, ipac_msg_idreq + ipac_msg_idreq_third,
 		       ipac_msg_idreq_third);
@@ -522,17 +546,14 @@
 		LOGCLI(osc, "\texpected=%s\n",
 		       osmo_hexdump(ipac_msg_idresp, sizeof(ipac_msg_idresp)));
 	}
+	msgb_free(msg);
 	printf("\n");
 	return 0;
 }
 
-static void *test_segm_ipa_stream_srv_run_client(void)
+struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void *ctx)
 {
-	struct osmo_stream_cli *osc;
-	void *ctx = talloc_named_const(NULL, 0, __func__);
-
-	(void) msgb_talloc_ctx_init(ctx, 0);
-	osc = osmo_stream_cli_create(ctx);
+	struct osmo_stream_cli *osc = osmo_stream_cli_create(ctx);
 	if (osc == NULL) {
 		fprintf(stderr, "osmo_stream_cli_create_iofd()\n");
 		return NULL;
@@ -541,55 +562,67 @@
 	osmo_stream_cli_set_local_port(osc, 8977);
 	osmo_stream_cli_set_port(osc, 1111);
 	osmo_stream_cli_set_connect_cb(osc, test_segm_ipa_stream_srv_cli_connect_cb);
-	osmo_stream_cli_set_data(osc, ctx);
 	osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_srv_cli_read_cb);
 	osmo_stream_cli_set_nodelay(osc, true);
 	if (osmo_stream_cli_open(osc) < 0) {
 		fprintf(stderr, "Cannot open stream client\n");
 		return NULL;
 	}
+	osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb);
 
-	return NULL;
+	return osc;
 }
 
-int test_segm_ipa_stream_srv_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg)
+int test_segm_ipa_stream_srv_srv_read_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg)
 {
 	static unsigned msgnum_srv = 0;
 	struct ipa_head *ih = (struct ipa_head *)msg->l1h;
 	unsigned char *data;
 	struct msgb *m;
-	uint8_t *msgt = msg->l2h; /* Octet right after IPA header */
+	uint8_t msgt;
+
+	if (res <= 0) {
+		if (res < 0)
+			LOGSRV(conn, "cannot receive message: %s\n", strerror(-res));
+		else
+			LOGSRV(conn, "client closed connection\n");
+		msgb_free(msg);
+		osmo_stream_srv_destroy(conn);
+		return -EBADF;
+	}
+
 	LOGSRV(conn, "%u-srv Received IPA message from stream (payload len = %" PRIu16 ")\n",
 	       ++msgnum_srv, msgb_length(msg));
 	LOGSRV(conn, "\tmsg buff data (including stripped headers): %s\n",
 	       osmo_hexdump((unsigned char *)ih, osmo_ntohs(ih->len) + sizeof(*ih)));
 	LOGSRV(conn, "\tIPA payload: %s\n", osmo_hexdump(ih->data, osmo_ntohs(ih->len)));
-	LOGSRV(conn, "\tType: %s\n", IPAC_MSG_TYPES*msgt);
+
+	msgt = *msg->l2h; /* Octet right after IPA header */
+	LOGSRV(conn, "\tType: %s\n", IPAC_MSG_TYPESmsgt);
 	LOGSRV(conn, "\t(msg dump: %s)\n", osmo_hexdump(msg->l1h, msg->len + sizeof(struct ipa_head)));
-	if (*msgt == IPAC_MSGT_ID_RESP) { /*  */
+
+	msgb_free(msg);
+
+	if (msgt == IPAC_MSGT_ID_RESP) { /*  */
 		LOGSRV(conn, "Send IPAC_MSGT_ID_GET to trigger client to send next third\n\n");
-		m = msgb_alloc_headroom(128, 0, "IPA messages");
+		m = osmo_ipa_msg_alloc(128);
 		if (m == NULL) {
 			fprintf(stderr, "Cannot allocate message\n");
 			return -ENOMEM;
 		}
-		put_ipa_msg(data, m, ipac_msg_idreq);
+		put_ipa_msg(data, m, ipac_msg_idreq_payload);
+		osmo_ipa_msg_push_headers(m, IPAC_PROTO_IPACCESS, -1);
 		osmo_stream_srv_send(conn, m);
-	} else if (msgnum_srv == 7 && *msgt == IPAC_MSGT_PONG) {
+	} else if (msgnum_srv == 7 && msgt == IPAC_MSGT_PONG) {
 		test_segm_ipa_stream_srv_all_msgs_processed = true;
+		osmo_stream_srv_destroy(conn);
 	}
 	return 0;
 }
 
-static int test_segm_ipa_stream_srv_srv_close_cb(struct osmo_stream_srv *conn)

libosmo-netif_1.4.0.tar.xz/tests/stream/stream_test.err -> libosmo-netif_1.5.0.tar.xz/tests/stream/stream_test.err Changed

@@ -2,28 +2,50 @@
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established
 
 {2.000001} autoreconnecting test step 11 client NA, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected write
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} sending 29 bytes of data
 
 {2.000002} autoreconnecting test step 10 client NA, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x1)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) message received
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) received 29 bytes from client
 
 {2.000003} autoreconnecting test step 9 client NA, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x2)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) sending 11 bytes of data
 
 {2.000004} autoreconnecting test step 8 client NA, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected read
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} message received
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} received 11 bytes from srv
 
 {2.000005} autoreconnecting test step 7 client OK, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected write
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} sending 29 bytes of data
 
 {2.000006} autoreconnecting test step 6 client OK, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x1)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) message received
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) received 29 bytes from client
 
 {2.000007} autoreconnecting test step 5 client OK, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected read
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} message received
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connection closed with srv
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} connection closed
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){WAIT_RECONNECT} retrying reconnect in 9 seconds...
 
 {11.000008} autoreconnecting test step 4 client OK, server OK, FD reg 0
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){WAIT_RECONNECT} reconnecting
 
 {11.000009} autoreconnecting test step 3 client OK, server OK, FD reg 1
 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8976
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} connection closed
 
 {11.000010} autoreconnecting test step 2 client OK, server OK, FD reg 0
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x1)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) message received
 SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connection closed with client
 
 {11.000011} autoreconnecting test step 1 client OK, server NA, FD reg 0
@@ -31,21 +53,63 @@
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTING} connection established
 
 {11.000012} non-reconnecting test step 7 client NA, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected write
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} sending 29 bytes of data
 
 {11.000013} non-reconnecting test step 6 client NA, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x1)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) message received
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) received 29 bytes from client
 
 {11.000014} non-reconnecting test step 5 client NA, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x2)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) sending 11 bytes of data
 
 {11.000015} non-reconnecting test step 4 client NA, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected read
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} message received
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} received 11 bytes from srv
 
 {11.000016} non-reconnecting test step 3 client OK, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected write
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} sending 29 bytes of data
 
 {11.000017} non-reconnecting test step 2 client OK, server OK, FD reg 1
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) connected read/write (what=0x1)
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) message received
+SRVCONN(srv_test,r=127.0.0.1:8976<->l=127.0.0.11:1111) received 29 bytes from client
 
 {11.000018} non-reconnecting test step 1 client OK, server OK, FD reg 1
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connected read
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} message received
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CONNECTED} connection closed with srv
+CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} connection closed
 CLICONN(cli_test,r=127.0.0.11:1111<->l=127.0.0.1:8976){CLOSED} not reconnecting, disabled
 
 {20.000019} non-reconnecting test step 0 client OK, server OK, FD reg 0
 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8977
 CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CONNECTING} connection established
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 24 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 24 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 24 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 24 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) connected write
+CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CONNECTED} received 6 bytes from srv
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 10 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 10 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1111) received 10 bytes from client
+CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CLOSED} connection closed
+SRV(srv_link_test,127.0.0.11:1112) accept()ed new link from 127.0.0.1:8977
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTING} connection established
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1112) connected write
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 24 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 24 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 24 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 24 bytes from srv
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1112) received 6 bytes from client
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1112) connected write
+SRVCONN(,r=127.0.0.1:8977<->l=127.0.0.11:1112) connected write
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 10 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 10 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTED} received 10 bytes from srv
+CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CLOSED} connection closed

libosmo-netif_1.4.0.tar.xz/tests/stream/stream_test.ok -> libosmo-netif_1.5.0.tar.xz/tests/stream/stream_test.ok Changed

@@ -49,18 +49,18 @@
 {20.000019} non-reconnecting test complete.
 
 ______________________________________Running test test_segm_ipa_stream_srv______________________________________
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 1-cli Appending msg of type IPAC_MSGT_PING into buffer
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 )
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 2-cli Appending msg of type IPAC_MSGT_PONG into buffer
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 01 )
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 3-cli Appending msg of type IPAC_MSGT_PING into buffer
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 )
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 4-cli Appending msg of type IPAC_MSGT_ID_RESP into buffer
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 07 fe 05 01 01 de ad be ef )
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): (04 + 1/3)-cli Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(dump: 00 03 )
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): Sending 4 + 1/3 messages as one:
-{20.000020} OK Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 1-cli Appending msg of type IPAC_MSGT_PING into buffer
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 2-cli Appending msg of type IPAC_MSGT_PONG into buffer
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 01 )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 3-cli Appending msg of type IPAC_MSGT_PING into buffer
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 4-cli Appending msg of type IPAC_MSGT_ID_RESP into buffer
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 07 fe 05 01 01 de ad be ef )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): (04 + 1/3)-cli Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(dump: 00 03 )
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): Sending 4 + 1/3 messages as one:
+{20.000020} NA Client's test_segm_ipa_stream_srv_cli_connect_cb(): 	(msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 )
 
 {20.000022} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 1-srv Received IPA message from stream (payload len = 1)
 {20.000022} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 	msg buff data (including stripped headers): 00 01 fe 00 
@@ -84,21 +84,21 @@
 {20.000022} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 	(msg dump: 00 07 fe 05 01 01 de ad be ef )
 {20.000022} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): Send IPAC_MSGT_ID_GET to trigger client to send next third
 
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (total len = 6)
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): 	Type: IPAC_MSGT_ID_GET
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): Got IPAC_MSGT_ID_GET from server
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): (4 + 2/3) -cli Appending: Second third of IPAC_MSGT_ID_GET
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): 	Sending: Second third of IPAC_MSGT_ID_GET
-{20.000024} OK Client's test_segm_ipa_stream_srv_cli_read_cb(): 	(msg dump: fe 04 )
-
-{20.500024} OK Client's send_last_third(): Delay for sending last third of message is over
-{20.500024} OK Client's send_last_third(): 5-cli Appending: Last third of IPAC_MSGT_ID_GET
-{20.500024} OK Client's send_last_third(): 6-cli Appending msg of type IPAC_MSGT_PONG into buffer
-{20.500024} OK Client's send_last_third(): 	(msg dump: 00 01 fe 01 )
-{20.500024} OK Client's send_last_third(): 7-cli Appending msg of type IPAC_MSGT_PONG into buffer
-{20.500024} OK Client's send_last_third(): 	(msg dump: 00 01 fe 01 )
-{20.500024} OK Client's send_last_third(): 	Sending: Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG 
-{20.500024} OK Client's send_last_third(): 	(msg dump: 01 01 00 01 fe 01 00 01 fe 01 )
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (payload len = 3)
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): 	Type: IPAC_MSGT_ID_GET
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): Got IPAC_MSGT_ID_GET from server
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): (4 + 2/3) -cli Appending: Second third of IPAC_MSGT_ID_GET
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): 	Sending: Second third of IPAC_MSGT_ID_GET
+{20.000024} NA Client's test_segm_ipa_stream_srv_cli_read_cb(): 	(msg dump: fe 04 )
+
+{20.500024} NA Client's send_last_third(): Delay for sending last third of message is over
+{20.500024} NA Client's send_last_third(): 5-cli Appending: Last third of IPAC_MSGT_ID_GET
+{20.500024} NA Client's send_last_third(): 6-cli Appending msg of type IPAC_MSGT_PONG into buffer
+{20.500024} NA Client's send_last_third(): 	(msg dump: 00 01 fe 01 )
+{20.500024} NA Client's send_last_third(): 7-cli Appending msg of type IPAC_MSGT_PONG into buffer
+{20.500024} NA Client's send_last_third(): 	(msg dump: 00 01 fe 01 )
+{20.500024} NA Client's send_last_third(): 	Sending: Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG 
+{20.500024} NA Client's send_last_third(): 	(msg dump: 01 01 00 01 fe 01 00 01 fe 01 )
 
 {20.500026} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 5-srv Received IPA message from stream (payload len = 3)
 {20.500026} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 	msg buff data (including stripped headers): 00 03 fe 04 01 01 
@@ -117,4 +117,73 @@
 {20.500026} NA|OK Server's test_segm_ipa_stream_srv_srv_read_cb(): 	(msg dump: 00 01 fe 01 )
 ==================================Test test_segm_ipa_stream_srv complete========================================
 
+______________________________________Running test test_segm_ipa_stream_cli______________________________________
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 1-srv Appending msg of type IPAC_MSGT_PING into buffer
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(msg dump: 00 01 fe 00 )
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 2-srv Appending msg of type IPAC_MSGT_PONG into buffer
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(msg dump: 00 01 fe 01 )
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 3-srv Appending msg of type IPAC_MSGT_PING into buffer
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(msg dump: 00 01 fe 00 )
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 4-srv Appending msg of type IPAC_MSGT_ID_RESP into buffer
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(msg dump: 00 07 fe 05 01 01 de ad be ef )
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): (04 + 1/3)-srv Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(dump: 00 03 )
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): Sending 4 + 1/3 messages as one:
+{20.500027} NA|OK Server's test_segm_ipa_stream_cli_srv_accept_cb(): 	(msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 )
+
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 1-cli Received message from stream (len = 1)
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 00 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 00 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_PING
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 01 fe 00 )
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 2-cli Received message from stream (len = 1)
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 01 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 01 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_PONG
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 01 fe 01 )
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 3-cli Received message from stream (len = 1)
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 00 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 00 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_PING
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 01 fe 00 )
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 4-cli Received message from stream (len = 7)
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 05 01 01 de ad be ef 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 05 01 01 de ad be ef 
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_ID_RESP
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 07 fe 05 01 01 de ad be ef )
+{20.500029} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): Send IPAC_MSGT_ID_GET to trigger server to send next third
+
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): Received message from stream (total len including stripped headers = 6)
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): 	Type: IPAC_MSGT_ID_GET
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): Got IPAC_MSGT_ID_GET from client
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): (4 + 2/3) -srv Appending: Second third of IPAC_MSGT_ID_GET
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): 	Sending: Second third of IPAC_MSGT_ID_GET
+{20.500031} NA|OK Server's test_segm_ipa_stream_cli_srv_read_cb(): 	(msg dump: fe 04 )
+
+{20.625031} NA|OK Server's send_last_third_srv(): Delay for sending last third of message is over
+{20.625031} NA|OK Server's send_last_third_srv(): 5-srv Appending: Last third of IPAC_MSGT_ID_GET
+{20.625031} NA|OK Server's send_last_third_srv(): 6-srv Appending msg of type IPAC_MSGT_PONG into buffer
+{20.625031} NA|OK Server's send_last_third_srv(): 	(msg dump: 00 01 fe 01 )
+{20.625031} NA|OK Server's send_last_third_srv(): 7-srv Appending msg of type IPAC_MSGT_PONG into buffer
+{20.625031} NA|OK Server's send_last_third_srv(): 	(msg dump: 00 01 fe 01 )
+{20.625031} NA|OK Server's send_last_third_srv(): 	Sending: Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG 
+{20.625031} NA|OK Server's send_last_third_srv(): 	(msg dump: 01 01 00 01 fe 01 00 01 fe 01 )
+
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 5-cli Received message from stream (len = 3)
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 04 01 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 04 01 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_ID_GET
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 03 fe 04 01 01 )
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 6-cli Received message from stream (len = 1)
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_PONG
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 01 fe 01 )
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 7-cli Received message from stream (len = 1)
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	msg buff data: 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	IPA payload: 01 
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	Type: IPAC_MSGT_PONG
+{20.625033} NA Client's test_segm_ipa_stream_cli_cli_read_cb(): 	(msg dump (including stripped headers): 00 01 fe 01 )
+==================================Test test_segm_ipa_stream_cli complete========================================
+
 Stream tests completed

rpmlintrc Deleted

Changes of Revision 6