diff -Nru resiprocate-1.11.0~beta4/configure.ac resiprocate-1.11.0~beta5/configure.ac --- resiprocate-1.11.0~beta4/configure.ac 2017-06-28 14:57:53.000000000 +0000 +++ resiprocate-1.11.0~beta5/configure.ac 2017-06-29 08:39:32.000000000 +0000 @@ -1,5 +1,5 @@ -AC_INIT(resiprocate,1.11.0~beta4) +AC_INIT(resiprocate,1.11.0~beta5) AC_CONFIG_SRCDIR(repro/repro.cxx) SO_RELEASE=`echo $PACKAGE_VERSION | cut -f1,2 -d.` diff -Nru resiprocate-1.11.0~beta4/debian/changelog resiprocate-1.11.0~beta5/debian/changelog --- resiprocate-1.11.0~beta4/debian/changelog 2017-06-28 15:00:32.000000000 +0000 +++ resiprocate-1.11.0~beta5/debian/changelog 2017-06-29 08:43:00.000000000 +0000 @@ -1,3 +1,9 @@ +resiprocate (1:1.11.0~beta5-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Pocock Thu, 29 Jun 2017 10:43:00 +0200 + resiprocate (1:1.11.0~beta4-1) unstable; urgency=medium * New upstream release. diff -Nru resiprocate-1.11.0~beta4/debian/repro.install resiprocate-1.11.0~beta5/debian/repro.install --- resiprocate-1.11.0~beta4/debian/repro.install 2017-06-28 14:59:25.000000000 +0000 +++ resiprocate-1.11.0~beta5/debian/repro.install 2017-06-29 08:43:00.000000000 +0000 @@ -5,3 +5,4 @@ debian/conf/repro/users.txt etc/repro repro/plugins/pyroute/*.py usr/share/doc/repro/examples/pyroute repro/plugins/pyroute/README.txt usr/share/doc/repro/examples/pyroute +repro/pkg/common/repro.service lib/systemd/system diff -Nru resiprocate-1.11.0~beta4/debian/resiprocate-turn-server.install resiprocate-1.11.0~beta5/debian/resiprocate-turn-server.install --- resiprocate-1.11.0~beta4/debian/resiprocate-turn-server.install 2016-12-10 09:30:01.000000000 +0000 +++ resiprocate-1.11.0~beta5/debian/resiprocate-turn-server.install 2017-06-29 08:43:00.000000000 +0000 @@ -1,3 +1,4 @@ usr/sbin/reTurnServer debian/conf/reTurnServer.config etc/reTurn debian/conf/reTurn/users.txt etc/reTurn +reTurn/pkg/common/resiprocate-turn-server.service lib/systemd/system diff -Nru resiprocate-1.11.0~beta4/resip/stack/test/Makefile.am resiprocate-1.11.0~beta5/resip/stack/test/Makefile.am --- resiprocate-1.11.0~beta4/resip/stack/test/Makefile.am 2017-06-28 14:57:53.000000000 +0000 +++ resiprocate-1.11.0~beta5/resip/stack/test/Makefile.am 2017-06-29 08:39:32.000000000 +0000 @@ -187,7 +187,8 @@ testIM.hxx \ TestSupport.hxx \ Transceiver.hxx \ - tassert.h + tassert.h \ + testPortOffset.hxx ############################################################################## # diff -Nru resiprocate-1.11.0~beta4/resip/stack/test/testPortOffset.hxx resiprocate-1.11.0~beta5/resip/stack/test/testPortOffset.hxx --- resiprocate-1.11.0~beta4/resip/stack/test/testPortOffset.hxx 1970-01-01 00:00:00.000000000 +0000 +++ resiprocate-1.11.0~beta5/resip/stack/test/testPortOffset.hxx 2017-06-29 08:39:32.000000000 +0000 @@ -0,0 +1,52 @@ +#ifndef TESTPORTOFFSET_HXX +#define TESTPORTOFFSET_HXX + +/* If the unit tests are run on a developer's machine, he or she may + * already be using port 5060 for another local process. + * + * The developer can override this offset with CPPFLAGS if necessary. + */ +#ifndef TEST_PORT_OFFSET +#define TEST_PORT_OFFSET 20000 +#endif + +#define resipTestPort(p) (TEST_PORT_OFFSET + p) + +#endif + +/* ==================================================================== + * + * Copyright 2017 Daniel Pocock http://danielpocock.com All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. Neither the name of the author(s) nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * ==================================================================== + * + * + */ diff -Nru resiprocate-1.11.0~beta4/resip/stack/test/testSocketFunc.cxx resiprocate-1.11.0~beta5/resip/stack/test/testSocketFunc.cxx --- resiprocate-1.11.0~beta4/resip/stack/test/testSocketFunc.cxx 2017-06-28 14:57:53.000000000 +0000 +++ resiprocate-1.11.0~beta5/resip/stack/test/testSocketFunc.cxx 2017-06-29 08:39:32.000000000 +0000 @@ -22,6 +22,8 @@ #include "resip/stack/EventStackThread.hxx" #include "resip/stack/Uri.hxx" +#include "testPortOffset.hxx" + using namespace resip; using namespace std; @@ -48,10 +50,10 @@ { Security *sec = new Security(); SipStack sipStack(sec, DnsStub::EmptyNameserverList, 0, false, &afterSocketCreationFunction); - sipStack.addTransport(UDP, 5060, V4, StunDisabled, Data::Empty, "127.0.0.1"); - sipStack.addTransport(TCP, 5062, V4, StunDisabled, Data::Empty, "127.0.0.1"); - //sipStack.addTransport(TLS, 5061, V4, StunDisabled, Data::Empty, "127.0.0.1"); - //sipStack.addTransport(WSS, 8443, V4, StunDisabled, Data::Empty, "127.0.0.1"); + sipStack.addTransport(UDP, resipTestPort(5060), V4, StunDisabled, Data::Empty, "127.0.0.1"); + sipStack.addTransport(TCP, resipTestPort(5062), V4, StunDisabled, Data::Empty, "127.0.0.1"); + //sipStack.addTransport(TLS, resipTestPort(5061), V4, StunDisabled, Data::Empty, "127.0.0.1"); + //sipStack.addTransport(WSS, resipTestPort(8443), V4, StunDisabled, Data::Empty, "127.0.0.1"); return 0; }