Bump version: 1.2.0.114-3804-dirty → 1.3.01.3.0

Change-Id: Id67541378193f22f924409f02301f0063aab639e

8 files changed, 147 insertions, 25 deletions

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 55371fd..d0852fc 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,7 +7,3 @@
 # 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
-libosmo-netif   osmux           new osmux_xfrm_output_* APIs
-libosmo-netif   osmux           new osmux_xfrm_input_* APIs
-libosmo-netif   osmux           new struct osmux_hdr->data[0] field
-libosmo-netif   stream          new APIs osmo_stream_{cli,srv}_clear_tx_queue()
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 06eaf6c..5763a74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,9 +89,9 @@ AC_SUBST(SYMBOL_VISIBILITY)
 dnl Generate the output
 AM_CONFIG_HEADER(config.h)
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.7.0)
-PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.8.0)
+PKG_CHECK_MODULES(LIBOSMOCODEC, libosmocodec >= 1.8.0)
 
 AC_ARG_ENABLE([lapd_examples],
 	[AS_HELP_STRING(
@@ -100,7 +100,7 @@ AC_ARG_ENABLE([lapd_examples],
 	)],
 	[lapd_examples=$enableval], [lapd_examples="no"])
 AS_IF([test "x$lapd_examples" = "xyes"], [
-	PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.3.0)
+	PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.4.0)
 	AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples])
 ])
 AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes")
diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in
index 6dc19ee..c4b39f6 100644
--- a/contrib/libosmo-netif.spec.in
+++ b/contrib/libosmo-netif.spec.in
@@ -24,26 +24,26 @@ BuildRequires:  automake
 BuildRequires:  libtool >= 2
 BuildRequires:  lksctp-tools-devel
 BuildRequires:  pkgconfig >= 0.20
-BuildRequires:  pkgconfig(libosmocore) >= 1.7.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.7.0
-BuildRequires:  pkgconfig(libosmocodec) >= 1.7.0
+BuildRequires:  pkgconfig(libosmocore) >= 1.8.0
+BuildRequires:  pkgconfig(libosmogsm) >= 1.8.0
+BuildRequires:  pkgconfig(libosmocodec) >= 1.8.0
 
 %description
 Network interface demuxer library for OsmoCom projects.
 
-%package -n libosmonetif8
+%package -n libosmonetif11
 Summary:        Osmocom library for muxed audio
 License:        AGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n libosmonetif8
+%description -n libosmonetif11
 Network interface demuxer library for OsmoCom projects.
 
 %package -n libosmonetif-devel
 Summary:        Development files for the Osmocom muxed audio library
 License:        AGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libosmonetif8 = %{version}
+Requires:       libosmonetif11 = %{version}
 
 %description -n libosmonetif-devel
 Network interface demuxer library for OsmoCom projects.
@@ -67,11 +67,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %check
 make %{?_smp_mflags} check || (find . -name testsuite.log -exec cat {} +)
 
-%post   -n libosmonetif8 -p /sbin/ldconfig
-%postun -n libosmonetif8 -p /sbin/ldconfig
+%post   -n libosmonetif11 -p /sbin/ldconfig
+%postun -n libosmonetif11 -p /sbin/ldconfig
 
-%files -n libosmonetif8
-%{_libdir}/libosmonetif.so.8*
+%files -n libosmonetif11
+%{_libdir}/libosmonetif.so.11*
 
 %files -n libosmonetif-devel
 %license COPYING
diff --git a/debian/changelog b/debian/changelog
index b283cc6..6b560fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,129 @@
+libosmo-netif (1.3.0) unstable; urgency=medium
+
+  [ Pau Espin Pedrol ]
+  * rtp: Delay rtph ptr assign after validating length
+  * stream: assert params are not NULL in send/recv functions
+  * stream: getsockopt ret socklen_t is unsigned
+  * osmux.h: Add missing msgb.h header
+  * osmux.h: Define default Osmux port
+  * rtp: Avoid memcpy(len=0)
+  * examples/osmux-test-output: Avoid using deprecated Osmux API
+  * osmux: Drop long time deprecated APIs
+  * osmux: Move osmux_xfrm_output_set_tx_cb() further down to the xfrm_output section
+  * osmux: Allocate struct osmux_out_handle through API
+  * osmux: Allow the user to alloc msgbs used to provide generated RTP packets
+  * osmux: osmux_xfrm_input_close_circuit(): Log circuit not found
+  * stream: Fix typos in log messages
+  * stream: Unset fd value after close() before calling closed_cb()
+  * stream: Provide caller with SCTP flags during osmo_stream_*_recv()
+  * tests/osmo-pcap-test/osmux_test: Fix return condition check for osmux_xfrm_input()
+  * osmux: Improve logging non-usual conditions
+  * osmux: osmux_xfrm_input(): Propagate error code to inform caller
+  * osmux: Avoid duplicated RTP msg trigger Tx of osmux frame
+  * osmux: Change order of lines to follow packet fill order
+  * cosmetic: osmux: Fix typo in comment
+  * osmux: Unify return codes of osmux_batch_add() and osmux_batch_enqueue()
+  * osmux: Early return on error or batch full during osmux_replay_lost_packets()
+  * osmux: assert no batch factor greater than 8 is used
+  * tests/osmux_test2: Document unit tests
+  * tests/osmux: Always run with fake time
+  * tests: rename test osmux_test2 -> osmux_output_test
+  * osmux: Print osmux_hdr rtp_m field in osmux_snprintf()
+  * amr: Add data[0] field to amr_hdr
+  * osmux: Proper encoding of osmux frames when when AMR FT changes
+  * tests/osmux: Add new osmux_input_test to validate AMR FT changes
+  * osmux: Fix AMR F,Q,CMR fields not properly encoded in osmux header
+  * cosmetic: osmux: Properly separate expressions with whitespace
+  * cosmetic: osmux: Fix typo in comment
+  * osmux: Fix osmux seqnum incremented globally instead of per circuit
+  * tests/osmux: Properly flush and free out_handle in osmux_test
+  * tests/osmux: Test rx of osmux seqnum wrap around
+  * osmux: Fix unwanted RTP marker bit upon rx of osmux seqnum wrap around
+  * stream: Set proper msgb length when returning sctp_notification
+  * stream: Erase sctp_msg_flags if receiving user data
+  * stream: Log rx of sctp notification SCTP_SEND_FAILED
+  * stream: Set sctp_ppid and sctp_stream when sctp notifciation is received
+  * stream: Remove unneeded break statement
+  * stream: Return 0 when receiving sctp notification SCTP_COMM_LOST
+  * stream: Document osmo_stream_srv_recv() SCTP specialties
+  * osmux: join osmux_xfrm_input_open_circuit() and osmux_batch_add_circuit()
+  * osmux: Take into account configured osmux_in_handle->osmux_seq field
+  * osmux: Split input and output code into separate files
+  * cosmetic: osmux: Make linter happy
+  * tests/osmo-pcap/osmux: Replace deprecated API osmux_xfrm_output_init2()
+  * osmux: Allocate struct osmux_out_handle through API
+  * osmux: Replace deprecated osmux_xfrm_input_* APIs in examples & tests
+  * osmux: Introduce API osmux_xfrm_input_get_deliver_cb_data()
+  * stream: Improve logging of SCTP_PEER_ADDR_CHANGE notification
+  * cosmetic: stream: Fix parameter name
+  * stream: Introduce APIs osmo_stream_{cli,srv}_clear_tx_queue()
+  * cosmetic: Fix indentation whitespace
+  * amr: Document SID frame length from spec
+  * osmux: Rework log formatting when replaying detected RTP gaps
+  * osmux: Use msgb_copy() API in osmux_replay_lost_packets()
+  * osmux: Log AMR FT when incorrect AMR payload size detected
+  * osmux: Fix naming of functions operating on osmux circuits
+  * osmux: rename internal struct osmux_batch -> osmux_link
+  * osmux: Add internal backpointer to in_handle to simplify param passing
+  * osmux: Fix endianness logging duplicaed seqnum
+  * osmux: Use internal struct to cache parsing state of rtp pkt from user
+  * osmux: dup in RTP pkt: check before applying queue flush due to Marker bit
+  * osmux: dup in RTP pkt: Replace potentially internally forged pkt with incoming one
+  * osmux: recreate lost RTP pkts before handling newest one
+  * osmux: Drop marker bit in forged RTP packets to fill gaps
+  * osmux: Add data[0] field to osmux_hdr
+  * osmux: Drop noop OR during assignment
+  * tests/osmux: Test replay of one lost RTP packet when generating osmux batches
+  * tests/osmux: Test incoming RTP stream with seqnum jumps during wraparound
+  * tests/osmux: Test big seqnum holes (>batch_factor) in incoming RTP stream
+  * osmux: Obey current batch_size restrictions when creating forged RTP packets to fill holes
+  * osmux: Use better rationale when limiting amount of lost & forged RTP incoming packets
+  * osmux: Avoid filling in seqnum holes upon rx of RTP pkt with M bit set
+  * osmux: Set M bit in osmuxhdr if seqnum hole found encoding RTP pkts
+  * osmux: Support recreating lost RTP packets at start of the batch
+  * osmux: Introduce API osmux_xfrm_input_set_name()
+  * osmux: Improve logging of osmux_xfrm_input
+  * tests/osmux: Add extra asserts to validate osmux header is pulled correctly
+  * amr: Guard against incorrect AMR FT passed to osmo_amr_{bits,bytes}()
+  * osmux: Check received osmuxh->amr_ft is correct before using it
+  * osmux: Refactor osmux_xfrm_output_pull() to simplify code flow
+  * osmux_output: Refactor init code to avoid calling deprecated APIs internally
+  * amr.h: Fix missing include dependencies
+  * amr: osmo_amr_bwe_to_oa(): Modify loop to allow osmo_amr_bytes()=0 (NO_DATA)
+  * amr: osmo_amr_bwe_to_oa() define variable as unsigned
+  * amr: Add struct definition for AMR BWE header
+  * tests/amr: Add test case for unused FT=14
+  * amr: Support all SID and NO_DATA amr formats
+  * osmux: Allow forwarding AMR NO_DATA frames
+  * stream: Log read/write flags
+  * stream: osmo_stream_*_write: Unifiy way to get data and length
+  * stream: Log error on short send
+  * stream: Avoid useless polling if tx_queue becomes empty
+  * stream: Fix tx data dropped upon show socket write
+  * amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN
+  * amr: Add missing header stdbool.h
+  * amr: constify input buffer in osmo_amr_is_oa()
+  * amr: use struct bwe_hdr in osmo_amr_bwe_to_oa()
+  * amr: Clarify size of AMR BWE header and ToC
+  * amr: use OSMO_BYTES_FOR_BITS()
+  * amr: osmo_amr_bwe_to_oa(): validate input data is long enough
+  * Introduce utils/osmo-amr-inspect program
+  * osmo-amr-inspect: Improve robustness reading from stdin
+
+  [ Vadim Yanitskiy ]
+  * tests/amr: fix less-than-zero comparison of an unsigned value
+
+  [ Max ]
+  * Log more details in osmo_stream_srv_write()
+  * Properly handle send() return code
+  * Better handling of send() error
+  * Add assert for link check to osmo_stream_srv_create()
+
+  [ Harald Welte ]
+  * Support building with -Werror=strict-prototypes / -Werror=old-style-definition
+
+ -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 07 Feb 2023 13:28:19 +0100
+
 libosmo-netif (1.2.0) unstable; urgency=medium
 
   [ Pau Espin Pedrol ]
diff --git a/debian/control b/debian/control
index c3596b3..f919392 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
                libdpkg-perl,
                git,
                doxygen,
-               libosmocore-dev (>= 1.7.0),
+               libosmocore-dev (>= 1.8.0),
                pkg-config,
                libpcap0.8-dev,
                libsctp-dev
@@ -20,7 +20,7 @@ Vcs-Browser: https://gitea.osmocom.org/osmocom/libosmo-netif
 Vcs-Git: https://gitea.osmocom.org/osmocom/libosmo-netif
 Homepage: https://projects.osmocom.org/projects/libosmo-netif
 
-Package: libosmonetif8
+Package: libosmonetif11
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -37,7 +37,7 @@ Architecture: any
 Depends: ${misc:Depends},
          libosmocore-dev,
          libosmocore,
-         libosmonetif8 (= ${binary:Version})
+         libosmonetif11 (= ${binary:Version})
 Multi-Arch: same
 Description: Development headers for Osmocom network interface
  The libosmo-netif library is one of the libraries needed by the
@@ -51,7 +51,7 @@ Package: libosmo-netif-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
-         libosmonetif8,
+         libosmonetif11,
          libjs-jquery
 Description: Documentation for the Osmo network interface library
  The libosmo-netif library is one of the libraries needed by the
@@ -64,7 +64,7 @@ Package: libosmo-netif-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: libosmonetif8 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmonetif11 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Debug symbols for Osmocom network interface library
  The libosmo-netif library is one of the libraries needed by the
diff --git a/debian/libosmonetif8.install b/debian/libosmonetif11.install
index 7a36b86..7a36b86 100644
--- a/debian/libosmonetif8.install
+++ b/debian/libosmonetif11.install
diff --git a/src/Makefile.am b/src/Makefile.am
index 0dc9616..1e89e39 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 # This is _NOT_ the library release version, it's an API version.
 # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
-LIBVERSION=10:0:2
+LIBVERSION=11:0:0
 
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)
 AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(LIBSCTP_CFLAGS)
diff --git a/tests/osmo-pcap-test/configure.ac b/tests/osmo-pcap-test/configure.ac
index 15b176a..6f5925d 100644
--- a/tests/osmo-pcap-test/configure.ac
+++ b/tests/osmo-pcap-test/configure.ac
@@ -16,7 +16,7 @@ PKG_PROG_PKG_CONFIG([0.20])
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.7.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.8.0)
 
 AC_PROG_CC
 AC_DISABLE_STATIC