log protocol discriminators and message types by name

Depends: libosmocore change-id I0fca8e95ed5c2148b1a7440eff3fc9c7583898df Change-Id: If1c49faf6e1757cb16b383dd2db87b48bc94eee6
adjust msc_vlr_test_reject_concurrency
2025-11-03 21:43:32 +00:00 · 2017-03-16 15:32:34 +01:00 · 2017-03-16 15:32:34 +01:00 · 2017-03-16 15:32:34 +01:00 · 2017-03-16 15:32:34 +01:00 · 2017-03-16 15:32:34 +01:00
620 changed files with 162527 additions and 24327 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,118 +0,0 @@
 # SPDX-License-Identifier: GPL-2.0
 #
 # clang-format configuration file. Intended for clang-format >= 4.
 #
 # For more information, see:
 #
 #   Documentation/process/clang-format.rst
 #   https://clang.llvm.org/docs/ClangFormat.html
 #   https://clang.llvm.org/docs/ClangFormatStyleOptions.html
 #
 ---
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 #AlignEscapedNewlines: Left # Unknown to clang-format-4.0
 AlignOperands: true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: false
 BinPackArguments: true
 BinPackParameters: true
 BraceWrapping:
  AfterClass: false
  AfterControlStatement: false
  AfterEnum: false
  AfterFunction: true
  AfterNamespace: true
  AfterObjCDeclaration: false
  AfterStruct: false
  AfterUnion: false
  #AfterExternBlock: false # Unknown to clang-format-5.0
  BeforeCatch: false
  BeforeElse: false
  IndentBraces: false
  #SplitEmptyFunction: true # Unknown to clang-format-4.0
  #SplitEmptyRecord: true # Unknown to clang-format-4.0
  #SplitEmptyNamespace: true # Unknown to clang-format-4.0
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 #BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: false
 #BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
 ColumnLimit: 120
 CommentPragmas: '^ IWYU pragma:'
 #CompactNamespaces: false # Unknown to clang-format-4.0
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 Cpp11BracedListStyle: false
 DerivePointerAlignment: false
 DisableFormat: false
 ExperimentalAutoDetectBinPacking: false
 #FixNamespaceComments: false # Unknown to clang-format-4.0
 #IncludeBlocks: Preserve # Unknown to clang-format-5.0
 IncludeCategories:
  - Regex: '.*'
    Priority: 1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
 #IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
 IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 #ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
 ObjCBlockIndentWidth: 8
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: true
 # Taken from git's rules
 #PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0
 PenaltyBreakBeforeFirstCallParameter: 30
 PenaltyBreakComment: 10
 PenaltyBreakFirstLessLess: 0
 PenaltyBreakString: 10
 PenaltyExcessCharacter: 100
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments: false
 SortIncludes: false
 #SortUsingDeclarations: false # Unknown to clang-format-4.0
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
 SpaceBeforeAssignmentOperators: true
 #SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0
 #SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0
 SpaceBeforeParens: ControlStatements
 #SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInAngles: false
 SpacesInContainerLiterals: false
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 Standard: Cpp03
 TabWidth: 8
 UseTab: Always
 ...
--- a/.gitignore
+++ b/.gitignore
@@ -1,71 +1 @@
 debian/*.log
 *.o
 *.lo
 *.a
 *.la
 .deps
 Makefile
 Makefile.in
 bscconfig.h
 bscconfig.h.in
 src/osmo-mgw/osmo-mgw
 *.*~
 *.sw?
 .libs
 *.pyc
 *.gcda
 *.gcno
 *.pc
 *~
 #configure
 aclocal.m4
 autom4te.cache/
 config.log
 config.status
 config.guess
 config.sub
 configure
 compile
 depcomp
 install-sh
 missing
 stamp-h1
 libtool
 ltmain.sh
 m4/*.m4
 # git-version-gen magic
 .tarball-version
 .version
 #tests
 tests/testsuite.dir
 tests/*/*_test
 tests/atconfig
 tests/atlocal
 tests/package.m4
 tests/testsuite
 tests/testsuite.log
 writtenconfig/
 # manuals
 doc/manuals/*.html
 doc/manuals/*.svg
 doc/manuals/*.pdf
 doc/manuals/*__*.png
 doc/manuals/*.check
 doc/manuals/generated/
 doc/manuals/osmomsc-usermanual.xml
 doc/manuals/common
 doc/manuals/build
 contrib/osmo-mgw.spec
 #vs code
 .cache
 .vscode
--- a/.gitreview
+++ b/.gitreview
@@ -1,3 +1,3 @@
 [gerrit]
 host=gerrit.osmocom.org
-project=osmo-mgw
+project=openbsc
--- a/24
+++ b/24
@@ -1,24 +0,0 @@
 About OsmoMGW
 =============
 OsmoMGW originated from the OpenBSC project, which started as a minimalistic
 all-in-one implementation of the GSM Network. In 2017, OpenBSC had reached
 maturity and diversity (including M3UA SIGTRAN and 3G support in the form of
 IuCS and IuPS interfaces) that naturally lead to a separation of the all-in-one
 approach to fully independent separate programs as in typical GSM networks.
 OsmoMGW was one of the parts split off from the old openbsc.git. It originated
 as a solution to merely navigate RTP streams through a NAT, but has since
 matured to a Media Gateway implementation that is capable of streaming RTP for
 2G (AoIP) and 3G (IuCS) GSM networks as well as (still not implemented at time
 of writing) transcoding between TRAU, various RTP payloads and IuUP.
 The OsmoMGW program exposes an MGCP interface towards clients like OsmoMSC and
 OsmoBSC, and receives and sends RTP streams as configured via MGCP.
 The libosmo-mgcp-client library exposes utilities used by e.g. OsmoMSC (found
 in osmo-msc.git) to instruct OsmoMGW via its MGCP service.
 Find OsmoMGW issue tracker and wiki online at
 https://osmocom.org/projects/osmo-mgw
 https://osmocom.org/projects/osmo-mgw/wiki
--- a/27
+++ b/27
@@ -1,27 +0,0 @@
 # When cleaning up this file upon a release:
 #
 # - Note that the release version number is entirely unrelated to the API
 #   versions. A release version 5.2.3 may happily have an API version of 42:7:5.
 #
 # - Bump API version in src/lib*/Makefile.am files according to chapter
 #   "Library interface versions" of the libtool documentation.
 #   https://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 #
 # - Iff the 'current' API version has changed, rename debian/lib*.install
 #
 # API version bumping for the impatient:
 # LIBVERSION=c:r:a  (current:revision_of_current:backwards_compat_age)
 # 5:2:4 means that
 # - this implements version 5 of the API;
 # - this is the 2nd (compatible) revision of API version 5;
 # - this is backwards compatible to all APIs since 4 versions ago,
 #   i.e. callers that need API versions from 1 to 5 can use this.
 #
 # Bumping API versions recipe:
 # If the library source code has changed at all since the last update, r++;
 # If any interfaces have been added, removed, or changed since the last update, c++, r=0;
 # If any interfaces have been added since the last public release, a++;
 # If any interfaces have been removed or changed since the last public release, a=0.
 #
 #library		what		description / commit summary line
 libosmogsm              >1.6.0          use of iuup.h (libosmocore.git Ib21cee2e30bf83dff4e167f79541796007af9845)
--- a/configure.ac
+++ b/configure.ac
@@ -1,206 +0,0 @@
 dnl Process this file with autoconf to produce a configure script
 AC_INIT([osmo-mgw],
 	m4_esyscmd([./git-version-gen .tarball-version]),
 	[openbsc@lists.osmocom.org])
 dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 CFLAGS="$CFLAGS -std=gnu11"
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl include release helper
 RELMAKE='-include osmo-release.mk'
 AC_SUBST([RELMAKE])
 dnl checks for programs
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
 LT_INIT
 dnl patching ${archive_cmds} to affect generation of file "libtool" to fix linking with clang
 AS_CASE(["$LD"],[*clang*],
  [AS_CASE(["${host_os}"],
     [*linux*],[archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'])])
 dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
 AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
 if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
        AC_MSG_WARN([You need to install pkg-config])
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 dnl checks for libraries
 AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DL)
 AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DLSYM)
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.6.0)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.6.0)
 PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.6.0)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.6.0)
 PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0)
 PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.2.0)
 PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.2.0)
 CFLAGS="$CFLAGS -pthread"
 LDFLAGS="$LDFLAGS -pthread"
 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
 		[--enable-sanitize],
 		[Compile with address sanitizer enabled],
 	)],
 	[sanitize=$enableval], [sanitize="no"])
 if test x"$sanitize" = x"yes"
 then
 	CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined"
 	CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined"
 fi
 AC_ARG_ENABLE(werror,
 	[AS_HELP_STRING(
 		[--enable-werror],
 		[Turn all compiler warnings into errors, with exceptions:
 		 a) deprecation (allow upstream to mark deprecation without breaking builds);
 		 b) "#warning" pragmas (allow to remind ourselves of errors without breaking builds)
 		]
 	)],
 	[werror=$enableval], [werror="no"])
 if test x"$werror" = x"yes"
 then
 	WERROR_FLAGS="-Werror"
 	WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations"
 	WERROR_FLAGS+=" -Wno-error=cpp" # "#warning"
 	CFLAGS="$CFLAGS $WERROR_FLAGS"
 	CPPFLAGS="$CPPFLAGS $WERROR_FLAGS"
 fi
 # Coverage build taken from WebKit's configure.in
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
              AC_HELP_STRING([--enable-coverage],
                             [enable code coverage support [default=no]]),
              [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 if test "$enable_coverage" = "yes"; then
   COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
   COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
   AC_SUBST([COVERAGE_CFLAGS])
   AC_SUBST([COVERAGE_LDFLAGS])
 fi
 AC_ARG_ENABLE([vty_tests],
 		AC_HELP_STRING([--enable-vty-tests],
 				[Include the VTY/CTRL tests in make check (deprecated)
 				[default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 AC_ARG_ENABLE([external_tests],
 		AC_HELP_STRING([--enable-external-tests],
 				[Include the VTY/CTRL tests in make check [default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 if test "x$enable_ext_tests" = "xyes" ; then
 	AM_PATH_PYTHON
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
 		AC_MSG_ERROR([Please install git://osmocom.org/python/osmo-python-tests to run the VTY/CTRL tests.])
 	fi
 fi
 AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
 # Generate manuals
 AC_ARG_ENABLE(manuals,
 	[AS_HELP_STRING(
 		[--enable-manuals],
 		[Generate manual PDFs [default=no]],
 	)],
 	[osmo_ac_build_manuals=$enableval], [osmo_ac_build_manuals="no"])
 AM_CONDITIONAL([BUILD_MANUALS], [test x"$osmo_ac_build_manuals" = x"yes"])
 AC_ARG_VAR(OSMO_GSM_MANUALS_DIR, [path to common osmo-gsm-manuals files, overriding pkg-config and "../osmo-gsm-manuals"
 	fallback])
 if test x"$osmo_ac_build_manuals" = x"yes"
 then
 	# Find OSMO_GSM_MANUALS_DIR (env, pkg-conf, fallback)
 	if test -n "$OSMO_GSM_MANUALS_DIR"; then
 		echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from env)"
 	else
 		OSMO_GSM_MANUALS_DIR="$($PKG_CONFIG osmo-gsm-manuals --variable=osmogsmmanualsdir 2>/dev/null)"
 		if test -n "$OSMO_GSM_MANUALS_DIR"; then
 			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (from pkg-conf)"
 		else
 			OSMO_GSM_MANUALS_DIR="../osmo-gsm-manuals"
 			echo "checking for OSMO_GSM_MANUALS_DIR... $OSMO_GSM_MANUALS_DIR (fallback)"
 		fi
 	fi
 	if ! test -d "$OSMO_GSM_MANUALS_DIR"; then
 		AC_MSG_ERROR("OSMO_GSM_MANUALS_DIR does not exist! Install osmo-gsm-manuals or set OSMO_GSM_MANUALS_DIR.")
 	fi
 	# Find and run check-depends
 	CHECK_DEPENDS="$OSMO_GSM_MANUALS_DIR/check-depends.sh"
 	if ! test -x "$CHECK_DEPENDS"; then
 		CHECK_DEPENDS="osmo-gsm-manuals-check-depends"
 	fi
 	if ! $CHECK_DEPENDS; then
 		AC_MSG_ERROR("missing dependencies for --enable-manuals")
 	fi
 	# Put in Makefile with absolute path
 	OSMO_GSM_MANUALS_DIR="$(realpath "$OSMO_GSM_MANUALS_DIR")"
 	AC_SUBST([OSMO_GSM_MANUALS_DIR])
 fi
 # https://www.freedesktop.org/software/systemd/man/daemon.html
 AC_ARG_WITH([systemdsystemunitdir],
     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],,
     [with_systemdsystemunitdir=auto])
 AS_IF([test "x$with_systemdsystemunitdir" = "xyes" -o "x$with_systemdsystemunitdir" = "xauto"], [
     def_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
     AS_IF([test "x$def_systemdsystemunitdir" = "x"],
   [AS_IF([test "x$with_systemdsystemunitdir" = "xyes"],
    [AC_MSG_ERROR([systemd support requested but pkg-config unable to query systemd package])])
    with_systemdsystemunitdir=no],
   [with_systemdsystemunitdir="$def_systemdsystemunitdir"])])
 AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
      [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
 AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
 AC_MSG_RESULT([CFLAGS="$CFLAGS"])
 AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
 dnl Generate the output
 AM_CONFIG_HEADER(bscconfig.h)
 AC_OUTPUT(
    libosmo-mgcp-client.pc
    include/Makefile
    include/osmocom/Makefile
    include/osmocom/mgcp_client/Makefile
    include/osmocom/mgcp/Makefile
    src/Makefile
    src/libosmo-mgcp-client/Makefile
    src/libosmo-mgcp/Makefile
    src/osmo-mgw/Makefile
    tests/Makefile
    tests/atlocal
    tests/mgcp_client/Makefile
    tests/mgcp/Makefile
    doc/Makefile
    doc/examples/Makefile
    doc/manuals/Makefile
    contrib/Makefile
    contrib/systemd/Makefile
    contrib/osmo-mgw.spec
    Makefile)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,3 +0,0 @@
 SUBDIRS = systemd
 EXTRA_DIST = ipa.py
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -1,16 +1,4 @@
 #!/usr/bin/env bash
 # jenkins build helper script for openbsc.  This is how we build on jenkins.osmocom.org
 #
 # environment variables:
 # * WITH_MANUALS: build manual PDFs if set to "1"
 # * PUBLISH: upload manuals after building if set to "1" (ignored without WITH_MANUALS = "1")
 #
 if ! [ -x "$(command -v osmo-build-dep.sh)" ]; then
 	echo "Error: We need to have scripts/osmo-deps.sh from http://git.osmocom.org/osmo-ci/ in PATH !"
 	exit 2
 fi
 set -ex
@@ -19,48 +7,45 @@ deps="$base/deps"
 inst="$deps/install"
 export deps inst
 osmo-clean-workspace.sh
 mkdir "$deps" || true
-osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
+rm -rf "$inst"
-verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]")
+osmo-build-dep.sh libosmocore "" ac_cv_path_DOXYGEN=false
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"
 export LD_LIBRARY_PATH="$inst/lib"
-export PATH="$inst/bin:$PATH"
+
 if [ "x$IU" = "x--enable-iu" ]; then
 	netif_branch="sysmocom/sctp"
 	sccp_branch="sysmocom/iu"
 fi
 osmo-build-dep.sh libosmo-abis
-osmo-build-dep.sh libosmo-netif
+osmo-build-dep.sh libosmo-netif $netif_branch
 osmo-build-dep.sh libosmo-sccp $sccp_branch
 PARALLEL_MAKE="" osmo-build-dep.sh libsmpp34
 osmo-build-dep.sh openggsn
-# Additional configure options and depends
+if [ "x$IU" = "x--enable-iu" ]; then
-CONFIG=""
+	osmo-build-dep.sh libasn1c
-if [ "$WITH_MANUALS" = "1" ]; then
+	#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
-	CONFIG="--enable-manuals"
+	osmo-build-dep.sh osmo-iuh
 fi
 set +x
 echo
 echo
 echo
-echo " =============================== osmo-mgw ==============================="
+echo " =============================== openbsc ==============================="
 echo
 set -x
 cd "$base"
 cd openbsc
 autoreconf --install --force
-./configure --enable-sanitize --enable-vty-tests --enable-external-tests --enable-werror $CONFIG
+./configure --enable-osmo-bsc --enable-nat $SMPP $MGCP $IU --enable-vty-tests --enable-external-tests
 $MAKE $PARALLEL_MAKE
 LD_LIBRARY_PATH="$inst/lib" $MAKE check \
  || cat-testlogs.sh
-LD_LIBRARY_PATH="$inst/lib" \
+LD_LIBRARY_PATH="$inst/lib" $MAKE distcheck \
  DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests $CONFIG" \
  $MAKE $PARALLEL_MAKE distcheck \
  || cat-testlogs.sh
 if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi
 $MAKE $PARALLEL_MAKE maintainer-clean
 osmo-clean-workspace.sh
--- a/contrib/osmo-mgw.spec.in
+++ b/contrib/osmo-mgw.spec.in
@@ -1,137 +0,0 @@
 #
 # spec file for package osmo-mgw
 #
 # Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
 #
 # 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.
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 Name:           osmo-mgw
 Version:        @VERSION@
 Release:        0
 Summary:        Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks
 License:        AGPL-3.0-or-later AND GPL-2.0-or-later
 Group:          Hardware/Mobile
 URL:            https://osmocom.org/projects/osmo-mgw
 Source:         %{name}-%{version}.tar.xz
 BuildRequires:  automake >= 1.9
 BuildRequires:  libtool >= 2
 BuildRequires:  pkgconfig >= 0.20
 %if 0%{?suse_version}
 BuildRequires:  systemd-rpm-macros
 %endif
 BuildRequires:  pkgconfig(libosmo-netif) >= 1.1.0
 BuildRequires:  pkgconfig(libosmocore) >= 1.6.0
 BuildRequires:  pkgconfig(libosmoctrl) >= 1.6.0
 BuildRequires:  pkgconfig(libosmogsm) >= 1.6.0
 BuildRequires:  pkgconfig(libosmovty) >= 1.6.0
 BuildRequires:  pkgconfig(libosmocoding) >= 1.6.0
 BuildRequires:  pkgconfig(libosmoabis) >= 1.2.0
 BuildRequires:  pkgconfig(libosmotrau) >= 1.2.0
 %{?systemd_requires}
 %description
 OsmoMGW is Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks.
 %package -n libosmo-mgcp-client9
 Summary:        Osmocom's Media Gateway Control Protocol client library
 Group:          System/Libraries
 %description -n libosmo-mgcp-client9
 Osmocom's Media Gateway Control Protocol client library.
 %package -n libosmo-mgcp-client-devel
 Summary:        Development files for Osmocom's Media Gateway Control Protocol client library
 Group:          Development/Libraries/C and C++
 Requires:       libosmo-mgcp-client9 = %{version}
 %description -n libosmo-mgcp-client-devel
 Osmocom's Media Gateway Control Protocol client librarary.
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmo-mgcp-client.
 %package -n libosmo-mgcp-devel
 Summary:        Development files for Osmocom's Media Gateway server library
 Group:          Development/Libraries/C and C++
 %description -n libosmo-mgcp-devel
 Osmocom's Media Gateway Control Protocol server library.
 This subpackage contains libraries and header files for developing
 applications that want to make use of libosmo-mgcp.
 %prep
 %setup -q
 %build
 echo "%{version}" >.tarball-version
 autoreconf -fi
 %configure \
  --disable-static \
  --docdir=%{_docdir}/%{name} \
  --with-systemdsystemunitdir=%{_unitdir}
 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 libosmo-mgcp-client9 -p /sbin/ldconfig
 %postun -n libosmo-mgcp-client9 -p /sbin/ldconfig
 %if 0%{?suse_version}
 %preun
 %service_del_preun osmo-mgw.service
 %postun
 %service_del_postun osmo-mgw.service
 %pre
 %service_add_pre osmo-mgw.service
 %post
 %service_add_post osmo-mgw.service
 %endif
 %files
 %license COPYING
 %doc AUTHORS README
 %dir %{_docdir}/%{name}/examples
 %dir %{_docdir}/%{name}/examples/osmo-mgw
 %{_docdir}/%{name}/examples/osmo-mgw/osmo-mgw.cfg
 %{_docdir}/%{name}/examples/osmo-mgw/osmo-mgw-abis_e1.cfg
 %{_bindir}/osmo-mgw
 %{_unitdir}/osmo-mgw.service
 %dir %{_sysconfdir}/osmocom
 %config(noreplace) %{_sysconfdir}/osmocom/osmo-mgw.cfg
 %files -n libosmo-mgcp-client9
 %{_libdir}/libosmo-mgcp-client.so.9*
 %files -n libosmo-mgcp-client-devel
 %{_libdir}/libosmo-mgcp-client.so
 %{_libdir}/pkgconfig/libosmo-mgcp-client.pc
 %dir %{_includedir}/osmocom
 %dir %{_includedir}/osmocom/mgcp_client
 %{_includedir}/osmocom/mgcp_client/*.h
 %files -n libosmo-mgcp-devel
 %dir %{_includedir}/osmocom
 %dir %{_includedir}/osmocom/mgcp
 %{_includedir}/osmocom/mgcp/*.h
 %changelog
--- a/contrib/systemd/Makefile.am
+++ b/contrib/systemd/Makefile.am
@@ -1,6 +0,0 @@
 EXTRA_DIST = osmo-mgw.service
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
  osmo-mgw.service
 endif
--- a/contrib/systemd/osmo-mgw.service
+++ b/contrib/systemd/osmo-mgw.service
@@ -1,11 +0,0 @@
 [Unit]
 Description=Osmocom Media Gateway (MGW)
 [Service]
 Type=simple
 Restart=always
 ExecStart=/usr/bin/osmo-mgw -s -c /etc/osmocom/osmo-mgw.cfg
 RestartSec=2
 [Install]
 WantedBy=multi-user.target
--- a/debian/autoreconf
+++ b/debian/autoreconf
@@ -0,0 +1 @@
 openbsc
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,756 +1,75 @@
-osmo-mgw (1.9.0) unstable; urgency=medium
+openbsc (0.15.1) UNRELEASED; urgency=medium
-  [ Harald Welte ]
+  * Move forward toward a new release.
-  * TOS bits != DSCP
+  * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured.
-  * manual: don't define fig-bsc twice
+    Note: such configs are broken without extra workarounds anyway.
  * switch from osmo_sock_set_dscp() to OSMO_SOCK_F_DSCP()
  * mgw: Add support for setting socket priority from VTY
  * manual: Include QoS chapter and add osmo-mgw specific example
-  [ Keith ]
+ -- Holger Hans Peter Freyther <holger@moiji-mobile.com>  Tue, 24 May 2016 23:14:31 +0200
  * Add vty command 'show mgcp active'
  * Log some useful messages at ERROR/INFO instead of DEBUG
-  [ Neels Hofmeyr ]
+openbsc (0.14.0) unstable; urgency=low
  * send DLCX only once
  * tweak termination DLCX log msg
  * add osmo_mgcpc_ep_ci_get_remote_rtp_info()
  * check_rtp_destin(): clarify log msg
  * mgcp_client_fsm delete: set mgcp_client as ctx, not NULL
  * mgcp_client_endpoint_fsm: on term, still let conns wait for DLCX OK
  * mgcp_client_fsm: add missing log_subsys
  * mgcp_client: add logging on received MGCP messages
-  [ Philipp Maier ]
+  * New upstream tag and additional patches.
  * mgcp_network: fix implicit address loopback
  * mgcp_common, mgcp_udp_send: make parameter buf const
  * mgcp_network: refactor MGCP_DUMMY_LOAD
  * mgcp_client: drop nunnecessary else statement
  * mgcp_client: fix error handling in mgcp message generation
  * mgcp_protocol: fix loop that sends dummy RTP packets
  * mgw_main: fix loop that resets all endpoints
  * mgcp_trunk: drop ws line
  * mgcp_ratectr: drop ws line
  * mgcp_ratectr: fix sourcecode formatting
  * mgcp_trunk: add value string for trunk type.
  * mgcp_ratectr: refactor rate counter and set group name
  * mgcp_protocol: forward declare mgcp_endpoint
  * mgcp_endp: make wildcarded detection separate
  * mgcp_protocol: refactor request handler array
  * mgcp_trunk: use unsigned int instead of int as trunk_nr
  * mgcp_protocol: refactor MGCP request handling
  * mgcp_ratectr: add stats items to monitor trunk usage
  * mgcp_msg: add trunk parameter to mgcp_check_param for logging
  * mgcp_protocol: refactor function create_response_with_sdp
  * mgcp_protocol: add support for wildcarded DLCX
  * remove struct member wildcarded_req from struct mgcp_endpoint
  * mgcp_lient: remove unsubstantial FIXME note
  * mgcp_protocol: assert endp when it becomes mandatory
  * mgcp_trunk: check MGW domain name earlier
  * mgcp_ratectr: add stats items to monitor trunk usage
  * mgcp_client: fix typo Initalize -> Initialize
  * mgcp_protocol: get rid of policy_cb and change_cb
  * mgcp_ratectr: do not set talloc destructor on library allocated item
  * mgcp_client: allow to reset endpoints on startup
  * mgcp_client_vty: remove unnecessary checks
  * mgcp_client: do not print (null) when address is ANY
  * mgcp_client: refactor function init_socket
  * libosmo-mgcp-client: extend the mgcp_client for MGW pooling
  * mgcp_client_vty: add missing docstrings
  * mgcp_client_vty: add OSMO_ASSERT on pool parameter
  * mgcp_client_vty: fix docstrings for mgw-pool
  * mgcp_client_vty: cosmetic: doc string should terminated with \n
  * mgcp_client_vty: fixing docstring
  * mgcp_ratectr: remove unusued rate counters
  * mgcp_client: fix typo in doxygen comment
  * mgcp_client: add MGW name as logging context
-  [ Pau Espin Pedrol ]
+ -- Holger Hans Peter Freyther <holger@freyther.de>  Sat, 14 Mar 2015 20:33:25 +0100
  * Use new stat item/ctr getter APIs
  * constify arg in addr_is_any()
  * Define patch_ssrc as bool type
  * constify some function arg pointers
  * mgcp_network.c: Reorder some functions in file
  * mgcp_send_dummy: Check RTP destination is available before attempt tx
  * mgw: rx CRCX: Avoid sending dummy rtp if remote address not provided
  * Fail rx MDCX sendrecv with invalid remote addr
  * Take into account Marker bit when patching RTP stream
  * Use DLMGCP instead of DLGLOBAL in log lines
  * Fix attribute parsing on gcc 11.1.0
-  [ neels ]
+openbsc (0.12.0+git26-7) unstable; urgency=low
  * Revert "mgcp_ratectr: add stats items to monitor trunk usage"
-  [ Daniel Willmann ]
+  * 64bit fix for the MGCP rewriting
  * contrib/jenkins: Use ASAN for osmo-mgw
-  [ Oliver Smith ]
+ -- Holger Hans Peter Freyther <holger@freyther.de>  Wed, 07 Nov 2012 11:39:34 +0100
  * mgcp_client_vty: add missing NO_STR
  * Revert "Turn some compiler warnings into errors"
-  [ Eric ]
+openbsc (0.12.0+git26-6) precise; urgency=low
  * add vscode stuff to gitignore
  * configure.ac: fix maybe-uninitialized for clang
  * fix missing includes and forward declarations
  * rename do_retransmission
  * mgcp_sdp: fix potential leak
  * stats: make sanitizers happy
  * libosmo-mgcp: cleanup audio codex alloc
  * libosmo-mgcp: atomic rate counter group indexes
  * libosmo-mgcp: do not use the default msgb talloc context
  * globally lock the portrange when trying to grab a port to prep for multithreading
  * embed strings into structs
  * adjust talloc context
  * endp: do not cache cfg pointer
  * add modified .clang-format
  * rename strip_epname and find_specific_endpoint and make them available
  * fix mgcp_conn_free_all
  * fix up some docstrings that lost their dot
-  [ Vadim Yanitskiy ]
+  * Added init script for osmocom-sgsn. 
  * libosmo-mgcp: use OSMO_STRLCPY_ARRAY in mgcp_codec_add()
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 16 Nov 2021 16:59:21 +0100
+ -- Eric Butler <eric@codebutler.com>  Fri, 24 Aug 2012 21:04:32 -0700
-osmo-mgw (1.8.1) unstable; urgency=medium
+openbsc (0.12.0+git26-5) precise; urgency=low
-  * attempt to fix RPM spec file after recent soversion bump
+  * Don't enable MNCC sock by default.
  * Automatically create important directories.
  * Fix init script 'stop' command.
- -- Harald Welte <laforge@osmocom.org>  Wed, 24 Feb 2021 10:56:17 +0100
+ -- Eric Butler <eric@codebutler.com>  Fri, 24 Aug 2012 20:56:33 -0700
-osmo-mgw (1.8.0) unstable; urgency=medium
+openbsc (0.12.0+git26-4) precise; urgency=low
-  [ Harald Welte ]
+  * Specify HLR path and enable RTP proxy.
  * Fix number of endpoints of default trunk
  * Add CTRL interface to osmo-mgw
  * Update per-trunk global packet/byte counters in real-time
  * remove accidential TODO-RELEASE entry
  * mgcp_protocol: Avoid code duplication between virtual + other trunks
  * osmo-mgw.spec.in: Use %config(noreplace) to retain current config file
  * mgcp_client_init(): consider "talloc returns NULL" case
  * mgcp_client_pending_add(): Consider "talloc returns NULL" case
  * libosmo-mgcp-client: fix memleak in case if no response is received
  * debian/control + SPEC: Add missing build dependency to libosmo-abis
  * osmo-mgw.spec.in: Fix dependency to libosmoabis
  * osmo-mgw.spec.in: Add missing dependency to libosmotrau
  * Add example osmo-mgw configuration file for Abis/E1
  * use osmo_fd_setup() whenever applicable
-  [ Neels Hofmeyr ]
+ -- Eric Butler <eric@codebutler.com>  Mon, 20 Aug 2012 00:21:07 -0700
  * fix vty dump_trunk: start from zero, do not omit first CONN
  * allow larger MGCP client wqueue: 10 -> 1024
  * add osmo-mgw --vty-ref-xml: dump VTY ref XML to stdout
  * manuals: generate vty reference xml at build time
  * refactor: use msgb to receive, pass and send RTP packets
  * change timer T2427001 to X2427
-  [ Philipp Maier ]
+openbsc (0.12.0+git26-3) precise; urgency=low
  * doc: do not bind osmo-mgw to random ip-address
  * cosmetic: remove excess newlines
  * mgcp: remove unused callback pointer
  * mgcp: find better locations for LOGPCONN and LOGPENDP
  * vty: fix unreachable code (error msg on trunk alloc fail)
  * mgcp_vty: fix indentation
  * osmo-mgw: rename struct mgcp_trunk_config and symbol tcfg
  * mgcp_vty: fix indentation in VTY config write
  * osmo-mgw: refactor endpoint and trunk handling
  * mgcp_trunk: remove audio_name and audio_payload
  * ratectr: move rate counter definitions into mgcp_ratectr.h
  * cosmetic: fix doxygen
  * cosmetic: fix doxygen
  * cosmetic: fix doxygen for mgcp_cleanup_rtp_bridge_cb()
  * trunk: get rid of virt_trunk pointer
  * cosmetic: remove excess space
  * endp: move endpoint name generation into mgcp_endp.c
  * endp: add name generator function for E1 endpoints
  * mgcp_client: add docstring for mgcp_client_rtpbridge_wildcard()
  * mgcp_trunk: fix docstring for mgcp_trunk_alloc()
  * mgcp_osmux: remove unused define constants
  * mgcp_trunk: move enum mgcp_trunk_type to mgcp_trunk.h
  * mgcp_trunk: use enum type for trunk type variable
  * trunk: parse E1 trunk number
  * endp: add typeset for e1-endpoints
  * mgcp_conn: move struct mgcp_conn mgcp_conn.h
  * mgcp_internal: remove forward declaration struct mgcp_endpoint_type
  * endp: add E1 endpoint interlocking
  * endp: require domain name also for E1 endpoints
  * mgcp_trunk: pick trunk by number and type
  * mgcp_client: add function to generate e1-endpoint names
  * mgcp_endp: use define constant to define max number of E1 subslots
  * mgcp_endp.c: cosmetic: fix sourcecode formatting
  * mgcp_trunk: remove double check
  * mgcp_test: do not access endpoint array elements directly
  * mgcp_vty: fix endpoint number configuration
  * mgcp_test: remove trunk2 from unit-test
  * mgcp_trunk: use talloc_zero_array instead of _talloc_zero_array
  * mgcp_protocol: remove unused variable
  * mgcp_e1: finish E1 support, add E1 support from libosmoabis
  * get rid of mgcp_internal.h
  * mgcp_ratectr: fix comments in header file
  * mgcp_e1: use return value of e1inp_line_update()
  * mgcp_protocol: log when endpoint is unavailable
  * cosmetic: add missing new-line
  * mgcp_trunk: drop "trunk 0" limitation
  * mgcp_e1: make E1 ts initalization more debugable
  * mgcp_e1: remove unused struct member trunk->e1.line
  * mgcp_endp: use NUM_E1_TS from e1_input.h
  * mgcp_trunk: increase default number of virtual endpoints
  * cosmetic: mgcp_client_fsm: change error message.
  * mgcp_vty: remove remains of loopback functionality
  * mgcp_vty: deprecate bind early command
  * mgcp_e1: do not expose function  mgcp_e1_init()
  * mgcp_vty: add user attributes to configuration commands
  * overview: update section limitations.
  * overview: fix graph "OsmoMGW used with OsmoBSC"
  * overview: fix graph "OsmoMGW used with OsmoMSC"
  * overview: add graph to show E1 integration
  * configuration: remove hint towards trunk 0 limit
  * configuration: drop note about lackin E1 support
  * configuration: add note that changes to trunks need a restart
  * mgcp_vty: fix config write for trunk 0
  * mgcp_vty: add missing VTY commands for E1 trunks
  * mgcp_trunk: get rid of magic numbers for E1 slots
  * configuration: add section about E1 trunks
  * usermanual: add chapter about mgcp endpoints
  * mgcp_client: get rid of magic numbers for E1 slots
-  [ Eric ]
+  * Fix init script.
  * tests: dlopen does not imply availability of dlsym..
  * configure.ac: fix libtool issue with clang and sanitizer
-  [ Alexander Chemeris ]
+ -- Eric Butler <eric@codebutler.com>  Sun, 19 Aug 2012 16:05:44 -0700
  * vty: Prepend VTY output of counters for better visual separation.
  * counters: Implement more useful counters.
  * mgcp_network: Fix a typo in the comment bahviour -> behaviour
  * rtp_bridge: Demote a chatty ERROR log message to DEBUG level.
-  [ Pau Espin Pedrol ]
+openbsc (0.12.0+git26-2) precise; urgency=low
  * Use OSMO_FD_* instead of deprecated BSC_FD_*
  * Support setting rt-prio and cpu-affinity mask through VTY
  * cosmetic: Rename main talloc ctx
  * mgcp-client: Support IPv6 in osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr() implementation
  * mgcp-client: Fix trailing whitespace in mgcp_client_fsm.h
  * mgcp_client: Use INET6_ADDRSTRLEN to store addresses in str format
  * mgcp_client: Allow submitting and parsing IPv6 addr in SDP
  * mgcp_client: Allow setting IPv6 addresses
  * mgcp_client: Make MGCP_CLIENT_LOCAL_ADDR_DEFAULT IPv6 compatible
  * mgcp_client: Support validating IPv6 addresses in CRCX and MDCX commands
  * mgcp_client: Deprecate unused IPv4-only API
  * mgcp_client: copy back Connection Information from MDCX ACK
  * mgw: Fix mgcp_rtp_end field description comment
  * mgw: Initial IPv6 support
  * mgw: Introduce VTY cmd 'rtp bind-ip-v6' command
  * mgw: Find and store RTP conn local_addr once during CRCX handling
  * mgw: Announce and rebind new local address if change required during MDCX
  * mgw: osmux: Avoid sending packets on recvonly connection
  * mgw: Release endpoint after last conn times out
  * mgw: osmux: Fix conn watchdog timeout not updated
  * mgw: Don't be case-sensitive when parsing X-Osmo-IGN param
  * cosmetic: Fix typo in comment
  * mgw: Avoid logging notice message each time we receive nt param in LCO
  * mgw: Fix return value documentation for API mgcp_verify_call_id
  * cosmetic: Fix typo in comment
  * contrib/jenkins: Enable parallel make in make distcheck
  * .gitignore: Ignore new autofoo tmp files
  * tests: Replace deprecated API log_set_print_filename
-  [ Oliver Smith ]
+  * Fix libdbi package dependency.
  * contrib: import RPM spec
  * contrib: integrate RPM spec
  * Makefile.am: EXTRA_DIST: debian, contrib/*.spec.in
  * contrib/jenkins: don't build osmo-gsm-manuals
  * configure.ac: set -std=gnu11
-  [ Vadim Yanitskiy ]
+ -- Eric Butler <eric@codebutler.com>  Wed, 15 Aug 2012 00:35:37 -0700
  * libosmo-mgcp-client: fix use-after-free in mgcp_client_tx()
  * libosmo-mgcp-client: fix use-after-free in mgcp_msg_gen()
  * libosmo-mgcp: fix unsigned compared against 0 in mgcp_trunk_by_name()
  * libosmo-mgcp: fix unused extra argument to printf() in add_fmtp()
  * libosmo-mgcp: always check result of msgb_printf() in add_fmtp()
  * libosmo-mgcp-client: mgcp_client_tx(): return rc on error
  * debian/control: change maintainer to the Osmocom team / mailing list
  * vty: use install_lib_element() and install_lib_element_ve()
  * main: add --vty-ref-mode, use vty_dump_xml_ref_mode()
  * fixup mgcp_trunk: increase default number of virtual endpoints
-  [ Alexander Couzens ]
+openbsc (0.12.0+git26-1) precise; urgency=low
  * configure.ac: require libosmoabis + libosmotrau >= 1.0.0
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Tue, 23 Feb 2021 18:28:45 +0100
+  * Fix version issue.
-osmo-mgw (1.7.0) unstable; urgency=medium
+ -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 21:00:51 -0700
-  [ Neels Hofmeyr ]
+openbsc (0.12.0+git26) precise; urgency=low
  * rename codecs_cmp() to codecs_same()
  * mgcp_codec: constify 'param' arg
  * fix crashes: don't assert on incoming RTP packet size
  * mgcp_send(): stop looping on conversion error
  * mgcp_codec: split codec_free() off of codec_init()
  * fix memleak: actually free strings in mgcp_codec_reset_all()
  * mgcp_test: extend / rewrite test_mgcp_codec_pt_translate()
  * test_mgcp_codec_pt_translate(): more tests
  * differentiate AMR octet-aligned=0 vs =1
  * ptmap: implicitly match  '/8000' and '/8000/1'
  * mgcp_codec: codec_set(): log about all possible errors
  * mgcp_codec_add: fix audio_name size check
  * explicitly free codecs in mgcp_rtp_conn_cleanup()
  * tweak mgcp_parse_audio_ptime_rtpmap()
  * SDP: store all ptmap entries
  * mgcp_client_fsm cleanup: Do not assert on DLCX failure
  * clear pending requests on MGCP failure
  * client: endp fsm: add notify struct, prep for cancel-notify
  * client: endp fsm: clear ci[] before dispatching DLCX success
  * client: endp fsm: allow cancelling a notify event
  * client: endp fsm: add osmo_mgcpc_ep_ci_ep()
  * accept MGCP without SDP
  * fix use-after-free: require new fsm deferred dealloc, check for term
-  [ Pau Espin Pedrol ]
+  * Updated ubuntu package.
  * mgcp_test: Correctly release all endpoints allocated
  * mgw: Allocate mgcp_conn instance under tcfg->endpoints
-  [ Harald Welte ]
+ -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 17:36:51 -0700
  * manual: Fix copy+paste error
  * mgcp_client: Check for osmo_fsm_register() error return value
  * Move fsm_mgcp_client regstration to __attribute__((contructor))
  * exit(2) on unsupported positional arguments on command line
-  [ Oliver Smith ]
+openbsc (0.9.13.115.eb113-1) natty; urgency=low
  * osmoappdesc.py: switch to python 3
 -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 03 Jan 2020 13:35:09 +0100
 osmo-mgw (1.6.0) unstable; urgency=medium
  [ Oliver Smith ]
  * Cosmetic: fix spaces/tabs in mgcp_requests[]
  * Inactive connection cleanup (disabled by default)
  * debian: create -doc subpackage with pdf manuals
  * vty: allow 0 as conn-timeout to disable it
  * vty: update desc of conn-timeout
  * manuals: update VTY documentation
  * "make dist" fix for: no rule to make mgcp_common.h
  * contrib/jenkins.sh: run "make maintainer-clean"
  [ Philipp Maier ]
  * Add option to GSM HR frames to RFC5593 representation
  * mgcp_sdp: cosmetic: correct typo in comment
  * mgco_client: cosmetic: remove excess whitespace
  * mgcp_sdp: mgcp_sdp.c does not include own header file
  * mgcp_sdp: untangle parsing of a= parameters
  * mgcp_network: use mgcp_rtp_codec in downlink format callback
  * AMR: Add function to convert between bw-effient and octet aligned mode
  [ Neels Hofmeyr ]
  * log: don't spam with "can not patch PT" messages
  * mgcp client: allow setting conn mode for CRCX and MDCX
  * make codec_table public as osmo_mgcpc_codec_names
  * move MGW endpoint FSM from osmo-bsc to here
  * fix: multiple initial CRCX
  * constify map_codec_to_pt() ptmap arg
  [ Pau Espin Pedrol ]
  * mgcp-client: whitespace cleanup in mgcp_client.c
  * mgcp-client: Sanitize implementation of mgcp_client_rtpbridge_wildcard
  * libosmo-mgcp: Use trunk type during endpoint allocation
  * cosmetic: Fix typos in comment
  * cosmetic: tests: mgcp_client_test: clean trailing whitespace
  * mgcp_msg: Log faulty line on Osmux parsing error
  * cosmetic: handle_modify_con: Fix indentation level
  * Introduce log fmt helpers LOGPENDP and LOGPCONN
  * create_response_with_sdp: Fix inclusion of X-Osmux
  * osmux: Cleanup of CID alloc pool APIs
  * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check
  * osmux: Log osmux socket during osmux_init
  * mgcp-cli: Change osmo_mgcpc_ep_fsm name to avoid collision with old osmo-bsc
  * osmux: Document func and return different rc upon osmux init failure
  * osmux: Fix reception of legacy dummy payloads
  * osmux: Use LOGPCONN in several log calls
  * cosmetic: mgcp_udp_send: Document port param is in network byte order
  * cosmetic: osmux: Document network byte order in port variable
  * vty: Allow enabling Osmux
  * osmux: Allocate CID during CRCX
  * osmux: Introduce mgcp_conn_rtp_is_osmux() helper
  * osmux: Mark conn_rtp->type as osmux during CRCX
  * mgcp-cli: Allow submitting X-Osmux on CRCX request
  * mgcp-cli: Parse X-Osmux on CRCX response
  * osmux: Handle Osmux MGCP extension in MDCX messages
  * mgcp-cli: Allow submitting X-Osmux on MDCX request
  * mgcp-cli: Parse X-Osmux on MDCX response
  * osmux: Drop unneeded OSMUX_STATE_NEGOTIATING
  * mgcp-cli: endpoint_fsm: Add API to retrieve Osmux CID from MGW
  * osmux: Provide correct local port during mgcp resp
  * osmux: Use remote port to send osmux frames
  * osmux: Improve logging around osmux enabling events
  * osmux: Delay osmux enable of conn until remote addr is configured by MDCX
  * osmux: Redo read/write osmux glue code to have data routed correctly
  * mgw, mgcp-li: Handle X-Osmux param name as case insensitive
  * osmux: Use DUMMY ft msg as per Osmux spec
  * osmux: Fix loopback for Osmux connections
  * osmux: Fix CID release for non-enabled connections
  * osmux: Fix hardcoded rtp payload_type 98 in osmux conn
  * mgcp-cli: Validate osmux cid value during mgcp_msg_gen
  * mgw: Support uppercase LCO options
  * mgw: Support lowercase header parameters
  * mgcp-cli: Support lowercase header parameters
  * mgw: Support receiving uppercase connection mode
  * mgw: Support receiving lowercase LCO codec
  * mgw: Make check of duplicated LCO fields case insensitive
  * mgw: Allow receiving lowercase MGCP header keyword
  * mgw: Allow receiving lowercase X-Osmo-Ign Callid field
  * mgw: Allow receiving uppercase noanswer keyword
  * doc: X-Osmo-IGN: small formatting and typo fixes
  * doc: Add Osmux documentation to OsmoMGW User Manual
  * Catch unsigned integer MGCP parsing errors with strtoul
  * Fix return variable of strtoul()
  * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
  * configure.ac: Require libosmo-netif 0.6.0
  [ Alexander Couzens ]
  * mgcp_internal: LOGPENDP: ensure *endp is not NULL
  [ Harald Welte ]
  * handle NULL return of rate_ctr_group_alloc()
  * update .gitignore
  * mgcp_sdp: Don't check if an unsigned int is below 0
  [ Vadim Yanitskiy ]
  * configure.ac: drop useless check for -fvisibility=hidden
  [ Daniel Willmann ]
  * manuals: Add script to regenerate vty/counter documentation
  * manuals: Update vty/counter documentation
  [ Hoernchen ]
  * turn -Werror=null-dereference into a warning
 -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 07 Aug 2019 16:52:58 +0200
 osmo-mgw (1.5.0) unstable; urgency=medium
  [ Pau Espin Pedrol ]
  * gitignore: Filter *.pc
  * configure: Find correct libgsm's gsm.h header
  * vty: Fix typo writing bts-jitter-buffer-delay-{min,max}
  * Remove libosmo-legacy-mgcp and osmo-bsc-mgcp
  * debian: Remove dangling symlink to osmo-bsc-mgcp.service
  * Install systemd services with autotools
  * Install sample cfg file to /etc/osmocom
  * mgcp: Fix osmux_cid_bitmap static array size calculation
  * mgcp_osmux: Use define to calculate rtp_ssrc_winlen
  * osmux: Avoid initing output without enabling osmux
  * mgcp: Log endpoint nr consistently as hex
  * osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled
  * osmux: Don't process regular osmux frames if disabled by cfg
  * osmux: Move parse_cid of legacy dummy frames to own function
  * osmux: Make func handling dummy frames independent of endp type
  * osmux: allow enabling osmux only on correct activating state
  * osmux: Improve checks around activating and using enabled osmux
  * osmux.h: Document enum osmux_state
  * osmux: Avoid processing further frames if conn not found
  [ Philipp Maier ]
  * mgcp_client_fsm: allow ptmap in mgcp_client_fsm as well
  * mgcp_network: translate payload type numbers in RTP packets
  * mgcp_client: use IETF source port as for MGCP
  * mgcp_client: increment local port number when port is in use
  * mgcp_test: release endpoints after use
  * network: do not patch PT of RTCP packets
  * network: check packets before further processing
  * Cosmetic: remove misplaced line break
  * mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap)
  * mgcp_sdp: restructure mgcp_write_response_sdp() (audio)
  * mgcp_client: check local port only once
  * mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio()
  * mgcp_protocol: increase buffer space for codec name in LCO
  * osmo-mgw: Add vty reference manual
  [ Neels Hofmeyr ]
  * fix handling of "Wrong domain name" error
  * interpret domain '*' as 'allow any domain'
  * cosmetic: log: fix "CallIDs does not match"
  * fix 3G hack: allow any IP for loopback and 0.0.0.0
  * cosmetic: drop code dup in mgcp_client_fsm.c CRCX
  * add X-Osmo-IGN MGCP header to ignore CallID
  * X-Osmo-IGN: rather parse items by token, not char
  * mgcp_test: fix log of conn_id presence
  * mgcp_test: fix get_conn_id_from_response() CI length
  * mgcp_client_test: cosmetically re-arrange reply_to() args
  * mgcp_client_test: use "\r\n\r\n" instead of "\n\n"
  * mgcp_client_test: also verify received conn_id
  * mgcp_client_test: test long conn_id
  * mgcp_client: error on too long conn id
  * mgcp_common: rename to MGCP_CONN_ID_MAXLEN
  * doc: fix mgcp_verify_ci() return val doc
  * mgcp_verify_ci(): return meaningful error codes
  * fix mgcp_verify_ci(): off-by-one in max len check
  * generate shorter 'I:' conn IDs
  * mgcp_conn_get(): compare conn Id ('I:') case insensitively
  * mgcp_conn_get(): match conn Id ('I:') despite leading zeros
  * cosmetic: mgcp_test: fix get_conn_id_from_response()
  * comment: indicate struct type for mgcp_endpoint.conns
  * log: avoid logging early media as error
  * fix osmo-mgw -s; fixes osmo-mgw.service using -s
  * Importing history from osmo-gsm-manuals.git
  * OsmoMGW: update VTY reference
  * OsmoMGW: document the 'X-Osmo-IGN' MGCP extension
  * mgw: update vty reference
  * drop/replace very weird logging in mgcp_client.c
  * check_rtp: on IP:port errors, log the IP and port
  * osmo-mgw: err-log: include expected domain name
  * mgcp_client_vty: fix missing talloc_free
  * mgcp_client: drop a bunch of dead code
  * mgcp_client: logging tweaks
  * mgcp_client: make domain part of endpoint configurable
  * mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR}
  [ Stefan Sperling ]
  * add VTY commands which show specific mgcp endpoints
  * add MGCP CRCX command statistics to osmo-mgw
  * show RTP TX/RX stats in 'mgcp show stats' output
  * use local variable for rate counters in handle_create_con()
  * add more mgcp crxc error counters
  * add MDCX command statistics to osmo-mgw
  * add aggregated rtp connection stats to osmo-mgw
  * add DLCX command statistics to osmo-mgw
  [ Harald Welte ]
  * debian/rules: Don't overwrite .tarball-version
  * check_rtp_origin(): Don't memcmp sockadd_in and in_addr
  * check_rtp_origin(): Avoid using memcmp for comparing integer types
  * vty-ref: Update URI of docbook 5.0 schema
  [ Daniel Willmann ]
  * mgw: Add new VTY reference
  * Add initial OsmoMGW manual
  [ Oliver Smith ]
  * build manuals moved here from osmo-gsm-manuals.git
  * jenkins.sh: remove leftover MGCP env variable
  * Fix DISTCHECK_CONFIGURE_FLAGS override
  * contrib/jenkins.sh: build and publish manuals
  * contrib: fix makedistcheck with disabled systemd
 -- Harald Welte <laforge@gnumonks.org>  Sun, 20 Jan 2019 15:02:18 +0100
 osmo-mgw (1.4.0) unstable; urgency=medium
  [ Philipp Maier ]
  * network: independently initalize state->out_stream
  * stats: use libosmocore rate counter for in/out_stream.err_ts_counter
  * mgcp_sdp: correct apidoc of mgcp_parse_sdp_data
  * vty: clean up rtp port-range command
  * sdp: remove unused alt_codec field from struct mgcp_rtp_end
  * sdp: remove circular inclusion
  * protocol: Try whole port range on port allocation
  * client: do not start connections in loopback mode
  * mgcp_network: do not log destination invalid ip/port as error
  * cosmetic: fix log output
  * conn: call talloc_free before setting the pointer to NULL
  * protocol: do not change LCO, when no LCO are present
  * protocol: reject illegal lco options
  * cosmetic: fix typo
  * mgw: clean up codec negotiation (sdp)
  * client: add features to generate and parse codec information
  * mgcp_internal: remove unused struct member
  * stats: replace packet statistic counters with libosmocore rate counters
  * stat+vty: fix printing of rate counter values
  * protocol: prevent unnecessary null pointer deref
  [ Pau Espin Pedrol ]
  * legacy-mgcp: Add jitter buffer on the uplink receiver
  * legacy-mgcp: switch to new osmux output APIs
  * mgcp: mgcp_osmux: use conn_bts when forwarding pkts from bsc_nat
  * mgcp: switch to new osmux output APIs
  * debian: Package installed example doc files
  * gitignore: Add m4 scripts from m4 subdir
  [ Neels Hofmeyr ]
  * api doc: fix parameter name for mgcp_conn_create()
  * mgcp-client: add mgcp_conn_get_ci()
  * mgcp_client_fsm: improve error logging
  * cosmetic: fix doxygen comment markers
  * cosmetic: mgcp_network.c: merge one LOGPC to its preceding LOGP
  * IuUP hack: make RTP patching less general
  [ Harald Welte ]
  * cosmetic: fix typo in log message: 'abrupt' instead of 'aprupt'
  [ Daniel Willmann ]
  * git-version-gen: Don't check for .git directory
 -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 27 Jul 2018 19:05:22 +0200
 osmo-mgw (1.3.0) unstable; urgency=medium
  [ Pau Espin Pedrol ]
  * contrib: Add osmo-mgw systemd service
  * legacy: mgcp_protocol: Don't print osmux stats if it is off
  * mgcp_stat: Don't print osmux stats if it is off
  [ Neels Hofmeyr ]
  * fix segfault: DLCX for unknown endpoint: dont try to log NULL endpoint
  * MGCP endpoints: parse as decimal, not hex
  * add --enable-sanitize config option
  * legacy_mgcp: mgcp_test: sanitize: free msgb_ctx
  * mgcp_test: test_packet_error_detection: sanitize: free all conns
  * mgcp_test: test_no_cycle: sanitize: free endp
  * mgcp_test: sanitize: free msgb_ctx
  * mgcp_client: don't configure "bts base"
  * Revert "mgcp_client: don't configure "bts base"" until osmo-msc is ready
  * mgcp_client: add transaction cleanup
  * mgcp_client_test makefile: add update_exp target
  * cosmetic: mgcp_network: typo in log
  * osmo-mgw: Add talloc context introspection via VTY
  * mgcp_client: show failure by MGCP SDP section parsing test
  * mgcp_client: cosmetic: clean up SDP params parsing
  * mgcp_client: detect SDP section-start parsing errors
  * compiler warning: ignore deprecated in mgcp_client_test.c
  * configure: add --enable-werror
  * jenkins.sh: add --enable-werror to configure flags
  * cosmetic: mgcp, legacy_mgcp: drop unused vty.h definitions
  * use osmo_init_logging2() with proper talloc ctx
  [ Philipp Maier ]
  * osmux: fix nullpointer dereference
  * cosmetic: guard dead osmux vty code with ifdef
  * cosmetic: remove prefix "net" from rtp related vty commands
  * doc: update sample config file
  * cosmetic: use correct VTY port number constant
  * vty: simplify endpoint allocation
  * vty: do not change number_endpoints at runtime
  * MGCP: Connection Identifiers are hex strings
  * libosmo-mgcp: Connection Identifiers are allocated by MGW, not CA
  * client: use osmo_strlcpy instead of strncpy
  * cosmetic: fix sourcecode formatting
  * cosmetic: clearly mark endpoint numbers as hex
  * client: use string as connection identifier
  * conn: remove assertions
  * mgcp_test: fix wrong strcmp() parameters
  * mgcp_test: fix nullpointer dereference
  * mgcp_test: add returncode check
  * mgcp_test: fix possible double free
  * mcgp_client: mgcp_msg_gen(): add checks to verify params
  * network: use originating RTP packet address for loopback
  * client: mgcp_response_parse_params: check rtp port
  * mgcp: allow endpoints beginning from zero
  * client/common: move constant MGCP_ENDPOINT_MAXLEN
  * mgcp: make domain name configurable
  * cosmetic: protocol: remove unnecessary nul termination
  * client: do not insist on \n\n when parsing MGCP messages
  * main: display mgcp ip/port
  * client: make callid in MDCX mandatory
  * client: add missing mandatory SDP fields
  * mgcp: permit wildcarded endpoint assignment (CRCX)
  * mgcp: add prefix to virtual trunk
  * client: eliminate destructive parameter parsing
  * client: eliminate destructive head parsing
  * cosmetic: client: add doxygen comments
  * protocol: fix problem with line break and OSMUX
  * protocol: fix missing carriage return
  * client: fix sdp parameter ordering
  * protocol: check the packetization in local cx options
  * cosmetic: remove spaces from pointer symbol
  * client: Do not accept endpoint ids with wildcards in responses
  * client: do not accept endpoint ids without @ character in responses
  * client: prohibit endpoint ids without @ character
  * protocol: on wildcarded CRCX return endpoint number as hex
  * msg: fix response code on exhausted endp resources
  * cosmetic: move mgcp_release_endp() to mgcp_ep.c
  * client: use heap to store mgcp_response
  * ep: move endpoint struct and define to mgcp_ep.h
  * cosmetic: rename mgcp_release_endp to mgcp_endp_release
  * cosmetic: rename mgcp_ep.c/h to mgcp_endp.c/h
  * protocol: reject DLCX/CRCX/MDCX on unsupported parameters
  * protocol: exit cleanly when local cx options check fails
  * cosmetic: Add missing \n on log line
  * protocol: check requested connection mode
  * protocol: fix tagging of wildcarded requests
  * protocol: prohibit wildcarded requests for MDCX and DLCX
  * mgcp: fix use-after-free and add callback for endpoint cleanup
  * client: add an optional FSM interface
  * mgcp_client_fsm: Add FSM event names
  * cosmetic: mgcp_client_fsm: rename enums
  * cosmetic: rename function .._conn_reset() to .._conn_init()
  * mgcp_conn: do not touch u.rtp in mgcp_conn_alloc()
  * cosmetic: rename .._codec_reset() to .._codec_init()
  * mgcp_conn: add function mgcp_rtp_conn_cleanup()
  * stats: use libosmocore rate counter for in/out_stream.err_ts_counter
  [ Alexander Couzens ]
  * debian/control: correct library dependency of osmo-mgw against libosmo-mgcp1
  * debian: include systemd service osmo-mgw.service
  * Revert "stats: use libosmocore rate counter for in/out_stream.err_ts_counter"
  [ Harald Welte ]
  * cosmetic: fix whitespaces; we use tabs for indentation
  * Fix possible buffer overflow in mgcp_conn_dump()
  * osmo-mgw: Update copyright statement
  * osmo-mgw: Config file is osmo-mgw.cfg, and not mgcp.cfg
  * osmo-mgw: Fix copyright notice
  * strct mgcp_rtp_state: Group + document struct members related to patching
  * mgcp_rtp_state: grup 'stats' members into sub-structure
  * mgcp_rtp_end: Group statistics members into 'stats' sub-struct
  * libosmo-mgcp: Cosmetic spelling fixes in comments
  * mgcp_msg: We must parse endpoint numbers as hex, not decimal!
  * mgcp_internal.h: document more struct members with comments
  * centralize handling of common errors like "endpoint not found"
  * Return proper MGCP Error codes, as per spec
  * osmo-mgw: Use libosmocore socket abstraction
  * osmo-bsc_mgcp: Add LIBOSMONETIF_{CFLAGS,LIBS}
  * libosmo-mgcp-client is GPLv2+, not AGPLv3+
  * Turn libosmo-mgcp into local, non-installed library
  [ Stefan Sperling ]
  * enable osmo_fsm vty commands in libosmo-mgcp-client vty
 -- Pau Espin Pedrol <pespin@sysmocom.de>  Thu, 03 May 2018 17:40:35 +0200
 osmo-mgw (1.2.0) unstable; urgency=medium
  [ Neels Hofmeyr ]
  * jenkins: use osmo-clean-workspace.sh before and after build
  * vty: skip installing cmds now always installed by default
  * mgcp-client vty: use name 'mgw' instead of 'mgcpgw'
  * mgcp client: vty: tweak doc strings
  [ Philipp Maier ]
  * sdp: refactoring sdp parser/generator
  * cosmetic: rename bts_codec to codec_str
  * cosmetic: fix coding style for mgcp_parse_sdp_data()
  * cosmetic: fix commenting style
  * cosmetic: correct whitespaces
  * client: fix stderror logging in unit-test
  * client: add unified function to generate MGCP messages
  * client: add ip address parsing to the client
  * protocol: allow wildcarded DLCX
  * mgcp: remove port/timeslot calculator functions from  mgcp.h
  * network: add separate log category
  * cosmetic: make dummy packet handling more explicit
  * network: autdetect rtp bind ip-address
  * network: fix rtp packet length
  * network: remove unused return code
  [ Pau Espin Pedrol ]
  * mgcp_client_vty.c: Fix VTY compatibility with 'mgcpgw bts-base'
 -- Harald Welte <laforge@gnumonks.org>  Fri, 10 Nov 2017 11:10:23 +0900
 osmo-mgw (1.1.0) unstable; urgency=medium
  * New upstream release
- -- Harald Welte <lafore@gnumonks.org>  Sat, 28 Oct 2017 12:48:41 +0200
+ -- Harald Welte <laforge@gnumonks.org>  Wed, 11 May 2011 18:41:24 +0000
-osmo-mgw (1.0.2) unstable; urgency=low
+openbsc (0.9.4-1) unstable; urgency=low
-  * First release after major rename.
+  * Initial release
- -- Max Suraev <msuraev@sysmocom.de>  Thu, 14 Sep 2017 18:41:05 +0200
+ -- Harald Welte <laforge@gnumonks.org>  Tue, 24 Aug 2010 13:34:24 +0200
 osmo-mgw (0.1.0) unstable; urgency=low
  * Initial release.
 -- Alexander Couzens <lynxis@fe80.eu>  Tue, 08 Aug 2017 01:12:53 +0000
--- a/debian/control
+++ b/debian/control
@@ -1,46 +1,181 @@
-Source: osmo-mgw
+Source: openbsc
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Section: net
 Priority: extra
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Build-Depends: debhelper (>=9),
               dh-autoreconf,
               pkg-config,
               autotools-dev,
               libosmocore-dev (>= 1.6.0),
               libosmo-netif-dev (>= 1.1.0),
               libosmo-abis-dev (>= 1.2.0),
               osmo-gsm-manuals-dev (>= 1.2.0)
 Standards-Version: 3.9.8
 Vcs-Git: git://git.osmocom.org/osmo-mgw.git
 Vcs-Browser: https://git.osmocom.org/osmo-mgw/
 Homepage: https://osmocom.org/projects/osmo-mgw
 Package: osmo-mgw
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: OsmoMGW: Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks
 Package: libosmo-mgcp-client9
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities
 Package: libosmo-mgcp-client-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libosmo-mgcp-client9 (= ${binary:Version}), ${misc:Depends}
 Description: libosmo-mgcp-client: Osmocom's Media Gateway Control Protocol client utilities
 Package: osmo-mgw-doc
 Architecture: all
 Section: doc
 Priority: optional
 Build-Depends: debhelper (>= 9),
               autotools-dev,
               autoconf-archive,
               pkg-config,
               libgtp-dev,
               libosmocore-dev,
               libosmo-sccp-dev,
               libdbi0-dev,
               dh-autoreconf,
               libosmo-abis-dev,
               libosmo-netif-dev,
               libdbd-sqlite3,
               libpcap-dev,
               libssl-dev,
               libc-ares-dev,
               libsmpp34-dev
 Standards-Version: 3.9.8
 Vcs-Git: git://bs11-abis.gnumonks.org/openbsc.git
 Vcs-Browser: http://openbsc.osmocom.org/trac/browser
 Homepage: https://projects.osmocom.org/projects/openbsc
 Package: osmocom-bsc
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Description: GSM Base Station Controller
 This is the BSC-only version of OpenBSC. It requires a Mobile Switching Center
 (MSC) to operate.
 .
 You might rather prefer to use osmocom-nitb which is considered a
 "GSM Network-in-a-Box" and does not depend on a MSC.
 Package: osmocom-nitb
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends},
         libdbd-sqlite3
 Description: GSM Network-in-a-Box, implements BSC, MSC, SMSC, HLR, VLR
 This is the Network-in-a-Box version of OpenBSC. It has all the GSM network
 components bundled together. When using osmocom-nitb, there is no need for a
 Mobile Switching Center (MSC) which is needed when using osmocom-bsc.
 Package: osmocom-ipaccess-utils
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Description: Command line utilities for ip.access nanoBTS
 This package contains utilities that are specific for nanoBTS when being used
 together with OpenBSC. It contains mainly three tools: ipaccess-find,
 ipaccess-config and ipaccess-proxy.
 Package: osmocom-bs11-utils
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Description: Command line utilities for Siemens BS-11 BTS
 There is a tool in this package for configuring the Siemens BS-11 BTS.
 Additionally, it contains one tool for making use of an ISDN-card and the
 public telephone network as frequency standard for the E1 line.
 Package: osmocom-sgsn
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Suggests: osmocom-bsc
 Description: Osmocom Serving GPRS Support Node
 This is an implementation of the GPRS Serving GPRS Support Node (SGSN). As
 such it implements the GPRS Mobility Management (GMM) and SM (Session
 Management).
 .
 The SGSN connects via the Gb-interface to the BSS (like the osmo-pcu or an
 ip.access nanoBTS), and it connects via the GTP protocol to a Gateway GPRS
 Support Node (GGSN) like openggsn.
 Package: osmocom-gbproxy
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Recommends: osmocom-sgsn
 Description: Osmocom GPRS Gb Interface Proxy
 The purpose of the Gb proxy is to aggregate the Gb links of multiple
 BSS's and present them in one Gb link to the SGSN.
 .
 This package is part of OpenBSC and closely related to osmocom-sgsn.
 Package: osmocom-bsc-nat
 Architecture: any
 Depends: ${shlibs:Depends},
         ${misc:Depends}
 Recommends: osmocom-bsc
 Description: Osmocom Base Station Controller Network Address Translation
 This NAT is useful for masquerading multiple BSCs behind one. It listens
 for incoming BSCs on port 5000 and connects to a specified Mobile Switching
 Center (MSC).
 .
 This package is part of OpenBSC and closely related to osmocom-bsc.
 Package: openbsc-dev
 Architecture: all
 Depends: ${misc:Depends}
-Description: ${misc:Package} PDF documentation
+Description: Header file needed by tools tightly integrated
- Various manuals: user manual, VTY reference manual and/or
+ Some other programs depend on gsm_data_shared.h and gsm_data_shared.c
- protocol/interface manuals.
+ from OpenBSC. This package installs these files to your file system so
 that the other packages can build-depend on this package.
 .
 The directory structure is copied after the structure in the repository
 and the header and .c file are installed into /usr/src/osmocom/openbsc/.
 Package: osmo-gtphub
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Osmocom GTP Hub
 Proxy for comms between multiple SGSNs and GGSNs.
 Package: osmocom-bsc-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-bsc (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC BSC
 Make debugging possible
 Package: osmocom-nitb-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-nitb (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC NITB
 Make debugging possible
 Package: osmocom-ipaccess-utils-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-ipaccess-utils (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC ip.access utils
 Make debugging possible
 Package: osmocom-bs11-utils-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-bs11-utils (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC BS11 utils
 Make debugging possible
 Package: osmocom-sgsn-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-sgsn (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC Serving GPRS Support Node
 Make debugging possible
 Package: osmocom-gbproxy-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-gbproxy (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC GPRS GBProxy
 Make debugging possible
 Package: osmocom-bsc-nat-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmocom-bsc-nat (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for the OpenBSC Network Address Translation
 Make debugging possible
 Package: osmo-gtphub-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: osmo-gtphub (= ${binary:Version}), ${misc:Depends}
 Description: Debug symbols for Osmocom GTP Hub
 Make debugging possible
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,14 +1,74 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: osmo-mgw
+Upstream-Name: OpenBSC
-Source: git://git.osmocom.org/osmo-mgw
+Source: http://openbsc.osmocom.org/
-Files:     *
+Files: *
-Copyright: 2009-2014 On-Waves
+Copyright: 2008-2015        Harald Welte <laforge@gnumonks.org>
-           2009-2015 Holger Hans Peter Freyther <zecke@selfish.org>
+           2008-2015        Holger Hans Peter Freyther <zecke@selfish.org>
-           2013 Jacob Erlbeck <jerlbeck@sysmocom.de>
+           2009-2015        On-Waves
-           2016-2017 sysmocom s.m.f.c. GmbH <info@sysmocom.de>
+           2008             Jan Luebbe <jluebbe@debian.org>
-License:   AGPL-3.0+
+           2008,2010-2011   Daniel Willmann <daniel@totalueberwachung.de>
- This program is free software; you can redistribute it and/or modify
+           2009,2011,2013   Andreas Eversberg <Andreas.Eversberg@versatel.de>
           2009,2011        Dieter Spaar <spaar@mirider.augusta.de>
           2009             Mike Haben <michael.haben@btinternet.com>
           2010             Sylvain Munaut <246tnt@gmail.com>
           2012-2013        Pablo Neira Ayuso <pablo@gnumonks.org>
           2013-2015        Sysmocom s.f.m.c. GmbH  (Jacob Erlbeck)
           2014             Alexander Chemeris <Alexander.Chemeris@fairwaves.co>
 License: AGPL-3+
 Comment: Contributions by Stefan Schmidt <stefan@datenfreihafen.org> as well
 Files: wireshark/0001-abis_oml.patch
       wireshark/0002-ericsson_rbs2409.patch
       wireshark/0003-lucent-hnb.patch
       wireshark/0005-rsl-hsl.patch
 Copyright: 1998         Gerald Combs <gerald@wireshark.org>
           2007,2011    Anders Broman <anders.broman@ericsson.com>
           2009         Holger Hans Peter Freyther <zecke@selfish.org>
           2009-2011    Harald Welte <laforge@gnumonks.org>
 License: GPL-2+
 Files: openbsc/include/mISDNif.h
 Copyright: 2008         Karsten Keil <kkeil@novell.com>
 License: LGPL-2.1
 Files: openbsc/src/libmgcp/g711common.h
 Copyright: 2009         Abramo Bagnara <abramo@alsa-project.org>
 License: GPL-2+
 Files: openbsc/git-version-gen
 Copyright: 2007-2010    Free Software Foundation
 License: GPL-3+
 Files: openbsc/osmoappdesc.py
       openbsc/tests/smpp_test_runner.py
       openbsc/tests/ctrl_test_runner.py
       openbsc/tests/vty_test_runner.py
 Copyright: 2013         Katerina Barone-Adesi <kat.obsc@gmail.com>
           2013         Jacob Erlbeck <jerlbeck@sysmocom.de>
           2013-2014    Holger Hans Peter Freyther <zecke@selfish.org>
 License: GPL-3+
 Files: openbsc/src/libbsc/bsc_ctrl_lookup.c
 Copyright: 2010-2011    Daniel Willmann <daniel@totalueberwachung.de>
           2010-2011    On-Waves
 License: GPL-2+
 Files: openbsc/src/libmsc/mncc_sock.c
       openbsc/src/libmsc/mncc_builtin.c
 Copyright: 2008-2010    Harald Welte <laforge@gnumonks.org>
           2009         Andreas Eversberg <Andreas.Eversberg@versatel.de>
           2012         Holger Hans Peter Freyther <zecke@selfish.org>
 License: GPL-2+
 Files: debian/*
 Copyright: 2012-2015    Holger Hans Peter Freyther <zecke@selfish.org>
           2016         Ruben Undheim <ruben.undheim@gmail.com>
 License: GPL-2+
 License: AGPL-3+
 This package is free software; you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
@@ -16,50 +76,62 @@ License:   AGPL-3.0+
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU Affero General Public License for more details.
+ GNU General Public License for more details.
 .
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Files:     src/libosmo-mgcp-client/* include/osmocom/mgcp_client/*
 Copyright: 2016 by sysmocom s.m.f.c. GmbH <info@sysmocom.de>
           Based on OpenBSC interface to quagga VTY (libmsc/vty_interface_layer3.c)
           2009 by Harald Welte <laforge@gnumonks.org>
           2009-2011 by Holger Hans Peter Freyther
 License:   GPL-2.0+
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 .
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 .
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
-Files:     tests/vty_test_runner.py
+License: GPL-2+
-Copyright: 2013 Holger Hans Peter Freyther
+ This package is free software: you can redistribute it and/or modify it
-           2013 Katerina Barone-Adesi <kat.obsc@gmail.com>
+ under the terms of the GNU General Public License as published by
-License:   GPL-3.0+
+ the Free Software Foundation, either version 2 of the License, or (at
- This program is free software: you can redistribute it and/or modify
+ your option) any later version.
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
 .
- This program is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful, but
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- GNU General Public License for more details.
+ for more details.
 .
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
- On Debian systems, the complete text of the GNU General Public License
+ On Debian systems, the complete text of the GNU General Public
- Version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-Files:     osmoappdesc.py
+
-Copyright: 2013 Katerina Barone-Adesi <kat.obsc@gmail.com>
+License: GPL-3+
-License:   GPL-3.0+
+ This package is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or (at
 your option) any later version.
 .
 This program is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 .
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .
 On Debian systems, the complete text of the GNU General Public
 License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 License: LGPL-2.1
 This library is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
 License as published by the Free Software Foundation; version
 2.1 of the License.
 .
 This library is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 .
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, see <http://www.gnu.org/licenses/>.
 .
 On Debian systems, the complete text of the GNU Lesser General
 Public License version 2.1 can be found in
 "/usr/share/common-licenses/LGPL-2.1".
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1 @@
 openbsc/README
--- a/debian/libosmo-mgcp-client-dev.install
+++ b/debian/libosmo-mgcp-client-dev.install
@@ -1,4 +0,0 @@
 usr/include/osmocom/mgcp_client
 usr/lib/*/libosmo-mgcp-client.so
 usr/lib/*/libosmo-mgcp-client.a
 usr/lib/*/pkgconfig/libosmo-mgcp-client.pc
--- a/debian/libosmo-mgcp-client9.install
+++ b/debian/libosmo-mgcp-client9.install
@@ -1 +0,0 @@
 usr/lib/*/libosmo-mgcp-client.so.*
--- a/debian/openbsc-dev.install
+++ b/debian/openbsc-dev.install
@@ -0,0 +1,3 @@
 openbsc/include/openbsc/gsm_data_shared.h usr/src/osmocom/openbsc/openbsc/include/openbsc/
 openbsc/include/openbsc/common_cs.h usr/src/osmocom/openbsc/openbsc/include/openbsc/
 openbsc/src/libcommon/gsm_data_shared.c usr/src/osmocom/openbsc/openbsc/src/libcommon/
--- a/debian/osmo-gtphub.default
+++ b/debian/osmo-gtphub.default
@@ -0,0 +1,2 @@
 CONFIG_FILE="/etc/osmocom/osmo-gtphub.cfg"
--- a/debian/osmo-gtphub.examples
+++ b/debian/osmo-gtphub.examples
@@ -0,0 +1 @@
 openbsc/doc/examples/osmo-gtphub
--- a/debian/osmo-gtphub.init
+++ b/debian/osmo-gtphub.init
@@ -0,0 +1,150 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          osmo-gtphub
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Osmocom GTP hub
 # Description:       Osmocom GTP hub
 ### END INIT INFO
 # Author: Neels Hofmeyr <nhofmeyr@sysmocom.de>
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=osmo-gtphub                         # Introduce the short server's name here
 DESC="Osmocom GTP hub"                   # Introduce a short description here
 DAEMON=/usr/bin/osmo-gtphub              # Introduce the server's location here
 SCRIPTNAME=/etc/init.d/osmo-gtphub
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 # Read configuration variable file if it is present
 [ -r /etc/default/osmo-gtphub ] && . /etc/default/osmo-gtphub
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE"
 #
 # Function that starts the daemon/service
 #
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
 }
 #
 # Function that stops the daemon/service
 #
 do_stop()
 {
 	# Return
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
 	# If the above conditions are not satisfied then add some other code
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
 	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
 	[ "$?" = 2 ] && return 2
 	return "$RETVAL"
 }
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
 	#
 	# If the daemon can reload its configuration without
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
 	start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
 	return 0
 }
 case "$1" in
  start)
    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
    do_start
    case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
  ;;
  stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
 	;;
  status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
  #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
 	# and leave 'force-reload' as an alias for 'restart'.
 	#
 	#log_daemon_msg "Reloading $DESC" "$NAME"
 	#do_reload
 	#log_end_msg $?
 	#;;
  restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
 	# 'force-reload' alias
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	case "$?" in
 	  0|1)
 		do_start
 		case "$?" in
 			0) log_end_msg 0 ;;
 			1) log_end_msg 1 ;; # Old process is still running
 			*) log_end_msg 1 ;; # Failed to start
 		esac
 		;;
 	  *)
 		# Failed to stop
 		log_end_msg 1
 		;;
 	esac
 	;;
  *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 :
--- a/debian/osmo-gtphub.install
+++ b/debian/osmo-gtphub.install
@@ -0,0 +1 @@
 /usr/bin/osmo-gtphub
--- a/debian/osmo-mgw-doc.install
+++ b/debian/osmo-mgw-doc.install
@@ -1 +0,0 @@
 usr/share/doc/osmo-mgw-doc/*.pdf
--- a/debian/osmo-mgw.install
+++ b/debian/osmo-mgw.install
@@ -1,5 +0,0 @@
 etc/osmocom/osmo-mgw.cfg
 lib/systemd/system/osmo-mgw.service
 usr/bin/osmo-mgw
 usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw.cfg
 usr/share/doc/osmo-mgw/examples/osmo-mgw/osmo-mgw-abis_e1.cfg
--- a/debian/osmocom-bs11-utils.install
+++ b/debian/osmocom-bs11-utils.install
@@ -0,0 +1,2 @@
 /usr/bin/bs11_config
 /usr/bin/isdnsync
--- a/debian/osmocom-bsc-nat.init
+++ b/debian/osmocom-bsc-nat.init
@@ -0,0 +1,153 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          osmocom-bsc-nat
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Osmocom GSM network-in-a-box
 # Description:       A minimal implementation of the GSM Base Station Controller,
 #                    Mobile Switching Center, Home Location regster and all other
 #                    components to run a self-contained GSM network.
 ### END INIT INFO
 # Author: Harald Welte <laforge@gnumonks.org>
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=osmo-bsc_nat                      # Introduce the short server's name here
 DESC="Osmocom GSM BSC Multiplexer (NAT)" # Introduce a short description here
 DAEMON=/usr/bin/osmo-bsc_nat           # Introduce the server's location here
 SCRIPTNAME=/etc/init.d/osmocom-bsc-nat
 CONFIG_FILE=/etc/osmocom/osmocom-bsc-nat.cfg
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 # Read configuration variable file if it is present
 [ -r /etc/default/osmocom-bsc-nat ] && . /etc/default/osmocom-bsc-nat
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 DAEMON_ARGS="-D -c $CONFIG_FILE"
 #
 # Function that starts the daemon/service
 #
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
 }
 #
 # Function that stops the daemon/service
 #
 do_stop()
 {
 	# Return
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
 	# If the above conditions are not satisfied then add some other code
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
 	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
 	[ "$?" = 2 ] && return 2
 	return "$RETVAL"
 }
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
 	#
 	# If the daemon can reload its configuration without
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
 	start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
 	return 0
 }
 case "$1" in
  start)
    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
    do_start
    case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
  ;;
  stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
 	;;
  status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
  #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
 	# and leave 'force-reload' as an alias for 'restart'.
 	#
 	#log_daemon_msg "Reloading $DESC" "$NAME"
 	#do_reload
 	#log_end_msg $?
 	#;;
  restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
 	# 'force-reload' alias
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	case "$?" in
 	  0|1)
 		do_start
 		case "$?" in
 			0) log_end_msg 0 ;;
 			1) log_end_msg 1 ;; # Old process is still running
 			*) log_end_msg 1 ;; # Failed to start
 		esac
 		;;
 	  *)
 	  	# Failed to stop
 		log_end_msg 1
 		;;
 	esac
 	;;
  *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 :
--- a/debian/osmocom-bsc-nat.install
+++ b/debian/osmocom-bsc-nat.install
@@ -0,0 +1 @@
 /usr/bin/osmo-bsc_nat
--- a/debian/osmocom-bsc.examples
+++ b/debian/osmocom-bsc.examples
@@ -0,0 +1 @@
 openbsc/doc/examples/osmo-bsc_mgcp
--- a/debian/osmocom-bsc.install
+++ b/debian/osmocom-bsc.install
@@ -0,0 +1,2 @@
 /usr/bin/osmo-bsc_mgcp
 /usr/bin/osmo-bsc
--- a/debian/osmocom-gbproxy.init
+++ b/debian/osmocom-gbproxy.init
@@ -0,0 +1,151 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          osmo-gbproxy
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Osmocom GBproxy
 # Description:       A tool to proxy the GPRS Gb interface.
 ### END INIT INFO
 # Author: Harald Welte <laforge@gnumonks.org>
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=osmo-gbproxy                      # Introduce the short server's name here
 DESC="Osmocom GBProxy" # Introduce a short description here
 DAEMON=/usr/bin/osmo-gbproxy           # Introduce the server's location here
 SCRIPTNAME=/etc/init.d/osmocom-gbproxy
 CONFIG_FILE=/etc/osmocom/osmocom-gbproxy.cfg
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 # Read configuration variable file if it is present
 [ -r /etc/default/osmocom-gbproxy ] && . /etc/default/osmocom-gbproxy
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 DAEMON_ARGS="-D -c $CONFIG_FILE"
 #
 # Function that starts the daemon/service
 #
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
 }
 #
 # Function that stops the daemon/service
 #
 do_stop()
 {
 	# Return
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
 	# If the above conditions are not satisfied then add some other code
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
 	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
 	[ "$?" = 2 ] && return 2
 	return "$RETVAL"
 }
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
 	#
 	# If the daemon can reload its configuration without
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
 	start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
 	return 0
 }
 case "$1" in
  start)
    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
    do_start
    case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
  ;;
  stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
 	;;
  status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
  #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
 	# and leave 'force-reload' as an alias for 'restart'.
 	#
 	#log_daemon_msg "Reloading $DESC" "$NAME"
 	#do_reload
 	#log_end_msg $?
 	#;;
  restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
 	# 'force-reload' alias
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	case "$?" in
 	  0|1)
 		do_start
 		case "$?" in
 			0) log_end_msg 0 ;;
 			1) log_end_msg 1 ;; # Old process is still running
 			*) log_end_msg 1 ;; # Failed to start
 		esac
 		;;
 	  *)
 	  	# Failed to stop
 		log_end_msg 1
 		;;
 	esac
 	;;
  *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 :
--- a/debian/osmocom-gbproxy.install
+++ b/debian/osmocom-gbproxy.install
@@ -0,0 +1 @@
 /usr/bin/osmo-gbproxy
--- a/debian/osmocom-ipaccess-utils.install
+++ b/debian/osmocom-ipaccess-utils.install
@@ -0,0 +1,3 @@
 /usr/bin/ipaccess-config
 /usr/bin/abisip-find
 /usr/bin/ipaccess-proxy
--- a/debian/osmocom-nitb.default
+++ b/debian/osmocom-nitb.default
@@ -0,0 +1,8 @@
 CONFIG_FILE="/etc/osmocom/osmo-nitb.cfg"
 HLR_FILE="/var/lib/osmocom/hlr.sqlite3"
 DAEMON_ARGS="-P"
 # Uncomment if using LCR+Asterisk
 # DAEMON_ARGS="-m -P"
--- a/debian/osmocom-nitb.dirs
+++ b/debian/osmocom-nitb.dirs
@@ -0,0 +1,3 @@
 /etc/osmocom
 /var/log/osmocom
 /var/lib/osmocom
--- a/debian/osmocom-nitb.examples
+++ b/debian/osmocom-nitb.examples
@@ -0,0 +1 @@
 openbsc/doc/examples/osmo-nitb
--- a/debian/osmocom-nitb.init
+++ b/debian/osmocom-nitb.init
@@ -0,0 +1,152 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          osmo-nitb
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Osmocom GSM network-in-a-box
 # Description:       A minimal implementation of the GSM Base Station Controller,
 #                    Mobile Switching Center, Home Location regster and all other
 #                    components to run a self-contained GSM network.
 ### END INIT INFO
 # Author: Harald Welte <laforge@gnumonks.org>
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=osmo-nitb                      # Introduce the short server's name here
 DESC="Osmocom GSM Network-in-a-Box" # Introduce a short description here
 DAEMON=/usr/bin/osmo-nitb           # Introduce the server's location here
 SCRIPTNAME=/etc/init.d/osmocom-nitb
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 # Read configuration variable file if it is present
 [ -r /etc/default/osmocom-nitb ] && . /etc/default/osmocom-nitb
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE -l $HLR_FILE"
 #
 # Function that starts the daemon/service
 #
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
 }
 #
 # Function that stops the daemon/service
 #
 do_stop()
 {
 	# Return
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
 	# If the above conditions are not satisfied then add some other code
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
 	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
 	[ "$?" = 2 ] && return 2
 	return "$RETVAL"
 }
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
 	#
 	# If the daemon can reload its configuration without
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
 	start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
 	return 0
 }
 case "$1" in
  start)
    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
    do_start
    case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
  ;;
  stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
 	;;
  status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
  #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
 	# and leave 'force-reload' as an alias for 'restart'.
 	#
 	#log_daemon_msg "Reloading $DESC" "$NAME"
 	#do_reload
 	#log_end_msg $?
 	#;;
  restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
 	# 'force-reload' alias
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	case "$?" in
 	  0|1)
 		do_start
 		case "$?" in
 			0) log_end_msg 0 ;;
 			1) log_end_msg 1 ;; # Old process is still running
 			*) log_end_msg 1 ;; # Failed to start
 		esac
 		;;
 	  *)
 	  	# Failed to stop
 		log_end_msg 1
 		;;
 	esac
 	;;
  *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 :
--- a/debian/osmocom-nitb.install
+++ b/debian/osmocom-nitb.install
@@ -0,0 +1 @@
 /usr/bin/osmo-nitb
--- a/debian/osmocom-sgsn.default
+++ b/debian/osmocom-sgsn.default
@@ -0,0 +1,2 @@
 CONFIG_FILE="/etc/osmocom/osmo-sgsn.cfg"
--- a/debian/osmocom-sgsn.examples
+++ b/debian/osmocom-sgsn.examples
@@ -0,0 +1 @@
 openbsc/doc/examples/osmo-sgsn
--- a/debian/osmocom-sgsn.init
+++ b/debian/osmocom-sgsn.init
@@ -0,0 +1,150 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          osmo-sgsn
 # Required-Start:    $network $local_fs
 # Required-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Osmocom Serving GPRS Support Node
 # Description:       Osmocom Serving GPRS Support Node
 ### END INIT INFO
 # Author: Harald Welte <laforge@gnumonks.org>
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=osmo-sgsn                           # Introduce the short server's name here
 DESC="Osmocom Serving GPRS Support Node" # Introduce a short description here
 DAEMON=/usr/bin/osmo-sgsn                # Introduce the server's location here
 SCRIPTNAME=/etc/init.d/osmocom-sgsn
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 # Read configuration variable file if it is present
 [ -r /etc/default/osmocom-sgsn ] && . /etc/default/osmocom-sgsn
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 DAEMON_ARGS="$DAEMON_ARGS -D -c $CONFIG_FILE"
 #
 # Function that starts the daemon/service
 #
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
 	start-stop-daemon --start --quiet --exec $DAEMON --test > /dev/null \
 		|| return 1
 	start-stop-daemon --start --quiet --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready
 	# to handle requests from services started subsequently which depend
 	# on this one.  As a last resort, sleep for some time.
 }
 #
 # Function that stops the daemon/service
 #
 do_stop()
 {
 	# Return
 	#   0 if daemon has been stopped
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
 	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Wait for children to finish too if this is a daemon that forks
 	# and if the daemon is only ever run from this initscript.
 	# If the above conditions are not satisfied then add some other code
 	# that waits for the process to drop all resources that could be
 	# needed by services started subsequently.  A last resort is to
 	# sleep for some time.
 	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
 	[ "$?" = 2 ] && return 2
 	return "$RETVAL"
 }
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
 	#
 	# If the daemon can reload its configuration without
 	# restarting (for example, when it is sent a SIGHUP),
 	# then implement that here.
 	#
 	start-stop-daemon --stop --signal 1 --quiet $PIDFILE --name $NAME
 	return 0
 }
 case "$1" in
  start)
    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
    do_start
    case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
  ;;
  stop)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
 		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
 	esac
 	;;
  status)
       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
       ;;
  #reload|force-reload)
 	#
 	# If do_reload() is not implemented then leave this commented out
 	# and leave 'force-reload' as an alias for 'restart'.
 	#
 	#log_daemon_msg "Reloading $DESC" "$NAME"
 	#do_reload
 	#log_end_msg $?
 	#;;
  restart|force-reload)
 	#
 	# If the "reload" option is implemented then remove the
 	# 'force-reload' alias
 	#
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
 	case "$?" in
 	  0|1)
 		do_start
 		case "$?" in
 			0) log_end_msg 0 ;;
 			1) log_end_msg 1 ;; # Old process is still running
 			*) log_end_msg 1 ;; # Failed to start
 		esac
 		;;
 	  *)
 	  	# Failed to stop
 		log_end_msg 1
 		;;
 	esac
 	;;
  *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
 	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
 	exit 3
 	;;
 esac
 :
--- a/debian/osmocom-sgsn.install
+++ b/debian/osmocom-sgsn.install
@@ -0,0 +1 @@
 /usr/bin/osmo-sgsn
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,32 @@
 #!/usr/bin/make -f
 # You must remove unused comment lines for the released package.
 # See debhelper(7) (uncomment to enable)
 # This is an autogenerated template for debian/rules.
 #
 # Output every command that modifies files on the build system.
 #export DH_VERBOSE = 1
-DEBIAN  := $(shell dpkg-parsechangelog | grep '^Version:' | cut -d' ' -f2)
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 DEBIAN  := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1)
 VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g')
-CFLAGS += -g
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --with autoreconf
+	dh $@ --sourcedirectory=openbsc --with autoreconf
-# debmake generated override targets
+# This is needed for debian stable (squeeze)
-# Set options for ./configure
+override_dh_autoreconf:
-#CONFIGURE_FLAGS = <options for ./configure>
+	cd openbsc && autoreconf --install --force
 #overrride_dh_configure:
 #	dh_configure -- $(CONFIGURE_FLAGS)
 #
 # Do not install libtool archive, python .pyc .pyo
 #override_dh_install:
 #	dh_install --list-missing -X.la -X.pyc -X.pyo
-override_dh_auto_test:
+override_dh_strip:
-	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+	dh_strip -posmocom-bsc --dbg-package=osmocom-bsc-dbg
 	dh_strip -posmocom-nitb --dbg-package=osmocom-nitb-dbg
 	dh_strip -posmocom-ipaccess-utils --dbg-package=osmocom-ipaccess-utils-dbg
 	dh_strip -posmocom-bs11-utils --dbg-package=osmocom-bs11-utils-dbg
 	dh_strip -posmocom-sgsn --dbg-package=osmocom-sgsn-dbg
 	dh_strip -posmocom-gbproxy --dbg-package=osmocom-gbproxy-dbg
 	dh_strip -posmocom-bsc-nat --dbg-package=osmocom-bsc-nat-dbg
 	dh_strip -posmo-gtphub --dbg-package=osmo-gtphub-dbg
 override_dh_auto_configure:
-	dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
+	echo $(VERSION) > openbsc/.tarball-version
 	dh_auto_configure --sourcedirectory=openbsc -- --enable-nat --enable-osmo-bsc --enable-smpp
 # Don't create .pdf.gz files (barely saves space and they can't be opened directly by most pdf readers)
 override_dh_compress:
 	dh_compress -X.pdf
 # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg
--- a/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg
+++ b/doc/examples/osmo-mgw/osmo-mgw-abis_e1.cfg
@@ -1,25 +0,0 @@
 !
 ! MGCP configuration example
 !
 e1_input
 e1_line 0 driver dahdi
 e1_line 0 port 0
 mgcp
  bind ip 127.0.0.1
  rtp port-range 4002 16000
  rtp bind-ip 127.0.0.1
  rtp ip-probing
  rtp ip-dscp 46
  bind port 2427
  sdp audio payload number 98
  sdp audio payload name GSM
  number endpoints 512
  loop 0
  force-realloc 1
  rtcp-omit
  rtp-patch ssrc
  rtp-patch timestamp
  trunk 1
   rtp keep-alive once
   no rtp keep-alive
   line 0
--- a/doc/examples/osmo-mgw/osmo-mgw.cfg
+++ b/doc/examples/osmo-mgw/osmo-mgw.cfg
@@ -1,18 +0,0 @@
 !
 ! MGCP configuration example
 !
 mgcp
  bind ip 127.0.0.1
  rtp port-range 4002 16000
  rtp bind-ip 127.0.0.1
  rtp ip-probing
  rtp ip-dscp 46
  bind port 2427
  sdp audio payload number 98
  sdp audio payload name GSM
  number endpoints 512
  loop 0
  force-realloc 1
  rtcp-omit
  rtp-patch ssrc
  rtp-patch timestamp
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,23 +0,0 @@
 EXTRA_DIST = osmomgw-usermanual.adoc \
    osmomgw-usermanual-docinfo.xml \
    osmomgw-vty-reference.xml \
    regen_doc.sh \
    chapters \
    vty
 if BUILD_MANUALS
  ASCIIDOC = osmomgw-usermanual.adoc
  ASCIIDOC_DEPS = $(srcdir)/chapters/*.adoc
  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.asciidoc.inc
  VTY_REFERENCE = osmomgw-vty-reference.xml
  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.vty-reference.inc
  BUILT_REFERENCE_XML = $(builddir)/vty/mgw_vty_reference.xml
  $(builddir)/vty/mgw_vty_reference.xml: $(top_builddir)/src/osmo-mgw/osmo-mgw
 	mkdir -p $(builddir)/vty
 	$(top_builddir)/src/osmo-mgw/osmo-mgw --vty-ref-xml > $@
  OSMO_REPOSITORY = osmo-mgw
  include $(OSMO_GSM_MANUALS_DIR)/build/Makefile.common.inc
 endif
--- a/doc/manuals/chapters/configuration.adoc
+++ b/doc/manuals/chapters/configuration.adoc
@@ -1,129 +0,0 @@
 == Configuring OsmoMGW
 A basic configation of OsmoMGW mainly consists of specifying the IP address
 and port on which to listen to MGCP commands, but changing the port range at
 which the RTP streams terminate as well as limiting operation to a single call
 agent can be done as well as changing the number of endpoints.
 === Configuring MGCP
 By default OsmoMGW listens for MGCP on port 2427 on any IP address. If a call
 agent address is configured then OsmoMGW will only answer MGCP commands from
 that IP port 2727, otherwise all sources are handled. A domain can be
 specified
 .Example: MGCP configuration
 ----
 OsmoMGW(config-mgcp)# bind ip 127.0.0.1
 OsmoMGW(config-mgcp)# bind port 2427
 OsmoMGW(config-mgcp)# call-agent ip 127.0.0.1
 OsmoMGW(config-mgcp)# domain mgw-bsc
 OsmoMGW(config-mgcp)# local ip 127.0.0.1
 ----
 === Configuring the trunk
 The first trunk is considered a virtual trunk in OsmoMGW. All
 endpoints of type "rtpbridge" are routed here. The virtual trunk is configured
 in the config-mgcp context.
 All other trunks are configured in the config-mgcp-trunk context, but the
 commands used are identical. Right now trunks are considered only for "ds/e1"
 type endpoints.
 .Example: MGCP trunk configuration
 ----
 OsmoMGW(config-mgcp)# number endpoints 63 <1>
 OsmoMGW(config-mgcp)# rtp bind-ip 10.0.0.1 <2>
 OsmoMGW(config-mgcp)# rtp port-range 12000-14000 <3>
 ----
 <1> Maximum number of endpoints that can be allocated at once
 <2> Use this IP when binding RTP endpoints
 <3> Use ports in this range when binding RTP endpoints
 There are some options to tweak how RTP forwarding behaves in OsmoMGW:
 .Example: MGCP trunk rtp options
 ----
 OsmoMGW(config-mgcp)# rtp keep-alive 30 <1>
 OsmoMGW(config-mgcp)# rtp-patch ssrc <2>
 OsmoMGW(config-mgcp)# rtp-patch timestamp <3>
 ----
 <1> Send dummy UDP packets periodically to RTP destination
 <2> Hide SSRC changes
 <3> Ensure RTP timestamp is aligned with frame duration
 NOTE: Changes to trunks that affect resource allocation, such as newly created
 trunks or a change of the number of available endpoints, require a full restart
 of osmo-mgw!
 === E1 trunk considerations
 While the RTP bridge trunks are natively based on IP no special considerations
 are required during setup. E1 trunks are mapped on a physical E1 line, which has
 to be configured as shown below.
 .Example: E1 line setup
 ----
 OsmoMGW(config-e1_input)# e1_line 0 driver dahdi <1>
 OsmoMGW(config-e1_input)# e1_line 0 port 2 <2>
 ----
 <1> Name of the libosmo-abis driver implementation ("dahdi")
 <2> Port number of the physical E1 port to use (2)
 In osmo-mgw the e1_input node is used to configure the physical E1 line. The
 line number will be used internally to identify the configured E1 line. The
 port number is the physical E1 connector (sometimes called 'span') at the E1
 hardware. Per trunk an individual E1 line will be needed. Beware that the E1
 driver may also need configuration settings that are not discussed here.
 .Example: E1 trunk setup
 ----
 OsmoMGW(config-mgcp)# trunk 0 <1>
 OsmoMGW(config-mgcp-trunk)# line 0 <2>
 ----
 <1> Creation of a trunk (0)
 <2> Reference to the E1 line to use (0)
 The E1 trunk is created along with a number, typically starting at 0, but if
 required any number from 0-64 is allowed. The E1 trunk configuration concerning
 the IP related aspects is nearly identical to the configuration of the virtual
 trunk. However, it is important that the user assigns one of the E1 line numbers
 that were configured under the e1_input node.
 NOTE: The endpoint name that is used on MGCP level will include the trunk number,
 not the E1 line number. For simplicity (and compatibility with OsmoBSC) it is
 recommended to use equal numbers for trunk and E1 line. However, if required any
 E1 line can be mapped flexible on any trunk as long as the mapping is bijective.
 .Example: A typical configuration with one E1 trunk
 ----
 e1_input
 e1_line 0 driver dahdi
 e1_line 0 port 2
 mgcp
 bind ip 127.0.0.1
 rtp net-range 6000 6011
 rtp net-bind-ip 192.168.100.130
 rtp ip-probing
 rtp ip-dscp 46
 no rtp keep-alive
 bind port 2428
 number endpoints 30
 loop 0
 force-realloc 1
 osmux off
 rtp-patch rfc5993hr
 trunk 0
  rtp keep-alive once
  no rtp keep-alive
  line 0
 ----
 NOTE: One E1 trunk always covers a whole E1 line. All subslots (I.640) will be mapped
 to individual MGCP endpoints. As long as the endpoints remain unused the
 underlying E1 timeslot is not used.
 NOTE: The E1 trunk implementation also works with T1 lines, however since T1 has
 24 instead of 31 usable timeslots only the endpoints that fall into that 1-24 timeslot
 range will be useable.
--- a/doc/manuals/chapters/counters.adoc
+++ b/doc/manuals/chapters/counters.adoc
@@ -1,4 +0,0 @@
 [[counters]]
 == Counters
 include::./counters_generated.adoc[]
--- a/doc/manuals/chapters/counters_generated.adoc
+++ b/doc/manuals/chapters/counters_generated.adoc
@@ -1,83 +0,0 @@
 // autogenerated by show asciidoc counters
 These counters and their description based on OsmoMGW 1.5.0.64-189f (OsmoMGW).
 === Rate Counters
 // generating tables for rate_ctr_group
 // rate_ctr_group table aggregated statistics for all rtp connections
 .all_rtp_conn - aggregated statistics for all rtp connections
 [options="header"]
 |===
 | Name | Reference | Description
 | all_rtp:err_tstmp_in | <<all_rtp_conn_all_rtp:err_tstmp_in>> | Total inbound rtp-stream timestamp errors.
 | all_rtp:err_tstmp_out | <<all_rtp_conn_all_rtp:err_tstmp_out>> | Total outbound rtp-stream timestamp errors.
 | all_rtp:packets_rx | <<all_rtp_conn_all_rtp:packets_rx>> | Total inbound rtp packets.
 | all_rtp:octets_rx | <<all_rtp_conn_all_rtp:octets_rx>> | Total inbound rtp octets.
 | all_rtp:packets_tx | <<all_rtp_conn_all_rtp:packets_tx>> | Total outbound rtp packets.
 | all_rtp:octets_tx | <<all_rtp_conn_all_rtp:octets_tx>> | Total outbound rtp octets.
 | all_rtp:dropped | <<all_rtp_conn_all_rtp:dropped>> | Total dropped rtp packets.
 | all_rtp:num_closed_conns | <<all_rtp_conn_all_rtp:num_closed_conns>> | Total number of rtp connections closed.
 |===
 // rate_ctr_group table dlcx statistics
 .dlcx - dlcx statistics
 [options="header"]
 |===
 | Name | Reference | Description
 | dlcx:success | <<dlcx_dlcx:success>> | DLCX command processed successfully.
 | dlcx:wildcard | <<dlcx_dlcx:wildcard>> | wildcard names in DLCX commands are unsupported.
 | dlcx:no_conn | <<dlcx_dlcx:no_conn>> | endpoint specified in DLCX command has no active connections.
 | dlcx:callid | <<dlcx_dlcx:callid>> | CallId specified in DLCX command mismatches endpoint's CallId .
 | dlcx:connid | <<dlcx_dlcx:connid>> | connection ID specified in DLCX command does not exist on endpoint.
 | dlcx:unhandled_param | <<dlcx_dlcx:unhandled_param>> | unhandled parameter in DLCX command.
 | dlcx:rejected | <<dlcx_dlcx:rejected>> | connection deletion rejected by policy.
 | dlcx:deferred | <<dlcx_dlcx:deferred>> | connection deletion deferred by policy.
 |===
 // rate_ctr_group table mdcx statistics
 .mdcx - mdcx statistics
 [options="header"]
 |===
 | Name | Reference | Description
 | mdcx:success | <<mdcx_mdcx:success>> | MDCX command processed successfully.
 | mdcx:wildcard | <<mdcx_mdcx:wildcard>> | wildcard endpoint names in MDCX commands are unsupported.
 | mdcx:no_conn | <<mdcx_mdcx:no_conn>> | endpoint specified in MDCX command has no active connections.
 | mdcx:callid | <<mdcx_mdcx:callid>> | invalid CallId specified in MDCX command.
 | mdcx:connid | <<mdcx_mdcx:connid>> | invalid connection ID specified in MDCX command.
 | crcx:unhandled_param | <<mdcx_crcx:unhandled_param>> | unhandled parameter in MDCX command.
 | mdcx:no_connid | <<mdcx_mdcx:no_connid>> | no connection ID specified in MDCX command.
 | mdcx:conn_not_found | <<mdcx_mdcx:conn_not_found>> | connection specified in MDCX command does not exist.
 | mdcx:invalid_mode | <<mdcx_mdcx:invalid_mode>> | invalid connection mode in MDCX command.
 | mdcx:conn_opt | <<mdcx_mdcx:conn_opt>> | connection options invalid.
 | mdcx:no_remote_conn_desc | <<mdcx_mdcx:no_remote_conn_desc>> | no opposite end specified for connection.
 | mdcx:start_rtp_failure | <<mdcx_mdcx:start_rtp_failure>> | failure to start RTP processing.
 | mdcx:conn_rejected | <<mdcx_mdcx:conn_rejected>> | connection rejected by policy.
 | mdcx:conn_deferred | <<mdcx_mdcx:conn_deferred>> | connection deferred by policy.
 |===
 // rate_ctr_group table crxc statistics
 .crcx - crxc statistics
 [options="header"]
 |===
 | Name | Reference | Description
 | crcx:success | <<crcx_crcx:success>> | CRCX command processed successfully.
 | crcx:bad_action | <<crcx_crcx:bad_action>> | bad action in CRCX command.
 | crcx:unhandled_param | <<crcx_crcx:unhandled_param>> | unhandled parameter in CRCX command.
 | crcx:missing_callid | <<crcx_crcx:missing_callid>> | missing CallId in CRCX command.
 | crcx:invalid_mode | <<crcx_crcx:invalid_mode>> | invalid connection mode in CRCX command.
 | crcx:limit_exceeded | <<crcx_crcx:limit_exceeded>> | limit of concurrent connections was reached.
 | crcx:unkown_callid | <<crcx_crcx:unkown_callid>> | unknown CallId in CRCX command.
 | crcx:alloc_conn_fail | <<crcx_crcx:alloc_conn_fail>> | connection allocation failure.
 | crcx:no_remote_conn_desc | <<crcx_crcx:no_remote_conn_desc>> | no opposite end specified for connection.
 | crcx:start_rtp_failure | <<crcx_crcx:start_rtp_failure>> | failure to start RTP processing.
 | crcx:conn_rejected | <<crcx_crcx:conn_rejected>> | connection rejected by policy.
 | crcx:no_osmux | <<crcx_crcx:no_osmux>> | no osmux offered by peer.
 | crcx:conn_opt | <<crcx_crcx:conn_opt>> | connection options invalid.
 | crcx:codec_nego | <<crcx_crcx:codec_nego>> | codec negotiation failure.
 | crcx:bind_port | <<crcx_crcx:bind_port>> | port bind failure.
 |===
 == Osmo Stat Items
 // generating tables for osmo_stat_items
 == Osmo Counters
 // generating tables for osmo_counters
 // there are no ungrouped osmo_counters
--- a/doc/manuals/chapters/mgcp_endpoints.adoc
+++ b/doc/manuals/chapters/mgcp_endpoints.adoc
@@ -1,94 +0,0 @@
 == MGCP Endpoints
 MGCP organizes the switching resources in so called endpoints. Each endpoint is
 referenced by its unique identifier. While RFC 3435 specifies a naming scheme, the
 actual identifier naming is subject to the implementation and configuration.
 === RTP proxy / RTP bridge endpoints
 OsmoMGW implements a freely configurable number of `rtpbridge` endpoints. Those
 endpoints are able to host two connections at a time to model the functionality
 of a tandem switch.
 RTP bridge endpoint identifiers are referenced by the string `rtpbridge/`, a
 hexadecimal number without leading zeros and a domain name (configurable).
 ----
 rtpbridge/<number>@<domain>
 ----
 .Example: List of virtual endpoints
 ----
 rtpbridge/1@mgw
 rtpbridge/2@mgw
 rtpbridge/3@mgw
 rtpbridge/4@mgw
 rtpbridge/5@mgw
 rtpbridge/6@mgw
 rtpbridge/7@mgw
 rtpbridge/8@mgw
 rtpbridge/9@mgw
 rtpbridge/a@mgw
 rtpbridge/b@mgw
 rtpbridge/c@mgw
 rtpbridge/d@mgw
 rtpbridge/e@mgw
 rtpbridge/f@mgw
 rtpbridge/10@mgw
 ----
 === E1/T1 endpoints
 OsmoMGW supports E1 subslot multiplexing as specified by I.460. All possible
 subslot combinations are mapped on individual endpoints. The endpoint names
 are prefixed with `ds/e1-` followed by the trunk number and the E1 timeslot.
 The subslot is defined by a bit rate and a bit offset.
 ----
 ds/e1-<trunk>/s-<timeslot>/su<bitrate>-<bitoffset>@<domain>
 ----
 .Example: List of endpoints on E1 trunk 0 at E1 timeslot 2
 ----
 ds/e1-0/s-2/su64-0@mgw
 ds/e1-0/s-2/su32-0@mgw
 ds/e1-0/s-2/su32-4@mgw
 ds/e1-0/s-2/su16-0@mgw
 ds/e1-0/s-2/su16-2@mgw
 ds/e1-0/s-2/su16-4@mgw
 ds/e1-0/s-2/su16-6@mgw
 ds/e1-0/s-2/su8-0@mgw
 ds/e1-0/s-2/su8-1@mgw
 ds/e1-0/s-2/su8-2@mgw
 ds/e1-0/s-2/su8-3@mgw
 ds/e1-0/s-2/su8-4@mgw
 ds/e1-0/s-2/su8-5@mgw
 ds/e1-0/s-2/su8-6@mgw
 ds/e1-0/s-2/su8-7@mgw
 ----
 When creating connections on endpoints that reside in one E1 timeslot the call
 agent must make sure that no overlapping endpoints are used. It is for example
 not possible to use `ds/e1-0/s-2/su16-2@mgw` and `ds/e1-0/s-2/su8-3@mgw` at the
 same time because they overlap.
 .Subslot overlapping
 [options="header"]
 |===
 | Bit offset  4+| Subslots
 | 0 | 8k .2+| 16k .4+| 32k .8+| 64k
 | 1 | 8k
 | 2 | 8k .2+| 16k
 | 3 | 8k
 | 4 | 8k .2+| 16k .4+| 32k
 | 5 | 8k
 | 6 | 8k .2+| 16k
 | 7 | 8k
 |===
 NOTE: The current implementation (December 2020) only implements TRAU frame
 encoding/decoding for 16K and 8K subslots. Endpoints with other bitrates are
 not yet useable.
 NOTE: the VTY command "show mgcp" can be used to get a list of all available
 endpoints (including identifiers)
--- a/doc/manuals/chapters/mgcp_extensions.adoc
+++ b/doc/manuals/chapters/mgcp_extensions.adoc
@@ -1,72 +0,0 @@
 == MGCP Extensions
 The MGCP protocol is extendable. The following non-standard extensions are
 understood by OsmoMGW.
 === `X-Osmo-IGN`
 `X-Osmo-IGN` indicates to OsmoMGW that specific items of an endpoint should be
 ignored, so that it is lenient on mismatching values that would normally
 indicate collisions or configuration errors.
 ==== `X-Osmo-IGN` Format
 The value part of `X-Osmo-IGN` must be one or more items separated by one or more
 spaces. Each item consists of one or more non-whitespace characters.
 .Example: `X-Osmo-IGN` format with three ficticious items "X", "abc" and "123".
 ----
 X-Osmo-IGN: X abc 123
 ----
 `X-Osmo-IGN` must be issued in the MGCP header section (typically as its last item),
 before the SDP section starts.
 ==== Supported `X-Osmo-IGN` Items
 Currently, the following `X-Osmo-IGN` items are supported:
 * `C`: ignore CallID mismatches, i.e. differing "C" values between connections
  on the same endpoint.
 .Note:
 `X-Osmo-IGN` does not support ignoring mismatches on the domain part of
 an endpoint name, e.g. ignoring a mismatch on "example.com" in
 `rtpbridge/123abc@example.com`. Instead, you may globally configure OsmoMGW
 with `mgcp` / `domain *` to permit all domain parts.
 ===== `X-Osmo-IGN: C`
 By default, OsmoMGW verifies that all CallIDs ("C" values) match for all
 connections on any one given endpoint. To ignore CallID mismatches, pass a `C`
 in the `X-Osmo-IGN` header, for the first or the second `CRCX` on an endpoint.
 When the `X-Osmo-IGN: C` is sent for any one `CRCX` on an endpoint, CallID
 mismatches will be ignored for that and all subsequent messages for that
 endpoint. Hence this header only needs to be included once per endpoint, in any
 `CRCX` message that precedes or coincides with a CallID mismatch.
 This is particularly useful for a BSC that is connected to an A/SCCPlite MSC,
 where the BSC and MSC each are expected to configure their respective own
 connection on a shared endpoint. For A/SCCPlite, it is impossible for the BSC
 to know the CallID that the MSC will use, so CallID mismatches are inevitable.
 See also OsmoBSC, which will by default pass the `X-Osmo-IGN: C` header for
 endpoints associated with an A/SCCPlite MSC.
 .Example: `CRCX` message that instructs OsmoMGW to ignore CallID mismatches
 ----
 CRCX 2 rtpbridge/123abc@mgw MGCP 1.0
 M: recvonly
 C: 2
 L: p:20
 X-Osmo-IGN: C
 v=0
 c=IN IP4 123.12.12.123
 m=audio 5904 RTP/AVP 97
 a=rtpmap:97 GSM-EFR/8000
 a=ptime:40
 ----
 === `X-Osmux`
 See <<mgcp-extension-osmux>>
--- a/doc/manuals/chapters/overview.adoc
+++ b/doc/manuals/chapters/overview.adoc
@@ -1,115 +0,0 @@
 [[overview]]
 == Overview
 This manual should help you getting started with OsmoMGW. It will cover
 aspects of configuring and running the media gateway.
 [[intro_overview]]
 === About OsmoMGW
 OsmoMGW is the Osmocom implementation of a media gateway to handle user
 plane (voice) traffic in cellular networks. It can connect and optionally
 transcode RTP voice streams between different network elements such as BTSs
 and external entities like SIP. It is typically co-located with both OsmoBSC
 and OsmoMSC and controlled by them via MGCP, the Media Gateway Control
 Protocol.
 [[fig-bsc]]
 .OsmoMGW used with OsmoBSC
 [graphviz]
 ----
 digraph G {
    rankdir = LR;
    OsmoBTS -> OsmoBSC [label="Abis/IP"];
    OsmoBSC -> "core-network" [label="3GPP AoIP"];
    OsmoBSC -> OsmoMGW [label="MGCP"];
    OsmoBTS -> OsmoMGW [label="RTP",dir=both];
    OsmoMGW -> "core-network" [label="RTP",dir=both];
    {rank=same OsmoBSC OsmoMGW}
    OsmoMGW [color=red];
 }
 ----
 [[fig-msc]]
 .OsmoMGW used with OsmoMSC
 [graphviz]
 ----
 digraph G {
    rankdir = LR;
    "2G BSS" -> OsmoMSC [label="3GPP AoIP"];
    OsmoMSC -> OsmoMGW [label="MGCP"];
    "2G BSS" -> OsmoMGW [label="RTP",dir=both];
    OsmoMSC -> OsmoSIP [label="MNCC"];
    OsmoSIP -> PBX [label="SIP Trunk"];
    OsmoMGW -> PBX [label="RTP",dir=both];
    {rank=same OsmoMSC OsmoMGW}
    OsmoSIP [label="osmo-sip-connector"];
    OsmoMGW [color=red];
    hNodeB -> OsmoHNBGW [label="Iuh"];
    OsmoHNBGW -> OsmoMSC [label="IuCS"];
    hNodeB -> OsmoMGW [label="RTP",dir=both];
 }
 ----
 [[fig-bsc-e1]]
 .Integration of legacy E1 BTS in AoIP network
 [graphviz]
 ----
 digraph G {
    rankdir = LR;
    BTS -> OsmoBSC [label="Abis/E1"];
    OsmoBSC -> "core-network" [label="3GPP AoIP"];
    OsmoBSC -> OsmoMGW [label="MGCP"];
    BTS -> OsmoMGW [label="TRAU/E1",dir=both];
    OsmoMGW -> "core-network" [label="RTP",dir=both];
    {rank=same OsmoBSC OsmoMGW}
    OsmoMGW [color=red];
 }
 ----
 === Software Components
 OsmoMGW contains a variety of different software components, which we’ll
 quickly describe in this section.
 ==== MGCP Implementation
 OsmoMGW brings its own MGCP implementation through which OsmoMGW is
 controlled.
 The commands implemented are CRCX, MDCX, DLCX and RSIP. The command AUEP is
 implemented as a stub and will simply respond with OK.
 ==== RTP implementation
 Support for IuUP which is used in 3G cells is quite lacking at the moment.
 3G<->3G and 2G<->2G calls should work, but 3G<->2G does not.
 ==== Audio transcoder
 Transcoding is currently not supported in OsmoMGW.
 === Limitations
 At the moment (November 2020), OsmoMGW implements RTP proxy / RTP bridge
 type endpoints and E1/T1 16k/8k sub-slots with TRAU frames for classic BTS
 support. To the RTP proxy / RTP bridge endpoints two RTP connections can
 be established, which then work as a tandem. E1/T1 endpoints support one
 RTP connection at a time that is associated with a sub-slot on an E1 line.
 We are planning to add further endpoint types for:
 - classic E1/T1 timeslots (64kBps alaw/ulaw)
 - announcement/playout end-points
 - conference endpoints
 === Additional resources
 You can find the OsmoMGW issue tracker and wiki online at
 - https://osmocom.org/projects/osmo-mgw
 - https://osmocom.org/projects/osmo-mgw/wiki
 RFC 3435 for MGCP is located at
 - https://tools.ietf.org/html/rfc3435
--- a/doc/manuals/chapters/qos-example.adoc
+++ b/doc/manuals/chapters/qos-example.adoc
@@ -1,42 +0,0 @@
 ==== Full example of QoS for osmo-mgw
 In the below example we will show the full set of configuration required
 for both DSCP and PCP differentiation of RTP traffic by osmo-mgw.
 What we want to achieve in this example is the following configuration:
 .DSCP and PCP assignments for osmo-mgw Abis downlink traffic in this example
 [options="header",width="30%",cols="2,1,1"]
 |===
 |Traffic      |DSCP|PCP
 |RTP    |  46|  6
 |===
 . configure the osmo-mgw program to set the DSCP value
 . configure an egrees QoS map to map from priority to PCP
 .Example Step 1: add related VTY configuration to `osmo-mgw.cfg`
 ----
 ...
 mgcp
 rtp ip-dscp 46
 rtp socket-priority 6
 ...
 ----
 .Example Step 2: egress QoS map to map from socket priority to PCP values
 ----
 $ sudo ip link set dev eth0.9<1> type vlan egress-qos-map 0:0 5:5 6:6 7:7 <2>
 ----
 <1> make sure to specify your specific VLAN interface name here instead of `eth0.9`.
 <2> create a egress QoS map that maps the priority value 1:1 to the PCP. We also include the
    mapping 5:5 and 7:7 from the osmo-bsc example (see <<userman-osmobsc>>) here.
 NOTE:: The settings of the `ip` command are volatile and only active until
 the next reboot (or the network device or VLAN is removed).  Please refer to
 the documentation of your specific Linux distribution in order to find out how
 to make such settings persistent by means of an `ifup` hook whenever the interface
 comes up.  For CentOS/RHEL 8 this can e.g. be achieved by means of an `/sbin/ifup-local
 script` (when using `network-scripts` and not NetworkManager).  For Debian or Ubuntu,
 this typically involves adding `up` lines to `/etc/network/interfaces` or a `/etc/network/if-up.d`
 script.
--- a/doc/manuals/chapters/running.adoc
+++ b/doc/manuals/chapters/running.adoc
@@ -1,25 +0,0 @@
 == Running OsmoMGW
 The OsmoMGW executable (`osmo-mgw`) offers the following command-line
 arguments:
 === SYNOPSIS
 *osmo-mgw* [-h|-V] [-D] [-c 'CONFIGFILE'] [-s]
 === OPTIONS
 *-h, --help*::
 	Print a short help message about the supported options
 *-V, --version*::
 	Print the compile-time version number of the program
 *-D, --daemonize*::
 	Fork the process as a daemon into background.
 *-c, --config-file 'CONFIGFILE'*::
 	Specify the file and path name of the configuration file to be
 	used. If none is specified, use `osmo-mgw.cfg` in the current
 	working directory.
 *-s, --disable-color*::
 	Disable colors for logging to stderr. This has mostly been
 	deprecated by VTY based logging configuration, see <<logging>>
 	for more information.
--- a/doc/manuals/osmomgw-usermanual-docinfo.xml
+++ b/doc/manuals/osmomgw-usermanual-docinfo.xml
@@ -1,47 +0,0 @@
 <revhistory>
  <revision>
    <revnumber>1</revnumber>
    <date>July 24th, 2018</date>
    <authorinitials>DW</authorinitials>
    <revremark>
      Initial version
    </revremark>
  </revision>
 </revhistory>
 <authorgroup>
  <author>
    <firstname>Daniel</firstname>
    <surname>Willmann</surname>
    <email>dwillmann@sysmocom.de</email>
    <authorinitials>DW</authorinitials>
    <affiliation>
      <shortaffil>sysmocom</shortaffil>
      <orgname>sysmocom - s.f.m.c. GmbH</orgname>
    </affiliation>
  </author>
 </authorgroup>
 <copyright>
  <year>2018</year>
  <holder>sysmocom - s.f.m.c. GmbH</holder>
 </copyright>
 <legalnotice>
  <para>
 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free Documentation License,
 	Version 1.3 or any later version published by the Free Software
 	Foundation; with the Invariant Sections being just 'Foreword',
 	'Acknowledgements' and 'Preface', with no Front-Cover Texts,
 	and no Back-Cover Texts.  A copy of the license is included in
 	the section entitled "GNU Free Documentation License".
  </para>
  <para>
 	The Asciidoc source code of this manual can be found at
 	<ulink url="http://git.osmocom.org/osmo-gsm-manuals/">
 		http://git.osmocom.org/osmo-gsm-manuals/
 	</ulink>
  </para>
 </legalnotice>
--- a/doc/manuals/osmomgw-usermanual.adoc
+++ b/doc/manuals/osmomgw-usermanual.adoc
@@ -1,39 +0,0 @@
 :gfdl-enabled:
 :program-name: OsmoMGW
 OsmoMGW User Manual
 ====================
 Daniel Willmann <dwillmann@sysmocom.de>
 include::./common/chapters/preface.adoc[]
 include::{srcdir}/chapters/overview.adoc[]
 include::{srcdir}/chapters/running.adoc[]
 include::./common/chapters/vty.adoc[]
 include::./common/chapters/logging.adoc[]
 include::{srcdir}/chapters/configuration.adoc[]
 include::{srcdir}/chapters/mgcp_endpoints.adoc[]
 include::{srcdir}/chapters/mgcp_extensions.adoc[]
 include::./common/chapters/osmux/osmux.adoc[]
 include::./common/chapters/qos-dscp-pcp.adoc[]
 //include::{srcdir}/chapters/counters.adoc[]
 include::./common/chapters/vty_cpu_sched.adoc[]
 include::./common/chapters/port_numbers.adoc[]
 include::./common/chapters/bibliography.adoc[]
 include::./common/chapters/glossary.adoc[]
 include::./common/chapters/gfdl.adoc[]
--- a/doc/manuals/osmomgw-vty-reference.xml
+++ b/doc/manuals/osmomgw-vty-reference.xml
@@ -1,38 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  ex:ts=2:sw=42sts=2:et
  -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
 -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN"
 "http://docbook.org/xml/5.0/dtd/docbook.dtd" [
 <!ENTITY chapter-vty      SYSTEM      "./common/chapters/vty.xml" >
 <!ENTITY sections-vty     SYSTEM      "generated/docbook_vty.xml"  >
 ]>
 <book>
  <info>
    <revhistory>
        <revision>
            <revnumber>v1</revnumber>
            <date>12th December 2017</date>
            <authorinitials>pm</authorinitials>
            <revremark>Initial</revremark>
        </revision>
    </revhistory>
    <title>OsmoMGW VTY Reference</title>
    <copyright>
      <year>2017</year>
    </copyright>
    <legalnotice>
      <para>This work is copyright by <orgname>sysmocom - s.f.m.c. GmbH</orgname>. All rights reserved.
      </para>
    </legalnotice>
  </info>
  <!-- Main chapters-->
  &chapter-vty;
 </book>
--- a/doc/manuals/regen_doc.sh
+++ b/doc/manuals/regen_doc.sh
@@ -1,17 +0,0 @@
 #!/bin/sh -x
 if [ -z "$DOCKER_PLAYGROUND" ]; then
 	echo "You need to set DOCKER_PLAYGROUND"
 	exit 1
 fi
 SCRIPT=$(realpath "$0")
 MANUAL_DIR=$(dirname "$SCRIPT")
 COMMIT=${COMMIT:-$(git log -1 --format=format:%H)}
 cd "$DOCKER_PLAYGROUND/scripts" || exit 1
 OSMO_MGW_BRANCH=$COMMIT ./regen_doc.sh osmo-mgw 4243 \
 	"$MANUAL_DIR/chapters/counters_generated.adoc" \
 	"$MANUAL_DIR/vty/mgw_vty_reference.xml"
--- a/doc/manuals/vty/mgw_vty_additions.xml
+++ b/doc/manuals/vty/mgw_vty_additions.xml
@@ -1,2 +0,0 @@
 <vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'>
 </vtydoc>
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,19 +0,0 @@
 SUBDIRS = \
 	osmocom \
 	$(NULL)
 nobase_include_HEADERS = \
 	osmocom/mgcp_client/mgcp_client.h \
 	osmocom/mgcp_client/mgcp_client_endpoint_fsm.h \
 	osmocom/mgcp_client/mgcp_client_fsm.h \
 	osmocom/mgcp_client/mgcp_client_pool.h \
 	osmocom/mgcp/mgcp.h \
 	osmocom/mgcp/mgcp_common.h \
 	osmocom/mgcp/osmux.h \
 	$(NULL)
 # This gets copied during make from osmocom/mgcp/mgcp_common.h. Therefore it is not included in the source tree and we
 # don't need to distribute it (OS#4084).
 nobase_nodist_include_HEADERS = \
 	osmocom/mgcp_client/mgcp_common.h \
 	$(NULL)
--- a/include/osmocom/Makefile.am
+++ b/include/osmocom/Makefile.am
@@ -1,4 +0,0 @@
 SUBDIRS = \
 	mgcp_client \
 	mgcp \
 	$(NULL)
--- a/include/osmocom/mgcp/Makefile.am
+++ b/include/osmocom/mgcp/Makefile.am
@@ -1,17 +0,0 @@
 noinst_HEADERS = \
 	vty.h \
 	mgcp_msg.h \
 	mgcp_conn.h \
 	mgcp_stat.h \
 	mgcp_endp.h \
 	mgcp_sdp.h \
 	mgcp_codec.h \
 	mgcp_ctrl.h \
 	mgcp_trunk.h \
 	debug.h \
 	mgcp_ratectr.h \
 	mgcp_e1.h \
 	mgcp_network.h \
 	mgcp_protocol.h \
 	mgcp_iuup.h \
 	$(NULL)
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -1,210 +0,0 @@
 /* A Media Gateway Control Protocol Media Gateway: RFC 3435 */
 /*
 * (C) 2009-2012 by Holger Hans Peter Freyther <zecke@selfish.org>
 * (C) 2009-2012 by On-Waves
 * All Rights Reserved
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #pragma once
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/core/write_queue.h>
 #include <osmocom/core/timer.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/mgcp/mgcp_common.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <pthread.h>
 #include "mgcp_ratectr.h"
 #define RTP_PORT_DEFAULT_RANGE_START 16002
 #define RTP_PORT_DEFAULT_RANGE_END RTP_PORT_DEFAULT_RANGE_START + 64
 /*
 * Handling of MGCP Endpoints and the MGCP Config
 */
 struct mgcp_endpoint;
 struct mgcp_config;
 struct mgcp_trunk;
 struct mgcp_rtp_end;
 #define MGCP_ENDP_CRCX 1
 #define MGCP_ENDP_DLCX 2
 #define MGCP_ENDP_MDCX 3
 /*
 * what to do with the msg?
 *	- continue as usual?
 *	- reject and send a failure code?
 *	- defer? do not send anything
 */
 #define MGCP_POLICY_CONT	4
 #define MGCP_POLICY_REJECT	5
 #define MGCP_POLICY_DEFER	6
 typedef int (*mgcp_reset)(struct mgcp_trunk *cfg);
 typedef int (*mgcp_rqnt)(struct mgcp_endpoint *endp, char tone);
 /**
 * Return:
 *   <  0 in case no audio was processed
 *   >= 0 in case audio was processed. The remaining payload
 *   length will be returned.
 */
 typedef int (*mgcp_processing)(struct mgcp_endpoint *endp,
 			       struct mgcp_rtp_end *dst_end,
 			       char *data, int *len, int buf_size);
 struct mgcp_conn_rtp;
 typedef int (*mgcp_processing_setup)(struct mgcp_endpoint *endp,
 				     struct mgcp_conn_rtp *conn_dst,
 				     struct mgcp_conn_rtp *conn_src);
 struct mgcp_rtp_codec;
 typedef void (*mgcp_get_format)(struct mgcp_endpoint *endp,
 				const struct mgcp_rtp_codec **codec,
 				const char **fmtp_extra,
 				struct mgcp_conn_rtp *conn);
 /**
 * This holds information on how to allocate ports
 */
 struct mgcp_port_range {
 	pthread_mutex_t lock;
 	/* addr or NULL to fall-back to default */
 	char bind_addr_v4[INET6_ADDRSTRLEN];
 	char bind_addr_v6[INET6_ADDRSTRLEN];
 	/* dynamically allocated */
 	int range_start;
 	int range_end;
 	int last_port;
 	/* set to true to enable automatic probing
 	 * of the local bind IP-Address, bind_addr
 	 * (or its fall back) is used when automatic
 	 * probing fails */
 	bool bind_addr_probe;
 };
 /* There are up to three modes in which the keep-alive dummy packet can be
 * sent. The behaviour is controlled via the keepalive_interval member of the
 * trunk config. If that member is set to 0 (MGCP_KEEPALIVE_NEVER) no dummy-
 * packet is sent at all and the timer that sends regular dummy packets
 * is no longer scheduled. If the keepalive_interval is set to -1, only
 * one dummy packet is sent when an CRCX or an MDCX is performed. No timer
 * is scheduled. For all vales greater 0, the timer is scheduled and the
 * value is used as interval. See also mgcp_keepalive_timer_cb(),
 * handle_modify_con(), and handle_create_con() */
 #define MGCP_KEEPALIVE_ONCE (-1)
 #define MGCP_KEEPALIVE_NEVER 0
 enum mgcp_role {
 	MGCP_BSC = 0,
 	MGCP_BSC_NAT,
 };
 struct mgcp_config {
 	int source_port;
 	char local_ip[INET6_ADDRSTRLEN];
 	char source_addr[INET6_ADDRSTRLEN];
 	char call_agent_addr[INET6_ADDRSTRLEN];
 	/* RTP processing */
 	mgcp_processing rtp_processing_cb;
 	mgcp_processing_setup setup_rtp_processing_cb;
 	mgcp_get_format get_net_downlink_format_cb;
 	struct osmo_wqueue gw_fd;
 	struct mgcp_port_range net_ports;
 	int endp_dscp;
 	int endp_priority;
 	int force_ptime;
 	mgcp_reset reset_cb;
 	mgcp_rqnt rqnt_cb;
 	void *data;
 	/* list holding the trunks */
 	struct llist_head trunks;
 	enum mgcp_role role;
 	/* osmux translator: 0 means disabled, 1 means enabled */
 	int osmux;
 	/* addr to bind the server to */
 	char osmux_addr[INET6_ADDRSTRLEN];
 	/* The BSC-NAT may ask for enabling osmux on demand. This tells us if
 	 * the osmux socket is already initialized.
 	 */
 	int osmux_init;
 	/* osmux batch factor: from 1 to 4 maximum */
 	int osmux_batch;
 	/* osmux batch size (in bytes) */
 	int osmux_batch_size;
 	/* osmux port */
 	uint16_t osmux_port;
 	/* Pad circuit with dummy messages until we see the first voice
 	 * message.
 	 */
 	uint16_t osmux_dummy;
 	/* domain name of the media gateway */
 	char domain[255+1];
 	/* time after which inactive connections (CIs) get closed */
 	int conn_timeout;
 	/* osmocom CTRL interface */
 	struct ctrl_handle *ctrl;
 	/* global rate counters to measure the MGWs overall performance and
 	 * health */
 	struct mgcp_ratectr_global ratectr;
 };
 /* config management */
 struct mgcp_config *mgcp_config_alloc(void);
 int mgcp_parse_config(const char *config_file, struct mgcp_config *cfg,
 		      enum mgcp_role role);
 int mgcp_vty_init(void);
 void mgcp_trunk_set_keepalive(struct mgcp_trunk *trunk, int interval);
 /*
 * format helper functions
 */
 struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg);
 int mgcp_send_reset_ep(struct mgcp_endpoint *endp);
 int mgcp_send_reset_all(struct mgcp_config *cfg);
 int mgcp_create_bind(const char *source_addr, struct osmo_fd *fd, int port, uint8_t dscp,
 		     uint8_t prio);
 int mgcp_udp_send(int fd, struct osmo_sockaddr *addr, int port, const char *buf, int len);
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -1,20 +0,0 @@
 #pragma once
 #define DEFAULT_RTP_AUDIO_FRAME_DUR_NUM 20
 #define DEFAULT_RTP_AUDIO_FRAME_DUR_DEN 1000
 #define DEFAULT_RTP_AUDIO_PACKET_DURATION_MS 20
 #define DEFAULT_RTP_AUDIO_DEFAULT_RATE  8000
 #define DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS 1
 #define PTYPE_UNDEFINED (-1)
 struct mgcp_conn_rtp;
 void mgcp_codec_summary(struct mgcp_conn_rtp *conn);
 void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn);
 int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param);
 int mgcp_codec_decide(struct mgcp_conn_rtp *conn);
 int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type);
 const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn,
 								const char *subtype_name, unsigned int match_nr);
 bool mgcp_codec_amr_is_octet_aligned(const struct mgcp_rtp_codec *codec);
--- a/include/osmocom/mgcp/mgcp_common.h
+++ b/include/osmocom/mgcp/mgcp_common.h
@@ -1,111 +0,0 @@
 /* MGCP common implementations.
 * These are used in libosmo-mgcp as well as libosmo-mgcp-client.
 * To avoid interdependency, these are implemented in .h file only. */
 /*
 * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
 * (C) 2009-2012 by Holger Hans Peter Freyther <zecke@selfish.org>
 * (C) 2009-2012 by On-Waves
 * All Rights Reserved
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 /* Two copies of this file are kept in osmocom/mgcp/ and osmocom/mgcp_client/.
 * Since both are by definition identical, use the old header exclusion ifdefs
 * instead of '#pragma once' to avoid including both of these files.
 * Though at the time of writing there are no such users, this allows including
 * both libosmo-mgcp and libosmo-mgcp-client headers in the same file. */
 #ifndef OSMO_MGCP_COMMON_H
 #define OSMO_MGCP_COMMON_H
 #include <string.h>
 #include <errno.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 #define for_each_non_empty_line(line, save)			\
 	for (line = strtok_r(NULL, "\r\n", &save); line;	\
 	     line = strtok_r(NULL, "\r\n", &save))
 enum mgcp_connection_mode {
 	MGCP_CONN_NONE = 0,
 	MGCP_CONN_RECV_ONLY = 1,
 	MGCP_CONN_SEND_ONLY = 2,
 	MGCP_CONN_RECV_SEND = MGCP_CONN_RECV_ONLY | MGCP_CONN_SEND_ONLY,
 	MGCP_CONN_LOOPBACK  = 4 | MGCP_CONN_RECV_SEND,
 };
 #define MGCP_X_OSMO_IGN_HEADER "X-Osmo-IGN:"
 #define MGCP_X_OSMO_OSMUX_HEADER "X-Osmux:"
 /* Values should be bitwise-OR-able */
 enum mgcp_x_osmo_ign {
 	MGCP_X_OSMO_IGN_NONE = 0,
 	MGCP_X_OSMO_IGN_CALLID = 1,
 };
 /* Codec parameters (communicated via SDP/fmtp) */
 struct mgcp_codec_param {
 	bool amr_octet_aligned_present;
 	bool amr_octet_aligned;
 };
 /* Ensure that the msg->l2h is NUL terminated. */
 static inline int mgcp_msg_terminate_nul(struct msgb *msg)
 {
 	unsigned char *tail = msg->l2h + msgb_l2len(msg); /* char after l2 data */
 	if (tail[-1] == '\0')
 		/* nothing to do */;
 	else if (msgb_tailroom(msg) > 0)
 		tail[0] = '\0';
 	else if (tail[-1] == '\r' || tail[-1] == '\n')
 		tail[-1] = '\0';
 	else {
 		LOGP(DLMGCP, LOGL_ERROR, "Cannot NUL terminate MGCP message: "
 		     "Length: %d, Buffer size: %d\n",
 		     msgb_l2len(msg), msg->data_len);
 		return -ENOTSUP;
 	}
 	return 0;
 }
 /* Maximum length of the comment field */
 #define MGCP_COMMENT_MAXLEN 256
 /* Maximum allowed String length of Connection Identifiers as per spec
 * (see also RFC3435 2.1.3.2 Names of Connections), plus one for '\0'. */
 #define MGCP_CONN_ID_MAXLEN 32+1
 /* Deprecated: old name of MGCP_CONN_ID_MAXLEN. */
 #define MGCP_CONN_ID_LENGTH MGCP_CONN_ID_MAXLEN
 /* String length of Endpoint Identifiers.
 /  (see also RFC3435 section 3.2.1.3) */
 #define MGCP_ENDPOINT_MAXLEN (255*2+1+1)
 /* A prefix to denote the virtual trunk (RTP on both ends) */
 #define MGCP_ENDPOINT_PREFIX_VIRTUAL_TRUNK "rtpbridge/"
 /* A prefix to denote the e1 trunk
 * (see also RFC3435 section E.2) */
 #define MGCP_ENDPOINT_PREFIX_E1_TRUNK "ds/e1-"
 /* Maximal number of payload types / codecs that can be negotiated via SDP at
 * at once. */
 #define MGCP_MAX_CODECS 10
 #endif
--- a/include/osmocom/mgcp/mgcp_conn.h
+++ b/include/osmocom/mgcp/mgcp_conn.h
@@ -1,206 +0,0 @@
 /* Message connection list handling */
 /*
 * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * Author: Philipp Maier
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #pragma once
 #include <osmocom/mgcp/mgcp.h>
 #include <osmocom/mgcp/mgcp_network.h>
 #include <osmocom/mgcp/osmux.h>
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/rate_ctr.h>
 #include <osmocom/gsm/iuup.h>
 #include <inttypes.h>
 #define LOGPCONN(conn, cat, level, fmt, args...) \
 LOGPENDP((conn)->endp, cat, level, "CI:%s " fmt, \
         (conn)->id, \
         ## args)
 #define LOG_CONN(conn, level, fmt, args...) \
 	LOGP(DRTP, level, "(%s I:%s) " fmt, \
 	     (conn)->endp ? (conn)->endp->name : "none", (conn)->id, ## args)
 #define LOG_CONN_RTP(conn_rtp, level, fmt, args...) \
 	LOG_CONN((conn_rtp)->conn, level, fmt, ## args)
 /* Specific rtp connection type (see struct mgcp_conn_rtp) */
 enum mgcp_conn_rtp_type {
 	MGCP_RTP_DEFAULT	= 0,
 	MGCP_OSMUX_BSC,
 	MGCP_OSMUX_BSC_NAT,
 	MGCP_RTP_IUUP,
 };
 /*! Connection type, specifies which member of the union "u" in mgcp_conn
 *  contains a useful connection description (currently only RTP) */
 enum mgcp_conn_type {
 	MGCP_CONN_TYPE_RTP,
 };
 /* MGCP connection (RTP) */
 struct mgcp_conn_rtp {
 	/* Backpointer to conn struct */
 	struct mgcp_conn *conn;
 	/* Specific connection type */
 	enum mgcp_conn_rtp_type type;
 	/* Port status */
 	struct mgcp_rtp_end end;
 	/* Sequence bits */
 	struct mgcp_rtp_state state;
 	/* taps for the rtp connection; one per direction */
 	struct mgcp_rtp_tap tap_in;
 	struct mgcp_rtp_tap tap_out;
 	/* Osmux states (optional) */
 	struct {
 		/* Osmux state: disabled, activating, active */
 		enum osmux_state state;
 		/* Is cid holding valid data? is it allocated from pool? */
 		bool cid_allocated;
 		/* Allocated Osmux circuit ID for this conn */
 		uint8_t cid;
 		/* handle to batch messages */
 		struct osmux_in_handle *in;
 		/* handle to unbatch messages */
 		struct osmux_out_handle out;
 		/* statistics */
 		struct {
 			uint32_t chunks;
 			uint32_t octets;
 		} stats;
 	} osmux;
 	struct {
 		struct osmo_iuup_instance *iui;
 		bool active_init; /* true: Send IuUP Init */
 		int rfci_id_no_data; /* RFCI Id for RFCI NO_DATA (-1 if not available) */
 		bool configured;
 		struct osmo_iuup_rnl_prim *init_ind;
 	} iuup;
 	struct rate_ctr_group *rate_ctr_group;
 };
 /*! MGCP connection (untyped) */
 struct mgcp_conn {
 	/*! list head */
 	struct llist_head entry;
 	/*! Backpointer to the endpoint where the conn belongs to */
 	struct mgcp_endpoint *endp;
 	/*! type of the connection (union) */
 	enum mgcp_conn_type type;
 	/*! mode of the connection */
 	enum mgcp_connection_mode mode;
 	/*! copy of the mode to restore the original setting (VTY) */
 	enum mgcp_connection_mode mode_orig;
 	/*! connection id to identify the connection */
 	char id[MGCP_CONN_ID_MAXLEN];
 	/*! human readable name (vty, logging) */
 	char name[256];
 	/*! activity tracker (for cleaning up inactive connections) */
 	struct osmo_timer_list watchdog;
 	/*! union with connection description */
 	union {
 		struct mgcp_conn_rtp rtp;
 	} u;
 	/*! pointer to optional private data */
 	void *priv;
 };
 /* RTP connection related counters */
 enum {
 	IN_STREAM_ERR_TSTMP_CTR,
 	OUT_STREAM_ERR_TSTMP_CTR,
        RTP_PACKETS_RX_CTR,
        RTP_OCTETS_RX_CTR,
        RTP_PACKETS_TX_CTR,
        RTP_OCTETS_TX_CTR,
        RTP_DROPPED_PACKETS_CTR,
        RTP_NUM_CONNECTIONS,
 };
 /* RTP per-connection statistics. Instances of the corresponding rate counter group
 * exist for the lifetime of an RTP connection.
 * Must be kept in sync with all_rtp_conn_rate_ctr_desc below */
 static const struct rate_ctr_desc mgcp_conn_rate_ctr_desc[] = {
 	[IN_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:in", "Inbound rtp-stream timestamp errors."},
 	[OUT_STREAM_ERR_TSTMP_CTR] = {"stream_err_tstmp:out", "Outbound rtp-stream timestamp errors."},
 	[RTP_PACKETS_RX_CTR] = {"rtp:packets_rx", "Inbound rtp packets."},
 	[RTP_OCTETS_RX_CTR] = {"rtp:octets_rx", "Inbound rtp octets."},
 	[RTP_PACKETS_TX_CTR] = {"rtp:packets_tx", "Outbound rtp packets."},
 	[RTP_OCTETS_TX_CTR] = {"rtp:octets_tx", "Outbound rtp octets."},
 	[RTP_DROPPED_PACKETS_CTR] = {"rtp:dropped", "dropped rtp packets."}
 };
 /* Aggregated RTP connection stats. These are updated when an RTP connection is freed.
 * Must be kept in sync with mgcp_conn_rate_ctr_desc above */
 static const struct rate_ctr_desc all_rtp_conn_rate_ctr_desc[] = {
 	[IN_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_in", "Total inbound rtp-stream timestamp errors."},
 	[OUT_STREAM_ERR_TSTMP_CTR] = {"all_rtp:err_tstmp_out", "Total outbound rtp-stream timestamp errors."},
 	[RTP_PACKETS_RX_CTR] = {"all_rtp:packets_rx", "Total inbound rtp packets."},
 	[RTP_OCTETS_RX_CTR] = {"all_rtp:octets_rx", "Total inbound rtp octets."},
 	[RTP_PACKETS_TX_CTR] = {"all_rtp:packets_tx", "Total outbound rtp packets."},
 	[RTP_OCTETS_TX_CTR] = {"all_rtp:octets_tx", "Total outbound rtp octets."},
 	[RTP_DROPPED_PACKETS_CTR] = {"all_rtp:dropped", "Total dropped rtp packets."},
 	/* This last counter does not exist in per-connection stats, only here. */
 	[RTP_NUM_CONNECTIONS] = {"all_rtp:num_closed_conns", "Total number of rtp connections closed."}
 };
 /* Was conn configured to handle Osmux? */
 static inline bool mgcp_conn_rtp_is_osmux(const struct mgcp_conn_rtp *conn) {
 	return conn->type == MGCP_OSMUX_BSC || conn->type == MGCP_OSMUX_BSC_NAT;
 }
 /* Was conn configured to handle Osmux? */
 static inline bool mgcp_conn_rtp_is_iuup(const struct mgcp_conn_rtp *conn)
 {
 	return conn->type == MGCP_RTP_IUUP;
 }
 struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp,
 				  enum mgcp_conn_type type, char *name);
 struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id);
 struct mgcp_conn_rtp *mgcp_conn_get_rtp(struct mgcp_endpoint *endp,
 					const char *id);
 void mgcp_conn_free(struct mgcp_endpoint *endp, const char *id);
 void mgcp_conn_free_oldest(struct mgcp_endpoint *endp);
 void mgcp_conn_free_all(struct mgcp_endpoint *endp);
 char *mgcp_conn_dump(struct mgcp_conn *conn);
 struct mgcp_conn *mgcp_find_dst_conn(struct mgcp_conn *conn);
 struct mgcp_conn *mgcp_conn_get_oldest(struct mgcp_endpoint *endp);
 void mgcp_conn_watchdog_kick(struct mgcp_conn *conn);
--- a/include/osmocom/mgcp/mgcp_e1.h
+++ b/include/osmocom/mgcp/mgcp_e1.h
@@ -1,27 +0,0 @@
 #pragma once
 /* A 64k timeslot on an E1 line can be subdevied into the following
 * subslot combinations:
 *
 * subslot:                                          offset:
 * [          ][          ][   16k    ][8k_subslot]  0
 * [          ][   32k    ][_subslot__][8k_subslot]  1
 * [          ][ subslot  ][   16k    ][8k_subslot]  2
 * [   64k    ][__________][_subslot__][8k_subslot]  3
 * [ timeslot ][          ][   16k    ][8k_subslot]  4
 * [          ][   32K    ][_subslot__][8k_subslot]  5
 * [          ][ subslot  ][   16k    ][8k_subslot]  6
 * [          ][          ][ subslot  ][8k_subslot]  7
 *
 * Since overlapping assignment of subslots is not possible there is a limited
 * set of subslot assignments possible. The e1_rates array lists the possible
 * assignments as depicted above. Also each subslot assignment comes along with
 * a bit offset in the E1 bitstream. The e1_offsets arrays lists the bit
 * offsets. */
 static const uint8_t e1_rates[] = { 64, 32, 32, 16, 16, 16, 16, 8, 8, 8, 8, 8, 8, 8, 8 };
 static const uint8_t e1_offsets[] = { 0, 0, 4, 0, 2, 4, 6, 0, 1, 2, 3, 4, 5, 6, 7 };
 int mgcp_e1_endp_equip(struct mgcp_endpoint *endp, uint8_t ts, uint8_t ss, uint8_t offs);
 void mgcp_e1_endp_update(struct mgcp_endpoint *endp);
 void mgcp_e1_endp_release(struct mgcp_endpoint *endp);
 int mgcp_e1_send_rtp(struct mgcp_endpoint *endp, struct mgcp_rtp_codec *codec, struct msgb *msg);
--- a/include/osmocom/mgcp/mgcp_endp.h
+++ b/include/osmocom/mgcp/mgcp_endp.h
@@ -1,142 +0,0 @@
 /* Endpoint types */
 /*
 * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * Author: Philipp Maier
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #pragma once
 #include <osmocom/core/msgb.h>
 #include <osmocom/gsm/i460_mux.h>
 #include <osmocom/mgcp/mgcp_protocol.h>
 struct sockaddr;
 struct mgcp_conn;
 struct mgcp_conn_rtp;
 struct mgcp_endpoint;
 /* Number of E1 subslots (different variants, not all useable at the same time) */
 #define MGCP_ENDP_E1_SUBSLOTS 15
 #define LOGPENDP(endp, cat, level, fmt, args...) \
 LOGP(cat, level, "endpoint:%s " fmt, \
     endp ? endp->name : "none", \
     ## args)
 struct osmo_rtp_msg_ctx {
 	int proto;
 	struct mgcp_conn_rtp *conn_src;
 	struct osmo_sockaddr *from_addr;
 };
 #define OSMO_RTP_MSG_CTX(MSGB) ((struct osmo_rtp_msg_ctx*)(MSGB)->cb)
 osmo_static_assert(sizeof(((struct msgb*)0)->cb) >= sizeof(struct osmo_rtp_msg_ctx), osmo_rtp_msg_ctx_fits_in_msgb_cb);
 /* Callback type for RTP dispatcher functions (e.g mgcp_dispatch_rtp_bridge_cb, see below).
 * The OSMO_RTP_MSG_CTX() should be set appropriately on the msg. */
 typedef int (*mgcp_dispatch_rtp_cb) (struct msgb *msg);
 /* Callback type for endpoint specific cleanup actions. This function
 * is automatically executed when a connection is freed (see mgcp_conn_free()
 * in mgcp_conn.c). Depending on the type of the endpoint there may be endpoint
 * specific things to take care of once a connection has been removed. */
 typedef void (*mgcp_cleanup_cp) (struct mgcp_endpoint *endp,
 				 struct mgcp_conn *conn);
 /*! MGCP endpoint properties */
 struct mgcp_endpoint_type {
 	/*! maximum number of connections */
 	int max_conns;
 	/*! callback that defines how to dispatch incoming RTP data */
 	mgcp_dispatch_rtp_cb dispatch_rtp_cb;
 	/*! callback that implements endpoint specific cleanup actions */
 	mgcp_cleanup_cp cleanup_cb;
 };
 /*! MGCP endpoint typeset */
 struct mgcp_endpoint_typeset {
 	struct mgcp_endpoint_type rtp;
 	struct mgcp_endpoint_type e1;
 };
 /*! static MGCP endpoint typeset (pre-initalized, read-only) */
 extern const struct mgcp_endpoint_typeset ep_typeset;
 /*! MGCP endpoint model */
 struct mgcp_endpoint {
 	/*! Unique endpoint name, used for addressing via MGCP */
 	char *name;
 	/*! Call identifier string (as supplied by the call agant) */
 	char *callid;
 	/*! Local connection options (see mgcp_internal.h) */
 	struct mgcp_lco local_options;
 	/*! List of struct mgcp_conn, of the connections active on this endpoint */
 	struct llist_head conns;
 	/*! Backpointer to the trunk this endpoint belongs to */
 	struct mgcp_trunk *trunk;
 	/*! Endpoint properties (see above) */
 	const struct mgcp_endpoint_type *type;
 	/*! Last MGCP transmission (in case re-transmission is required) */
 	char *last_trans;
 	/*! Last MGCP response (in case re-transmission is required) */
 	char *last_response;
 	/*! MGCP_X_OSMO_IGN_* flags from 'X-Osmo-IGN:' header */
 	uint32_t x_osmo_ign;
 	/* E1 specific */
 	struct {
 		struct osmo_i460_schan_desc scd;
 		struct osmo_i460_subchan *schan;
 		struct osmo_fsm_inst *trau_sync_fi;
 		struct osmo_trau2rtp_state *trau_rtp_st;
 		uint8_t last_amr_ft;
 		struct mgcp_rtp_codec *last_codec;
 	} e1;
 };
 struct mgcp_endpoint *mgcp_endp_alloc(struct mgcp_trunk *trunk, unsigned int index);
 void mgcp_endp_release(struct mgcp_endpoint *endp);
 int mgcp_endp_claim(struct mgcp_endpoint *endp, const char *callid);
 void mgcp_endp_update(struct mgcp_endpoint *endp);
 bool mgcp_endp_is_wildcarded(const char *epname);
 struct mgcp_endpoint *mgcp_endp_by_name_trunk(int *cause, const char *epname,
 					      const struct mgcp_trunk *trunk);
 struct mgcp_endpoint *mgcp_endp_by_name(int *cause, const char *epname,
 					struct mgcp_config *cfg);
 bool mgcp_endp_avail(struct mgcp_endpoint *endp);
 void mgcp_endp_add_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn);
 void mgcp_endp_remove_conn(struct mgcp_endpoint *endp, struct mgcp_conn *conn);
 void mgcp_endp_strip_name(char *epname_stripped, const char *epname,
 			 const struct mgcp_trunk *trunk);
 struct mgcp_endpoint *mgcp_endp_find_specific(const char *epname,
 			const struct mgcp_trunk *trunk);
--- a/include/osmocom/mgcp/mgcp_msg.h
+++ b/include/osmocom/mgcp/mgcp_msg.h
@@ -1,58 +0,0 @@
 /* A Media Gateway Control Protocol Media Gateway: RFC 3435 */
 /* Message parser/generator utilities */
 /*
 * (C) 2009-2012 by Holger Hans Peter Freyther <zecke@selfish.org>
 * (C) 2009-2012 by On-Waves
 * (C) 2017 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #pragma once
 #include <stdint.h>
 #include <stdbool.h>
 struct mgcp_conn;
 struct mgcp_parse_data;
 struct mgcp_endpoint;
 struct mgcp_trunk;
 void mgcp_disp_msg(unsigned char *message, unsigned int len, char *preamble);
 int mgcp_parse_conn_mode(const char *msg, struct mgcp_endpoint *endp,
 			 struct mgcp_conn *conn);
 int mgcp_parse_header(struct mgcp_parse_data *pdata, char *data);
 int mgcp_parse_osmux_cid(const char *line);
 bool mgcp_check_param(const struct mgcp_endpoint *endp, struct mgcp_trunk *trunk, const char *line);
 int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid);
 int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id);
 char *mgcp_strline(char *str, char **saveptr);
 #define for_each_line(line, save)\
 	for (line = mgcp_strline(NULL, &save); line;\
 	     line = mgcp_strline(NULL, &save))
 #define for_each_non_empty_line(line, save)\
 	for (line = strtok_r(NULL, "\r\n", &save); line;\
 	     line = strtok_r(NULL, "\r\n", &save))
--- a/include/osmocom/mgcp/mgcp_network.h
+++ b/include/osmocom/mgcp/mgcp_network.h
@@ -1,182 +0,0 @@
 #pragma once
 #include <inttypes.h>
 #include <stdbool.h>
 #include <osmocom/core/socket.h>
 #include <osmocom/mgcp/mgcp.h>
 /* The following constant defines an RTP dummy payload that is used for
 * "UDP Hole Punching" (NAT) */
 static const char rtp_dummy_payload[] = { 0x23 };
 /* Check if the data in a given message buffer matches the rtp dummy payload
 * defined above */
 #define mgcp_is_rtp_dummy_payload(msg) \
 	(msgb_length(msg) == sizeof(rtp_dummy_payload) && \
 	memcmp(msgb_data(msg), rtp_dummy_payload, sizeof(rtp_dummy_payload)) == 0)
 #define RTP_BUF_SIZE	4096
 struct mgcp_rtp_stream_state {
 	uint32_t ssrc;
 	uint16_t last_seq;
 	uint32_t last_timestamp;
 	struct rate_ctr *err_ts_ctr;
 	int32_t last_tsdelta;
 	uint32_t last_arrival_time;
 };
 struct mgcp_rtp_state {
 	/* has this state structure been initialized? */
 	int initialized;
 	struct {
 		/* are we patching the SSRC value? */
 		bool patch_ssrc;
 		/* original SSRC (to which we shall patch any different SSRC) */
 		uint32_t orig_ssrc;
 		/* offset to apply on the sequence number */
 		int seq_offset;
 		/* offset to apply on the timestamp number */
 		int32_t timestamp_offset;
 	} patch;
 	/* duration of a packet (FIXME: in which unit?) */
 	uint32_t packet_duration;
 	/* Note: These states are not continuously updated, they serve as an
 	 * information source to patch certain values in the RTP header. Do
 	 * not use this state if constantly updated data about the RTP stream
 	 * is needed. (see also mgcp_patch_and_count() */
 	struct mgcp_rtp_stream_state in_stream;
 	struct mgcp_rtp_stream_state out_stream;
 	/* jitter and packet loss calculation */
 	struct {
 		int initialized;
 		uint16_t base_seq;
 		uint16_t max_seq;
 		uint32_t ssrc;
 		uint32_t jitter;
 		int32_t transit;
 		int cycles;
 	} stats;
 	/* Alternative values for RTP tx, in case no sufficient header
 	 * information is available so the header needs to be generated
 	 * locally (when just forwarding packets, the header of incoming
 	 * data is just re-used) */
 	uint16_t alt_rtp_tx_sequence;
 	uint32_t alt_rtp_tx_ssrc;
 };
 struct mgcp_rtp_codec {
 	uint32_t rate;
 	int channels;
 	uint32_t frame_duration_num;
 	uint32_t frame_duration_den;
 	int payload_type;
 	char audio_name[64];
 	char subtype_name[64];
 	bool param_present;
 	struct mgcp_codec_param param;
 };
 /* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */
 struct mgcp_rtp_end {
 	/* remote IP address of the RTP socket */
 	struct osmo_sockaddr addr;
 	/* in network byte order */
 	int rtp_port, rtcp_port;
 	/* currently selected audio codec */
 	struct mgcp_rtp_codec *codec;
 	/* array with assigned audio codecs to choose from (SDP) */
 	struct mgcp_rtp_codec codecs[MGCP_MAX_CODECS];
 	/* number of assigned audio codecs (SDP) */
 	unsigned int codecs_assigned;
 	/* per endpoint data */
 	int  frames_per_packet;
 	uint32_t packet_duration_ms;
 	int maximum_packet_time; /* -1: not set */
 	char *fmtp_extra;
 	/* are we transmitting packets (true) or dropping (false) outbound packets */
 	bool output_enabled;
 	/* FIXME: This parameter can be set + printed, but is nowhere used! */
 	int force_output_ptime;
 	/* RTP patching */
 	int force_constant_ssrc; /* -1: always, 0: don't, 1: once */
 	/* should we perform align_rtp_timestamp_offset() (1) or not (0) */
 	int force_aligned_timing;
 	bool rfc5993_hr_convert;
 	/* Each end has a separate socket for RTP and RTCP */
 	struct osmo_fd rtp;
 	struct osmo_fd rtcp;
 	/* local UDP port number of the RTP socket; RTCP is +1 */
 	int local_port;
 	/* where the endpoint RTP connection binds to, set during CRCX and
 	 * possibly updated during MDCX */
 	char local_addr[INET6_ADDRSTRLEN];
 };
 bool mgcp_rtp_end_remote_addr_available(const struct mgcp_rtp_end *rtp_end);
 struct mgcp_rtp_tap {
 	/* is this tap active (1) or not (0) */
 	int enabled;
 	/* IP/port to which we're forwarding the tapped data */
 	struct osmo_sockaddr forward;
 };
 struct mgcp_conn;
 int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct osmo_sockaddr *addr,
 	      struct msgb *msg, struct mgcp_conn_rtp *conn_src,
 	      struct mgcp_conn_rtp *conn_dst);
 int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn);
 int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg);
 void mgcp_cleanup_rtp_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn);
 int mgcp_dispatch_e1_bridge_cb(struct msgb *msg);
 void mgcp_cleanup_e1_bridge_cb(struct mgcp_endpoint *endp, struct mgcp_conn *conn);
 int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port,
 			   struct mgcp_conn_rtp *conn);
 void mgcp_free_rtp_port(struct mgcp_rtp_end *end);
 void mgcp_patch_and_count(const struct mgcp_endpoint *endp,
 			  struct mgcp_rtp_state *state,
 			  struct mgcp_rtp_end *rtp_end,
 			  struct osmo_sockaddr *addr, struct msgb *msg);
 void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn);
 /* payload processing default functions */
 int mgcp_rtp_processing_default(struct mgcp_endpoint *endp, struct mgcp_rtp_end *dst_end,
 				char *data, int *len, int buf_size);
 int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp,
 				      struct mgcp_conn_rtp *conn_dst,
 				      struct mgcp_conn_rtp *conn_src);
 void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp,
 					  const struct mgcp_rtp_codec **codec,
 					  const char **fmtp_extra,
 					  struct mgcp_conn_rtp *conn);
 /* internal RTP Annex A counting */
 void mgcp_rtp_annex_count(const struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,
 			const uint16_t seq, const int32_t transit,
 			const uint32_t ssrc, const bool marker_bit);
 void rtpconn_rate_ctr_add(struct mgcp_conn_rtp *conn_rtp, struct mgcp_endpoint *endp,
 				 int id, int inc);
 void forward_data_tap(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg);
 uint32_t mgcp_get_current_ts(unsigned codec_rate);
--- a/include/osmocom/mgcp/mgcp_protocol.h
+++ b/include/osmocom/mgcp/mgcp_protocol.h
@@ -1,30 +0,0 @@
 #pragma once
 /* Internal structure while parsing a request */
 struct mgcp_parse_data {
 	struct mgcp_config *cfg;
 	char *epname;
 	char *trans;
 	char *save;
 };
 /* Local connection options */
 struct mgcp_lco {
 	char *string;
 	char *codec;
 	int pkt_period_min; /* time in ms */
 	int pkt_period_max; /* time in ms */
 };
 char *mgcp_debug_get_last_endpoint_name(void);
 char *get_lco_identifier(const char *options);
 int check_local_cx_options(void *ctx, const char *options);
 struct mgcp_rtp_end;
 struct mgcp_endpoint;
 void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change,
 			 struct mgcp_rtp_end *rtp);
 uint32_t mgcp_rtp_packet_duration(const struct mgcp_endpoint *endp,
 				  const struct mgcp_rtp_end *rtp);
--- a/include/osmocom/mgcp/mgcp_ratectr.h
+++ b/include/osmocom/mgcp/mgcp_ratectr.h
@@ -1,107 +0,0 @@
 #pragma once
 /* Global MCGP general rate counters */
 enum {
 	MGCP_GENERAL_RX_MSGS_TOTAL,
 	MGCP_GENERAL_RX_MSGS_RETRANSMITTED,
 	MGCP_GENERAL_RX_MSGS_HANDLED,
 	MGCP_GENERAL_RX_MSGS_UNHANDLED,
 	MGCP_GENERAL_RX_FAIL_MSG_PARSE,
 	MGCP_GENERAL_RX_FAIL_NO_ENDPOINT,
 };
 /* Trunk-global MCGP CRCX related rate counters */
 enum {
 	MGCP_CRCX_SUCCESS,
 	MGCP_CRCX_FAIL_BAD_ACTION,
 	MGCP_CRCX_FAIL_UNHANDLED_PARAM,
 	MGCP_CRCX_FAIL_MISSING_CALLID,
 	MGCP_CRCX_FAIL_INVALID_MODE,
 	MGCP_CRCX_FAIL_LIMIT_EXCEEDED,
 	MGCP_CRCX_FAIL_UNKNOWN_CALLID,
 	MGCP_CRCX_FAIL_ALLOC_CONN,
 	MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC,
 	MGCP_CRCX_FAIL_START_RTP,
 	MGCP_CRCX_FAIL_NO_OSMUX,
 	MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS,
 	MGCP_CRCX_FAIL_CODEC_NEGOTIATION,
 	MGCP_CRCX_FAIL_BIND_PORT,
 	MGCP_CRCX_FAIL_AVAIL,
 	MGCP_CRCX_FAIL_CLAIM,
 };
 /* Trunk-global MCGP MDCX related rate counters */
 enum {
 	MGCP_MDCX_SUCCESS,
 	MGCP_MDCX_FAIL_WILDCARD,
 	MGCP_MDCX_FAIL_NO_CONN,
 	MGCP_MDCX_FAIL_INVALID_CALLID,
 	MGCP_MDCX_FAIL_INVALID_CONNID,
 	MGCP_MDCX_FAIL_UNHANDLED_PARAM,
 	MGCP_MDCX_FAIL_NO_CONNID,
 	MGCP_MDCX_FAIL_CONN_NOT_FOUND,
 	MGCP_MDCX_FAIL_INVALID_MODE,
 	MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS,
 	MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC,
 	MGCP_MDCX_FAIL_START_RTP,
 	MGCP_MDCX_FAIL_AVAIL,
 };
 /* Trunk-global MCGP DLCX related rate counters */
 enum {
 	MGCP_DLCX_SUCCESS,
 	MGCP_DLCX_FAIL_NO_CONN,
 	MGCP_DLCX_FAIL_INVALID_CALLID,
 	MGCP_DLCX_FAIL_INVALID_CONNID,
 	MGCP_DLCX_FAIL_UNHANDLED_PARAM,
 	MGCP_DLCX_FAIL_AVAIL,
 };
 /* Trunk-global E1 related counters */
 enum {
        E1_I460_TRAU_RX_FAIL_CTR,
        E1_I460_TRAU_TX_FAIL_CTR,
        E1_I460_TRAU_MUX_EMPTY_CTR,
 };
 /* NOTE: When adding counters, also the dump_ratectr_* routines in vty.c must be updated. */
 struct mgcp_ratectr_global {
 	/* Rate counter group which contains stats for generic MGCP events. */
 	struct rate_ctr_group *mgcp_general_ctr_group;
 };
 struct mgcp_ratectr_trunk {
 	/* Rate counter group which contains stats for processed CRCX commands. */
 	struct rate_ctr_group *mgcp_crcx_ctr_group;
 	/* Rate counter group which contains stats for processed MDCX commands. */
 	struct rate_ctr_group *mgcp_mdcx_ctr_group;
 	/* Rate counter group which contains stats for processed DLCX commands. */
 	struct rate_ctr_group *mgcp_dlcx_ctr_group;
 	/* Rate counter group which aggregates stats of individual RTP connections. */
 	struct rate_ctr_group *all_rtp_conn_stats;
 	/* Rate counter group which contains stats for E1 events (only valid for E1 trunks) */
 	struct rate_ctr_group *e1_stats;
 };
 struct mgcp_config;
 struct mgcp_trunk;
 int mgcp_ratectr_global_alloc(struct mgcp_config *cfg);
 void mgcp_ratectr_global_free(struct mgcp_config *cfg);
 int mgcp_ratectr_trunk_alloc(struct mgcp_trunk *trunk);
 void mgcp_ratectr_trunk_free(struct mgcp_trunk *trunk);
 /* Trunk-global common stat items */
 enum {
 	TRUNK_STAT_ENDPOINTS_TOTAL,
 	TRUNK_STAT_ENDPOINTS_USED,
 };
 struct mgcp_stat_trunk {
 	/* Stat item group which contains general status values of the trunk. */
 	struct osmo_stat_item_group *common;
 };
 int mgcp_stat_trunk_alloc(struct mgcp_trunk *trunk);
 void mgcp_stat_trunk_free(struct mgcp_trunk *trunk);
--- a/include/osmocom/mgcp/mgcp_threads_queue.h
+++ b/include/osmocom/mgcp/mgcp_threads_queue.h
@@ -1,52 +0,0 @@
 /*
 * (C) 2021 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
 * All Rights Reserved
 *
 * Author: Eric Wild
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Affero General Public License for more details.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
 #include <stdatomic.h>
 #include <stdbool.h>
 #include <stdlib.h>
 struct spsc {
 	atomic_uint readptr;
 	atomic_uint writeptr;
 	int efd_r, efd_w; /* eventfds used to block/notify readers/writers */
 	int count;
 	int size_per_buf;
 	void *buf; /* buffer size count*size_per_buf */
 	uintptr_t data[0]; /* count sized array of pointers to size_per_buf chunks in buf array*/
 };
 struct qchan {
 	struct spsc *a;
 	struct spsc *b;
 };
 bool spsc_push(struct spsc *q, void *elem);
 bool spsc_pop(struct spsc *q, void *elem);
 ssize_t spsc_prep_pop(struct spsc *q);
 int spsc_get_a_rdfd(struct qchan *q);
 struct qchan spsc_chan_init(void *talloc_ctx, unsigned int count, unsigned int size_per_buf);
 struct qchan spsc_chan_init_ex(void *talloc_ctx, unsigned int count, unsigned int size_per_buf, bool blockr_a,
 			       bool blockw_a, bool blockr_b, bool blockw_b);
 void spsc_chan_close(struct qchan *q);
--- a/include/osmocom/mgcp/mgcp_trunk.h
+++ b/include/osmocom/mgcp/mgcp_trunk.h
@@ -1,88 +0,0 @@
 #pragma once
 #include <osmocom/gsm/i460_mux.h>
 #include <osmocom/abis/e1_input.h>
 #include <osmocom/mgcp/mgcp_ratectr.h>
 #define LOGPTRUNK(trunk, cat, level, fmt, args...) \
 LOGP(cat, level, "trunk:%u " fmt, \
     trunk ? trunk->trunk_nr : 0, \
     ## args)
 enum mgcp_trunk_type {
 	MGCP_TRUNK_VIRTUAL,
 	MGCP_TRUNK_E1,
 };
 extern const struct value_string mgcp_trunk_type_strs[];
 static inline const char *mgcp_trunk_type_strs_str(enum mgcp_trunk_type val)
 { return get_value_string(mgcp_trunk_type_strs, val); }
 struct mgcp_trunk {
 	struct llist_head entry;
 	struct mgcp_config *cfg;
 	unsigned int trunk_nr;
 	enum mgcp_trunk_type trunk_type;
 	char *audio_fmtp_extra;
 	int audio_send_ptime;
 	int audio_send_name;
 	int no_audio_transcoding;
 	int omit_rtcp;
 	int keepalive_interval;
 	/* RTP patching */
 	int force_constant_ssrc; /* 0: don't, 1: once */
 	int force_aligned_timing;
 	bool rfc5993_hr_convert;
 	/* spec handling */
 	int force_realloc;
 	/* timer */
 	struct osmo_timer_list keepalive_timer;
 	/* When set, incoming RTP packets are not filtered
 	 * when ports and ip-address do not match (debug) */
 	int rtp_accept_all;
 	unsigned int number_endpoints;
 	struct mgcp_endpoint **endpoints;
 	/* rate counters and stat items to measure the trunks overall performance and health */
 	struct mgcp_ratectr_trunk ratectr;
 	struct mgcp_stat_trunk stats;
 	union {
 		/* Virtual trunk specific */
 		struct {
 			unsigned int vty_number_endpoints;
 		} v;
 		/* E1 specific */
 		struct {
 			unsigned int vty_line_nr;
 			bool ts_in_use[NUM_E1_TS-1];
 			struct osmo_i460_timeslot i460_ts[NUM_E1_TS-1];
 			/* Note: on an E1 line TS 0 is devoted to framing and
 			 * alignment and therefore only NUM_E1_TS-1 timeslots
 			 * are available for traffic. */
 		} e1;
 	};
 };
 struct mgcp_trunk *mgcp_trunk_alloc(struct mgcp_config *cfg, enum mgcp_trunk_type ttype, unsigned int nr);
 int mgcp_trunk_equip(struct mgcp_trunk *trunk);
 struct mgcp_trunk *mgcp_trunk_by_num(const struct mgcp_config *cfg, enum mgcp_trunk_type ttype, unsigned int nr);
 struct mgcp_trunk *mgcp_trunk_by_name(const struct mgcp_config *cfg, const char *epname);
 int e1_trunk_nr_from_epname(unsigned int *trunk_nr, const char *epname);
 struct mgcp_trunk *mgcp_trunk_by_line_num(const struct mgcp_config *cfg, unsigned int num);
 /* The virtual trunk is always created on trunk id 0 for historical reasons,
 * use this define constant as ID when allocating a virtual trunk. Other
 * trunks may be assigned with arbritrary id numbers */
 #define MGCP_VIRT_TRUNK_ID 0
--- a/include/osmocom/mgcp/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -1,40 +0,0 @@
 #pragma once
 #include <osmocom/core/socket.h>
 #include <osmocom/netif/osmux.h>
 struct mgcp_conn_rtp;
 #define OSMUX_PORT	1984
 enum {
 	OSMUX_ROLE_BSC = 0,
 	OSMUX_ROLE_BSC_NAT,
 };
 int osmux_init(int role, struct mgcp_config *cfg);
 int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,
 		      struct osmo_sockaddr *addr, uint16_t port);
 void conn_osmux_disable(struct mgcp_conn_rtp *conn);
 int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid);
 void conn_osmux_release_cid(struct mgcp_conn_rtp *conn);
 int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn);
 int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn);
 void osmux_cid_pool_get(uint8_t osmux_cid);
 int osmux_cid_pool_get_next(void);
 void osmux_cid_pool_put(uint8_t osmux_cid);
 bool osmux_cid_pool_allocated(uint8_t osmux_cid);
 int osmux_cid_pool_count_used(void);
 enum osmux_state {
 	OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */
 	OSMUX_STATE_ACTIVATING,   /* Osmux was accepted in MGCP CRCX ACK. It can now be enabled by \ref osmux_enable_endpoint. */
 	OSMUX_STATE_ENABLED,	  /* Osmux was initialized by \ref osmux_enable_endpoint and can process frames */
 };
 enum osmux_usage {
 	OSMUX_USAGE_OFF = 0,
 	OSMUX_USAGE_ON = 1,
 	OSMUX_USAGE_ONLY = 2,
 };
--- a/include/osmocom/mgcp/vty.h
+++ b/include/osmocom/mgcp/vty.h
@@ -1,12 +0,0 @@
 #pragma once
 #include <osmocom/vty/command.h>
 enum mgcp_vty_node {
 	MGCP_NODE = _LAST_OSMOVTY_NODE + 1,
 	TRUNK_NODE,
 };
 enum mgw_vty_cmd_attr {
 	MGW_CMD_ATTR_NEWCONN = 0,
 };
--- a/include/osmocom/mgcp_client/Makefile.am
+++ b/include/osmocom/mgcp_client/Makefile.am
@@ -1,14 +0,0 @@
 BUILT_SOURCES = \
 	mgcp_common.h \
 	$(NULL)
 noinst_HEADERS = \
 	mgcp_client_internal.h \
 	mgcp_client_pool_internal.h \
 	$(NULL)
 mgcp_common.h: $(top_srcdir)/include/osmocom/mgcp/mgcp_common.h
 	echo -e "/*\n\n   DO NOT EDIT THIS FILE!\n   THIS IS OVERWRITTEN DURING BUILD\n   This is an automatic copy of <osmocom/mgcp/mgcp_common.h>\n\n */" > mgcp_common.h
 	cat $(top_srcdir)/include/osmocom/mgcp/mgcp_common.h >> mgcp_common.h
 CLEANFILES = mgcp_common.h
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -1,181 +0,0 @@
 #pragma once
 #include <stdint.h>
 #include <arpa/inet.h>
 #include <osmocom/mgcp_client/mgcp_common.h>
 /* See also: RFC 3435, chapter 3.5 Transmission over UDP */
 #define MGCP_CLIENT_LOCAL_ADDR_DEFAULT NULL /* INADDR(6)_ANY */
 #define MGCP_CLIENT_LOCAL_PORT_DEFAULT 2727
 #define MGCP_CLIENT_REMOTE_ADDR_DEFAULT "127.0.0.1"
 #define MGCP_CLIENT_REMOTE_PORT_DEFAULT 2427
 #define MGCP_CLIENT_MGW_STR "Configure MGCP connection to Media Gateway\n"
 struct msgb;
 struct vty;
 struct mgcp_client;
 struct mgcp_client_conf {
 	const char *local_addr;
 	int local_port;
 	const char *remote_addr;
 	int remote_port;
 	/* By default, we are always addressing the MGW with e.g. 'rtpbridge/123@mgw'.
 	 * If this is nonempty, the contained name will be used instead of 'mgw'. */
 	char endpoint_domain_name[MGCP_ENDPOINT_MAXLEN];
 	/* The user may configure certain endpoint names that are reset via DLCX
 	 * on startup. Usually this will be one wildcarded endpoint e.g.
 	 * 'rtpbridge/(wildcard)' or a number of specific E1 like e.g.
 	 * 'ds/e1-0/s-3/su16-4' */
 	struct llist_head reset_epnames;
 	/* human readable name / description */
 	char *description;
 };
 typedef unsigned int mgcp_trans_id_t;
 /*! Enumeration of the codec types that mgcp_client is able to handle. */
 enum mgcp_codecs {
 	CODEC_PCMU_8000_1 = 0,
 	CODEC_GSM_8000_1 = 3,
 	CODEC_PCMA_8000_1 = 8,
 	CODEC_G729_8000_1 = 18,
 	CODEC_GSMEFR_8000_1 = 110,
 	CODEC_GSMHR_8000_1 = 111,
 	CODEC_AMR_8000_1 = 112,
 	CODEC_AMRWB_16000_1 = 113,
 	CODEC_IUFP = 96,
 };
 /* Note: when new codec types are added, the corresponding value strings
 * in mgcp_client.c (codec_table) must be updated as well. Enumerations
 * in enum mgcp_codecs must correspond to a valid payload type. However,
 * this is an internal assumption that is made to avoid lookup tables.
 * The API-User should not rely on this coincidence! */
 extern const struct value_string osmo_mgcpc_codec_names[];
 static inline const char *osmo_mgcpc_codec_name(enum mgcp_codecs val)
 { return get_value_string(osmo_mgcpc_codec_names, val); }
 /*! Structure to build a payload type map to allow the defiition custom payload
 *  types. */
 struct ptmap {
 	/*! codec for which a payload type number should be defined */
 	enum mgcp_codecs codec;
 	/*! payload type number (96-127) */
 	unsigned int pt;
 };
 struct mgcp_response_head {
 	int response_code;
 	mgcp_trans_id_t trans_id;
 	char comment[MGCP_COMMENT_MAXLEN];
 	char conn_id[MGCP_CONN_ID_MAXLEN];
 	char endpoint[MGCP_ENDPOINT_MAXLEN];
 	bool x_osmo_osmux_use;
 	uint8_t x_osmo_osmux_cid;
 };
 struct mgcp_response {
 	char *body;
 	struct mgcp_response_head head;
 	uint16_t audio_port;
 	char audio_ip[INET6_ADDRSTRLEN];
 	unsigned int ptime;
 	enum mgcp_codecs codecs[MGCP_MAX_CODECS];
 	unsigned int codecs_len;
 	struct ptmap ptmap[MGCP_MAX_CODECS];
 	unsigned int ptmap_len;
 };
 enum mgcp_verb {
 	MGCP_VERB_CRCX,
 	MGCP_VERB_MDCX,
 	MGCP_VERB_DLCX,
 	MGCP_VERB_AUEP,
 	MGCP_VERB_RSIP,
 };
 #define MGCP_MSG_PRESENCE_ENDPOINT	0x0001
 #define MGCP_MSG_PRESENCE_CALL_ID	0x0002
 #define MGCP_MSG_PRESENCE_CONN_ID	0x0004
 #define MGCP_MSG_PRESENCE_AUDIO_IP	0x0008
 #define MGCP_MSG_PRESENCE_AUDIO_PORT	0x0010
 #define MGCP_MSG_PRESENCE_CONN_MODE	0x0020
 #define MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID 0x4000
 #define MGCP_MSG_PRESENCE_X_OSMO_IGN	0x8000
 struct mgcp_msg {
 	enum mgcp_verb verb;
 	/* See MGCP_MSG_PRESENCE_* constants */
 	uint32_t presence;
 	char endpoint[MGCP_ENDPOINT_MAXLEN];
 	unsigned int call_id;
 	char *conn_id;
 	uint16_t audio_port;
 	char *audio_ip;
 	enum mgcp_connection_mode conn_mode;
 	unsigned int ptime;
 	enum mgcp_codecs codecs[MGCP_MAX_CODECS];
 	unsigned int codecs_len;
 	struct ptmap ptmap[MGCP_MAX_CODECS];
 	unsigned int ptmap_len;
 	uint32_t x_osmo_ign;
 	bool x_osmo_osmux_use;
 	int x_osmo_osmux_cid; /* -1 is wildcard */
 	bool param_present;
 	struct mgcp_codec_param param;
 };
 void mgcp_client_conf_init(struct mgcp_client_conf *conf);
 void mgcp_client_vty_init(void *talloc_ctx, int node, struct mgcp_client_conf *conf);
 int mgcp_client_config_write(struct vty *vty, const char *indent);
 struct mgcp_client_conf *mgcp_client_conf_actual(struct mgcp_client *mgcp);
 struct mgcp_client *mgcp_client_init(void *ctx,
 				     struct mgcp_client_conf *conf);
 int mgcp_client_connect(struct mgcp_client *mgcp);
 int mgcp_client_connect2(struct mgcp_client *mgcp, unsigned int retry_n_ports);
 void mgcp_client_disconnect(struct mgcp_client *mgcp);
 const char *mgcp_client_remote_addr_str(struct mgcp_client *mgcp);
 uint16_t mgcp_client_remote_port(struct mgcp_client *mgcp);
 uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp) OSMO_DEPRECATED("deprecated, returns 0");
 const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp);
 const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp);
 const char *mgcp_client_e1_epname(void *ctx, const struct mgcp_client *mgcp, uint8_t trunk_id, uint8_t ts,
 				  uint8_t rate, uint8_t offset);
 /* Invoked when an MGCP response is received or sending failed.  When the
 * response is passed as NULL, this indicates failure during transmission. */
 typedef void (* mgcp_response_cb_t )(struct mgcp_response *response, void *priv);
 int mgcp_response_parse_params(struct mgcp_response *r);
 int mgcp_client_tx(struct mgcp_client *mgcp, struct msgb *msg,
 		   mgcp_response_cb_t response_cb, void *priv);
 int mgcp_client_cancel(struct mgcp_client *mgcp, mgcp_trans_id_t trans_id);
 enum mgcp_connection_mode;
 struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg);
 mgcp_trans_id_t mgcp_msg_trans_id(struct msgb *msg);
 extern const struct value_string mgcp_client_connection_mode_strs[];
 static inline const char *mgcp_client_cmode_name(enum mgcp_connection_mode mode)
 {
 	return get_value_string(mgcp_client_connection_mode_strs, mode);
 }
 enum mgcp_codecs map_str_to_codec(const char *str);
 unsigned int map_codec_to_pt(const struct ptmap *ptmap, unsigned int ptmap_len,
 			     enum mgcp_codecs codec);
 enum mgcp_codecs map_pt_to_codec(struct ptmap *ptmap, unsigned int ptmap_len,
 				 unsigned int pt);
 const char *mgcp_client_name(const struct mgcp_client *mgcp);
--- a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
+++ b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
@@ -1,54 +0,0 @@
 /* FSM to manage multiple connections of an MGW endpoint */
 #pragma once
 #include <osmocom/mgcp_client/mgcp_client_fsm.h>
 #define LOG_MGCPC_EP(ep, level, fmt, args...) do { \
 	LOGPFSML(ep->fi, level, "%s " fmt, \
 		 osmo_mgcpc_ep_name(ep), ## args); \
 	} while(0)
 struct osmo_mgcpc_ep;
 struct osmo_mgcpc_ep_ci;
 struct osmo_tdef;
 struct osmo_mgcpc_ep *osmo_mgcpc_ep_alloc(struct osmo_fsm_inst *parent, uint32_t parent_term_event,
 					  struct mgcp_client *mgcp_client,
 					  const struct osmo_tdef *T_defs,
 					  const char *fsm_id,
 					  const char *endpoint_str_fmt, ...);
 struct osmo_mgcpc_ep_ci *osmo_mgcpc_ep_ci_add(struct osmo_mgcpc_ep *ep, const char *label_fmt, ...);
 const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_rtp_info(const struct osmo_mgcpc_ep_ci *ci);
 bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest);
 bool osmo_mgcpc_ep_ci_get_crcx_info_to_osmux_cid(const struct osmo_mgcpc_ep_ci *ci, uint8_t* cid);
 const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_remote_rtp_info(const struct osmo_mgcpc_ep_ci *ci);
 void osmo_mgcpc_ep_ci_request(struct osmo_mgcpc_ep_ci *ci,
 			      enum mgcp_verb verb, const struct mgcp_conn_peer *verb_info,
 			      struct osmo_fsm_inst *notify,
 			      uint32_t event_success, uint32_t event_failure,
 			      void *notify_data);
 void osmo_mgcpc_ep_cancel_notify(struct osmo_mgcpc_ep *ep, struct osmo_fsm_inst *notify);
 struct osmo_mgcpc_ep *osmo_mgcpc_ep_ci_ep(struct osmo_mgcpc_ep_ci *ci);
 /*! Dispatch a DLCX for the given connection.
 * \param ci  Connection identifier as obtained from osmo_mgcpc_ep_ci_add().
 */
 static inline void osmo_mgcpc_ep_ci_dlcx(struct osmo_mgcpc_ep_ci *ci)
 {
 	osmo_mgcpc_ep_ci_request(ci, MGCP_VERB_DLCX, NULL, NULL, 0, 0, NULL);
 }
 void osmo_mgcpc_ep_clear(struct osmo_mgcpc_ep *ep);
 const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep);
 const char *osmo_mgcpc_ep_ci_name(const struct osmo_mgcpc_ep_ci *ci);
 const char *osmo_mgcpc_ep_ci_id(const struct osmo_mgcpc_ep_ci *ci);
 struct mgcp_client *osmo_mgcpc_ep_client(const struct osmo_mgcpc_ep *ep);
 extern const struct value_string osmo_mgcp_verb_names[];
 static inline const char *osmo_mgcp_verb_name(enum mgcp_verb val)
 { return get_value_string(osmo_mgcp_verb_names, val); }
--- a/include/osmocom/mgcp_client/mgcp_client_fsm.h
+++ b/include/osmocom/mgcp_client/mgcp_client_fsm.h
@@ -1,74 +0,0 @@
 #pragma once
 #include <osmocom/mgcp_client/mgcp_common.h>
 #include <osmocom/mgcp_client/mgcp_client.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 /*! This struct organizes the connection infromation one connection side
 *  (either remote or local). It is used to pass parameters (local) to the FSM
 *  and get responses (remote) from the FSM as pointer attached to the FSM
 *  event.
 *
 *  When modifiying a connection, the endpoint and call_id members may be left
 *  unpopulated. The call_id field is ignored in this case. If an endpoint
 *  identifier is supplied it is checked against the internal state to make
 *  sure it is correct. */
 struct mgcp_conn_peer {
 	/*! RTP connection IP-Address (optional, string e.g. "127.0.0.1") */
 	char addr[INET6_ADDRSTRLEN];
 	/*! RTP connection IP-Port (optional)  */
 	uint16_t port;
 	/*! RTP endpoint */
 	char endpoint[MGCP_ENDPOINT_MAXLEN];
 	/*! CALL ID (unique per connection) */
 	unsigned int call_id;
 	/*! RTP packetization interval (optional) */
 	unsigned int ptime;
 	/*! RTP codec list (optional) */
 	enum mgcp_codecs codecs[MGCP_MAX_CODECS];
 	/*! Number of codecs in RTP codec list (optional) */
 	unsigned int codecs_len;
 	/*! RTP payload type map (optional, only needed when payload types are
 	 * used that differ from what IANA/3GPP defines) */
 	struct ptmap ptmap[MGCP_MAX_CODECS];
 	/*! RTP payload type map length (optional, only needed when payload
 	 * types are used that differ from what IANA/3GPP defines) */
 	unsigned int ptmap_len;
 	/*! If nonzero, send 'X-Osmo-IGN:' header. This is useful e.g. for SCCPlite MSCs where the MSC is
 	 * known to issue incoherent or unknown CallIDs / to issue CRCX commands with a different domain
 	 * name than the BSC. An OsmoMGW will then ignore these and not fail on mismatches. */
 	uint32_t x_osmo_ign;
 	/*! send 'X-Osmux: %d' header (or "*" as wildcard). */
 	bool x_osmo_osmux_use;
 	/*! -1 means send wildcard. */
 	int x_osmo_osmux_cid;
 	/*! If left MGCP_CONN_NONE, use MGCP_CONN_RECV_ONLY or MGCP_CONN_RECV_SEND, depending on whether an audio RTP
 	 * address is set. If != MGCP_CONN_NONE, force this conn mode. */
 	enum mgcp_connection_mode conn_mode;
 	/*! If the codec requires additional format parameters (fmtp), those cann be set here, see also
 	 * mgcp_common.h */
 	bool param_present;
 	struct mgcp_codec_param param;
 };
 struct osmo_fsm_inst *mgcp_conn_create(struct mgcp_client *mgcp, struct osmo_fsm_inst *parent_fi, uint32_t parent_term_evt,
 				       uint32_t parent_evt, struct mgcp_conn_peer *conn_peer);
 int mgcp_conn_modify(struct osmo_fsm_inst *fi, uint32_t parent_evt, struct mgcp_conn_peer *conn_peer);
 void mgcp_conn_delete(struct osmo_fsm_inst *fi);
 const char *mgcp_conn_get_ci(struct osmo_fsm_inst *fi);
 struct mgcp_client *mgcp_conn_get_client(struct osmo_fsm_inst *fi);
 const char *osmo_mgcpc_conn_peer_name(const struct mgcp_conn_peer *info);
--- a/include/osmocom/mgcp_client/mgcp_client_internal.h
+++ b/include/osmocom/mgcp_client/mgcp_client_internal.h
@@ -1,41 +0,0 @@
 #pragma once
 #include <osmocom/core/write_queue.h>
 #define MSGB_CB_MGCP_TRANS_ID 0
 /* Struct that holds one endpoint name */
 struct reset_ep {
 	struct llist_head list;
 	char name[MGCP_ENDPOINT_MAXLEN];
 };
 struct mgcp_client {
 	struct mgcp_client_conf actual;
 	struct osmo_wqueue wq;
 	mgcp_trans_id_t next_trans_id;
 	struct llist_head responses_pending;
 	struct llist_head inuse_endpoints;
 	struct mgcp_client_pool *pool;
 };
 struct mgcp_inuse_endpoint {
 	struct llist_head entry;
 	uint16_t id;
 };
 struct mgcp_response_pending {
 	struct llist_head entry;
 	mgcp_trans_id_t trans_id;
 	mgcp_response_cb_t response_cb;
 	void *priv;
 };
 int mgcp_client_rx(struct mgcp_client *mgcp, struct msgb *msg);
 struct mgcp_response_pending * mgcp_client_pending_add(
 					struct mgcp_client *mgcp,
 					mgcp_trans_id_t trans_id,
 					mgcp_response_cb_t response_cb,
 					void *priv);
--- a/include/osmocom/mgcp_client/mgcp_client_pool.h
+++ b/include/osmocom/mgcp_client/mgcp_client_pool.h
@@ -1,11 +0,0 @@
 #pragma once
 struct mgcp_client;
 struct mgcp_client_pool;
 struct mgcp_client_pool *mgcp_client_pool_alloc(void *talloc_ctx);
 void mgcp_client_pool_vty_init(int parent_node, int mgw_node, const char *indent, struct mgcp_client_pool *pool);
 unsigned int mgcp_client_pool_connect(struct mgcp_client_pool *pool);
 void mgcp_client_pool_register_single(struct mgcp_client_pool *pool, struct mgcp_client *mgcp_client);
 struct mgcp_client *mgcp_client_pool_get(struct mgcp_client_pool *pool);
 void mgcp_client_pool_put(struct mgcp_client *mgcp_client);
--- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h
+++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h
@@ -1,45 +0,0 @@
 #pragma once
 /* Struct to handle a member of a pool of MGWs. */
 struct mgcp_client_pool_member {
 	struct llist_head list;
 	/* Reference number assinged by VTY. This number is used to manage the pool from the VTY and to identify it in
 	 * the log. */
 	unsigned int nr;
 	/* MGCP client configuration, this is not the running configuration, when mgcp_client_init() is executed, a
 	 * copy of this config is created. */
 	struct mgcp_client_conf conf;
 	/* MGCP client descriptor, will be automatically allocated when mgcp_client_pool_connect() is called. (the MGCP
 	 * client is connected when this pointer is populated) */
 	struct mgcp_client *client;
 	/* A pool member may be set as 'blocked' from the VTY, this means that the pool member may still work and serve
 	 * ongoing calls, but it won't be picked from the pool anymore. */
 	bool blocked;
 	/* Reference counter to count how often this pool member is currently picked. */
 	unsigned int refcount;
 };
 /* Struct to handle a pool of MGWs. (Use _pool functions) */
 struct mgcp_client_pool {
 	/* A pointer to a 'single' mgcp client. This is a non-pooled MGCP client that is configured using
 	 * mgcp_client_vty_init() and actively registered by the API user using mgcp_client_pool_register_single() */
 	struct mgcp_client *mgcp_client_single;
 	/* A list that manages the pool members (see above) */
 	struct llist_head pool;
 	/* String to use for indentation when writing the configuration file to the VTY. This field is populated by
 	 * mgcp_client_pool_vty_init() */
 	char *vty_indent;
 	/* VTY node specification used with this pool. This field is populated by mgcp_client_pool_vty_init() */
 	struct cmd_node *vty_node;
 };
 const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member);
--- a/libosmo-mgcp-client.pc.in
+++ b/libosmo-mgcp-client.pc.in
@@ -1,10 +0,0 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 Name: Osmocom Media Gateway Control Protocol Client library
 Description: C Utility Library
 Version: @VERSION@
 Libs: -L${libdir} -losmo-mgcp-client
 Cflags: -I${includedir}/
--- a/openbsc/.gitignore
+++ b/openbsc/.gitignore
@@ -0,0 +1,111 @@
 *.o
 *.lo
 *.a
 .deps
 Makefile
 Makefile.in
 bscconfig.h
 bscconfig.h.in
 openbsc.pc
 src/osmo-nitb/osmo-nitb
 src/osmo-bsc_mgcp/osmo-bsc_mgcp
 src/osmo-bsc/osmo-bsc
 src/utils/meas_vis
 src/utils/osmo-meas-pcap2db
 src/utils/osmo-meas-udp2db
 src/utils/smpp_mirror
 *.*~
 *.sw?
 .libs
 *.pyc
 *.gcda
 *.gcno
 #configure
 aclocal.m4
 autom4te.cache/
 config.log
 config.status
 config.guess
 config.sub
 configure
 compile
 depcomp
 install-sh
 missing
 stamp-h1
 libtool
 ltmain.sh
 # git-version-gen magic
 .tarball-version
 .version
 # apps and app data
 hlr.sqlite3
 src/utils/bs11_config
 src/ipaccess/ipaccess-config
 src/ipaccess/abisip-find
 src/ipaccess/ipaccess-firmware
 src/ipaccess/ipaccess-proxy
 src/utils/isdnsync
 src/nat/bsc_nat
 src/gprs/osmo-sgsn
 src/gprs/osmo-gbproxy
 src/gprs/osmo-gtphub
 src/osmo-bsc_nat/osmo-bsc_nat
 src/libcommon/gsup_test_client
 src/osmo-msc/osmo-msc
 #tests
 tests/testsuite.dir
 tests/bsc-nat/bsc_nat_test
 tests/bsc-nat-trie/bsc_nat_trie_test
 tests/channel/channel_test
 tests/db/db_test
 tests/debug/debug_test
 tests/gsm0408/gsm0408_test
 tests/mgcp/mgcp_test
 tests/sccp/sccp_test
 tests/sms/sms_test
 tests/timer/timer_test
 tests/gprs/gprs_test
 tests/gbproxy/gbproxy_test
 tests/abis/abis_test
 tests/si/si_test
 tests/smpp/smpp_test
 tests/bsc/bsc_test
 tests/trau/trau_test
 tests/mgcp/mgcp_transcoding_test
 tests/sgsn/sgsn_test
 tests/subscr/subscr_test
 tests/subscr/bsc_subscr_test
 tests/oap/oap_test
 tests/gtphub/gtphub_test
 tests/mm_auth/mm_auth_test
 tests/xid/xid_test
 tests/sndcp_xid/sndcp_xid_test
 tests/slhc/slhc_test
 tests/v42bis/v42bis_test
 tests/nanobts_omlattr/nanobts_omlattr_test
 tests/msc_vlr/msc_vlr_test_no_authen
 tests/msc_vlr/msc_vlr_test_gsm_authen
 tests/msc_vlr/msc_vlr_test_gsm_ciph
 tests/msc_vlr/msc_vlr_test_umts_authen
 tests/msc_vlr/msc_vlr_test_hlr_reject
 tests/msc_vlr/msc_vlr_test_hlr_timeout
 tests/msc_vlr/msc_vlr_test_ms_timeout
 tests/msc_vlr/msc_vlr_test_reject_concurrency
 tests/msc_vlr/msc_vlr_test_rest
 tests/atconfig
 tests/atlocal
 tests/package.m4
 tests/testsuite
 tests/testsuite.log
 gsn_restart
 src/openbsc.cfg*
 writtenconfig/
 gtphub_restart_count
--- a/openbsc/AUTHORS
+++ b/openbsc/AUTHORS
--- a/openbsc/COPYING
+++ b/openbsc/COPYING
--- a/openbsc/Makefile.am
+++ b/openbsc/Makefile.am
@@ -9,32 +9,17 @@ AM_CPPFLAGS = \
 	$(NULL)
 SUBDIRS = \
 	doc \
 	include \
 	src \
 	tests \
 	doc \
 	contrib \
 	$(NULL)
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
+pkgconfig_DATA = openbsc.pc
 	libosmo-mgcp-client.pc \
 	$(NULL)
 BUILT_SOURCES = $(top_srcdir)/.version
-EXTRA_DIST = \
+EXTRA_DIST = git-version-gen osmoappdesc.py .version
 	     .version \
 	     contrib/osmo-mgw.spec.in \
 	     debian \
 	     git-version-gen \
 	     osmoappdesc.py \
 	     $(NULL)
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
@RELMAKE@
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook:
--- a/openbsc/README
+++ b/openbsc/README
@@ -0,0 +1,39 @@
 About OpenBSC
 =============
 OpenBSC started as a minimalistic all-in-one implementation of the GSM Network,
 with particular emphasis on the functionality typically provided by the BSC,
 MSC, HLR, VLR and SMSC.  Today it is a growing suite of libraries and programs,
 implementing protocol stacks and functional elements, including
 * OsmoBSC - a pure GSM BSC, speaking Abis/IP to the BTS and A/IP to the MSC
 * OsmoBSC-MGCP - MGCP helper to the OsmoBSC software
 * OsmoNITB - a BSC+MSC+VLR+HLR+SMSC "Network in the box".
 * OsmoMSC - a voice CN with A/IP and IuCS/IP towards the BSC and/or HNB-GW
 * OsmoSGSN - a GPRS SGSN with Gb/IP and IuPS/IP towards the PCU and/or HNB-GW
 * Osmo-GbProxy - a Proxy to aggregate many Gb links as one Gb link to the SGSN
 * OsmoBSCNAT - a gateway aggregating many A links as one A link to the MSC
 * OsmoGTPHUB - a hub aggregating many GTP links (between SGSN and GGSN)
 * ipaccess-utils - some tools to discover + configure ip.access nanoBTS
 * bs11_config - a tool to configure the Siemens BS-11 microBTS
 Various interfaces towards the BTS are supported, among which are:
 * Classic A-bis over E1 using a mISDN based E1 interface. In other
   words, you can connect existing GSM Base Transceiver Station (BTS)
   through E1 to OpenBSC.  So far, we have made it work with the Siemens BS-11,
   various Ericsson RBS2xxx BTS models and the Nokia MetroSite.
 * A-bis over IP as used by the ip.access nanoBTS product family as well as
   the Open Source OsmoBTS software (by the same authors as OpenBSC).  OsmoBTS
   in turn supports various transceiver hardware, including the sysmoBTS
   product family, as well as SDR transceivers supported by OsmoTRX, such as
   the UmTRX or USRP boardss.
 * IuCS and IuPS over IP towards an HNB-GW (see osmo-iuh) for UMTS (3G)
   voice and data links.
 Find OpenBSC online at
 http://openbsc.osmocom.org/
 	Harald Welte <laforge@gnumonks.org>
--- a/openbsc/README.vty-tests
+++ b/openbsc/README.vty-tests
--- a/openbsc/configure.ac
+++ b/openbsc/configure.ac
@@ -0,0 +1,267 @@
 dnl Process this file with autoconf to produce a configure script
 AC_INIT([openbsc],
 	m4_esyscmd([./git-version-gen .tarball-version]),
 	[openbsc@lists.osmocom.org])
 dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
 AC_CONFIG_AUX_DIR([.])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_CONFIG_TESTDIR(tests)
 dnl kernel style compile messages
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 dnl checks for programs
 AC_PROG_MAKE_SET
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 dnl check for pkg-config (explained in detail in libosmocore/configure.ac)
 AC_PATH_PROG(PKG_CONFIG_INSTALLED, pkg-config, no)
 if test "x$PKG_CONFIG_INSTALLED" = "xno"; then
        AC_MSG_WARN([You need to install pkg-config])
 fi
 PKG_PROG_PKG_CONFIG([0.20])
 dnl check for AX_CHECK_COMPILE_FLAG
 m4_ifdef([AX_CHECK_COMPILE_FLAG], [], [
 	AC_MSG_ERROR([Please install autoconf-archive; re-run 'autoreconf -fi' for it to take effect.])
 	])
 dnl checks for libraries
 AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DL)
 PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.9.5)
 PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.3.0)
 PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl)
 PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.9.5)
 PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.2.0)
 PKG_CHECK_MODULES(LIBOSMOGB, libosmogb >= 0.6.4)
 PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.0.1)
 PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= 0.9.5)
 # Enabke/disable the NAT?
 AC_ARG_ENABLE([nat], [AS_HELP_STRING([--enable-nat], [Build the BSC NAT. Requires SCCP])],
    [osmo_ac_build_nat="$enableval"],[osmo_ac_build_nat="no"])
 if test "$osmo_ac_build_nat" = "yes" ; then
        PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.2)
 fi
 AM_CONDITIONAL(BUILD_NAT, test "x$osmo_ac_build_nat" = "xyes")
 AC_SUBST(osmo_ac_build_nat)
 # Enable/disable the BSC?
 AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo BSC])],
    [osmo_ac_build_bsc="$enableval"],[osmo_ac_build_bsc="no"])
 if test "$osmo_ac_build_bsc" = "yes" ; then
    PKG_CHECK_MODULES(LIBOSMOSCCP, libosmo-sccp >= 0.0.6)
 fi
 AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes")
 AC_SUBST(osmo_ac_build_bsc)
 # Enable/disable smpp support in the msc?
 AC_ARG_ENABLE([smpp], [AS_HELP_STRING([--enable-smpp], [Build the SMPP interface])],
    [osmo_ac_build_smpp="$enableval"],[osmo_ac_build_smpp="no"])
 if test "$osmo_ac_build_smpp" = "yes" ; then
    PKG_CHECK_MODULES(LIBSMPP34, libsmpp34 >= 1.10)
    AC_DEFINE(BUILD_SMPP, 1, [Define if we want to build SMPP])
 fi
 AM_CONDITIONAL(BUILD_SMPP, test "x$osmo_ac_build_smpp" = "xyes")
 AC_SUBST(osmo_ac_build_smpp)
 # Enable/disable transcoding within osmo-bsc_mgcp?
 AC_ARG_ENABLE([mgcp-transcoding], [AS_HELP_STRING([--enable-mgcp-transcoding], [Build the MGCP gateway with internal transcoding enabled.])],
    [osmo_ac_mgcp_transcoding="$enableval"],[osmo_ac_mgcp_transcoding="no"])
 AC_ARG_WITH([g729], [AS_HELP_STRING([--with-g729], [Enable G.729 encoding/decoding.])], [osmo_ac_with_g729="$withval"],[osmo_ac_with_g729="no"])
 if test "$osmo_ac_mgcp_transcoding" = "yes" ; then
    AC_SEARCH_LIBS([gsm_create], [gsm], [LIBRARY_GSM="$LIBS";LIBS=""], [AC_MSG_ERROR([--enable-mgcp-transcoding: cannot find usable libgsm])])
    AC_SUBST(LIBRARY_GSM)
    if test "$osmo_ac_with_g729" = "yes" ; then
 	PKG_CHECK_MODULES(LIBBCG729, libbcg729 >= 0.1, [AC_DEFINE([HAVE_BCG729], [1], [Use bgc729 decoder/encoder])])
    fi
    AC_DEFINE(BUILD_MGCP_TRANSCODING, 1, [Define if we want to build the MGCP gateway with transcoding support])
 fi
 AM_CONDITIONAL(BUILD_MGCP_TRANSCODING, test "x$osmo_ac_mgcp_transcoding" = "xyes")
 AC_SUBST(osmo_ac_mgcp_transcoding)
 # Enable/disable 3G aka IuPS + IuCS support?
 AC_ARG_ENABLE([iu], [AS_HELP_STRING([--enable-iu], [Build 3G support, aka IuPS and IuCS interfaces])],
    [osmo_ac_iu="$enableval"],[osmo_ac_iu="no"])
 if test "x$osmo_ac_iu" = "xyes" ; then
    PKG_CHECK_MODULES(LIBASN1C, libasn1c) # TODO version?
    PKG_CHECK_MODULES(LIBOSMORANAP, libosmo-ranap) # TODO version?
    PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran) # TODO version?
    AC_DEFINE(BUILD_IU, 1, [Define if we want to build IuPS and IuCS interfaces support])
 fi
 AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes")
 AC_SUBST(osmo_ac_iu)
 found_libgtp=yes
 PKG_CHECK_MODULES(LIBGTP, libgtp >= 0.92, , found_libgtp=no)
 AM_CONDITIONAL(HAVE_LIBGTP, test "$found_libgtp" = yes)
 AC_SUBST(found_libgtp)
 found_libcares=yes
 PKG_CHECK_MODULES([LIBCARES], [libcares], [], [found_libcares=no])
 AM_CONDITIONAL(HAVE_LIBCARES, test "$found_libcares" = yes)
 AC_SUBST(found_libcares)
 found_libgtp_and_libcares=no
 if test "$found_libgtp" = "yes" -a "$found_libcares" = "yes"; then
    found_libgtp_and_libcares=yes
 fi
 AC_SUBST(found_libgtp_and_libcares)
 dnl checks for header files
 AC_HEADER_STDC
 AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed))
 AC_CHECK_HEADERS(pcap/pcap.h,,AC_MSG_ERROR(PCAP library is not installed))
 found_cdk=yes
 AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no)
 AM_CONDITIONAL(HAVE_LIBCDK, test "$found_cdk" = yes)
 found_sqlite3=yes
 PKG_CHECK_MODULES(SQLITE3, sqlite3, ,found_sqlite3=no)
 AM_CONDITIONAL(HAVE_SQLITE3, test "$found_sqlite3" = yes)
 AC_SUBST(found_sqlite3)
 dnl Checks for typedefs, structures and compiler characteristics
 # The following test is taken from WebKit's webkit.m4
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -fvisibility=hidden "
 AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([char foo;])],
      [ AC_MSG_RESULT([yes])
        SYMBOL_VISIBILITY="-fvisibility=hidden"],
        AC_MSG_RESULT([no]))
 CFLAGS="$saved_CFLAGS"
 AC_SUBST(SYMBOL_VISIBILITY)
 AX_CHECK_COMPILE_FLAG([-Werror=implicit], [CFLAGS="$CFLAGS -Werror=implicit"])
 AX_CHECK_COMPILE_FLAG([-Werror=maybe-uninitialized], [CFLAGS="$CFLAGS -Werror=maybe-uninitialized"])
 AX_CHECK_COMPILE_FLAG([-Werror=memset-transposed-args], [CFLAGS="$CFLAGS -Werror=memset-transposed-args"])
 AX_CHECK_COMPILE_FLAG([-Werror=null-dereference], [CFLAGS="$CFLAGS -Werror=null-dereference"])
 AX_CHECK_COMPILE_FLAG([-Werror=sizeof-array-argument], [CFLAGS="$CFLAGS -Werror=sizeof-array-argument"])
 AX_CHECK_COMPILE_FLAG([-Werror=sizeof-pointer-memaccess], [CFLAGS="$CFLAGS -Werror=sizeof-pointer-memaccess"])
 # Coverage build taken from WebKit's configure.in
 AC_MSG_CHECKING([whether to enable code coverage support])
 AC_ARG_ENABLE(coverage,
              AC_HELP_STRING([--enable-coverage],
                             [enable code coverage support [default=no]]),
              [],[enable_coverage="no"])
 AC_MSG_RESULT([$enable_coverage])
 if test "$enable_coverage" = "yes"; then
   COVERAGE_CFLAGS="-ftest-coverage -fprofile-arcs"
   COVERAGE_LDFLAGS="-ftest-coverage -fprofile-arcs"
   AC_SUBST([COVERAGE_CFLAGS])
   AC_SUBST([COVERAGE_LDFLAGS])
 fi
 AC_DEFUN([CHECK_TM_INCLUDES_TM_GMTOFF], [
  AC_CACHE_CHECK(
    [whether struct tm has tm_gmtoff member],
    osmo_cv_tm_includes_tm_gmtoff,
    [AC_LINK_IFELSE([
      AC_LANG_PROGRAM([
        #include <time.h>
      ], [
        time_t t = time(NULL);
        struct tm* lt = localtime(&t);
        int off = lt->tm_gmtoff;
      ])
    ],
    osmo_cv_tm_includes_tm_gmtoff=yes,
    osmo_cv_tm_includes_tm_gmtoff=no
    )]
  )
  if test "x$osmo_cv_tm_includes_tm_gmtoff" = xyes; then
    AC_DEFINE(HAVE_TM_GMTOFF_IN_TM, 1,
              [Define if struct tm has tm_gmtoff member.])
  fi
 ])
 CHECK_TM_INCLUDES_TM_GMTOFF
 AC_ARG_ENABLE([vty_tests],
 		AC_HELP_STRING([--enable-vty-tests],
 				[Include the VTY/CTRL tests in make check (deprecated)
 				[default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 AC_ARG_ENABLE([external_tests],
 		AC_HELP_STRING([--enable-external-tests],
 				[Include the VTY/CTRL tests in make check [default=no]]),
 		[enable_ext_tests="$enableval"],[enable_ext_tests="no"])
 if test "x$enable_ext_tests" = "xyes" ; then
 	AM_PATH_PYTHON
 	AC_CHECK_PROG(OSMOTESTEXT_CHECK,osmotestvty.py,yes)
 	 if test "x$OSMOTESTEXT_CHECK" != "xyes" ; then
 		AC_MSG_ERROR([Please install osmocom-python to run the VTY/CTRL tests.])
 	fi
 fi
 AC_MSG_CHECKING([whether to enable VTY/CTRL tests])
 AC_MSG_RESULT([$enable_ext_tests])
 AM_CONDITIONAL(ENABLE_EXT_TESTS, test "x$enable_ext_tests" = "xyes")
 dnl Generate the output
 AM_CONFIG_HEADER(bscconfig.h)
 AC_OUTPUT(
    openbsc.pc
    include/openbsc/Makefile
    include/Makefile
    src/Makefile
    src/libtrau/Makefile
    src/libbsc/Makefile
    src/libmsc/Makefile
    src/libvlr/Makefile
    src/libmgcp/Makefile
    src/libcommon/Makefile
    src/libfilter/Makefile
    src/libiu/Makefile
    src/libcommon-cs/Makefile
    src/osmo-msc/Makefile
    src/osmo-bsc/Makefile
    src/osmo-bsc_nat/Makefile
    src/osmo-bsc_mgcp/Makefile
    src/ipaccess/Makefile
    src/utils/Makefile
    src/gprs/Makefile
    tests/Makefile
    tests/atlocal
    tests/libiudummy/Makefile
    tests/gsm0408/Makefile
    tests/channel/Makefile
    tests/bsc/Makefile
    tests/bsc-nat/Makefile
    tests/bsc-nat-trie/Makefile
    tests/mgcp/Makefile
    tests/gprs/Makefile
    tests/gbproxy/Makefile
    tests/abis/Makefile
    tests/smpp/Makefile
    tests/trau/Makefile
    tests/sgsn/Makefile
    tests/subscr/Makefile
    tests/oap/Makefile
    tests/gtphub/Makefile
    tests/mm_auth/Makefile
    tests/xid/Makefile
    tests/sndcp_xid/Makefile
    tests/slhc/Makefile
    tests/v42bis/Makefile
    tests/nanobts_omlattr/Makefile
    tests/vlr/Makefile
    tests/msc_vlr/Makefile
    tests/sms_queue/Makefile
    doc/Makefile
    doc/examples/Makefile
    Makefile)
--- a/openbsc/contrib/a-link/sccp-split-by-con.lua
+++ b/openbsc/contrib/a-link/sccp-split-by-con.lua
@@ -0,0 +1,170 @@
 -- Split trace based on SCCP Source
 -- There are still bugs to find... bugs bugs bugs... hmm
 do
        local function init_listener()
                print("CREATED LISTENER")
 		local tap = Listener.new("ip", "sccp && (ip.src == 172.16.1.81 || ip.dst == 172.16.1.81)")
 		local sccp_type_field = Field.new("sccp.message_type")
 		local sccp_src_field = Field.new("sccp.slr")
 		local sccp_dst_field = Field.new("sccp.dlr")
 		local msg_type_field = Field.new("gsm_a.dtap_msg_mm_type")
 		local lu_rej_field = Field.new("gsm_a.dtap.rej_cause")
 		local ip_src_field = Field.new("ip.src")
 		local ip_dst_field = Field.new("ip.dst")
 		--
 		local bssmap_msgtype_field = Field.new("gsm_a.bssmap_msgtype")
 		-- assignment failure 0x03
 		-- 
 		--
 		local dtap_cause_field = Field.new("gsm_a_dtap.cause")
 		local dtap_cc_field = Field.new("gsm_a.dtap_msg_cc_type")
 		local connections = {}
 		function check_failure(con)
 			check_lu_reject(con)
 			check_disconnect(con)
 			check_failures(con)
 		end
 		-- cipher mode reject
 		function check_failures(con)
 			local msgtype = bssmap_msgtype_field()
 			if not msgtype then
 				return
 			end
 			msgtype = tonumber(msgtype)
 			if msgtype == 89 then
 				print("Cipher mode reject")
 				con[4] = true
 			elseif msgtype == 0x03 then
 				print("Assignment failure")
 				con[4] = true
 			elseif msgtype == 0x22 then
 				print("Clear Request... RF failure?")
 				con[4] = true
 			end
 		end
 		-- check if a DISCONNECT is normal
 		function check_disconnect(con)
 			local msg_type = dtap_cc_field()
 			if not msg_type then
 				return
 			end
 			if tonumber(msg_type) ~= 0x25 then
 				return
 			end
 			local cause = dtap_cause_field()
 			if not cause then
 				return
 			end
 			cause = tonumber(cause)
 			if cause ~= 0x10 then
 				print("DISCONNECT != Normal")
 				con[4] = true
 			end
 		end
 		-- check if we have a LU Reject
 		function check_lu_reject(con)
 			local msg_type =  msg_type_field()
 			if not msg_type then
 				return
 			end
 			msg_type = tonumber(tostring(msg_type))
 			if msg_type == 0x04 then
 				print("LU REJECT with " .. tostring(lu_rej_field()))
 				con[4] = true
 			end
 		end
                function tap.packet(pinfo,tvb,ip)
 			local ip_src = tostring(ip_src_field())
 			local ip_dst = tostring(ip_dst_field())
 			local sccp_type = tonumber(tostring(sccp_type_field()))
 			local sccp_src = sccp_src_field()
 			local sccp_dst = sccp_dst_field()
 			local con
 			if sccp_type == 0x01 then
 			elseif sccp_type == 0x2 then
 				local src = string.format("%s-%s", ip_src, tostring(sccp_src))
 				local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
 				local datestring = os.date("%Y%m%d%H%M%S")
 				local pcap_name = string.format("alink_trace_%s-%s_%s.pcap", src, dst, datestring)
 				local dumper = Dumper.new_for_current(pcap_name)
 				local con = { ip_src, tostring(sccp_src), tostring(sccp_dst), false, dumper, pcap_name }
 				dumper:dump_current()
 				connections[src] = con
 				connections[dst] = con
 			elseif sccp_type == 0x4 then
 				-- close a connection... remove it from the list
 				local src = string.format("%s-%s", ip_src, tostring(sccp_src))
 				local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
 				local con = connections[src]
 				if not con then
 					return
 				end
 				con[5]:dump_current()
 				con[5]:flush()
 				-- this causes a crash on unpacted wireshark
 				con[5]:close()
 				-- the connection had a failure
 				if con[4] == true then
 					local datestring = os.date("%Y%m%d%H%M%S")
 					local new_name = string.format("alink_failure_%s_%s-%s.pcap", datestring, con[2], con[3])
 					os.rename(con[6], new_name)
 				else
 					os.remove(con[6])
 				end
 				-- clear the old connection
 				connections[src] = nil
 				connections[dst] = nil
 			elseif sccp_type == 0x5 then
 				-- not handled yet... we should verify stuff here...
 				local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
 				local con = connections[dst]
 				if not con then
 					return
 				end
 				con[5]:dump_current()
 			elseif sccp_type == 0x6 then
 				local dst = string.format("%s-%s", ip_dst, tostring(sccp_dst))
 				local con = connections[dst]
 				if not con then
 					print("DON'T KNOW THIS CONNECTION for " .. ip_dst)
 					return
 				end
 				con[5]:dump_current()
 				check_failure(con)
 			end
                end
                function tap.draw()
                        print("DRAW")
                end
                function tap.reset()
                        print("RESET")
                end
        end
        init_listener()
 end
--- a/openbsc/contrib/bsc-test/README
+++ b/openbsc/contrib/bsc-test/README
@@ -0,0 +1 @@
 Some crazy scripts call testing... and MSC link failure simulation
--- a/openbsc/contrib/bsc-test/all_dial
+++ b/openbsc/contrib/bsc-test/all_dial
@@ -0,0 +1,8 @@
 ABORT BUSY
 ABORT 'NO CARRIER'
 ABORT 'OK'
 '' AT
 SAY "Dialing a number\n"
 'OK' ATD05660066;
--- a/openbsc/contrib/bsc-test/dial.sh
+++ b/openbsc/contrib/bsc-test/dial.sh
@@ -0,0 +1,11 @@
 #!/bin/sh
 # Evil dial script..
 while true;
 do
 	chat -v -f all_dial < /dev/ttyACM0 > /dev/ttyACM0
 	sleep 5s
 	chat -v -f hangup < /dev/ttyACM0 > /dev/ttyACM0
 	sleep 2s
 done
--- a/openbsc/contrib/bsc-test/drop-oml.sh
+++ b/openbsc/contrib/bsc-test/drop-oml.sh
@@ -0,0 +1,6 @@
 #!/bin/sh
 sleep 3
 echo "enable"
 sleep 1
 echo "drop bts connection 0 oml"
 sleep 1
--- a/openbsc/contrib/bsc-test/drop.sh
+++ b/openbsc/contrib/bsc-test/drop.sh
@@ -0,0 +1,8 @@
 #!/bin/sh
 while true;
 do
 	echo "Going to drop the OML connection"
 	./drop-oml.sh | telnet 127.0.0.1 4242
 	sleep 58m
 done
--- a/openbsc/contrib/bsc-test/hangup
+++ b/openbsc/contrib/bsc-test/hangup
@@ -0,0 +1,4 @@
 TIMEOUT 10
 '' ^Z
 SAY "Waiting for hangup confirm\n"
 '' ATH;
--- a/openbsc/contrib/bsc-test/msc.sh
+++ b/openbsc/contrib/bsc-test/msc.sh
@@ -0,0 +1,8 @@
 #!/bin/sh
 while true;
 do
 	echo "Kill the osmo-bsc"
 	/usr/bin/kill -s SIGUSR2 `pidof osmo-bsc`
 	sleep 58s
 done
--- a/openbsc/contrib/bsc_control.py
+++ b/openbsc/contrib/bsc_control.py
@@ -0,0 +1,120 @@
 #!/usr/bin/python
 # -*- mode: python-mode; py-indent-tabs-mode: nil -*-
 """
 /*
 * Copyright (C) 2016 sysmocom s.f.m.c. GmbH
 *
 * All Rights Reserved
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License along
 * with this program; if not, write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 """
 from optparse import OptionParser
 from ipa import Ctrl
 import socket
 verbose = False
 def connect(host, port):
        if verbose:
                print "Connecting to host %s:%i" % (host, port)
        sck = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
        sck.setblocking(1)
        sck.connect((host, port))
        return sck
 def do_set_get(sck, var, value = None):
        (r, c) = Ctrl().cmd(var, value)
        sck.send(c)
        answer = Ctrl().rem_header(sck.recv(4096))
        return (answer,) + Ctrl().verify(answer, r, var, value)
 def set_var(sck, var, val):
        (a, _, _) = do_set_get(sck, var, val)
        return a
 def get_var(sck, var):
        (_, _, v) = do_set_get(sck, var)
        return v
 def _leftovers(sck, fl):
        """
        Read outstanding data if any according to flags
        """
        try:
                data = sck.recv(1024, fl)
        except socket.error as (s_errno, strerror):
                return False
        if len(data) != 0:
                tail = data
                while True:
                        (head, tail) = Ctrl().split_combined(tail)
                        print "Got message:", Ctrl().rem_header(head)
                        if len(tail) == 0:
                                break
                return True
        return False
 if __name__ == '__main__':
        parser = OptionParser("Usage: %prog [options] var [value]")
        parser.add_option("-d", "--host", dest="host",
                          help="connect to HOST", metavar="HOST")
        parser.add_option("-p", "--port", dest="port", type="int",
                          help="use PORT", metavar="PORT", default=4249)
        parser.add_option("-g", "--get", action="store_true",
                          dest="cmd_get", help="perform GET operation")
        parser.add_option("-s", "--set", action="store_true",
                          dest="cmd_set", help="perform SET operation")
        parser.add_option("-v", "--verbose", action="store_true",
                          dest="verbose", help="be verbose", default=False)
        parser.add_option("-m", "--monitor", action="store_true",
                          dest="monitor", help="monitor the connection for traps", default=False)
        (options, args) = parser.parse_args()
        verbose = options.verbose
        if options.cmd_set and options.cmd_get:
                parser.error("Get and set options are mutually exclusive!")
        if not (options.cmd_get or options.cmd_set or options.monitor):
                parser.error("One of -m, -g, or -s must be set")
        if not (options.host):
                parser.error("Destination host and port required!")
        sock = connect(options.host, options.port)
        if options.cmd_set:
                if len(args) < 2:
                        parser.error("Set requires var and value arguments")
                _leftovers(sock, socket.MSG_DONTWAIT)
                print "Got message:", set_var(sock, args[0], ' '.join(args[1:]))
        if options.cmd_get:
                if len(args) != 1:
                        parser.error("Get requires the var argument")
                _leftovers(sock, socket.MSG_DONTWAIT)
                (a, _, _) = do_set_get(sock, args[0])
                print "Got message:", a
        if options.monitor:
                while True:
                        if not _leftovers(sock, 0):
                                print "Connection is gone."
                                break
        sock.close()
--- a/Show More
+++ b/Show More
		`@@ -0,0 +1,2 @@`
							`CONFIG_FILE="/etc/osmocom/osmo-gtphub.cfg"`
		`@@ -0,0 +1,2 @@`
							`/usr/bin/osmo-bsc_mgcp`
							`/usr/bin/osmo-bsc`
		`@@ -1,2 +0,0 @@`
			`<vtydoc xmlns='urn:osmocom:xml:libosmocore:vty:doc:1.0'>`
			`</vtydoc>`
		`@@ -0,0 +1 @@`
							`Some crazy scripts call testing... and MSC link failure simulation`