log protocol discriminators and message types by name

Depends: libosmocore change-id I0fca8e95ed5c2148b1a7440eff3fc9c7583898df Change-Id: If1c49faf6e1757cb16b383dd2db87b48bc94eee6
adjust msc_vlr_test_reject_concurrency
2025-11-02 13:03:33 +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
601 changed files with 161038 additions and 19198 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,63 +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
--- 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/26
+++ b/26
@@ -1,26 +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
--- a/configure.ac
+++ b/configure.ac
@@ -1,212 +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)
-
-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 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)
-
-AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""])
-AC_SUBST(LIBRARY_DLSYM)
-
-
-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.1.0)
-PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0)
-
-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
-
-dnl Checks for typedefs, structures and compiler characteristics
-
-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([-Wnull-dereference], [CFLAGS="$CFLAGS -Wnull-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_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
-    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,49 +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
-CONFIG=""
-if [ "$WITH_MANUALS" = "1" ]; then
-	osmo-build-dep.sh osmo-gsm-manuals
-	CONFIG="--enable-manuals"
+if [ "x$IU" = "x--enable-iu" ]; then
+	osmo-build-dep.sh libasn1c
+	#osmo-build-dep.sh asn1c aper-prefix # only needed for make regen in osmo-iuh
+	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-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" \
-  DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests $CONFIG" \
-  $MAKE distcheck \
+LD_LIBRARY_PATH="$inst/lib" $MAKE distcheck \
  || cat-testlogs.sh
-
-if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
-	make -C "$base/doc/manuals" publish
-fi
-
-$MAKE maintainer-clean
-osmo-clean-workspace.sh
--- a/contrib/osmo-mgw.spec
+++ b/contrib/osmo-mgw.spec
@@ -1,136 +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:        0.0.0
-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%{?centos_ver}
-BuildRequires:  systemd
-%else
-BuildRequires:  systemd-rpm-macros
-%endif
-BuildRequires:  pkgconfig(libosmo-netif) >= 0.6.0
-BuildRequires:  pkgconfig(libosmocore) >= 1.0.0
-BuildRequires:  pkgconfig(libosmoctrl) >= 1.1.0
-BuildRequires:  pkgconfig(libosmogsm) >= 1.0.0
-BuildRequires:  pkgconfig(libosmovty) >= 1.0.0
-BuildRequires:  pkgconfig(libosmocoding) >= 1.0.0
-%{?systemd_requires}
-
-%description
-OsmoMGW is Osmocom's Media Gateway for 2G and 3G circuit-switched mobile networks.
-
-%package -n libosmo-mgcp-client6
-Summary:        Osmocom's Media Gateway Control Protocol client library
-Group:          System/Libraries
-
-%description -n libosmo-mgcp-client6
-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-client6 = %{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-client6 -p /sbin/ldconfig
-%postun -n libosmo-mgcp-client6 -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
-%{_bindir}/osmo-mgw
-%{_unitdir}/osmo-mgw.service
-%dir %{_sysconfdir}/osmocom
-%config %{_sysconfdir}/osmocom/osmo-mgw.cfg
-
-%files -n libosmo-mgcp-client6
-%{_libdir}/libosmo-mgcp-client.so.6*
-
-%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,476 +1,75 @@
-osmo-mgw (1.7.0) unstable; urgency=medium
+openbsc (0.15.1) UNRELEASED; urgency=medium

-  [ Neels Hofmeyr ]
-  * 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
+  * Move forward toward a new release.
+  * Prevent SGSN starting with 'auth-policy remote' when no 'gsup remote-*' are configured.
+    Note: such configs are broken without extra workarounds anyway.

-  [ Pau Espin Pedrol ]
-  * mgcp_test: Correctly release all endpoints allocated
-  * mgw: Allocate mgcp_conn instance under tcfg->endpoints
+ -- Holger Hans Peter Freyther <holger@moiji-mobile.com>  Tue, 24 May 2016 23:14:31 +0200

-  [ Harald Welte ]
-  * 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
+openbsc (0.14.0) unstable; urgency=low

-  [ Oliver Smith ]
-  * osmoappdesc.py: switch to python 3
+  * New upstream tag and additional patches.

- -- Pau Espin Pedrol <pespin@sysmocom.de>  Fri, 03 Jan 2020 13:35:09 +0100
+ -- Holger Hans Peter Freyther <holger@freyther.de>  Sat, 14 Mar 2015 20:33:25 +0100

-osmo-mgw (1.6.0) unstable; urgency=medium
+openbsc (0.12.0+git26-7) unstable; urgency=low

-  [ 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"
+  * 64bit fix for the MGCP rewriting

-  [ 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
+ -- Holger Hans Peter Freyther <holger@freyther.de>  Wed, 07 Nov 2012 11:39:34 +0100

-  [ 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
+openbsc (0.12.0+git26-6) precise; urgency=low

-  [ 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
+  * Added init script for osmocom-sgsn. 

-  [ Alexander Couzens ]
-  * mgcp_internal: LOGPENDP: ensure *endp is not NULL
+ -- Eric Butler <eric@codebutler.com>  Fri, 24 Aug 2012 21:04:32 -0700

-  [ Harald Welte ]
-  * handle NULL return of rate_ctr_group_alloc()
-  * update .gitignore
-  * mgcp_sdp: Don't check if an unsigned int is below 0
+openbsc (0.12.0+git26-5) precise; urgency=low

-  [ Vadim Yanitskiy ]
-  * configure.ac: drop useless check for -fvisibility=hidden
+  * Don't enable MNCC sock by default.
+  * Automatically create important directories.
+  * Fix init script 'stop' command.

-  [ Daniel Willmann ]
-  * manuals: Add script to regenerate vty/counter documentation
-  * manuals: Update vty/counter documentation
+ -- Eric Butler <eric@codebutler.com>  Fri, 24 Aug 2012 20:56:33 -0700

-  [ Hoernchen ]
-  * turn -Werror=null-dereference into a warning
+openbsc (0.12.0+git26-4) precise; urgency=low

- -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 07 Aug 2019 16:52:58 +0200
+  * Specify HLR path and enable RTP proxy.

-osmo-mgw (1.5.0) unstable; urgency=medium
+ -- Eric Butler <eric@codebutler.com>  Mon, 20 Aug 2012 00:21:07 -0700

-  [ 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
+openbsc (0.12.0+git26-3) precise; urgency=low

-  [ 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
+  * Fix init script.

-  [ 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}
+ -- Eric Butler <eric@codebutler.com>  Sun, 19 Aug 2012 16:05:44 -0700

-  [ 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
+openbsc (0.12.0+git26-2) precise; urgency=low

-  [ 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
+  * Fix libdbi package dependency.

-  [ Daniel Willmann ]
-  * mgw: Add new VTY reference
-  * Add initial OsmoMGW manual
+ -- Eric Butler <eric@codebutler.com>  Wed, 15 Aug 2012 00:35:37 -0700

-  [ 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
+openbsc (0.12.0+git26-1) precise; urgency=low

- -- Harald Welte <laforge@gnumonks.org>  Sun, 20 Jan 2019 15:02:18 +0100
+  * Fix version issue.

-osmo-mgw (1.4.0) unstable; urgency=medium
+ -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 21:00:51 -0700

-  [ 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
+openbsc (0.12.0+git26) precise; urgency=low

-  [ 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
+  * Updated ubuntu package.

-  [ 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
+ -- Eric Butler <eric@codebutler.com>  Tue, 14 Aug 2012 17:36:51 -0700

-  [ 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
+openbsc (0.9.13.115.eb113-1) natty; urgency=low

  * 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
-
-
-osmo-mgw (0.1.0) unstable; urgency=low
-
-  * Initial release.
-
- -- Alexander Couzens <lynxis@fe80.eu>  Tue, 08 Aug 2017 01:12:53 +0000
+ -- Harald Welte <laforge@gnumonks.org>  Tue, 24 Aug 2010 13:34:24 +0200
--- a/debian/control
+++ b/debian/control
@@ -1,45 +1,181 @@
-Source: osmo-mgw
+Source: openbsc
+Maintainer: Harald Welte <laforge@gnumonks.org>
 Section: net
-Priority: extra
-Maintainer: Alexander Couzens <lynxis@fe80.eu>
-Build-Depends: debhelper (>=9),
-               dh-autoreconf,
-               pkg-config,
-               autotools-dev,
-               libosmocore-dev,
-               libosmo-netif-dev,
-               osmo-gsm-manuals-dev
-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-client6
-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-client6 (= ${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
- Various manuals: user manual, VTY reference manual and/or
- protocol/interface manuals.
+Description: Header file needed by tools tightly integrated
+ Some other programs depend on gsm_data_shared.h and gsm_data_shared.c
+ 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
-Source: git://git.osmocom.org/osmo-mgw
+Upstream-Name: OpenBSC
+Source: http://openbsc.osmocom.org/

-Files:     *
-Copyright: 2009-2014 On-Waves
-           2009-2015 Holger Hans Peter Freyther <zecke@selfish.org>
-           2013 Jacob Erlbeck <jerlbeck@sysmocom.de>
-           2016-2017 sysmocom s.m.f.c. GmbH <info@sysmocom.de>
-License:   AGPL-3.0+
- This program is free software; you can redistribute it and/or modify
+Files: *
+Copyright: 2008-2015        Harald Welte <laforge@gnumonks.org>
+           2008-2015        Holger Hans Peter Freyther <zecke@selfish.org>
+           2009-2015        On-Waves
+           2008             Jan Luebbe <jluebbe@debian.org>
+           2008,2010-2011   Daniel Willmann <daniel@totalueberwachung.de>
+           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
-Copyright: 2013 Holger Hans Peter Freyther
-           2013 Katerina Barone-Adesi <kat.obsc@gmail.com>
-License:   GPL-3.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 3 of the License, or
- (at your option) any later version.
+License: GPL-2+
+ 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 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.
+ 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'.
+ On Debian systems, the complete text of the GNU General Public
+ 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.0+
+
+License: GPL-3+
+ 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-client6.install
+++ b/debian/libosmo-mgcp-client6.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,4 +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
--- 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
-# Set options for ./configure
-#CONFIGURE_FLAGS = <options for ./configure>
-#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
+# This is needed for debian stable (squeeze)
+override_dh_autoreconf:
+	cd openbsc && autoreconf --install --force

-override_dh_auto_test:
-	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)
+override_dh_strip:
+	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.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-tos 184
-  bind port 2427
-  sdp audio payload number 98
-  sdp audio payload name GSM
-  number endpoints 31
-  loop 0
-  force-realloc 1
-  rtcp-omit
-  rtp-patch ssrc
-  rtp-patch timestamp
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,18 +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
-
-  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,57 +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 (trunk 0) 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 which are not yet implemented. Don't use trunks other than the
-"virtual" trunk 0.
-
-.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
-
-
--- 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_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,100 +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 -> OsmoMSC [label="3GPP AoIP"];
-    OsmoBSC -> OsmoMGW [label="MGCP"];
-    OsmoBTS -> OsmoMGW [label="RTP",dir=both];
-    OsmoMGW -> OsmoMSC [label="RTP",dir=both];
-    {rank=same OsmoBSC OsmoMGW}
-    OsmoMGW [color=red];
-}
----
-
-[[fig-msc]]
-.OsmoMGW used with OsmoMSC
-[graphviz]
----
-digraph G {
-    rankdir = LR;
-    BTS -> BSC [label="Abis"];
-    BSC -> OsmoMSC [label="3GPP AoIP"];
-    OsmoMSC -> OsmoMGW [label="MGCP"];
-    BSC -> 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];
-}
----
-
-=== 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
-
-Osmux is not yet supported in OsmoMGW.
-
-At the moment (July 2018), OsmoMGW only implements RTP proxy / RTP bridge
-type endpoints, to each of which two RTP connections can be established.
-We are planning to add endpoint types for:
-
- classic E1/T1 timeslots (64kBps alaw/ulaw)
- classic E1/T1 16k sub-slots with TRAU frames for classic BTS support
- announcement/playout end-points
- conference endpoints
-
-=== Additional resources
-
-You can find the OsmoMGW issue tracker and wiki online at
-
- https://osmocom.org/projects/osmomgw
- https://osmocom.org/projects/osmomgw/wiki
-
-RFC 3435 for MGCP is located at
-
- https://tools.ietf.org/html/rfc3435
--- 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,33 +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_extensions.adoc[]
-
-include::./common/chapters/osmux/osmux.adoc[]
-
-//include::{srcdir}/chapters/counters.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/doc/manuals/vty/mgw_vty_reference.xml
+++ b/doc/manuals/vty/mgw_vty_reference.xml
--- 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/mgcp.h \
-	osmocom/mgcp/mgcp_common.h \
-	osmocom/mgcp/mgcp_internal.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,11 +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 \
-	debug.h \
-	$(NULL)
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -1,7 +0,0 @@
-#pragma once
-
-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);
--- a/include/osmocom/mgcp/mgcp_common.h
+++ b/include/osmocom/mgcp/mgcp_common.h
@@ -1,107 +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/"
-
-/* 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,80 +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_internal.h>
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/rate_ctr.h>
-#include <inttypes.h>
-
-/* 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."}
-};
-
-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);
--- a/include/osmocom/mgcp/mgcp_endp.h
+++ b/include/osmocom/mgcp/mgcp_endp.h
@@ -1,101 +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
-
-struct sockaddr_in;
-struct mgcp_conn;
-struct mgcp_endpoint;
-
-/* Callback type for RTP dispatcher functions
-   (e.g mgcp_dispatch_rtp_bridge_cb, see below) */
-typedef int (*mgcp_dispatch_rtp_cb) (int proto, struct sockaddr_in *addr,
-				     char *buf, unsigned int buf_size,
-				     struct mgcp_conn *conn);
-
-/* 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;
-};
-
-/*! static MGCP endpoint typeset (pre-initalized, read-only) */
-extern const struct mgcp_endpoint_typeset ep_typeset;
-
-/*! MGCP endpoint model */
-struct mgcp_endpoint {
-
-	/*! 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 MGW configuration */
-	struct mgcp_config *cfg;
-
-	/*! Backpointer to the Trunk specific configuration */
-	struct mgcp_trunk_config *tcfg;
-
-	/*! 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;
-
-	/*! Memorize if this endpoint was choosen by the MGW (wildcarded, true)
-	 *   or if the user has choosen the particular endpoint explicitly. */
-	bool wildcarded_req;
-
-	/*! MGCP_X_OSMO_IGN_* flags from 'X-Osmo-IGN:' header */
-	uint32_t x_osmo_ign;
-};
-
-/*! Extract endpoint number for a given endpoint */
-#define ENDPOINT_NUMBER(endp) abs((int)(endp - endp->tcfg->endpoints))
-
-void mgcp_endp_release(struct mgcp_endpoint *endp);
--- a/include/osmocom/mgcp/mgcp_internal.h
+++ b/include/osmocom/mgcp/mgcp_internal.h
@@ -1,352 +0,0 @@
-/* MGCP Private Data */
-
-/*
- * (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 <string.h>
-#include <inttypes.h>
-#include <osmocom/core/select.h>
-#include <osmocom/mgcp/mgcp.h>
-#include <osmocom/core/linuxlist.h>
-#include <osmocom/core/counter.h>
-#include <osmocom/core/rate_ctr.h>
-
-#define CI_UNUSED 0
-
-/* FIXME: This this is only needed to compile the currently
- * broken OSMUX support. Remove when fixed */
-#define CONN_ID_BTS "0"
-#define CONN_ID_NET "1"
-
-enum mgcp_trunk_type {
-	MGCP_TRUNK_VIRTUAL,
-	MGCP_TRUNK_E1,
-};
-
-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? */
-		int 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;
-
-	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;
-
-	bool patched_first_rtp_payload; /* FIXME: drop this, see OS#2459 */
-};
-
-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;
-	char *subtype_name;
-
-	bool param_present;
-	struct mgcp_codec_param param;
-};
-
-/* 'mgcp_rtp_end': basically a wrapper around the RTP+RTCP ports */
-struct mgcp_rtp_end {
-	/* local IP address of the RTP socket */
-	struct in_addr 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 (1) or dropping (0) outbound packets */
-	int 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;
-};
-
-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 sockaddr_in forward;
-};
-
-struct mgcp_lco {
-	char *string;
-	char *codec;
-	int pkt_period_min; /* time in ms */
-	int pkt_period_max; /* time in ms */
-};
-
-/* 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,
-};
-
-#include <osmocom/mgcp/osmux.h>
-struct mgcp_conn;
-
-/* 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 rate_ctr_group *rate_ctr_group;
-};
-
-/*! 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 (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;
-};
-
-#include <osmocom/mgcp/mgcp_conn.h>
-
-struct mgcp_endpoint_type;
-
-
-
-
-
-/**
- * Internal structure while parsing a request
- */
-struct mgcp_parse_data {
-	struct mgcp_config *cfg;
-	struct mgcp_endpoint *endp;
-	char *trans;
-	char *save;
-};
-
-int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
-	      char *buf, int rc, 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(int proto, struct sockaddr_in *addr, char *buf,
-				unsigned int buf_size, struct mgcp_conn *conn);
-void mgcp_cleanup_rtp_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);
-
-/* For transcoding we need to manage an in and an output that are connected */
-static inline int endp_back_channel(int endpoint)
-{
-	return endpoint + 60;
-}
-
-struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, int index);
-struct mgcp_trunk_config *mgcp_trunk_num(struct mgcp_config *cfg, int index);
-
-char *get_lco_identifier(const char *options);
-int check_local_cx_options(void *ctx, const char *options);
-void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change,
-			 struct mgcp_rtp_end *rtp);
-uint32_t mgcp_rtp_packet_duration(struct mgcp_endpoint *endp,
-				  struct mgcp_rtp_end *rtp);
-
-/* 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(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,
-			const uint16_t seq, const int32_t transit,
-			const uint32_t ssrc);
-
-int mgcp_set_ip_tos(int fd, int tos);
-
-/* 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;
-}
-
-enum {
-	MGCP_DEST_NET = 0,
-	MGCP_DEST_BTS,
-};
-
-
-#define MGCP_DUMMY_LOAD 0x23
-
-
-/**
- * SDP related information
- */
-/* Assume audio frame length of 20ms */
-#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)
-
-void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn);
-void mgcp_conn_watchdog_kick(struct mgcp_conn *conn);
-
-#define LOGPENDP(endp, cat, level, fmt, args...) \
-LOGP(cat, level, "endpoint:0x%x " fmt, \
-     endp ? ENDPOINT_NUMBER(endp) : -1, \
-     ## args)
-
-#define LOGPCONN(conn, cat, level, fmt, args...) \
-LOGPENDP((conn)->endp, cat, level, "CI:%s " fmt, \
-         (conn)->id, \
-         ## args)
--- a/include/osmocom/mgcp/mgcp_msg.h
+++ b/include/osmocom/mgcp/mgcp_msg.h
@@ -1,56 +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>
-
-struct mgcp_conn;
-struct mgcp_parse_data;
-struct mgcp_endpoint;
-
-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);
-
-int mgcp_check_param(const struct mgcp_endpoint *endp, 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/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -1,39 +0,0 @@
-#pragma once
-
-
-#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 in_addr *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,8 +0,0 @@
-#pragma once
-
-#include <osmocom/vty/command.h>
-
-enum mgcp_vty_node {
-	MGCP_NODE = _LAST_OSMOVTY_NODE + 1,
-	TRUNK_NODE,
-};
--- a/include/osmocom/mgcp_client/Makefile.am
+++ b/include/osmocom/mgcp_client/Makefile.am
@@ -1,13 +0,0 @@
-BUILT_SOURCES = \
-	mgcp_common.h \
-	$(NULL)
-
-noinst_HEADERS = \
-	mgcp_client_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,165 +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 "0.0.0.0"
-#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];
-};
-
-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,
-};
-/* 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[INET_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);
-
-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);
-
-const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp);
-const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp);
-
-/* 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);
--- a/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
+++ b/include/osmocom/mgcp_client/mgcp_client_endpoint_fsm.h
@@ -1,51 +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);
-
-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);
-
-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,73 +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[INET_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);
-
-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,35 +0,0 @@
-#pragma once
-
-#include <osmocom/core/write_queue.h>
-
-#define MSGB_CB_MGCP_TRANS_ID 0
-
-struct mgcp_client {
-	struct mgcp_client_conf actual;
-	uint32_t remote_addr;
-	struct osmo_wqueue wq;
-	mgcp_trans_id_t next_trans_id;
-	struct llist_head responses_pending;
-	struct llist_head inuse_endpoints;
-};
-
-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/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
@@ -13,22 +13,13 @@ SUBDIRS = \
 	include \
 	src \
 	tests \
-	contrib \
 	$(NULL)

 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-	libosmo-mgcp-client.pc \
-	$(NULL)
+pkgconfig_DATA = openbsc.pc

 BUILT_SOURCES = $(top_srcdir)/.version
 EXTRA_DIST = git-version-gen osmoappdesc.py .version
-
-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/openbsc/contrib/bt.py
+++ b/openbsc/contrib/bt.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+
+import os
+
+f = open("unbalanced")
+lines = []
+for line in f:
+    lines.append(line)
+
+filenames = {}
+
+output = []
+for line in lines:
+    if "[0x" in line:
+        start = line.find("[")
+        end = line.find("]")
+        addr = line[start+1:end]
+        try:
+            file = filenames[addr]
+        except KeyError:
+            r = os.popen("addr2line -fs -e ./bsc_hack %s" % addr)
+            all = r.read().replace("\n", ",")
+            file = all
+            filenames[addr] = file
+
+        line = line.replace(addr, file)
+    output.append(line)
+
+g = open("unbalanced.2", "w")
+g.write("".join(output))
+
+
+
--- a/openbsc/contrib/convert_to_enum.py
+++ b/openbsc/contrib/convert_to_enum.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+#
+# Convert ETSI documents to an enum
+#
+
+import re, sys
+
+def convert(string):
+    string = string.strip().replace(" ", "").rjust(8, "0")
+    var = 0
+    offset = 7
+    for char in string:
+        assert offset >= 0
+        var = var | (int(char) << offset)
+        offset = offset - 1
+
+    return var
+
+def string(name):
+    name = name.replace(" ", "_")
+    name = name.replace('"', "")
+    name = name.replace('/', '_')
+    name = name.replace('(', '_')
+    name = name.replace(')', '_')
+    return "%s_%s" % (sys.argv[2], name.upper())
+
+file = open(sys.argv[1])
+
+
+for line in file:
+    m = re.match(r"[ \t]*(?P<value>[01 ]+)[ ]+(?P<name>[a-zA-Z /0-9()]+)", line[:-1])
+
+    if m:
+        print "\t%s\t\t= %d," % (string(m.groupdict()["name"]), convert(m.groupdict()["value"]))
+    else:
+        print line[:-1]
--- a/openbsc/contrib/ctrl2sse.py
+++ b/openbsc/contrib/ctrl2sse.py
@@ -0,0 +1,147 @@
+#!/usr/bin/python2
+
+mod_license = '''
+/*
+ * 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.
+ */
+'''
+
+import sys, argparse, random, logging, tornado.ioloop, tornado.web, tornado.tcpclient, tornado.httpclient, eventsource, bsc_control
+from eventsource import listener, request
+
+'''
+N. B: this is not an example of building proper REST API or building secure web application.
+It's only purpose is to illustrate conversion of Osmocom's Control Interface to web-friendly API.
+Exposing this to Internet while connected to production network might lead to all sorts of mischief and mayhem
+from NSA' TAO breaking into your network to zombie apocalypse. Do NOT do that.
+'''
+
+token = None
+stream = None
+url = None
+
+'''
+Returns json according to following schema - see http://json-schema.org/documentation.html for details:
+{
+        "title": "Ctrl Schema",
+        "type": "object",
+        "properties": {
+                "variable": {
+                        "type": "string"
+                },
+                "varlue": {
+                        "type": "string"
+                }
+        },
+        "required": ["interface", "variable", "value"]
+}
+Example validation from command-line:
+json validate --schema-file=schema.json --document-file=data.json
+The interface is represented as string because it might look different for IPv4 vs v6.
+'''
+
+def read_header(data):
+	t_length = bsc_control.ipa_ctrl_header(data)
+	if (t_length):
+		stream.read_bytes(t_length - 1, callback = read_trap)
+	else:
+		print >> sys.stderr, "protocol error: length missing in %s!" % data
+
+@tornado.gen.coroutine
+def read_trap(data):
+	(t, z, v, p) = data.split()
+	if (t != 'TRAP' or int(z) != 0):
+		print >> sys.stderr, "protocol error: TRAP != %s or 0! = %d" % (t, int(z))
+	else:
+		yield tornado.httpclient.AsyncHTTPClient().fetch(tornado.httpclient.HTTPRequest(url = "%s/%s/%s" % (url, "ping", token),
+												method = 'POST',
+												headers = {'Content-Type': 'application/json'},
+												body = tornado.escape.json_encode({ 'variable' : v, 'value' : p })))
+		stream.read_bytes(4, callback = read_header)
+
+@tornado.gen.coroutine
+def trap_setup(host, port, target_host, target_port, tk):
+	global stream
+	global url
+	global token
+	token = tk
+	url = "http://%s:%s/sse" % (host, port)
+	stream = yield tornado.tcpclient.TCPClient().connect(target_host, target_port)
+	stream.read_bytes(4, callback = read_header)
+
+def get_v(s, v):
+	return { 'variable' : v, 'value' : bsc_control.get_var(s, tornado.escape.native_str(v)) }
+
+class CtrlHandler(tornado.web.RequestHandler):
+	def initialize(self):
+		self.skt = bsc_control.connect(self.settings['ctrl_host'], self.settings['ctrl_port'])
+
+	def get(self, v):
+		self.write(get_v(self.skt, v))
+
+	def post(self):
+		self.write(get_v(self.skt, self.get_argument("variable")))
+
+class SetCtrl(CtrlHandler):
+	def get(self, var, val):
+		bsc_control.set_var(self.skt, tornado.escape.native_str(var), tornado.escape.native_str(val))
+		super(SetCtrl, self).get(tornado.escape.native_str(var))
+
+	def post(self):
+		bsc_control.set_var(self.skt, tornado.escape.native_str(self.get_argument("variable")), tornado.escape.native_str(self.get_argument("value")))
+		super(SetCtrl, self).post()
+
+class Slash(tornado.web.RequestHandler):
+	def get(self):
+		self.write('<html><head><title>%s</title></head><body>Using Tornado framework v%s'
+				'<form action="/get" method="POST">'
+					'<input type="text" name="variable">'
+					'<input type="submit" value="GET">'
+				'</form>'
+				'<form action="/set" method="POST">'
+					'<input type="text" name="variable">'
+					'<input type="text" name="value">'
+					'<input type="submit" value="SET">'
+				'</form>'
+				'</body></html>' % ("Osmocom Control Interface Proxy", tornado.version))
+
+if __name__ == '__main__':
+	p = argparse.ArgumentParser(description='Osmocom Control Interface proxy.')
+	p.add_argument('-c', '--control-port', type = int, default = 4252, help = "Target Control Interface port")
+	p.add_argument('-a', '--control-host', default = 'localhost', help = "Target Control Interface adress")
+	p.add_argument('-b', '--host', default = 'localhost', help = "Adress to bind proxy's web interface")
+	p.add_argument('-p', '--port', type = int, default = 6969, help = "Port to bind proxy's web interface")
+	p.add_argument('-d', '--debug', action='store_true', help = "Activate debugging (default off)")
+	p.add_argument('-t', '--token', default = 'osmocom', help = "Token to be used by SSE client in URL e. g. http://127.0.0.1:8888/poll/osmocom where 'osmocom' is default token value")
+	p.add_argument('-k', '--keepalive', type = int, default = 5000, help = "Timeout betwwen keepalive messages, in milliseconds, defaults to 5000")
+	args = p.parse_args()
+	random.seed()
+	tornado.netutil.Resolver.configure('tornado.netutil.ThreadedResolver') # Use non-blocking resolver
+	logging.basicConfig()
+	application = tornado.web.Application([
+		(r"/", Slash),
+		(r"/get", CtrlHandler),
+		(r"/get/(.*)", CtrlHandler),
+		(r"/set", SetCtrl),
+		(r"/set/(.*)/(.*)", SetCtrl),
+		(r"/sse/(.*)/(.*)", listener.EventSourceHandler, dict(event_class = listener.JSONIdEvent, keepalive = args.keepalive)),
+	], debug = args.debug, ctrl_host = args.control_host, ctrl_port = args.control_port)
+	application.listen(address = args.host, port = args.port)
+	trap_setup(args.host, args.port, application.settings['ctrl_host'], application.settings['ctrl_port'], args.token)
+	tornado.ioloop.IOLoop.instance().start()
--- a/openbsc/contrib/gprs/gb-proxy-unblock-bug.py
+++ b/openbsc/contrib/gprs/gb-proxy-unblock-bug.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python
+
+"""
+demonstrate a unblock bug on the GB Proxy..
+"""
+
+bts_ns_reset = "\x02\x00\x81\x01\x01\x82\x1f\xe7\x04\x82\x1f\xe7"
+ns_reset_ack = "\x03\x01\x82\x1f\xe7\x04\x82\x1f\xe7"
+
+bts_ns_unblock = "\x06"
+ns_unblock_ack = "\x07"
+
+bts_bvc_reset_0 = "\x00\x00\x00\x00\x22\x04\x82\x00\x00\x07\x81\x03\x3b\x81\x02"
+ns_bvc_reset_0_ack = "\x00\x00\x00\x00\x23\x04\x82\x00\x00"
+
+bts_bvc_reset_8167 = "\x00\x00\x00\x00\x22\x04\x82\x1f\xe7\x07\x81\x08\x08\x88\x72\xf4\x80\x10\x1c\x00\x9c\x40"
+
+
+import socket
+socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+socket.bind(("0.0.0.0", 0))
+socket.setblocking(1)
+
+
+import sys
+port = int(sys.argv[1])
+print "Sending data to port: %d" % port
+
+def send_and_receive(packet):
+    socket.sendto(packet, ("127.0.0.1", port))
+
+    try:
+        data, addr = socket.recvfrom(4096)
+    except socket.error, e:
+        print "ERROR", e
+        import sys
+        sys.exit(0)
+    return data
+
+#send stuff once
+
+to_send = [
+    (bts_ns_reset, ns_reset_ack, "reset ack"),
+    (bts_ns_unblock, ns_unblock_ack, "unblock ack"),
+    (bts_bvc_reset_0, ns_bvc_reset_0_ack, "BVCI=0 reset ack"),
+]
+
+
+for (out, inp, type) in to_send:
+    res = send_and_receive(out)
+    if res != inp:
+        print "Failed to get the %s" % type
+        sys.exit(-1)
+
+import time
+time.sleep(3)
+res = send_and_receive(bts_bvc_reset_8167)
+print "Sent all messages... check wireshark for the last response"
--- a/openbsc/contrib/gprs/gprs-bssgp-histogram.lua
+++ b/openbsc/contrib/gprs/gprs-bssgp-histogram.lua
@@ -0,0 +1,78 @@
+-- Simple LUA script to print the size of BSSGP messages over their type...
+
+do
+	local ip_bucket = {}
+
+	local pdu_types = {}
+	pdu_types[ 6] = "PAGING"
+	pdu_types[11] = "SUSPEND"
+	pdu_types[12] = "SUSPEND-ACK"
+	pdu_types[32] = "BVC-BLOCK"
+	pdu_types[33] = "BVC-BLOCK-ACK"
+	pdu_types[34] = "BVC-RESET"
+	pdu_types[35] = "BVC-RESET-ACK"
+	pdu_types[36] = "UNBLOCK"
+	pdu_types[37] = "UNBLOCK-ACK"
+	pdu_types[38] = "FLOW-CONTROL-BVC"
+	pdu_types[39] = "FLOW-CONTROL-BVC-ACK"
+	pdu_types[40] = "FLOW-CONTROL-MS"
+	pdu_types[41] = "FLOW-CONTROL-MS-ACK"
+	pdu_types[44] = "LLC-DISCARDED"
+
+	local function init_listener()
+		-- handle the port as NS over IP
+		local udp_port_table = DissectorTable.get("udp.port")
+		local gprs_ns_dis = Dissector.get("gprs_ns")
+		udp_port_table:add(23000,gprs_ns_dis)
+
+		-- bssgp filters
+		local bssgp_pdu_get = Field.new("bssgp.pdu_type")
+		local udp_length_get = Field.new("udp.length")
+
+		local tap = Listener.new("ip", "udp.port == 23000")
+		function tap.packet(pinfo,tvb,ip)
+			local pdu = bssgp_pdu_get()
+			local len = udp_length_get()
+
+			-- only handle bssgp, but we also want the IP frame
+			if not pdu then
+				return
+			end
+
+			pdu = tostring(pdu)
+			if tonumber(pdu) == 0 or tonumber(pdu) == 1 then
+				return
+			end
+
+			local ip_src = tostring(ip.ip_src)
+			local bssgp_histo = ip_bucket[ip_src]
+			if not bssgp_histo then
+				bssgp_histo = {}
+				ip_bucket[ip_src] = bssgp_histo
+			end
+
+			local key = pdu
+			local bucket = bssgp_histo[key]
+			if not bucket then
+				bucket = {}
+				bssgp_histo[key] = bucket
+			end
+
+			table.insert(bucket, tostring(len))
+			print("IP: " .. ip_src .. " PDU: " .. pdu_types[tonumber(pdu)] .. " Length: " .. tostring(len))
+		end
+
+		function tap.draw()
+			-- well... this will not be called...
+--			for ip,bssgp_histo in pairs(dumpers) do
+--				print("IP " .. ip)
+--			end
+		end
+
+		function tap.reset()
+			-- well... this will not be called...
+		end
+	end
+
+	init_listener()
+end
--- a/openbsc/contrib/gprs/gprs-buffer-count.lua
+++ b/openbsc/contrib/gprs/gprs-buffer-count.lua
@@ -0,0 +1,80 @@
+-- I count the buffer space needed for LLC PDUs in the worse case and print it
+
+do
+	local function init_listener()
+		-- handle the port as NS over IP
+		local udp_port_table = DissectorTable.get("udp.port")
+		local gprs_ns_dis = Dissector.get("gprs_ns")
+		udp_port_table:add(23000,gprs_ns_dis)
+
+		-- bssgp filters
+		local bssgp_pdu_get = Field.new("bssgp.pdu_type")
+		local bssgp_delay_get = Field.new("bssgp.delay_val")
+		local llcgprs_get = Field.new("llcgprs")
+		local pdus = nil
+
+		print("START...")
+
+		local tap = Listener.new("ip", "udp.port == 23000 && bssgp.pdu_type == 0")
+		function tap.packet(pinfo,tvb,ip)
+			local pdu = bssgp_pdu_get()
+			local len = llcgprs_get().len
+			local delay = bssgp_delay_get()
+
+			-- only handle bssgp, but we also want the IP frame
+			if not pdu then
+				return
+			end
+
+			if tonumber(tostring(delay)) == 65535 then
+				pdus = { next = pdus,
+					 len = len,
+					 expires = -1 }
+			else
+				local off = tonumber(tostring(delay)) / 100.0
+				pdus = { next = pdus,
+					 len = len,
+					 expires = pinfo.rel_ts + off }
+			end
+			local now_time = tonumber(tostring(pinfo.rel_ts))
+			local now_size = 0
+			local l = pdus
+			local prev = nil
+			local count = 0
+			while l do
+				if now_time < l.expires or l.expires == -1 then
+					now_size = now_size + l.len
+					prev = l
+					l = l.next
+					count = count + 1
+				else
+					-- delete things
+					if prev == nil then
+						pdus = nil
+						l = nil
+					else
+						prev.next = l.next
+						l = l.next
+					end
+				end
+			end
+--			print("TOTAL: " .. now_time .. " PDU_SIZE: " .. now_size)
+			print(now_time .. " " .. now_size / 1024.0 .. " " .. count)
+--			print("NOW: " .. tostring(pinfo.rel_ts) .. " Delay: " .. tostring(delay) .. " Length: " .. tostring(len))
+		end
+
+		function tap.draw()
+			-- well... this will not be called...
+--			for ip,bssgp_histo in pairs(dumpers) do
+--				print("IP " .. ip)
+--			end
+			print("END")
+		end
+
+		function tap.reset()
+			-- well... this will not be called...
+		end
+	end
+
+	init_listener()
+end
--- a/openbsc/contrib/gprs/gprs-split-trace-by-tlli.lua
+++ b/openbsc/contrib/gprs/gprs-split-trace-by-tlli.lua
@@ -0,0 +1,46 @@
+-- Create a file named by_ip/''ip_addess''.cap with all ip traffic of each ip host. (works for tshark only)
+-- Dump files are created for both source and destination hosts
+do
+	local dir = "by_tlli"
+	local dumpers = {}
+	local function init_listener()
+		local udp_port_table = DissectorTable.get("udp.port")
+		local gprs_ns_dis = Dissector.get("gprs_ns")
+		udp_port_table:add(23000,gprs_ns_dis)
+
+		local field_tlli = Field.new("bssgp.tlli")
+		local tap = Listener.new("ip", "udp.port == 23000")
+
+		-- we will be called once for every IP Header.
+		-- If there's more than one IP header in a given packet we'll dump the packet once per every header
+		function tap.packet(pinfo,tvb,ip)
+			local tlli = field_tlli()
+			if not tlli then
+				return
+			end
+
+			local tlli_str = tostring(tlli)
+			tlli_dmp = dumpers[tlli_str]
+			if not tlli_dmp then
+				local tlli_hex = string.format("0x%x", tonumber(tlli_str))
+				print("Creating dump for TLLI " .. tlli_hex)
+				tlli_dmp = Dumper.new_for_current(dir .. "/" .. tlli_hex .. ".pcap")
+				dumpers[tlli_str] = tlli_dmp
+			end
+			tlli_dmp:dump_current()
+			tlli_dmp:flush()
+		end
+		function tap.draw()
+			for tlli,dumper in pairs(dumpers) do
+				 dumper:flush()
+			end
+		end
+		function tap.reset()
+			for tlli,dumper in pairs(dumpers) do
+				 dumper:close()
+			end
+			dumpers = {}
+		end
+	end
+	init_listener()
+end
--- a/openbsc/contrib/gprs/gprs-verify-nu.lua
+++ b/openbsc/contrib/gprs/gprs-verify-nu.lua
@@ -0,0 +1,59 @@
+-- This script verifies that the N(U) is increasing...
+--
+do
+	local nu_state_src = {}
+
+	local function init_listener()
+		-- handle the port as NS over IP
+		local udp_port_table = DissectorTable.get("udp.port")
+		local gprs_ns_dis = Dissector.get("gprs_ns")
+		udp_port_table:add(23000,gprs_ns_dis)
+
+		-- we want to look here...
+		local llc_sapi_get = Field.new("llcgprs.sapib")
+		local llc_nu_get = Field.new("llcgprs.nu")
+		local bssgp_tlli_get = Field.new("bssgp.tlli")
+
+		local tap = Listener.new("ip", "udp.port == 23000")
+		function tap.packet(pinfo,tvb,ip)
+			local llc_sapi = llc_sapi_get()
+			local llc_nu = llc_nu_get()
+			local bssgp_tlli = bssgp_tlli_get()
+
+			if not llc_sapi or not llc_nu or not bssgp_tlli then
+				return
+			end
+
+			local ip_src = tostring(ip.ip_src)
+			local bssgp_tlli = tostring(bssgp_tlli)
+			local llc_nu = tostring(llc_nu)
+			local llc_sapi = tostring(llc_sapi)
+
+			local src_key = ip_src .. "-" .. bssgp_tlli .. "-" .. llc_sapi
+			local last_nu = nu_state_src[src_key]
+			if not last_nu then
+				-- print("Establishing mapping for " .. src_key)
+				nu_state_src[src_key] = llc_nu
+				return
+			end
+
+			local function tohex(number)
+				return string.format("0x%x", tonumber(number))
+			end
+
+			nu_state_src[src_key] = llc_nu
+			if tonumber(last_nu) + 1 ~= tonumber(llc_nu) then
+				print("JUMP in N(U) on TLLI " .. tohex(bssgp_tlli) .. " and SAPI: " .. llc_sapi .. " src: " .. ip_src)
+				print("\t last: " .. last_nu .. " now: " .. llc_nu)
+			end
+		end
+
+		function tap.draw()
+		end
+
+		function tap.reset()
+		end
+	end
+	init_listener()
+end
+
--- a/openbsc/contrib/hlr-remove-old.sql
+++ b/openbsc/contrib/hlr-remove-old.sql
@@ -0,0 +1,18 @@
+-- Remove old data from the database
+DELETE FROM Subscriber
+	WHERE id != 1 AND datetime('now', '-10 days') > updated AND authorized != 1;
+DELETE FROM Equipment
+	WHERE datetime('now', '-10 days') > updated;
+DELETE FROM EquipmentWatch
+	WHERE datetime('now', '-10 days') > updated;
+DELETE FROM SMS
+	WHERE datetime('now', '-10 days') > created;
+DELETE FROM VLR
+	WHERE datetime('now', '-10 days') > updated;
+DELETE FROM ApduBlobs
+	WHERE datetime('now', '-10 days') > created;
+DELETE FROM Counters
+	WHERE datetime('now', '-10 days') > timestamp;
+DELETE FROM RateCounters
+	WHERE datetime('now', '-10 days') > timestamp;
+VACUUM;
--- a/openbsc/contrib/hlrsync/hlrsync.py
+++ b/openbsc/contrib/hlrsync/hlrsync.py
@@ -0,0 +1,125 @@
+#!/usr/bin/python2.5
+
+from __future__ import with_statement
+
+from pysqlite2 import dbapi2 as sqlite3
+import sys
+
+hlr = sqlite3.connect(sys.argv[1])
+web = sqlite3.connect(sys.argv[2])
+
+# switch to autocommit
+hlr.isolation_level = None
+web.isolation_level = None
+
+hlr.row_factory = sqlite3.Row
+web.row_factory = sqlite3.Row
+
+with hlr:
+	hlr_subscrs = hlr.execute("""
+		SELECT * FROM Subscriber
+	""").fetchall()
+	hlr_tokens = hlr.execute("""
+		SELECT * FROM AuthToken
+	""").fetchall()
+
+with web:
+	web_tokens = web.execute("""
+		SELECT * FROM reg_tokens
+	""").fetchall()
+	web_sms = web.execute("""
+		SELECT * FROM sms_queue
+	""").fetchall()
+
+# index by subscr id
+hlr_subscrs_by_id = {}
+hlr_subscrs_by_ext = {}
+hlr_tokens_by_subscr_id = {}
+for x in hlr_subscrs:
+	hlr_subscrs_by_id[x['id']] = x
+	hlr_subscrs_by_ext[x['extension']] = x
+del hlr_subscrs
+for x in hlr_tokens:
+	hlr_tokens_by_subscr_id[x['subscriber_id']] = x
+del hlr_tokens
+
+web_tokens_by_subscr_id = {}
+for x in web_tokens:
+	web_tokens_by_subscr_id[x['subscriber_id']] = x
+del web_tokens
+
+# remove leftover web_tokens and correct inconsistent fields
+with web:
+	for x in web_tokens_by_subscr_id.values():
+		subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
+		if subscr is None:
+			web.execute("""
+				      DELETE FROM reg_tokens WHERE subscriber_id = ?
+				   """, (x['subscriber_id'],))
+			del web_tokens_by_subscr_id[x['subscriber_id']]
+			continue
+		if str(x['imsi']) != str(subscr['imsi']) or \
+		   x['extension'] != subscr['extension'] or \
+		   x['tmsi'] != subscr['tmsi'] or \
+		   x['lac'] != subscr['lac']:
+			web.execute("""
+				      UPDATE reg_tokens
+				      SET imsi = ?, extension = ?, tmsi = ?, lac = ?
+				      WHERE subscriber_id = ?
+				   """, (str(subscr['imsi']), subscr['extension'],
+				   subscr['tmsi'], subscr['lac'], x['subscriber_id']))
+
+# add missing web_tokens
+with web:
+	for x in hlr_tokens_by_subscr_id.values():
+		subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
+		if subscr is None:
+			hlr.execute("""
+				      DELETE FROM AuthToken WHERE subscriber_id = ?
+				   """, (x['subscriber_id'],))
+			del hlr_tokens_by_subscr_id[x['subscriber_id']]
+			continue
+		webtoken = web_tokens_by_subscr_id.get(x['subscriber_id'], None)
+		if webtoken is None:
+			web.execute("""
+				      INSERT INTO reg_tokens
+				      (subscriber_id, extension, reg_completed, name, email, lac, imsi, token, tmsi)
+				      VALUES
+				      (?, ?, 0, ?, '', ?, ?, ?, ?)
+				   """, (x['subscriber_id'], subscr['extension'], subscr['name'],
+				   subscr['lac'], str(subscr['imsi']), x['token'], subscr['tmsi']))
+
+# authorize subscribers
+with hlr:
+	for x in web_tokens_by_subscr_id.values():
+		subscr = hlr_subscrs_by_id.get(x['subscriber_id'], None)
+		if x['reg_completed'] and not subscr['authorized']:
+			hlr.execute("""
+				      UPDATE Subscriber
+				      SET authorized = 1
+				      WHERE id = ?
+				   """, (x['subscriber_id'],))
+
+# Sync SMS from web to hlr
+with hlr:
+	for sms in web_sms:
+		subscr = hlr_subscrs_by_ext.get(sms['receiver_ext'])
+		if subscr is None:
+			print '%s not found' % sms['receiver_ext']
+			continue
+		hlr.execute("""
+				      INSERT INTO SMS
+				      (created, sender_id, receiver_id, reply_path_req, status_rep_req, protocol_id, data_coding_scheme, ud_hdr_ind, text)
+				      VALUES
+				      (?, 1, ?, 0, 0, 0, 0, 0, ?)
+				   """, (sms['created'], subscr['id'], sms['text']))
+with web:
+	for sms in web_sms:
+		web.execute("""
+				      DELETE FROM sms_queue WHERE id = ?
+				   """, (sms['id'],))
+
+
+hlr.close()
+web.close()
+
--- a/openbsc/contrib/ipa.py
+++ b/openbsc/contrib/ipa.py
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1,2 @@`
				`CONFIG_FILE="/etc/osmocom/osmo-gtphub.cfg"`
				`@@ -0,0 +1 @@`
				`Some crazy scripts call testing... and MSC link failure simulation`