Hello community, here is the log from the commit of package libosmo-netif for openSUSE:Factory checked in at 2016-08-10 19:55:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libosmo-netif (Old) and /work/SRC/openSUSE:Factory/.libosmo-netif.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libosmo-netif" Changes: -------- --- /work/SRC/openSUSE:Factory/libosmo-netif/libosmo-netif.changes 2016-02-01 19:55:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libosmo-netif.new/libosmo-netif.changes 2016-08-10 19:55:48.000000000 +0200 @@ -1,0 +2,9 @@ +Sun Jul 31 17:59:57 UTC 2016 - [email protected] + +- Update to new upstream snapshot 0.0.6.19 +* misc: Drop oRTP dependency as there is nothing using it +* osmux: Pass circuit to _batch_del_circuit() and use it from _xfrm_input_fini() +* osmux: Add function to delete all msgs pending for a circuit +* osmux-test: remove real-time constraint by default + +------------------------------------------------------------------- Old: ---- libosmo-netif-0.0.6.8.tar.xz New: ---- _service libosmo-netif-0.0.6.19.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libosmo-netif.spec ++++++ --- /var/tmp/diff_new_pack.JhVZxf/_old 2016-08-10 19:55:49.000000000 +0200 +++ /var/tmp/diff_new_pack.JhVZxf/_new 2016-08-10 19:55:49.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libosmo-netif # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,23 +16,21 @@ # +%define version_unconverted 0.0.6.19 + Name: libosmo-netif Summary: Osmocom library for muxed audio -Version: 0.0.6.8 -Release: 0 License: AGPL-3.0+ and GPL-2.0+ Group: Productivity/Telephony/Utilities +Version: 0.0.6.19 +Release: 0 Url: http://openbsc.osmocom.org/trac/ -#Git-Clone: git://git.osmocom.org/libosmo-netif -#Git-Web: http://git.osmocom.org/libosmo-netif/ -#Snapshot: 0.0.6-8-g4d702db Source: %name-%version.tar.xz Patch1: osmo-talloc.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake -#BuildRequires: dahdi-linux-devel BuildRequires: libtool >= 2 BuildRequires: lksctp-tools-devel BuildRequires: pkg-config @@ -41,7 +39,6 @@ BuildRequires: pkgconfig(libosmocore) >= 0.3.0 BuildRequires: pkgconfig(libosmogsm) >= 0.3.0 BuildRequires: pkgconfig(libosmovty) >= 0.3.0 -BuildRequires: pkgconfig(ortp) >= 0.15.0 %description Network interface demuxer library for OsmoCom projects. @@ -67,7 +64,7 @@ applications that want to make use of libosmo-netif. %prep -%setup -qn %name +%setup -q %patch -P 1 -p1 %build ++++++ _service ++++++ <services> <service name="tar_scm" mode="localonly"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/libosmo-netif</param> <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> </service> <service name="recompress" mode="localonly"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="localonly"/> </services> ++++++ libosmo-netif-0.0.6.8.tar.xz -> libosmo-netif-0.0.6.19.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/.gitignore new/libosmo-netif-0.0.6.19/.gitignore --- old/libosmo-netif/.gitignore 2014-10-02 22:55:39.000000000 +0200 +++ new/libosmo-netif-0.0.6.19/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.o -*.lo -*.la -*.pc -aclocal.m4 -acinclude.m4 -aminclude.am -m4/*.m4 -autom4te.cache -compile -config.h* -config.sub -config.log -config.status -config.guess -configure -depcomp -missing -ltmain.sh -install-sh -stamp-h1 -libtool - -.tarball-version -.version - -tests/atconfig -tests/package.m4 -tests/testsuite -tests/osmux/osmux_test -tests/testsuite.log - -examples/channel/abis_ipa_stream_client -examples/channel/abis_ipa_stream_server -examples/ipa-stream-client -examples/ipa-stream-server -examples/lapd-over-datagram-network -examples/lapd-over-datagram-user -examples/osmux-test-input -examples/osmux-test-output -examples/rs232-read -examples/rs232-write -examples/rtp-udp-test-client -examples/rtp-udp-test-server -examples/stream-client -examples/stream-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/configure.ac new/libosmo-netif-0.0.6.19/configure.ac --- old/libosmo-netif/configure.ac 2016-01-22 19:16:55.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/configure.ac 2016-07-31 20:00:09.000000000 +0200 @@ -39,7 +39,6 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0) dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) -PKG_CHECK_MODULES(ORTP, ortp >= 0.15.0) old_LIBS=$LIBS AC_SEARCH_LIBS([sctp_send], [sctp], [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/contrib/jenkins.sh new/libosmo-netif-0.0.6.19/contrib/jenkins.sh --- old/libosmo-netif/contrib/jenkins.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/contrib/jenkins.sh 2016-07-31 20:00:09.000000000 +0200 @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +set -ex + +rm -rf deps/install +mkdir deps || true +cd deps +osmo-deps.sh libosmocore + +cd libosmocore +autoreconf --install --force +./configure --prefix=$PWD/../install +$MAKE $PARALLEL_MAKE install + +cd ../ +osmo-deps.sh libosmo-abis +cd libosmo-abis +autoreconf --install --force +PKG_CONFIG_PATH=$PWD/../install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure --prefix=$PWD/../install +PKG_CONFIG_PATH=$PWD/..//install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE install + +cd ../../ +autoreconf --install --force +PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH ./configure +PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH $MAKE $PARALLEL_MAKE +PKG_CONFIG_PATH=$PWD/deps/install/lib/pkgconfig:$PKG_CONFIG_PATH LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/debian/changelog new/libosmo-netif-0.0.6.19/debian/changelog --- old/libosmo-netif/debian/changelog 2015-12-23 18:06:49.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/debian/changelog 2016-07-31 20:00:09.000000000 +0200 @@ -1,3 +1,9 @@ +libosmo-netif (0.0.7) UNRELEASED; urgency=medium + + * Move forward toward a new release. + + -- Holger Hans Peter Freyther <[email protected]> Tue, 24 May 2016 23:06:33 +0200 + libosmo-netif (0.0.6) unstable; urgency=medium * Drop libosmovty dependency. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/debian/control new/libosmo-netif-0.0.6.19/debian/control --- old/libosmo-netif/debian/control 2015-12-23 18:06:49.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/debian/control 2016-07-31 20:00:09.000000000 +0200 @@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Holger Hans Peter Freyther <[email protected]> -Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev, libosmo-abis-dev, pkg-config, libortp-dev +Build-Depends: debhelper (>= 9), autotools-dev, autoconf, automake, libtool, dh-autoreconf, libdpkg-perl, git, libosmocore-dev, libosmo-abis-dev, pkg-config, libsctp-dev Standards-Version: 3.9.6 Vcs-Git: git://git.osmocom.org/libosmo-netif.git Vcs-Browser: http://git.osmocom.org/gitweb?p=libosmo-netif.git;a=summary diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/examples/stream-client.c new/libosmo-netif-0.0.6.19/examples/stream-client.c --- old/libosmo-netif/examples/stream-client.c 2014-10-02 22:55:39.000000000 +0200 +++ new/libosmo-netif-0.0.6.19/examples/stream-client.c 2016-07-31 20:00:09.000000000 +0200 @@ -80,7 +80,7 @@ LOGP(DSTREAMTEST, LOGL_ERROR, "cannot allocate message\n"); return 0; } - ptr = msgb_put(msg, strlen(buf)); + ptr = msgb_put(msg, ret); memcpy(ptr, buf, ret); osmo_stream_cli_send(conn, msg); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/m4/.gitignore new/libosmo-netif-0.0.6.19/m4/.gitignore --- old/libosmo-netif/m4/.gitignore 2014-10-02 22:55:39.000000000 +0200 +++ new/libosmo-netif-0.0.6.19/m4/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -/libtool.m4 -/lt*.m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/src/osmux.c new/libosmo-netif-0.0.6.19/src/osmux.c --- old/libosmo-netif/src/osmux.c 2015-12-23 18:06:49.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/src/osmux.c 2016-07-31 20:00:09.000000000 +0200 @@ -225,6 +225,16 @@ circuit->nmsgs--; } +static void osmux_circuit_del_msgs(struct osmux_batch *batch, struct osmux_circuit *circuit) +{ + struct msgb *cur, *tmp; + llist_for_each_entry_safe(cur, tmp, &circuit->msg_list, list) { + osmux_batch_dequeue(cur, circuit); + msgb_free(cur); + batch->nmsgs--; + } +} + struct osmux_input_state { struct msgb *out_msg; struct msgb *msg; @@ -533,17 +543,12 @@ return circuit; } -static void osmux_batch_del_circuit(struct osmux_batch *batch, int ccid) +static void osmux_batch_del_circuit(struct osmux_batch *batch, struct osmux_circuit *circuit) { - struct osmux_circuit *circuit; - - circuit = osmux_batch_find_circuit(batch, ccid); - if (circuit == NULL) - return; - if (circuit->dummy) batch->ndummy--; llist_del(&circuit->head); + osmux_circuit_del_msgs(batch, circuit); talloc_free(circuit); } @@ -713,8 +718,13 @@ void osmux_xfrm_input_close_circuit(struct osmux_in_handle *h, int ccid) { struct osmux_batch *batch = (struct osmux_batch *)h->internal_data; + struct osmux_circuit *circuit; + + circuit = osmux_batch_find_circuit(batch, ccid); + if (circuit == NULL) + return; - osmux_batch_del_circuit(batch, ccid); + osmux_batch_del_circuit(batch, circuit); } void osmux_xfrm_input_fini(struct osmux_in_handle *h) @@ -722,10 +732,9 @@ struct osmux_batch *batch = (struct osmux_batch *)h->internal_data; struct osmux_circuit *circuit, *next; - llist_for_each_entry_safe(circuit, next, &batch->circuit_list, head) { - llist_del(&circuit->head); - talloc_free(circuit); - } + llist_for_each_entry_safe(circuit, next, &batch->circuit_list, head) + osmux_batch_del_circuit(batch, circuit); + osmo_timer_del(&batch->timer); talloc_free(batch); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/src/stream.c new/libosmo-netif-0.0.6.19/src/stream.c --- old/libosmo-netif/src/stream.c 2016-01-22 19:16:55.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/src/stream.c 2016-07-31 20:00:09.000000000 +0200 @@ -641,7 +641,7 @@ { int ret; - ret = recv(conn->ofd.fd, msg->data, msg->data_len, 0); + ret = recv(conn->ofd.fd, msgb_data(msg), msgb_tailroom(msg), 0); if (ret < 0) { if (errno == EPIPE || errno == ECONNRESET) { LOGP(DLINP, LOGL_ERROR, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/tests/osmo-pcap-test/.gitignore new/libosmo-netif-0.0.6.19/tests/osmo-pcap-test/.gitignore --- old/libosmo-netif/tests/osmo-pcap-test/.gitignore 2014-10-02 22:55:39.000000000 +0200 +++ new/libosmo-netif-0.0.6.19/tests/osmo-pcap-test/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -Makefile -Makefile.in -.deps -.libs -*.o -*.lo -*.la -aclocal.m4 -acinclude.m4 -aminclude.am -m4/*.m4 -autom4te.cache -config.h* -config.sub -config.log -config.status -config.guess -configure -depcomp -missing -ltmain.sh -install-sh -stamp-h1 -libtool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libosmo-netif/tests/osmux/osmux_test.c new/libosmo-netif-0.0.6.19/tests/osmux/osmux_test.c --- old/libosmo-netif/tests/osmux/osmux_test.c 2015-12-23 18:06:49.000000000 +0100 +++ new/libosmo-netif-0.0.6.19/tests/osmux/osmux_test.c 2016-07-31 20:00:09.000000000 +0200 @@ -8,6 +8,8 @@ * (at your option) any later version. */ +#define OSMUX_TEST_USE_TIMING 0 + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -15,7 +17,9 @@ #include <string.h> #include <signal.h> #include <arpa/inet.h> +#if OSMUX_TEST_USE_TIMING #include <sys/time.h> +#endif #include <osmocom/core/select.h> #include <osmocom/core/application.h> @@ -51,11 +55,14 @@ }; static int rtp_pkts; +#if OSMUX_TEST_USE_TIMING static struct timeval last; +#endif static void tx_cb(struct msgb *msg, void *data) { char buf[4096]; +#if OSMUX_TEST_USE_TIMING struct timeval now, diff; gettimeofday(&now, NULL); @@ -63,9 +70,12 @@ last = now; if (diff.tv_usec > 2*17000) { - fprintf(stdout, "lagging to deliver reconstructed RTP\n"); + fprintf(stdout, "delivery of reconstructed RTP lagged" + " (diff.tv_usec=%u > 2*17000)\n", + (unsigned int)diff.tv_usec); exit(EXIT_FAILURE); } +#endif osmo_rtp_snprintf(buf, sizeof(buf), msg); fprintf(stderr, "extracted packet: %s\n", buf); @@ -147,7 +157,9 @@ osmux_xfrm_input(&h_input, msg, (i % 2) + ccid); if (i % 4 == 0) { +#if OSMUX_TEST_USE_TIMING gettimeofday(&last, NULL); +#endif /* After four RTP messages, squash them into the OSMUX * batch and call the routine to deliver it.
