systemd service: add save_log_tail

Change-Id: I36d149d1dbfe30a4e51122e671ab801b6fd18c74
fix double free: fix wrong fix of earlier msgb leaks
2025-11-03 05:23:43 +00:00 · 2018-12-27 17:40:10 +01:00 · 2018-12-27 16:31:40 +01:00 · 2018-12-27 15:46:14 +01:00 · 2018-12-21 23:38:44 +01:00 · 2018-12-21 23:36:29 +01:00
48 changed files with 1149 additions and 3606 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,20 @@ debian/*.log
 *.o
 *.lo
 *.a
-*.la
 .deps
 Makefile
 Makefile.in
 bscconfig.h
 bscconfig.h.in
-src/osmo-mgw/osmo-mgw
+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/meas_json
+src/utils/osmo-meas-pcap2db
+src/utils/osmo-meas-udp2db
+src/utils/smpp_mirror
 *.*~
 *.sw?
 .libs
@@ -39,9 +46,32 @@ m4/*.m4
 .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/*/*_test
+# ignore compiled binaries like msc_vlr_test_foo; do not ignore
+# msc_vlr_test_foo.{c,ok,err}, but do still ignore the corresponding .o object
+# files:
+tests/msc_vlr/msc_vlr_test_*
+!tests/msc_vlr/msc_vlr_test_*.*
+tests/msc_vlr/msc_vlr_test_*.o
+

 tests/atconfig
 tests/atlocal
@@ -49,7 +79,10 @@ tests/package.m4
 tests/testsuite
 tests/testsuite.log

+gsn_restart
+src/openbsc.cfg*
 writtenconfig/
+gtphub_restart_count

 # manuals
 doc/manuals/*.html
--- a/1
+++ b/1
@@ -24,3 +24,4 @@
 # If any interfaces have been removed or changed since the last public release, a=0.
 #
 #library		what		description / commit summary line
+libosmo-mgcp-client	various         Drop legacy API functions and mgcp_client_conf members
--- a/configure.ac
+++ b/configure.ac
@@ -39,10 +39,10 @@ AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DL="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DL)


-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.0.0)
-PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.6.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.12.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.12.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.12.0)
+PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 0.3.0)

 AC_ARG_ENABLE(sanitize,
 	[AS_HELP_STRING(
@@ -76,10 +76,21 @@ fi

 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([-Wnull-dereference], [CFLAGS="$CFLAGS -Wnull-dereference"])
+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"])

--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -63,5 +63,4 @@ if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then
 	make -C "$base/doc/manuals" publish
 fi

-$MAKE maintainer-clean
 osmo-clean-workspace.sh
--- a/contrib/systemd/osmo-mgw.service
+++ b/contrib/systemd/osmo-mgw.service
@@ -6,6 +6,7 @@ Type=simple
 Restart=always
 ExecStart=/usr/bin/osmo-mgw -s -c /etc/osmocom/osmo-mgw.cfg
 RestartSec=2
+ExecStopPost=/usr/local/bin/save_log_tail osmo-mgw

 [Install]
 WantedBy=multi-user.target
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,216 +1,3 @@
-osmo-mgw (1.6.0) unstable; urgency=medium
-
-  [ Oliver Smith ]
-  * Cosmetic: fix spaces/tabs in mgcp_requests[]
-  * Inactive connection cleanup (disabled by default)
-  * debian: create -doc subpackage with pdf manuals
-  * vty: allow 0 as conn-timeout to disable it
-  * vty: update desc of conn-timeout
-  * manuals: update VTY documentation
-  * "make dist" fix for: no rule to make mgcp_common.h
-  * contrib/jenkins.sh: run "make maintainer-clean"
-
-  [ Philipp Maier ]
-  * Add option to GSM HR frames to RFC5593 representation
-  * mgcp_sdp: cosmetic: correct typo in comment
-  * mgco_client: cosmetic: remove excess whitespace
-  * mgcp_sdp: mgcp_sdp.c does not include own header file
-  * mgcp_sdp: untangle parsing of a= parameters
-  * mgcp_network: use mgcp_rtp_codec in downlink format callback
-  * AMR: Add function to convert between bw-effient and octet aligned mode
-
-  [ Neels Hofmeyr ]
-  * log: don't spam with "can not patch PT" messages
-  * mgcp client: allow setting conn mode for CRCX and MDCX
-  * make codec_table public as osmo_mgcpc_codec_names
-  * move MGW endpoint FSM from osmo-bsc to here
-  * fix: multiple initial CRCX
-  * constify map_codec_to_pt() ptmap arg
-
-  [ Pau Espin Pedrol ]
-  * mgcp-client: whitespace cleanup in mgcp_client.c
-  * mgcp-client: Sanitize implementation of mgcp_client_rtpbridge_wildcard
-  * libosmo-mgcp: Use trunk type during endpoint allocation
-  * cosmetic: Fix typos in comment
-  * cosmetic: tests: mgcp_client_test: clean trailing whitespace
-  * mgcp_msg: Log faulty line on Osmux parsing error
-  * cosmetic: handle_modify_con: Fix indentation level
-  * Introduce log fmt helpers LOGPENDP and LOGPCONN
-  * create_response_with_sdp: Fix inclusion of X-Osmux
-  * osmux: Cleanup of CID alloc pool APIs
-  * mgcp_osmux.c: osmux_enable_endpoint: Fix incorrect return check
-  * osmux: Log osmux socket during osmux_init
-  * mgcp-cli: Change osmo_mgcpc_ep_fsm name to avoid collision with old osmo-bsc
-  * osmux: Document func and return different rc upon osmux init failure
-  * osmux: Fix reception of legacy dummy payloads
-  * osmux: Use LOGPCONN in several log calls
-  * cosmetic: mgcp_udp_send: Document port param is in network byte order
-  * cosmetic: osmux: Document network byte order in port variable
-  * vty: Allow enabling Osmux
-  * osmux: Allocate CID during CRCX
-  * osmux: Introduce mgcp_conn_rtp_is_osmux() helper
-  * osmux: Mark conn_rtp->type as osmux during CRCX
-  * mgcp-cli: Allow submitting X-Osmux on CRCX request
-  * mgcp-cli: Parse X-Osmux on CRCX response
-  * osmux: Handle Osmux MGCP extension in MDCX messages
-  * mgcp-cli: Allow submitting X-Osmux on MDCX request
-  * mgcp-cli: Parse X-Osmux on MDCX response
-  * osmux: Drop unneeded OSMUX_STATE_NEGOTIATING
-  * mgcp-cli: endpoint_fsm: Add API to retrieve Osmux CID from MGW
-  * osmux: Provide correct local port during mgcp resp
-  * osmux: Use remote port to send osmux frames
-  * osmux: Improve logging around osmux enabling events
-  * osmux: Delay osmux enable of conn until remote addr is configured by MDCX
-  * osmux: Redo read/write osmux glue code to have data routed correctly
-  * mgw, mgcp-li: Handle X-Osmux param name as case insensitive
-  * osmux: Use DUMMY ft msg as per Osmux spec
-  * osmux: Fix loopback for Osmux connections
-  * osmux: Fix CID release for non-enabled connections
-  * osmux: Fix hardcoded rtp payload_type 98 in osmux conn
-  * mgcp-cli: Validate osmux cid value during mgcp_msg_gen
-  * mgw: Support uppercase LCO options
-  * mgw: Support lowercase header parameters
-  * mgcp-cli: Support lowercase header parameters
-  * mgw: Support receiving uppercase connection mode
-  * mgw: Support receiving lowercase LCO codec
-  * mgw: Make check of duplicated LCO fields case insensitive
-  * mgw: Allow receiving lowercase MGCP header keyword
-  * mgw: Allow receiving lowercase X-Osmo-Ign Callid field
-  * mgw: Allow receiving uppercase noanswer keyword
-  * doc: X-Osmo-IGN: small formatting and typo fixes
-  * doc: Add Osmux documentation to OsmoMGW User Manual
-  * Catch unsigned integer MGCP parsing errors with strtoul
-  * Fix return variable of strtoul()
-  * Remove undefined param passed to {logging,osmo_stats}_vty_add_cmds
-  * configure.ac: Require libosmo-netif 0.6.0
-
-  [ Alexander Couzens ]
-  * mgcp_internal: LOGPENDP: ensure *endp is not NULL
-
-  [ Harald Welte ]
-  * handle NULL return of rate_ctr_group_alloc()
-  * update .gitignore
-  * mgcp_sdp: Don't check if an unsigned int is below 0
-
-  [ Vadim Yanitskiy ]
-  * configure.ac: drop useless check for -fvisibility=hidden
-
-  [ Daniel Willmann ]
-  * manuals: Add script to regenerate vty/counter documentation
-  * manuals: Update vty/counter documentation
-
-  [ Hoernchen ]
-  * turn -Werror=null-dereference into a warning
-
- -- Pau Espin Pedrol <pespin@sysmocom.de>  Wed, 07 Aug 2019 16:52:58 +0200
-
-osmo-mgw (1.5.0) unstable; urgency=medium
-
-  [ Pau Espin Pedrol ]
-  * gitignore: Filter *.pc
-  * configure: Find correct libgsm's gsm.h header
-  * vty: Fix typo writing bts-jitter-buffer-delay-{min,max}
-  * Remove libosmo-legacy-mgcp and osmo-bsc-mgcp
-  * debian: Remove dangling symlink to osmo-bsc-mgcp.service
-  * Install systemd services with autotools
-  * Install sample cfg file to /etc/osmocom
-  * mgcp: Fix osmux_cid_bitmap static array size calculation
-  * mgcp_osmux: Use define to calculate rtp_ssrc_winlen
-  * osmux: Avoid initing output without enabling osmux
-  * mgcp: Log endpoint nr consistently as hex
-  * osmux_send_dummy: Avoid logging incorrectly and sending if osmux not enabled
-  * osmux: Don't process regular osmux frames if disabled by cfg
-  * osmux: Move parse_cid of legacy dummy frames to own function
-  * osmux: Make func handling dummy frames independent of endp type
-  * osmux: allow enabling osmux only on correct activating state
-  * osmux: Improve checks around activating and using enabled osmux
-  * osmux.h: Document enum osmux_state
-  * osmux: Avoid processing further frames if conn not found
-
-  [ Philipp Maier ]
-  * mgcp_client_fsm: allow ptmap in mgcp_client_fsm as well
-  * mgcp_network: translate payload type numbers in RTP packets
-  * mgcp_client: use IETF source port as for MGCP
-  * mgcp_client: increment local port number when port is in use
-  * mgcp_test: release endpoints after use
-  * network: do not patch PT of RTCP packets
-  * network: check packets before further processing
-  * Cosmetic: remove misplaced line break
-  * mgcp_sdp: restructure mgcp_write_response_sdp() (rtpmap)
-  * mgcp_sdp: restructure mgcp_write_response_sdp() (audio)
-  * mgcp_client: check local port only once
-  * mgcp_client_fsm: switch to MGCP_CONN_RECV_SEND in add_audio()
-  * mgcp_protocol: increase buffer space for codec name in LCO
-  * osmo-mgw: Add vty reference manual
-
-  [ Neels Hofmeyr ]
-  * fix handling of "Wrong domain name" error
-  * interpret domain '*' as 'allow any domain'
-  * cosmetic: log: fix "CallIDs does not match"
-  * fix 3G hack: allow any IP for loopback and 0.0.0.0
-  * cosmetic: drop code dup in mgcp_client_fsm.c CRCX
-  * add X-Osmo-IGN MGCP header to ignore CallID
-  * X-Osmo-IGN: rather parse items by token, not char
-  * mgcp_test: fix log of conn_id presence
-  * mgcp_test: fix get_conn_id_from_response() CI length
-  * mgcp_client_test: cosmetically re-arrange reply_to() args
-  * mgcp_client_test: use "\r\n\r\n" instead of "\n\n"
-  * mgcp_client_test: also verify received conn_id
-  * mgcp_client_test: test long conn_id
-  * mgcp_client: error on too long conn id
-  * mgcp_common: rename to MGCP_CONN_ID_MAXLEN
-  * doc: fix mgcp_verify_ci() return val doc
-  * mgcp_verify_ci(): return meaningful error codes
-  * fix mgcp_verify_ci(): off-by-one in max len check
-  * generate shorter 'I:' conn IDs
-  * mgcp_conn_get(): compare conn Id ('I:') case insensitively
-  * mgcp_conn_get(): match conn Id ('I:') despite leading zeros
-  * cosmetic: mgcp_test: fix get_conn_id_from_response()
-  * comment: indicate struct type for mgcp_endpoint.conns
-  * log: avoid logging early media as error
-  * fix osmo-mgw -s; fixes osmo-mgw.service using -s
-  * Importing history from osmo-gsm-manuals.git
-  * OsmoMGW: update VTY reference
-  * OsmoMGW: document the 'X-Osmo-IGN' MGCP extension
-  * mgw: update vty reference
-  * drop/replace very weird logging in mgcp_client.c
-  * check_rtp: on IP:port errors, log the IP and port
-  * osmo-mgw: err-log: include expected domain name
-  * mgcp_client_vty: fix missing talloc_free
-  * mgcp_client: drop a bunch of dead code
-  * mgcp_client: logging tweaks
-  * mgcp_client: make domain part of endpoint configurable
-  * mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR}
-
-  [ Stefan Sperling ]
-  * add VTY commands which show specific mgcp endpoints
-  * add MGCP CRCX command statistics to osmo-mgw
-  * show RTP TX/RX stats in 'mgcp show stats' output
-  * use local variable for rate counters in handle_create_con()
-  * add more mgcp crxc error counters
-  * add MDCX command statistics to osmo-mgw
-  * add aggregated rtp connection stats to osmo-mgw
-  * add DLCX command statistics to osmo-mgw
-
-  [ Harald Welte ]
-  * debian/rules: Don't overwrite .tarball-version
-  * check_rtp_origin(): Don't memcmp sockadd_in and in_addr
-  * check_rtp_origin(): Avoid using memcmp for comparing integer types
-  * vty-ref: Update URI of docbook 5.0 schema
-
-  [ Daniel Willmann ]
-  * mgw: Add new VTY reference
-  * Add initial OsmoMGW manual
-
-  [ Oliver Smith ]
-  * build manuals moved here from osmo-gsm-manuals.git
-  * jenkins.sh: remove leftover MGCP env variable
-  * Fix DISTCHECK_CONFIGURE_FLAGS override
-  * contrib/jenkins.sh: build and publish manuals
-  * contrib: fix makedistcheck with disabled systemd
-
- -- Harald Welte <laforge@gnumonks.org>  Sun, 20 Jan 2019 15:02:18 +0100
-
 osmo-mgw (1.4.0) unstable; urgency=medium

  [ Philipp Maier ]
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Build-Depends: debhelper (>=9),
               pkg-config,
               autotools-dev,
               libosmocore-dev,
-               libosmo-netif-dev,
-               osmo-gsm-manuals-dev
+               libosmo-netif-dev
 Standards-Version: 3.9.8
 Vcs-Git: git://git.osmocom.org/osmo-mgw.git
 Vcs-Browser: https://git.osmocom.org/osmo-mgw/
@@ -20,7 +19,7 @@ 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
+Package: libosmo-mgcp-client3
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -32,14 +31,5 @@ Package: libosmo-mgcp-client-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libosmo-mgcp-client6 (= ${binary:Version}), ${misc:Depends}
+Depends: libosmo-mgcp-client3 (= ${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
-Depends: ${misc:Depends}
-Description: ${misc:Package} PDF documentation
- Various manuals: user manual, VTY reference manual and/or
- protocol/interface manuals.
--- a/debian/libosmo-mgcp-client3.install
+++ b/debian/libosmo-mgcp-client3.install
--- a/debian/osmo-mgw-doc.install
+++ b/debian/osmo-mgw-doc.install
@@ -1 +0,0 @@
-usr/share/doc/osmo-mgw-doc/*.pdf
--- a/debian/rules
+++ b/debian/rules
@@ -30,10 +30,6 @@ override_dh_auto_test:
 	dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false)

 override_dh_auto_configure:
-	dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system --enable-manuals
-
-# 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
+	dh_auto_configure -- --with-systemdsystemunitdir=/lib/systemd/system

 # See https://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-dbg
--- a/doc/manuals/Makefile.am
+++ b/doc/manuals/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST = osmomgw-usermanual.adoc \
    osmomgw-usermanual-docinfo.xml \
    osmomgw-vty-reference.xml \
-    regen_doc.sh \
    chapters \
    vty

@@ -13,6 +12,5 @@ if BUILD_MANUALS
  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/counters_generated.adoc
+++ b/doc/manuals/chapters/counters_generated.adoc
@@ -1,79 +1,10 @@

 // autogenerated by show asciidoc counters
-These counters and their description based on OsmoMGW 1.5.0.64-189f (OsmoMGW).
+These counters and their description based on OsmoMGW 1.3.0.34-9cd52 (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
--- a/doc/manuals/chapters/mgcp_extensions.adoc
+++ b/doc/manuals/chapters/mgcp_extensions.adoc
@@ -11,7 +11,7 @@ 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
+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".
@@ -19,7 +19,7 @@ spaces. Each item consists of one or more non-whitespace characters.
 X-Osmo-IGN: X abc 123
 ----

-`X-Osmo-IGN` must be issued in the MGCP header section (typically as its last item),
+`X-Osmo-IGN` must be issued in the MGCP section (typically as its last item),
 before the SDP section starts.

 ==== Supported `X-Osmo-IGN` Items
@@ -66,7 +66,3 @@ m=audio 5904 RTP/AVP 97
 a=rtpmap:97 GSM-EFR/8000
 a=ptime:40
 ----
-
-=== `X-Osmux`
-
-See <<mgcp-extension-osmux>>
--- a/doc/manuals/osmomgw-usermanual.adoc
+++ b/doc/manuals/osmomgw-usermanual.adoc
@@ -20,8 +20,6 @@ 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[]
@@ -31,3 +29,5 @@ include::./common/chapters/bibliography.adoc[]
 include::./common/chapters/glossary.adoc[]

 include::./common/chapters/gfdl.adoc[]
+
+
--- 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_reference.xml
+++ b/doc/manuals/vty/mgw_vty_reference.xml
@@ -187,11 +187,12 @@
        <param name='MASK' doc='List of logging categories to log, e.g. &apos;abc:mno:xyz&apos;. Available log categories depend on the specific application, refer to the &apos;logging level&apos; command. Optionally add individual log levels like &apos;abc,1:mno,3:xyz,5&apos;, where the level numbers are LOGL_DEBUG=1 LOGL_INFO=3 LOGL_NOTICE=5 LOGL_ERROR=7 LOGL_FATAL=8' />
      </params>
    </command>
-    <command id='logging level (rtp|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal)'>
+    <command id='logging level (rtp|iuup|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)'>
      <params>
        <param name='logging' doc='Configure logging' />
        <param name='level' doc='Set the log level for a specified category' />
        <param name='rtp' doc='RTP stream handling' />
+        <param name='iuup' doc='IuUP within RTP stream handling' />
        <param name='lglobal' doc='Library-internal global log family' />
        <param name='llapd' doc='LAPD in libosmogsm' />
        <param name='linp' doc='A-bis Intput Subsystem' />
@@ -210,7 +211,6 @@
        <param name='lm3ua' doc='libosmo-sigtran MTP3 User Adaptation' />
        <param name='lmgcp' doc='libosmo-mgcp Media Gateway Control Protocol' />
        <param name='ljibuf' doc='libosmo-netif Jitter Buffer' />
-        <param name='lrspro' doc='Remote SIM protocol' />
        <param name='debug' doc='Log debug messages and higher levels' />
        <param name='info' doc='Log informational messages and higher levels' />
        <param name='notice' doc='Log noticeable messages and higher levels' />
@@ -522,11 +522,12 @@
        <param name='MASK' doc='List of logging categories to log, e.g. &apos;abc:mno:xyz&apos;. Available log categories depend on the specific application, refer to the &apos;logging level&apos; command. Optionally add individual log levels like &apos;abc,1:mno,3:xyz,5&apos;, where the level numbers are LOGL_DEBUG=1 LOGL_INFO=3 LOGL_NOTICE=5 LOGL_ERROR=7 LOGL_FATAL=8' />
      </params>
    </command>
-    <command id='logging level (rtp|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal)'>
+    <command id='logging level (rtp|iuup|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)'>
      <params>
        <param name='logging' doc='Configure logging' />
        <param name='level' doc='Set the log level for a specified category' />
        <param name='rtp' doc='RTP stream handling' />
+        <param name='iuup' doc='IuUP within RTP stream handling' />
        <param name='lglobal' doc='Library-internal global log family' />
        <param name='llapd' doc='LAPD in libosmogsm' />
        <param name='linp' doc='A-bis Intput Subsystem' />
@@ -545,7 +546,6 @@
        <param name='lm3ua' doc='libosmo-sigtran MTP3 User Adaptation' />
        <param name='lmgcp' doc='libosmo-mgcp Media Gateway Control Protocol' />
        <param name='ljibuf' doc='libosmo-netif Jitter Buffer' />
-        <param name='lrspro' doc='Remote SIM protocol' />
        <param name='debug' doc='Log debug messages and higher levels' />
        <param name='info' doc='Log informational messages and higher levels' />
        <param name='notice' doc='Log noticeable messages and higher levels' />
@@ -561,7 +561,8 @@
        <param name='debug' doc='Log debug messages and higher levels' />
        <param name='info' doc='Log informational messages and higher levels' />
        <param name='notice' doc='Log noticeable messages and higher levels' />
-        <param name='error' doc='Log error messages and higher levels' />        <param name='fatal' doc='Log only fatal messages' />
+        <param name='error' doc='Log error messages and higher levels' />
+        <param name='fatal' doc='Log only fatal messages' />
      </params>
    </command>
    <command id='logging level force-all (debug|info|notice|error|fatal)'>
@@ -1039,11 +1040,12 @@
        <param name='[last]' doc='Log source file info at the end of a log line. If omitted, log source file info just before the log text.' />
      </params>
    </command>
-    <command id='logging level (rtp|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf|lrspro) (debug|info|notice|error|fatal)'>
+    <command id='logging level (rtp|iuup|lglobal|llapd|linp|lmux|lmi|lmib|lsms|lctrl|lgtp|lstats|lgsup|loap|lss7|lsccp|lsua|lm3ua|lmgcp|ljibuf) (debug|info|notice|error|fatal)'>
      <params>
        <param name='logging' doc='Configure logging' />
        <param name='level' doc='Set the log level for a specified category' />
        <param name='rtp' doc='RTP stream handling' />
+        <param name='iuup' doc='IuUP within RTP stream handling' />
        <param name='lglobal' doc='Library-internal global log family' />
        <param name='llapd' doc='LAPD in libosmogsm' />
        <param name='linp' doc='A-bis Intput Subsystem' />
@@ -1062,7 +1064,6 @@
        <param name='lm3ua' doc='libosmo-sigtran MTP3 User Adaptation' />
        <param name='lmgcp' doc='libosmo-mgcp Media Gateway Control Protocol' />
        <param name='ljibuf' doc='libosmo-netif Jitter Buffer' />
-        <param name='lrspro' doc='Remote SIM protocol' />
        <param name='debug' doc='Log debug messages and higher levels' />
        <param name='info' doc='Log informational messages and higher levels' />
        <param name='notice' doc='Log noticeable messages and higher levels' />
@@ -1185,11 +1186,10 @@
        <param name='login' doc='Enable password checking' />
      </params>
    </command>
-    <command id='bind A.B.C.D [&lt;0-65535&gt;]'>
+    <command id='bind A.B.C.D'>
      <params>
        <param name='bind' doc='Accept VTY telnet connections on local interface' />
        <param name='A.B.C.D' doc='Local interface IP address (default: 127.0.0.1)' />
-        <param name='[&lt;0-65535&gt;]' doc='Local TCP port number' />
      </params>
    </command>
  </node>
@@ -1397,19 +1397,6 @@
        <param name='rtp-patch' doc='Modify RTP packet header in both directions' />
      </params>
    </command>
-    <command id='rtp-patch rfc5993hr'>
-      <params>
-        <param name='rtp-patch' doc='Modify RTP packet header in both directions' />
-        <param name='rfc5993hr' doc='Convert GSM-HR from TS101318 to RFC5993 and vice versa' />
-      </params>
-    </command>
-    <command id='no rtp-patch rfc5993hr'>
-      <params>
-        <param name='no' doc='Negate a command or set its defaults' />
-        <param name='rtp-patch' doc='Modify RTP packet header in both directions' />
-        <param name='rfc5993hr' doc='Convert GSM-HR from TS101318 to RFC5993 and vice versa' />
-      </params>
-    </command>
    <command id='sdp audio fmtp-extra .NAME'>
      <params>
        <param name='sdp' doc='Add extra fmtp for the SDP file' />
@@ -1509,12 +1496,6 @@
        <param name='NAME' doc='Qualified domain name expected in MGCP endpoint names, or &apos;*&apos; to accept any domain' />
      </params>
    </command>
-    <command id='conn-timeout &lt;0-65534&gt;'>
-      <params>
-        <param name='conn-timeout' doc='Set a time after which inactive connections (CIs) are closed. Set to 0 to disable timeout. This can be used to work around interoperability problems causing connections to stay open forever, and slowly exhausting all available ports. Enable keep-alive packets in MGW clients when using this option together with LCLS (OsmoBSC, OsmoMSC: &apos;rtp keep-alive&apos;)!' />
-        <param name='&lt;0-65534&gt;' doc='Timeout value (sec.)' />
-      </params>
-    </command>
    <command id='trunk &lt;1-64&gt;'>
      <params>
        <param name='trunk' doc='Configure a SS7 trunk' />
@@ -1598,19 +1579,6 @@
        <param name='timestamp' doc='Adjust RTP timestamp' />
      </params>
    </command>
-    <command id='rtp-patch rfc5993hr'>
-      <params>
-        <param name='rtp-patch' doc='Modify RTP packet header in both directions' />
-        <param name='rfc5993hr' doc='Convert GSM-HR from TS101318 to RFC5993 and vice versa' />
-      </params>
-    </command>
-    <command id='no rtp-patch rfc5993hr'>
-      <params>
-        <param name='no' doc='Negate a command or set its defaults' />
-        <param name='rtp-patch' doc='Modify RTP packet header in both directions' />
-        <param name='rfc5993hr' doc='Convert GSM-HR from TS101318 to RFC5993 and vice versa' />
-      </params>
-    </command>
    <command id='no rtp-patch timestamp'>
      <params>
        <param name='no' doc='Negate a command or set its defaults' />
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,16 +4,10 @@ SUBDIRS = \

 nobase_include_HEADERS = \
 	osmocom/mgcp_client/mgcp_client.h \
-	osmocom/mgcp_client/mgcp_client_endpoint_fsm.h \
 	osmocom/mgcp_client/mgcp_client_fsm.h \
+	osmocom/mgcp_client/mgcp_common.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/mgcp/Makefile.am
+++ b/include/osmocom/mgcp/Makefile.am
@@ -7,6 +7,4 @@ noinst_HEADERS = \
 	mgcp_sdp.h \
 	mgcp_codec.h \
 	debug.h \
-	iuup_cn_node.h \
-	iuup_protocol.h \
 	$(NULL)
--- a/include/osmocom/mgcp/iuup_cn_node.h
+++ b/include/osmocom/mgcp/iuup_cn_node.h
@@ -12,6 +12,7 @@

 #pragma once

+struct osmo_iuup_cn;
 struct msgb;

 typedef int (*osmo_iuup_data_cb_t)(struct msgb *msg, void *node_priv);
@@ -29,13 +30,6 @@ struct osmo_iuup_cn_cfg {
 	osmo_iuup_data_cb_t tx_msg;
 };

-struct osmo_iuup_cn {
-	struct osmo_iuup_cn_cfg cfg;
-	char *name;
-	uint8_t next_frame_nr;
-	int rtp_payload_type;
-};
-
 bool osmo_iuup_cn_is_iuup_init(struct msgb *msg);

 struct osmo_iuup_cn *osmo_iuup_cn_init(void *ctx, struct osmo_iuup_cn_cfg *cfg,
--- a/include/osmocom/mgcp/mgcp.h
+++ b/include/osmocom/mgcp/mgcp.h
@@ -81,11 +81,10 @@ typedef int (*mgcp_processing_setup)(struct mgcp_endpoint *endp,
 				     struct mgcp_conn_rtp *conn_dst,
 				     struct mgcp_conn_rtp *conn_src);

-struct mgcp_rtp_codec;
-
 typedef void (*mgcp_get_format)(struct mgcp_endpoint *endp,
-				const struct mgcp_rtp_codec **codec,
-				const char **fmtp_extra,
+				int *payload_type,
+				const char**subtype_name,
+				const char**fmtp_extra,
 				struct mgcp_conn_rtp *conn);

 /**
@@ -191,7 +190,6 @@ struct mgcp_trunk_config {
 	/* RTP patching */
 	int force_constant_ssrc; /* 0: don't, 1: once */
 	int force_aligned_timing;
-	bool rfc5993_hr_convert;

 	/* spec handling */
 	int force_realloc;
@@ -276,9 +274,6 @@ struct mgcp_config {
 	uint16_t osmux_dummy;
 	/* domain name of the media gateway */
 	char domain[255+1];
-
-	/* time after which inactive connections (CIs) get closed */
-	int conn_timeout;
 };

 /* config management */
--- a/include/osmocom/mgcp/mgcp_codec.h
+++ b/include/osmocom/mgcp/mgcp_codec.h
@@ -2,8 +2,6 @@

 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_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name);
 int mgcp_codec_decide(struct mgcp_conn_rtp *conn);
 int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp *conn_dst, int payload_type);
-const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn,
-								const char *subtype_name, unsigned int match_nr);
--- a/include/osmocom/mgcp/mgcp_common.h
+++ b/include/osmocom/mgcp/mgcp_common.h
@@ -50,7 +50,6 @@ enum mgcp_connection_mode {
 };

 #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 {
@@ -58,12 +57,6 @@ enum mgcp_x_osmo_ign {
 	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)
 {
--- a/include/osmocom/mgcp/mgcp_endp.h
+++ b/include/osmocom/mgcp/mgcp_endp.h
@@ -42,7 +42,8 @@ struct osmo_rtp_msg_ctx {
 	LOGP(DRTP, level, "%x@ " fmt, ENDPOINT_NUMBER(endp), ## args)

 /* Callback type for RTP dispatcher functions (e.g mgcp_dispatch_rtp_bridge_cb, see below).
- * The OSMO_RTP_MSG_CTX() should be set appropriately on the msg. */
+ * The fields OSMO_RTP_MSG_PROTO, OSMO_RTP_MSG_CONN_SRC, OSMO_RTP_MSG_FROM_ADDR should be set
+ * appropriately on the msg. */
 typedef int (*mgcp_dispatch_rtp_cb) (struct msgb *msg);

 /* Callback type for endpoint specific cleanup actions. This function
@@ -111,3 +112,4 @@ struct mgcp_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
@@ -102,9 +102,6 @@ struct mgcp_rtp_codec {
 	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 */
@@ -138,7 +135,6 @@ struct mgcp_rtp_end {
 	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;
@@ -195,9 +191,9 @@ struct mgcp_conn_rtp {
 	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 */
+		/* Allocated Osmux circuit ID for this endpoint */
+		int allocated_cid;
+		/* Used Osmux circuit ID for this endpoint */
 		uint8_t cid;
 		/* handle to batch messages */
 		struct osmux_in_handle *in;
@@ -244,9 +240,6 @@ struct mgcp_conn {
 	/*! 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;
@@ -309,8 +302,9 @@ int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp,
 				      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,
+					  int *payload_type,
+					  const char**audio_name,
+					  const char**fmtp_extra,
 					  struct mgcp_conn_rtp *conn);

 /* internal RTP Annex A counting */
@@ -320,11 +314,6 @@ void mgcp_rtp_annex_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *sta

 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,
@@ -347,17 +336,6 @@ enum {
 #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)

 void mgcp_patch_and_count(struct mgcp_endpoint *endp,
 			  struct mgcp_rtp_state *state,
--- a/include/osmocom/mgcp/osmux.h
+++ b/include/osmocom/mgcp/osmux.h
@@ -14,20 +14,18 @@ enum {
 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);
+void osmux_disable_conn(struct mgcp_conn_rtp *conn);
+void osmux_allocate_cid(struct mgcp_conn_rtp *conn);
+void 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);
+int osmux_get_cid(void);
+void osmux_put_cid(uint8_t osmux_cid);
+int osmux_used_cid(void);

 enum osmux_state {
 	OSMUX_STATE_DISABLED = 0, /* Osmux not being currently used by endp */
+	OSMUX_STATE_NEGOTIATING,  /* Osmux was locally requested in MGCP CRCX */
 	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 */
 };
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -25,7 +25,7 @@ struct mgcp_client_conf {

 	/* 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];
+	char endpoint_domain_name[64];
 };

 typedef unsigned int mgcp_trans_id_t;
@@ -37,7 +37,7 @@ enum mgcp_codecs {
 	CODEC_PCMA_8000_1 = 8,
 	CODEC_G729_8000_1 = 18,
 	CODEC_GSMEFR_8000_1 = 110,
-	CODEC_GSMHR_8000_1 = 111,
+	CODEC_GSMHR_8000_1 = 111,	
 	CODEC_AMR_8000_1 = 112,
 	CODEC_AMRWB_16000_1 = 113,
 };
@@ -47,10 +47,6 @@ enum mgcp_codecs {
 * 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 {
@@ -67,8 +63,6 @@ struct mgcp_response_head {
 	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 {
@@ -80,7 +74,7 @@ struct mgcp_response {
 	enum mgcp_codecs codecs[MGCP_MAX_CODECS];
 	unsigned int codecs_len;
 	struct ptmap ptmap[MGCP_MAX_CODECS];
-	unsigned int ptmap_len;
+	unsigned int ptmap_len;	
 };

 enum mgcp_verb {
@@ -97,7 +91,6 @@ enum mgcp_verb {
 #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 {
@@ -116,10 +109,6 @@ struct mgcp_msg {
 	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);
@@ -159,7 +148,7 @@ static inline const char *mgcp_client_cmode_name(enum mgcp_connection_mode 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,
+unsigned int map_codec_to_pt(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,48 +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);
-
-/*! 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
@@ -47,20 +47,6 @@ struct mgcp_conn_peer {
 	 * 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,
@@ -69,5 +55,3 @@ int mgcp_conn_modify(struct osmo_fsm_inst *fi, uint32_t parent_evt, struct mgcp_
 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/src/libosmo-mgcp-client/Makefile.am
+++ b/src/libosmo-mgcp-client/Makefile.am
@@ -20,7 +20,7 @@ AM_LDFLAGS = \

 # This is not at all related to the release version, but a range of supported
 # API versions. Read TODO_RELEASE in the source tree's root!
-MGCP_CLIENT_LIBVERSION=6:0:0
+MGCP_CLIENT_LIBVERSION=4:0:1

 lib_LTLIBRARIES = \
 	libosmo-mgcp-client.la \
@@ -30,7 +30,6 @@ libosmo_mgcp_client_la_SOURCES = \
 	mgcp_client.c \
 	mgcp_client_vty.c \
 	mgcp_client_fsm.c \
-	mgcp_client_endpoint_fsm.c \
 	$(NULL)

 libosmo_mgcp_client_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(MGCP_CLIENT_LIBVERSION)
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -35,16 +35,9 @@
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#ifndef OSMUX_CID_MAX
-#define OSMUX_CID_MAX 255 /* FIXME: use OSMUX_CID_MAX from libosmo-netif? */
-#endif

 /* Codec descripton for dynamic payload types (SDP) */
-const struct value_string osmo_mgcpc_codec_names[] = {
+static const struct value_string codec_table[] = {
 	{ CODEC_PCMU_8000_1, "PCMU/8000/1" },
 	{ CODEC_GSM_8000_1, "GSM/8000/1" },
 	{ CODEC_PCMA_8000_1, "PCMA/8000/1" },
@@ -88,19 +81,19 @@ enum mgcp_codecs map_str_to_codec(const char *str)

 	osmo_strlcpy(str_buf, extract_codec_name(str), sizeof(str_buf));

-	for (i = 0; i < ARRAY_SIZE(osmo_mgcpc_codec_names); i++) {
-		codec_name = extract_codec_name(osmo_mgcpc_codec_names[i].str);
+	for (i = 0; i < ARRAY_SIZE(codec_table); i++) {
+		codec_name = extract_codec_name(codec_table[i].str);
 		if (!codec_name)
 			continue;
 		if (strcmp(codec_name, str_buf) == 0)
-			return osmo_mgcpc_codec_names[i].value;
+			return codec_table[i].value;
 	}

 	return -1;
 }

 /* Check the ptmap for illegal mappings */
-static int check_ptmap(const struct ptmap *ptmap)
+static int check_ptmap(struct ptmap *ptmap)
 {
 	/* Check if there are mappings that leave the IANA assigned dynamic
 	 * payload type range. Under normal conditions such mappings should
@@ -129,7 +122,7 @@ error:
 *  \ptmap[in] ptmap_len length of the payload type map.
 *  \ptmap[in] codec the codec for which the payload type should be looked up.
 *  \returns assigned payload type */
-unsigned int map_codec_to_pt(const struct ptmap *ptmap, unsigned int ptmap_len,
+unsigned int map_codec_to_pt(struct ptmap *ptmap, unsigned int ptmap_len,
 			     enum mgcp_codecs codec)
 {
 	unsigned int i;
@@ -267,8 +260,7 @@ static bool mgcp_line_is_valid(const char *line)
 static int mgcp_parse_audio_port_pt(struct mgcp_response *r, char *line)
 {
 	char *pt_str;
-	char *pt_end;
-	unsigned long int pt;
+	unsigned int pt;
 	unsigned int count = 0;
 	unsigned int i;

@@ -292,14 +284,7 @@ static int mgcp_parse_audio_port_pt(struct mgcp_response *r, char *line)
 		pt_str = strtok(NULL, " ");
 		if (!pt_str)
 			break;
-		errno = 0;
-		pt = strtoul(pt_str, &pt_end, 0);
-		if ((errno == ERANGE && pt == ULONG_MAX) || (errno && !pt) ||
-		    pt_str == pt_end)
-			goto response_parse_failure_pt;
-
-		if (pt >> 7) /* PT is 7 bit field, higher values not allowed */
-			goto response_parse_failure_pt;
+		pt = atoi(pt_str);

 		/* Do not allow duplicate payload types */
 		for (i = 0; i < count; i++)
@@ -337,34 +322,48 @@ static int mgcp_parse_audio_ptime_rtpmap(struct mgcp_response *r, const char *li
 {
 	unsigned int pt;
 	char codec_resp[64];
-	enum mgcp_codecs codec;
+	unsigned int codec;
+	
+	
+	if (strstr(line, "ptime")) {
+		if (sscanf(line, "a=ptime:%u", &r->ptime) != 1)
+			goto response_parse_failure_ptime;
+	} else if (strstr(line, "rtpmap")) {
+		if (sscanf(line, "a=rtpmap:%d %63s", &pt, codec_resp) == 2) {
+			/* The MGW may assign an own payload type in the
+			 * response if the choosen codec falls into the IANA
+			 * assigned dynamic payload type range (96-127).
+			 * Normally the MGW should obey the 3gpp payload type
+			 * assignments, which are fixed, so we likely wont see
+			 * anything unexpected here. In order to be sure that
+			 * we will now check the codec string and if the result
+			 * does not match to what is IANA / 3gpp assigned, we
+			 * will create an entry in the ptmap table so we can
+			 * lookup later what has been assigned. */
+			codec = map_str_to_codec(codec_resp);
+			if (codec != pt) {
+				if (r->ptmap_len < ARRAY_SIZE(r->ptmap)) {
+					r->ptmap[r->ptmap_len].pt = pt;
+					r->ptmap[r->ptmap_len].codec = codec;
+					r->ptmap_len++;
+				} else
+					goto response_parse_failure_rtpmap;
+			}

-#define A_PTIME "a=ptime:"
-#define A_RTPMAP "a=rtpmap:"
-
-	if (osmo_str_startswith(line, A_PTIME)) {
-		if (sscanf(line, A_PTIME "%u", &r->ptime) != 1) {
-			LOGP(DLMGCP, LOGL_ERROR,
-			     "Failed to parse SDP parameter, invalid ptime (%s)\n", line);
-			return -EINVAL;
-		}
-	} else if (osmo_str_startswith(line, A_RTPMAP)) {
-		if (sscanf(line, A_RTPMAP "%d %63s", &pt, codec_resp) != 2) {
-			LOGP(DLMGCP, LOGL_ERROR,
-			     "Failed to parse SDP parameter, invalid rtpmap: %s\n", osmo_quote_str(line, -1));
-			return -EINVAL;
-		}
-		if (r->ptmap_len >= ARRAY_SIZE(r->ptmap)) {
-			LOGP(DLMGCP, LOGL_ERROR, "No more space in ptmap array (len=%u)\n", r->ptmap_len);
-			return -ENOSPC;
-		}
-		codec = map_str_to_codec(codec_resp);
-		r->ptmap[r->ptmap_len].pt = pt;
-		r->ptmap[r->ptmap_len].codec = codec;
-		r->ptmap_len++;
+		} else
+			goto response_parse_failure_rtpmap;
 	}
-
+	
 	return 0;
+
+response_parse_failure_ptime:
+	LOGP(DLMGCP, LOGL_ERROR,
+	     "Failed to parse SDP parameter, invalid ptime (%s)\n", line);
+	return -EINVAL;		
+response_parse_failure_rtpmap:
+	LOGP(DLMGCP, LOGL_ERROR,
+	     "Failed to parse SDP parameter, invalid rtpmap (%s)\n", line);
+	return -EINVAL;		
 }

 /* Parse a line like "c=IN IP4 10.11.12.13" */
@@ -394,37 +393,6 @@ response_parse_failure:
 	return -EINVAL;
 }

-/*! Extract OSMUX CID from an MGCP parameter line (string).
- *  \param[in] line single parameter line from the MGCP message
- *  \returns OSMUX CID, -1 wildcard, -2 on error
- * FIXME: This is a copy of function in mgcp_msg.c. Have some common.c file between both libs?
- */
-static int mgcp_parse_osmux_cid(const char *line)
-{
-	int osmux_cid;
-
-
-	if (strcasecmp(line + 2, "Osmux: *") == 0) {
-		LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n");
-		return -1;
-	}
-
-	if (sscanf(line + 2 + 7, "%u", &osmux_cid) != 1) {
-		LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n",
-		     line);
-		return -2;
-	}
-
-	if (osmux_cid > OSMUX_CID_MAX) { /* OSMUX_CID_MAX from libosmo-netif */
-		LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n",
-		     osmux_cid, OSMUX_CID_MAX);
-		return -2;
-	}
-	LOGP(DLMGCP, LOGL_DEBUG, "bsc-nat offered Osmux CID %u\n", osmux_cid);
-
-	return osmux_cid;
-}
-
 /* A new section is marked by a double line break, check a few more
 * patterns as there may be variants */
 static char *mgcp_find_section_end(char *string)
@@ -565,12 +533,12 @@ static int parse_head_params(struct mgcp_response *r)
 	/* If there is an SDP body attached, prevent for_each_non_empty_line()
 	 * into running in there, we are not yet interested in the parameters
 	 * stored there. */
-	data_end = mgcp_find_section_end(data);
+	data_end = mgcp_find_section_end(data);	
 	if (data_end)
 		*data_end = '\0';

 	for_each_non_empty_line(line, data_ptr) {
-		switch (toupper(line[0])) {
+		switch (line[0]) {
 		case 'Z':
 			rc = mgcp_parse_head_param(r->head.endpoint,
 						   sizeof(r->head.endpoint),
@@ -599,21 +567,6 @@ static int parse_head_params(struct mgcp_response *r)
 			if (rc)
 				goto exit;
 			break;
-		case 'X':
-			if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {
-				rc = mgcp_parse_osmux_cid(line);
-				if (rc < 0) {
-					/* -1: we don't want wildcards in response. -2: error */
-					rc = -EINVAL;
-					goto exit;
-				}
-				r->head.x_osmo_osmux_use = true;
-				r->head.x_osmo_osmux_cid = (uint8_t) rc;
-				rc = 0;
-				break;
-			}
-			/* Ignore unknown X-headers */
-			break;
 		default:
 			/* skip unhandled parameters */
 			break;
@@ -752,14 +705,8 @@ struct mgcp_client *mgcp_client_init(void *ctx,
 	mgcp->actual.remote_port = conf->remote_port >= 0 ? (uint16_t)conf->remote_port :
 		MGCP_CLIENT_REMOTE_PORT_DEFAULT;

-	if (osmo_strlcpy(mgcp->actual.endpoint_domain_name, conf->endpoint_domain_name,
-			 sizeof(mgcp->actual.endpoint_domain_name))
-	    >= sizeof(mgcp->actual.endpoint_domain_name)) {
-		LOGP(DLMGCP, LOGL_ERROR, "MGCP client: endpoint domain name is too long, max length is %zu: '%s'\n",
-		     sizeof(mgcp->actual.endpoint_domain_name) - 1, conf->endpoint_domain_name);
-		talloc_free(mgcp);
-		return NULL;
-	}
+	osmo_strlcpy(mgcp->actual.endpoint_domain_name, conf->endpoint_domain_name,
+		     sizeof(mgcp->actual.endpoint_domain_name));
 	LOGP(DLMGCP, LOGL_NOTICE, "MGCP client: using endpoint domain '@%s'\n", mgcp_client_endpoint_domain(mgcp));

 	return mgcp;
@@ -872,18 +819,19 @@ uint32_t mgcp_client_remote_addr_n(struct mgcp_client *mgcp)
 * For example, snprintf("rtpbridge\*@%s", mgcp_client_endpoint_domain(mgcp)). */
 const char *mgcp_client_endpoint_domain(const struct mgcp_client *mgcp)
 {
-	return mgcp->actual.endpoint_domain_name[0] ? mgcp->actual.endpoint_domain_name : "mgw";
+	return mgcp->actual.endpoint_domain_name[0]? mgcp->actual.endpoint_domain_name : "mgw";
 }

-static const char *_mgcp_client_name_append_domain(const struct mgcp_client *mgcp, char *name)
+const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp)
 {
 	static char endpoint[MGCP_ENDPOINT_MAXLEN];
 	int rc;

-	rc = snprintf(endpoint, sizeof(endpoint), "%s@%s", name, mgcp_client_endpoint_domain(mgcp));
+#define RTPBRIDGE_WILDCARD_FMT "rtpbridge/*@%s"
+	rc = snprintf(endpoint, sizeof(endpoint), RTPBRIDGE_WILDCARD_FMT, mgcp_client_endpoint_domain(mgcp));
 	if (rc > sizeof(endpoint) - 1) {
-		LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length of %zu: '%s@%s'\n",
-		     sizeof(endpoint) - 1, name, mgcp_client_endpoint_domain(mgcp));
+		LOGP(DLMGCP, LOGL_ERROR, "MGCP endpoint exceeds maximum length ('" RTPBRIDGE_WILDCARD_FMT "')\n",
+		     mgcp_client_endpoint_domain(mgcp));
 		return NULL;
 	}
 	if (rc < 1) {
@@ -893,11 +841,6 @@ static const char *_mgcp_client_name_append_domain(const struct mgcp_client *mgc
 	return endpoint;
 }

-const char *mgcp_client_rtpbridge_wildcard(const struct mgcp_client *mgcp)
-{
-	return _mgcp_client_name_append_domain(mgcp, "rtpbridge/*");
-}
-
 struct mgcp_response_pending * mgcp_client_pending_add(
 					struct mgcp_client *mgcp,
 					mgcp_trans_id_t trans_id,
@@ -1029,8 +972,8 @@ static int add_lco(struct msgb *msg, struct mgcp_msg *mgcp_msg)
 		rc += msgb_printf(msg, " a:");
 		for (i = 0; i < mgcp_msg->codecs_len; i++) {
 			pt = mgcp_msg->codecs[i];
-			codec = get_value_string_or_null(osmo_mgcpc_codec_names, pt);
-
+			codec = get_value_string_or_null(codec_table, pt);
+			
 			/* Note: Use codec descriptors from enum mgcp_codecs
 			 * in mgcp_client only! */
 			OSMO_ASSERT(codec);
@@ -1102,37 +1045,23 @@ static int add_sdp(struct msgb *msg, struct mgcp_msg *mgcp_msg, struct mgcp_clie
 	}
 	rc += msgb_printf(msg, "\r\n");

-	/* Add optional codec parameters (fmtp) */
-	if (mgcp_msg->param_present) {
-		for (i = 0; i < mgcp_msg->codecs_len; i++) {
-			/* The following is only applicable for AMR */
-			if (mgcp_msg->codecs[i] != CODEC_AMR_8000_1 && mgcp_msg->codecs[i] != CODEC_AMRWB_16000_1)
-				   continue;
-			pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]);
-			if (mgcp_msg->param.amr_octet_aligned_present && mgcp_msg->param.amr_octet_aligned)
-				rc += msgb_printf(msg, "a=fmtp:%u octet-align=1\r\n", pt);
-			else if (mgcp_msg->param.amr_octet_aligned_present && !mgcp_msg->param.amr_octet_aligned)
-				rc += msgb_printf(msg, "a=fmtp:%u octet-align=0\r\n", pt);
-		}
-	}
-
 	for (i = 0; i < mgcp_msg->codecs_len; i++) {
 		pt = map_codec_to_pt(mgcp_msg->ptmap, mgcp_msg->ptmap_len, mgcp_msg->codecs[i]);
-
+		
 		/* Note: Only dynamic payload type from the range 96-127
 		 * require to be explained further via rtpmap. All others
 		 * are implcitly definedby the number in m=audio */
 		if (pt >= 96 && pt <= 127) {
-			codec = get_value_string_or_null(osmo_mgcpc_codec_names, mgcp_msg->codecs[i]);
+			codec = get_value_string_or_null(codec_table, mgcp_msg->codecs[i]);

 			/* Note: Use codec descriptors from enum mgcp_codecs
 			 * in mgcp_client only! */
 			OSMO_ASSERT(codec);
-
+			
 			rc += msgb_printf(msg, "a=rtpmap:%u %s\r\n", pt, codec);
 		}
 	}
-
+	
 	if (mgcp_msg->ptime)
 		rc += msgb_printf(msg, "a=ptime:%u\r\n", mgcp_msg->ptime);

@@ -1151,7 +1080,6 @@ struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg)
 	int rc = 0;
 	int rc_sdp;
 	bool use_sdp = false;
-	char buf[32];

 	msg->l2h = msg->data;
 	msg->cb[MSGB_CB_MGCP_TRANS_ID] = trans_id;
@@ -1255,22 +1183,6 @@ struct msgb *mgcp_msg_gen(struct mgcp_client *mgcp, struct mgcp_msg *mgcp_msg)
 		    msgb_printf(msg, MGCP_X_OSMO_IGN_HEADER "%s\r\n",
 				mgcp_msg->x_osmo_ign & MGCP_X_OSMO_IGN_CALLID ? " C": "");

-	/* Add X-Osmo-Osmux */
-	if ((mgcp_msg->presence & MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID)) {
-		if (mgcp_msg->x_osmo_osmux_cid < -1 || mgcp_msg->x_osmo_osmux_cid > OSMUX_CID_MAX) {
-			LOGP(DLMGCP, LOGL_ERROR,
-			     "Wrong Osmux CID %d, can not generate MGCP message\n",
-			     mgcp_msg->x_osmo_osmux_cid);
-			msgb_free(msg);
-			return NULL;
-		}
-		snprintf(buf, sizeof(buf), " %d", mgcp_msg->x_osmo_osmux_cid);
-		rc +=
-		    msgb_printf(msg, MGCP_X_OSMO_OSMUX_HEADER "%s\r\n",
-				mgcp_msg->x_osmo_osmux_cid == -1 ? " *": buf);
-	}
-
-
 	/* Add session description protocol (SDP) */
 	if (use_sdp
 	    && (mgcp_msg->verb == MGCP_VERB_CRCX
--- a/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c
@@ -1,886 +0,0 @@
-/* FSM to manage multiple connections of an MGW endpoint
- *
- * (C) 2018-2019 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de>
- * All Rights Reserved
- *
- * Author: Neels Hofmeyr <neels@hofmeyr.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <osmocom/core/fsm.h>
-#include <osmocom/core/byteswap.h>
-#include <osmocom/core/tdef.h>
-
-#include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h>
-
-#define LOG_CI(ci, level, fmt, args...) do { \
-	if (!ci || !ci->ep) \
-		LOGP(DLGLOBAL, level, "(unknown MGW endpoint) " fmt, ## args); \
-	else \
-		LOG_MGCPC_EP(ci->ep, level, "CI[%d] %s%s%s: " fmt, \
-			(int)(ci - ci->ep->ci), \
-			ci->label ? : "-", \
-			ci->mgcp_ci_str[0] ? " CI=" : "", \
-			ci->mgcp_ci_str[0] ? ci->mgcp_ci_str : "", \
-			## args); \
-	} while(0)
-
-#define LOG_CI_VERB(ci, level, fmt, args...) do { \
-	if (ci->verb_info.addr[0]) \
-		LOG_CI(ci, level, "%s %s:%u: " fmt, \
-			osmo_mgcp_verb_name(ci->verb), ci->verb_info.addr, ci->verb_info.port, \
-			## args); \
-	else \
-		LOG_CI(ci, level, "%s: " fmt, \
-			osmo_mgcp_verb_name(ci->verb), \
-			## args); \
-	} while(0)
-
-enum osmo_mgcpc_ep_fsm_state {
-	OSMO_MGCPC_EP_ST_UNUSED = 0,
-	OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE,
-	OSMO_MGCPC_EP_ST_IN_USE,
-};
-
-enum osmo_mgcpc_ep_fsm_event {
-	_OSMO_MGCPC_EP_EV_LAST = 0,
-	/* and MGW response events are allocated dynamically */
-};
-
-#define FIRST_CI_EVENT (_OSMO_MGCPC_EP_EV_LAST + (_OSMO_MGCPC_EP_EV_LAST & 1)) /* rounded up to even nr */
-#define USABLE_CI ((32 - FIRST_CI_EVENT)/2)
-#define EV_TO_CI_IDX(event) ((event - FIRST_CI_EVENT) / 2)
-
-#define CI_EV_SUCCESS(ci) (FIRST_CI_EVENT + (((ci) - ci->ep->ci) * 2))
-#define CI_EV_FAILURE(ci) (CI_EV_SUCCESS(ci) + 1)
-
-static struct osmo_fsm osmo_mgcpc_ep_fsm;
-
-/*! One connection on an endpoint, corresponding to a connection identifier (CI) as returned by the MGW.
- * An endpoint has a fixed number of slots of these, which may or may not be in use.
- */
-struct osmo_mgcpc_ep_ci {
-	struct osmo_mgcpc_ep *ep;
-
-	bool occupied;
-	char label[64];
-	struct osmo_fsm_inst *mgcp_client_fi;
-
-	bool pending;
-	bool sent;
-	enum mgcp_verb verb;
-	struct mgcp_conn_peer verb_info;
-	struct osmo_fsm_inst *notify;
-	uint32_t notify_success;
-	uint32_t notify_failure;
-	void *notify_data;
-
-	bool got_port_info;
-	struct mgcp_conn_peer rtp_info;
-	char mgcp_ci_str[MGCP_CONN_ID_LENGTH];
-};
-
-/*! An MGW endpoint with N connections, like "rtpbridge/23@mgw". */
-struct osmo_mgcpc_ep {
-	/*! MGCP client connection to the MGW. */
-	struct mgcp_client *mgcp_client;
-	struct osmo_fsm_inst *fi;
-
-	/*! Endpoint string; at first this might be a wildcard, and upon the first CRCX OK response, this will reflect
-	 * the endpoint name returned by the MGW. */
-	char endpoint[MGCP_ENDPOINT_MAXLEN];
-
-	/*! Timeout definitions used for this endpoint, see osmo_mgcpc_ep_fsm_timeouts. */
-	const struct osmo_tdef *T_defs;
-
-	/*! True as soon as the first CRCX OK is received. The endpoint name may be determined by the first CRCX
-	 * response, so to dispatch any other messages, the FSM instance *must* wait for the first CRCX OK to arrive
-	 * first. Once the endpoint name is pinpointed, any amount of operations may be dispatched concurrently. */
-	bool first_crcx_complete;
-
-	/*! Endpoint connection slots. Note that each connection has its own set of FSM event numbers to signal success
-	 * and failure, depending on its index within this array. See CI_EV_SUCCESS and CI_EV_FAILURE. */
-	struct osmo_mgcpc_ep_ci ci[USABLE_CI];
-};
-
-const struct value_string osmo_mgcp_verb_names[] = {
-	{ MGCP_VERB_CRCX, "CRCX" },
-	{ MGCP_VERB_MDCX, "MDCX" },
-	{ MGCP_VERB_DLCX, "DLCX" },
-	{ MGCP_VERB_AUEP, "AUEP" },
-	{ MGCP_VERB_RSIP, "RSIP" },
-	{}
-};
-
-static void osmo_mgcpc_ep_count(struct osmo_mgcpc_ep *ep, int *occupied, int *pending_not_sent,
-				int *waiting_for_response);
-
-static struct osmo_mgcpc_ep_ci *osmo_mgcpc_ep_check_ci(struct osmo_mgcpc_ep_ci *ci)
-{
-	if (!ci)
-		return NULL;
-	if (!ci->ep)
-		return NULL;
-	if (ci < ci->ep->ci || ci >= &ci->ep->ci[USABLE_CI])
-		return NULL;
-	return ci;
-}
-
-static struct osmo_mgcpc_ep_ci *osmo_mgcpc_ep_ci_for_event(struct osmo_mgcpc_ep *ep, uint32_t event)
-{
-	int idx;
-	if (event < FIRST_CI_EVENT)
-		return NULL;
-	idx = EV_TO_CI_IDX(event);
-	if (idx >= sizeof(ep->ci))
-		return NULL;
-	return osmo_mgcpc_ep_check_ci(&ep->ci[idx]);
-}
-
-const char *osmo_mgcpc_ep_name(const struct osmo_mgcpc_ep *ep)
-{
-	if (!ep)
-		return "NULL";
-	if (ep->endpoint[0])
-		return ep->endpoint;
-	return osmo_fsm_inst_name(ep->fi);
-}
-
-const char *mgcp_conn_peer_name(const struct mgcp_conn_peer *info)
-{
-	/* I'd be fine with a smaller buffer and accept truncation, but gcc possibly refuses to build if
-	 * this buffer is too small. */
-	static char buf[1024];
-
-	if (!info)
-		return "NULL";
-
-	if (info->endpoint[0]
-	    && info->addr[0])
-		snprintf(buf, sizeof(buf), "%s:%s:%u",
-			 info->endpoint, info->addr, info->port);
-	else if (info->endpoint[0])
-		snprintf(buf, sizeof(buf), "%s", info->endpoint);
-	else if (info->addr[0])
-		snprintf(buf, sizeof(buf), "%s:%u", info->addr, info->port);
-	else
-		return "empty";
-	return buf;
-}
-
-const char *osmo_mgcpc_ep_ci_name(const struct osmo_mgcpc_ep_ci *ci)
-{
-	const struct mgcp_conn_peer *rtp_info;
-
-	if (!ci)
-		return "NULL";
-
-	rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);
-
-	if (rtp_info)
-		return mgcp_conn_peer_name(rtp_info);
-	return osmo_mgcpc_ep_name(ci->ep);
-}
-
-const char *osmo_mgcpc_ep_ci_id(const struct osmo_mgcpc_ep_ci *ci)
-{
-	if (!ci || !ci->mgcp_ci_str[0])
-		return NULL;
-	return ci->mgcp_ci_str;
-}
-
-static struct value_string osmo_mgcpc_ep_fsm_event_names[33] = {};
-
-static char osmo_mgcpc_ep_fsm_event_name_bufs[32][32] = {};
-
-static void fill_event_names()
-{
-	int i;
-	for (i = 0; i < (ARRAY_SIZE(osmo_mgcpc_ep_fsm_event_names) - 1); i++) {
-		if (i < _OSMO_MGCPC_EP_EV_LAST)
-			continue;
-		if (i < FIRST_CI_EVENT || EV_TO_CI_IDX(i) > USABLE_CI) {
-			osmo_mgcpc_ep_fsm_event_names[i] = (struct value_string){i, "Unused"};
-			continue;
-		}
-		snprintf(osmo_mgcpc_ep_fsm_event_name_bufs[i], sizeof(osmo_mgcpc_ep_fsm_event_name_bufs[i]),
-			 "MGW Response for CI #%d", EV_TO_CI_IDX(i));
-		osmo_mgcpc_ep_fsm_event_names[i] = (struct value_string){i, osmo_mgcpc_ep_fsm_event_name_bufs[i]};
-	}
-}
-
-/* T_defs is used to obtain an (Osmocom specific) T2427001: timeout for an MGCP response (note, 2427 corresponds to the
- * default MGCP port in osmo-mgw). */
-static __attribute__((constructor)) void osmo_mgcpc_ep_fsm_init()
-{
-	OSMO_ASSERT(osmo_fsm_register(&osmo_mgcpc_ep_fsm) == 0);
-	fill_event_names();
-}
-
-struct osmo_mgcpc_ep *osmo_mgcpc_ep_fi_mgwep(struct osmo_fsm_inst *fi)
-{
-	OSMO_ASSERT(fi);
-	OSMO_ASSERT(fi->fsm == &osmo_mgcpc_ep_fsm);
-	OSMO_ASSERT(fi->priv);
-	return fi->priv;
-}
-
-/*! Allocate an osmo_mgcpc_ep FSM.
- * MGCP messages to set up the endpoint will be sent on the given mgcp_client, as soon as the first
- * osmo_mgcpc_ep_ci_request() is invoked.
- *
- * A typical sequence of events would be:
- *
- *    ep = osmo_mgcpc_ep_alloc(..., mgcp_client_rtpbridge_wildcard(client));
- *    ci_to_ran = osmo_mgcpc_ep_ci_add(ep);
- *    osmo_mgcpc_ep_ci_request(ci_to_ran, MGCP_VERB_CRCX, verb_info,
- *                             my_call_fsm, MY_EVENT_MGCP_OK, MY_EVENT_MGCP_FAIL);
- *    ci_to_cn = osmo_mgcpc_ep_ci_add(ep);
- *    osmo_mgcpc_ep_ci_request(ci_to_cn, MGCP_VERB_CRCX, verb_info,
- *                             my_call_fsm, MY_EVENT_MGCP_OK, MY_EVENT_MGCP_FAIL);
- *    ...
- *    osmo_mgcpc_ep_ci_request(ci_to_ran, MGCP_VERB_MDCX, ...);
- *    ...
- *    osmo_mgcpc_ep_clear(ep);
- *    ep = NULL;
- *
- * \param parent  Parent FSM.
- * \param parent_term_event  Event to dispatch to the parent on termination of this FSM instance.
- * \param mgcp_client  Connection to the MGW.
- * \param T_defs  Timeout definitions to be used for FSM states, see osmo_mgcpc_ep_fsm_timeouts.
- * \param fsm_id  FSM instance ID.
- * \param endpoint_str_fmt  The endpoint string format to send to the MGW upon the first CRCX.
- *                          See mgcp_client_rtpbridge_wildcard() for "rtpbridge" endpoints.
- */
-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, ...)
-{
-	va_list ap;
-	struct osmo_fsm_inst *fi;
-	struct osmo_mgcpc_ep *ep;
-	int rc;
-
-	if (!mgcp_client)
-		return NULL;
-
-	fi = osmo_fsm_inst_alloc_child(&osmo_mgcpc_ep_fsm, parent, parent_term_event);
-	OSMO_ASSERT(fi);
-
-	osmo_fsm_inst_update_id(fi, fsm_id);
-
-	ep = talloc_zero(fi, struct osmo_mgcpc_ep);
-	OSMO_ASSERT(ep);
-
-	*ep = (struct osmo_mgcpc_ep){
-		.mgcp_client = mgcp_client,
-		.fi = fi,
-		.T_defs = T_defs,
-	};
-	fi->priv = ep;
-
-	va_start(ap, endpoint_str_fmt);
-	rc = vsnprintf(ep->endpoint, sizeof(ep->endpoint), endpoint_str_fmt ? : "", ap);
-	va_end(ap);
-
-	if (rc <= 0 || rc >= sizeof(ep->endpoint)) {
-		LOG_MGCPC_EP(ep, LOGL_ERROR, "Endpoint name too long or too short: %s\n",
-			  ep->endpoint);
-		osmo_fsm_inst_term(ep->fi, OSMO_FSM_TERM_ERROR, 0);
-		return NULL;
-	}
-
-	return ep;
-}
-
-/*! Add a connection to an endpoint.
- * Allocate a connection identifier slot in the osmo_mgcpc_ep instance, do not yet dispatch a CRCX.
- * The CRCX is dispatched only upon the first osmo_mgcpc_ep_ci_request().
- * \param ep  Parent endpoint instance.
- * \param label_fmt  Label for logging.
- */
-struct osmo_mgcpc_ep_ci *osmo_mgcpc_ep_ci_add(struct osmo_mgcpc_ep *ep,
-					      const char *label_fmt, ...)
-{
-	va_list ap;
-	int i;
-	struct osmo_mgcpc_ep_ci *ci;
-
-	for (i = 0; i < USABLE_CI; i++) {
-		ci = &ep->ci[i];
-
-		if (ci->occupied || ci->mgcp_client_fi)
-			continue;
-
-		*ci = (struct osmo_mgcpc_ep_ci){
-			.ep = ep,
-			.occupied = true,
-		};
-		if (label_fmt) {
-			va_start(ap, label_fmt);
-			vsnprintf(ci->label, sizeof(ci->label), label_fmt, ap);
-			va_end(ap);
-		}
-		return ci;
-	}
-
-	LOG_MGCPC_EP(ep, LOGL_ERROR,
-		  "Cannot allocate another endpoint, all "
-		  OSMO_STRINGIFY_VAL(USABLE_CI) " are in use\n");
-
-	return NULL;
-}
-
-static bool osmo_mgcpc_ep_fsm_check_state_chg_after_response(struct osmo_fsm_inst *fi);
-
-static void on_failure(struct osmo_mgcpc_ep_ci *ci)
-{
-	struct osmo_fsm_inst *notify = ci->notify;
-	uint32_t notify_failure = ci->notify_failure;
-	void *notify_data = ci->notify_data;
-
-	if (!ci->occupied)
-		return;
-
-	*ci = (struct osmo_mgcpc_ep_ci){
-		.ep = ci->ep,
-	};
-
-	/* If this check has terminated the FSM instance, don't fire any more events to prevent use-after-free problems.
-	 * The endpoint FSM does dispatch a term event to its parent, and everything should be cleaned like that. */
-	if (!osmo_mgcpc_ep_fsm_check_state_chg_after_response(ci->ep->fi))
-		return;
-
-	if (notify)
-		osmo_fsm_inst_dispatch(notify, notify_failure, notify_data);
-}
-
-static int update_endpoint_name(struct osmo_mgcpc_ep_ci *ci, const char *new_endpoint_name)
-{
-	struct osmo_mgcpc_ep *ep = ci->ep;
-	int rc;
-	int i;
-
-	if (!strcmp(ep->endpoint, new_endpoint_name)) {
-		/* Same endpoint name, nothing to do. */
-		return 0;
-	}
-
-	/* The endpoint name should only change on the very first CRCX response. */
-	if (ep->first_crcx_complete) {
-		LOG_CI(ci, LOGL_ERROR, "Reponse returned mismatching endpoint name."
-		       " This is endpoint %s, instead received %s\n",
-		       ep->endpoint, new_endpoint_name);
-		on_failure(ci);
-		return -EINVAL;
-	}
-
-	/* This is the first CRCX response, update endpoint name. */
-	rc = OSMO_STRLCPY_ARRAY(ep->endpoint, new_endpoint_name);
-	if (rc <= 0 || rc >= sizeof(ep->endpoint)) {
-		LOG_CI(ci, LOGL_ERROR, "Unable to copy endpoint name %s\n", osmo_quote_str(new_endpoint_name, -1));
-		osmo_mgcpc_ep_ci_dlcx(ci);
-		on_failure(ci);
-		return -ENOSPC;
-	}
-
-	/* Make sure already pending requests use this updated endpoint name. */
-	for (i = 0; i < ARRAY_SIZE(ep->ci); i++) {
-		struct osmo_mgcpc_ep_ci *other_ci = &ep->ci[i];
-		if (!other_ci->occupied)
-			continue;
-		if (!other_ci->pending)
-			continue;
-		if (other_ci->sent)
-			continue;
-		OSMO_STRLCPY_ARRAY(other_ci->verb_info.endpoint, ep->endpoint);
-	}
-	return 0;
-}
-
-static void on_success(struct osmo_mgcpc_ep_ci *ci, void *data)
-{
-	struct mgcp_conn_peer *rtp_info;
-
-	if (!ci->occupied)
-		return;
-
-	ci->pending = false;
-
-	switch (ci->verb) {
-	case MGCP_VERB_CRCX:
-		/* If we sent a wildcarded endpoint name on CRCX, we need to store the resulting endpoint
-		 * name here. Also, we receive the MGW's RTP port information. */
-		rtp_info = data;
-		OSMO_ASSERT(rtp_info);
-		ci->got_port_info = true;
-		ci->rtp_info = *rtp_info;
-		osmo_strlcpy(ci->mgcp_ci_str, mgcp_conn_get_ci(ci->mgcp_client_fi),
-			sizeof(ci->mgcp_ci_str));
-		if (rtp_info->endpoint[0]) {
-			/* On errors, this instance might already be deallocated. Make sure to not access anything after
-			 * error. */
-			if (update_endpoint_name(ci, rtp_info->endpoint))
-				return;
-		}
-		ci->ep->first_crcx_complete = true;
-		break;
-
-	default:
-		break;
-	}
-
-	LOG_CI(ci, LOGL_DEBUG, "received successful response to %s: RTP=%s%s\n",
-	       osmo_mgcp_verb_name(ci->verb),
-	       mgcp_conn_peer_name(ci->got_port_info? &ci->rtp_info : NULL),
-	       ci->notify ? "" : " (not sending a notification)");
-
-	if (ci->notify)
-		osmo_fsm_inst_dispatch(ci->notify, ci->notify_success, ci->notify_data);
-
-	osmo_mgcpc_ep_fsm_check_state_chg_after_response(ci->ep->fi);
-}
-
-/*! Return the MGW's RTP port information for this connection, as returned by the last CRCX/MDCX OK message. */
-const struct mgcp_conn_peer *osmo_mgcpc_ep_ci_get_rtp_info(const struct osmo_mgcpc_ep_ci *ci)
-{
-	ci = osmo_mgcpc_ep_check_ci((struct osmo_mgcpc_ep_ci*)ci);
-	if (!ci)
-		return NULL;
-	if (!ci->got_port_info)
-		return NULL;
-	return &ci->rtp_info;
-}
-
-/*! Return the MGW's RTP port information for this connection, as returned by the last CRCX/MDCX OK message. */
-bool osmo_mgcpc_ep_ci_get_crcx_info_to_sockaddr(const struct osmo_mgcpc_ep_ci *ci, struct sockaddr_storage *dest)
-{
-	const struct mgcp_conn_peer *rtp_info;
-	struct sockaddr_in *sin;
-
-	rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);
-	if (!rtp_info)
-		return false;
-
-        sin = (struct sockaddr_in *)dest;
-
-        sin->sin_family = AF_INET;
-        sin->sin_addr.s_addr = inet_addr(rtp_info->addr);
-        sin->sin_port = osmo_ntohs(rtp_info->port);
-	return true;
-}
-
-bool osmo_mgcpc_ep_ci_get_crcx_info_to_osmux_cid(const struct osmo_mgcpc_ep_ci *ci, uint8_t* cid)
-{
-	const struct mgcp_conn_peer *rtp_info;
-
-	rtp_info = osmo_mgcpc_ep_ci_get_rtp_info(ci);
-	if (!rtp_info)
-		return false;
-
-	if (!rtp_info->x_osmo_osmux_use)
-		return false;
-
-	*cid = rtp_info->x_osmo_osmux_cid;
-	return true;
-}
-
-static const struct osmo_tdef_state_timeout osmo_mgcpc_ep_fsm_timeouts[32] = {
-	[OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE] = { .T=2427001 },
-};
-
-/* Transition to a state, using the T timer defined in assignment_fsm_timeouts.
- * The actual timeout value is in turn obtained from osmo_mgcpc_ep.T_defs.
- * Assumes local variable fi exists. */
-#define osmo_mgcpc_ep_fsm_state_chg(state) \
-	osmo_tdef_fsm_inst_state_chg(fi, state, osmo_mgcpc_ep_fsm_timeouts, \
-				     ((struct osmo_mgcpc_ep*)fi->priv)->T_defs, 5)
-
-/*! Dispatch an actual CRCX/MDCX/DLCX message for this connection.
- * \param ci  Connection identifier as obtained from osmo_mgcpc_ep_ci_add().
- * \param verb  MGCP operation to dispatch.
- * \param verb_info  Parameters for the MGCP operation.
- * \param notify  Peer FSM instance to notify of completed/failed operation.
- * \param event_success  Which event to dispatch to 'notify' upon OK response.
- * \param event_failure  Which event to dispatch to 'notify' upon failure response.
- * \param notify_data  Data pointer to pass to the event dispatch for both success and failure.
- */
-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)
-{
-	struct osmo_mgcpc_ep *ep;
-	struct osmo_fsm_inst *fi;
-	struct osmo_mgcpc_ep_ci cleared_ci;
-	ci = osmo_mgcpc_ep_check_ci(ci);
-
-	if (!ci) {
-		LOGP(DLGLOBAL, LOGL_ERROR, "Invalid MGW endpoint request: no ci\n");
-		goto dispatch_error;
-	}
-	if (!verb_info && verb != MGCP_VERB_DLCX) {
-		LOG_CI(ci, LOGL_ERROR, "Invalid MGW endpoint request: missing verb details for %s\n",
-		       osmo_mgcp_verb_name(verb));
-		goto dispatch_error;
-	}
-	if ((verb < 0) || (verb > MGCP_VERB_RSIP)) {
-		LOG_CI(ci, LOGL_ERROR, "Invalid MGW endpoint request: unknown verb: %s\n",
-		       osmo_mgcp_verb_name(verb));
-		goto dispatch_error;
-	}
-
-	ep = ci->ep;
-	fi = ep->fi;
-
-	/* Clear volatile state by explicitly keeping those that should remain. Because we can't assign
-	 * the char[] directly, dance through cleared_ci and copy back. */
-	cleared_ci = (struct osmo_mgcpc_ep_ci){
-		.ep = ep,
-		.mgcp_client_fi = ci->mgcp_client_fi,
-		.got_port_info = ci->got_port_info,
-		.rtp_info = ci->rtp_info,
-
-		.occupied = true,
-		/* .pending = true follows below */
-		.verb = verb,
-		.notify = notify,
-		.notify_success = event_success,
-		.notify_failure = event_failure,
-		.notify_data = notify_data,
-	};
-	osmo_strlcpy(cleared_ci.label, ci->label, sizeof(cleared_ci.label));
-	osmo_strlcpy(cleared_ci.mgcp_ci_str, ci->mgcp_ci_str, sizeof(cleared_ci.mgcp_ci_str));
-	*ci = cleared_ci;
-
-	LOG_CI_VERB(ci, LOGL_DEBUG, "notify=%s\n", osmo_fsm_inst_name(ci->notify));
-
-	if (verb_info)
-		ci->verb_info = *verb_info;
-
-	if (ep->endpoint[0]) {
-		if (ci->verb_info.endpoint[0] && strcmp(ci->verb_info.endpoint, ep->endpoint))
-			LOG_CI(ci, LOGL_ERROR,
-			       "Warning: Requested %s on endpoint %s, but this CI is on endpoint %s."
-			       " Using the proper endpoint instead.\n",
-			       osmo_mgcp_verb_name(verb), ci->verb_info.endpoint, ep->endpoint);
-		osmo_strlcpy(ci->verb_info.endpoint, ep->endpoint, sizeof(ci->verb_info.endpoint));
-	}
-
-	switch (ci->verb) {
-	case MGCP_VERB_CRCX:
-		if (ci->mgcp_client_fi) {
-			LOG_CI(ci, LOGL_ERROR, "CRCX can be called only once per MGW endpoint CI\n");
-			on_failure(ci);
-			return;
-		}
-		break;
-
-	case MGCP_VERB_MDCX:
-		if (!ci->mgcp_client_fi) {
-			LOG_CI_VERB(ci, LOGL_ERROR, "The first verb on an unused MGW endpoint CI must be CRCX, not %s\n",
-				    osmo_mgcp_verb_name(ci->verb));
-			on_failure(ci);
-			return;
-		}
-		break;
-
-	case MGCP_VERB_DLCX:
-		if (!ci->mgcp_client_fi) {
-			LOG_CI_VERB(ci, LOGL_DEBUG, "Ignoring DLCX on unused MGW endpoint CI\n");
-			return;
-		}
-		break;
-
-	default:
-		LOG_CI(ci, LOGL_ERROR, "This verb is not supported: %s\n", osmo_mgcp_verb_name(ci->verb));
-		on_failure(ci);
-		return;
-	}
-
-	ci->pending = true;
-
-	LOG_CI_VERB(ci, LOGL_DEBUG, "Scheduling\n");
-
-	if (ep->fi->state != OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE)
-		osmo_mgcpc_ep_fsm_state_chg(OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE);
-
-	return;
-dispatch_error:
-	if (notify)
-		osmo_fsm_inst_dispatch(notify, event_failure, notify_data);
-}
-
-static int send_verb(struct osmo_mgcpc_ep_ci *ci)
-{
-	int rc;
-	struct osmo_mgcpc_ep *ep = ci->ep;
-
-	if (!ci->occupied || !ci->pending || ci->sent)
-		return 0;
-
-	switch (ci->verb) {
-
-	case MGCP_VERB_CRCX:
-		OSMO_ASSERT(!ci->mgcp_client_fi);
-		LOG_CI_VERB(ci, LOGL_DEBUG, "Sending\n");
-		ci->mgcp_client_fi = mgcp_conn_create(ep->mgcp_client, ep->fi,
-						      CI_EV_FAILURE(ci), CI_EV_SUCCESS(ci),
-						      &ci->verb_info);
-		ci->sent = true;
-		if (!ci->mgcp_client_fi){
-			LOG_CI_VERB(ci, LOGL_ERROR, "Cannot send\n");
-			on_failure(ci);
-			return -EINVAL;
-		}
-		osmo_fsm_inst_update_id(ci->mgcp_client_fi, ci->label);
-		break;
-
-	case MGCP_VERB_MDCX:
-		OSMO_ASSERT(ci->mgcp_client_fi);
-		LOG_CI_VERB(ci, LOGL_DEBUG, "Sending\n");
-		rc = mgcp_conn_modify(ci->mgcp_client_fi, CI_EV_SUCCESS(ci), &ci->verb_info);
-		ci->sent = true;
-		if (rc) {
-			LOG_CI_VERB(ci, LOGL_ERROR, "Cannot send (rc=%d %s)\n", rc, strerror(-rc));
-			on_failure(ci);
-			return -EINVAL;
-		}
-		break;
-
-	case MGCP_VERB_DLCX:
-		LOG_CI(ci, LOGL_DEBUG, "Sending MGCP: %s %s\n",
-		       osmo_mgcp_verb_name(ci->verb), ci->mgcp_ci_str);
-		/* The way this is designed, we actually need to forget all about the ci right away. */
-		mgcp_conn_delete(ci->mgcp_client_fi);
-		if (ci->notify)
-			osmo_fsm_inst_dispatch(ci->notify, ci->notify_success, ci->notify_data);
-		*ci = (struct osmo_mgcpc_ep_ci){
-			.ep = ep,
-		};
-		break;
-
-	default:
-		OSMO_ASSERT(false);
-	}
-
-	return 1;
-}
-
-/*! DLCX all connections, terminate the endpoint FSM and free. */
-void osmo_mgcpc_ep_clear(struct osmo_mgcpc_ep *ep)
-{
-	if (!ep)
-		return;
-	osmo_fsm_inst_term(ep->fi, OSMO_FSM_TERM_REGULAR, 0);
-}
-
-static void osmo_mgcpc_ep_count(struct osmo_mgcpc_ep *ep, int *occupied, int *pending_not_sent,
-				int *waiting_for_response)
-{
-	int i;
-
-	if (occupied)
-		*occupied = 0;
-
-	if (pending_not_sent)
-		*pending_not_sent = 0;
-
-	if (waiting_for_response)
-		*waiting_for_response = 0;
-
-	for (i = 0; i < ARRAY_SIZE(ep->ci); i++) {
-		struct osmo_mgcpc_ep_ci *ci = &ep->ci[i];
-		if (ci->occupied) {
-			if (occupied)
-				(*occupied)++;
-		} else
-			continue;
-
-		if (ci->pending)
-			LOG_CI_VERB(ci, LOGL_DEBUG, "%s\n",
-				    ci->sent ? "waiting for response" : "waiting to be sent");
-		else
-			LOG_CI_VERB(ci, LOGL_DEBUG, "done (%s)\n", mgcp_conn_peer_name(osmo_mgcpc_ep_ci_get_rtp_info(ci)));
-
-		if (ci->pending && ci->sent)
-			if (waiting_for_response)
-				(*waiting_for_response)++;
-		if (ci->pending && !ci->sent)
-			if (pending_not_sent)
-				(*pending_not_sent)++;
-	}
-}
-
-static bool osmo_mgcpc_ep_fsm_check_state_chg_after_response(struct osmo_fsm_inst *fi)
-{
-	int waiting_for_response;
-	int occupied;
-	struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi);
-
-	osmo_mgcpc_ep_count(ep, &occupied, NULL, &waiting_for_response);
-	LOG_MGCPC_EP(ep, LOGL_DEBUG, "CI in use: %d, waiting for response: %d\n", occupied, waiting_for_response);
-
-	if (!occupied)  {
-		/* All CI have been released. The endpoint no longer exists. Notify the parent FSM, by
-		 * terminating. */
-		osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, 0);
-		return false;
-	}
-
-	if (!waiting_for_response) {
-		if (fi->state != OSMO_MGCPC_EP_ST_IN_USE)
-			osmo_mgcpc_ep_fsm_state_chg(OSMO_MGCPC_EP_ST_IN_USE);
-	}
-
-	return true;
-}
-
-static void osmo_mgcpc_ep_fsm_wait_mgw_response_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
-{
-	static int re_enter = 0;
-	int rc;
-	int count = 0;
-	int i;
-	struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi);
-
-	re_enter++;
-	OSMO_ASSERT(re_enter < 10);
-
-	/* The first CRCX gives us the endpoint name in the CRCX response. So we must wait for the first CRCX endpoint
-	 * response to come in before sending any other MGCP requests -- otherwise we might end up creating new
-	 * endpoints instead of acting on the same. This FSM always sends out N requests and waits for all of them to
-	 * complete before sending out new requests. Hence we're safe when the very first time at most one request is
-	 * sent (which needs to be a CRCX). */
-
-	for (i = 0; i < ARRAY_SIZE(ep->ci); i++) {
-		struct osmo_mgcpc_ep_ci *ci = &ep->ci[i];
-
-		/* Make sure that only CRCX get dispatched if no CRCX were sent yet. */
-		if (!ep->first_crcx_complete) {
-			if (ci->occupied && ci->verb != MGCP_VERB_CRCX)
-				continue;
-		}
-
-		rc = send_verb(&ep->ci[i]);
-		/* Need to be careful not to access the instance after failure. Event chains may already have
-		 * deallocated this memory. */
-		if (rc < 0)
-			return;
-		if (!rc)
-			continue;
-		count++;
-		/* Make sure that we wait for the first CRCX response before dispatching more requests. */
-		if (!ep->first_crcx_complete)
-			break;
-	}
-
-	LOG_MGCPC_EP(ep, LOGL_DEBUG, "Sent messages: %d\n", count);
-	if (ep->first_crcx_complete)
-		osmo_mgcpc_ep_fsm_check_state_chg_after_response(fi);
-	re_enter--;
-}
-
-static void osmo_mgcpc_ep_fsm_handle_ci_events(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
-	struct osmo_mgcpc_ep_ci *ci;
-	struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi);
-	ci = osmo_mgcpc_ep_ci_for_event(ep, event);
-	if (ci) {
-		if (event == CI_EV_SUCCESS(ci))
-			on_success(ci, data);
-		else
-			on_failure(ci);
-	}
-}
-
-static void osmo_mgcpc_ep_fsm_in_use_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)
-{
-	int pending_not_sent;
-	struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi);
-
-	osmo_mgcpc_ep_count(ep, NULL, &pending_not_sent, NULL);
-	if (pending_not_sent)
-		osmo_mgcpc_ep_fsm_state_chg(OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE);
-}
-
-#define S(x)	(1 << (x))
-
-static const struct osmo_fsm_state osmo_mgcpc_ep_fsm_states[] = {
-	[OSMO_MGCPC_EP_ST_UNUSED] = {
-		.name = "UNUSED",
-		.in_event_mask = 0,
-		.out_state_mask = 0
-			| S(OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE)
-			,
-	},
-	[OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE] = {
-		.name = "WAIT_MGW_RESPONSE",
-		.onenter = osmo_mgcpc_ep_fsm_wait_mgw_response_onenter,
-		.action = osmo_mgcpc_ep_fsm_handle_ci_events,
-		.in_event_mask = 0xffffffff,
-		.out_state_mask = 0
-			| S(OSMO_MGCPC_EP_ST_IN_USE)
-			,
-	},
-	[OSMO_MGCPC_EP_ST_IN_USE] = {
-		.name = "IN_USE",
-		.onenter = osmo_mgcpc_ep_fsm_in_use_onenter,
-		.action = osmo_mgcpc_ep_fsm_handle_ci_events,
-		.in_event_mask = 0xffffffff, /* mgcp_client_fsm may send parent term anytime */
-		.out_state_mask = 0
-			| S(OSMO_MGCPC_EP_ST_WAIT_MGW_RESPONSE)
-			,
-	},
-};
-
-static int osmo_mgcpc_ep_fsm_timer_cb(struct osmo_fsm_inst *fi)
-{
-	int i;
-	struct osmo_mgcpc_ep *ep = osmo_mgcpc_ep_fi_mgwep(fi);
-
-	switch (fi->T) {
-	default:
-		for (i = 0; i < ARRAY_SIZE(ep->ci); i++) {
-			struct osmo_mgcpc_ep_ci *ci = &ep->ci[i];
-			if (!ci->occupied)
-				continue;
-			if (!(ci->pending && ci->sent))
-				continue;
-			on_failure(ci);
-		}
-		return 0;
-	}
-
-	return 0;
-}
-
-static struct osmo_fsm osmo_mgcpc_ep_fsm = {
-	.name = "mgw-endp",
-	.states = osmo_mgcpc_ep_fsm_states,
-	.num_states = ARRAY_SIZE(osmo_mgcpc_ep_fsm_states),
-	.log_subsys = DLMGCP,
-	.event_names = osmo_mgcpc_ep_fsm_event_names,
-	.timer_cb = osmo_mgcpc_ep_fsm_timer_cb,
-	/* The FSM termination will automatically trigger any mgcp_client_fsm instances to DLCX. */
-};
--- a/src/libosmo-mgcp-client/mgcp_client_fsm.c
+++ b/src/libosmo-mgcp-client/mgcp_client_fsm.c
@@ -114,23 +114,16 @@ static void make_crcx_msg(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info
 		.conn_mode = MGCP_CONN_RECV_ONLY,
 		.ptime = info->ptime,
 		.codecs_len = info->codecs_len,
-		.ptmap_len = info->ptmap_len,
-		.param_present = info->param_present
+		.ptmap_len = info->ptmap_len
 	};
 	osmo_strlcpy(mgcp_msg->endpoint, info->endpoint, MGCP_ENDPOINT_MAXLEN);
 	memcpy(mgcp_msg->codecs, info->codecs, sizeof(mgcp_msg->codecs));
 	memcpy(mgcp_msg->ptmap, info->ptmap, sizeof(mgcp_msg->ptmap));
-	memcpy(&mgcp_msg->param, &info->param, sizeof(mgcp_msg->param));

 	if (info->x_osmo_ign) {
 		mgcp_msg->x_osmo_ign = info->x_osmo_ign;
 		mgcp_msg->presence |= MGCP_MSG_PRESENCE_X_OSMO_IGN;
 	}
-
-	if (info->x_osmo_osmux_use) {
-		mgcp_msg->x_osmo_osmux_cid = info->x_osmo_osmux_cid;
-		mgcp_msg->presence |= MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID;
-	}
 }

 static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info)
@@ -141,13 +134,6 @@ static void add_audio(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *info)
 	mgcp_msg->conn_mode = MGCP_CONN_RECV_SEND;
 }

-static void set_conn_mode(struct mgcp_msg *mgcp_msg, struct mgcp_conn_peer *peer)
-{
-	enum mgcp_connection_mode conn_mode = peer->conn_mode;
-	if (conn_mode != MGCP_CONN_NONE)
-		mgcp_msg->conn_mode = conn_mode;
-}
-
 static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx)
 {
 	struct mgcp_msg mgcp_msg;
@@ -163,20 +149,11 @@ static struct msgb *make_mdcx_msg(struct mgcp_ctx *mgcp_ctx)
 		.audio_port = mgcp_ctx->conn_peer_local.port,
 		.ptime = mgcp_ctx->conn_peer_local.ptime,
 		.codecs_len = mgcp_ctx->conn_peer_local.codecs_len,
-		.ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len,
-		.param_present = mgcp_ctx->conn_peer_local.param_present
+		.ptmap_len = mgcp_ctx->conn_peer_local.ptmap_len
 	};
 	osmo_strlcpy(mgcp_msg.endpoint, mgcp_ctx->conn_peer_remote.endpoint, MGCP_ENDPOINT_MAXLEN);
 	memcpy(mgcp_msg.codecs, mgcp_ctx->conn_peer_local.codecs, sizeof(mgcp_msg.codecs));
 	memcpy(mgcp_msg.ptmap, mgcp_ctx->conn_peer_local.ptmap, sizeof(mgcp_msg.ptmap));
-	memcpy(&mgcp_msg.param, &mgcp_ctx->conn_peer_local.param, sizeof(mgcp_ctx->conn_peer_local.param));
-
-	set_conn_mode(&mgcp_msg, &mgcp_ctx->conn_peer_local);
-
-	if (mgcp_ctx->conn_peer_local.x_osmo_osmux_use) {
-		mgcp_msg.x_osmo_osmux_cid = mgcp_ctx->conn_peer_local.x_osmo_osmux_cid;
-		mgcp_msg.presence |= MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID;
-	}

 	/* Note: We take the endpoint and the call_id from the remote
 	 * connection info, because we can be confident that the
@@ -222,8 +199,6 @@ static void fsm_crcx_cb(struct osmo_fsm_inst *fi, uint32_t event, void *data)
 		make_crcx_msg(&mgcp_msg, &mgcp_ctx->conn_peer_local);
 		if (mgcp_ctx->conn_peer_local.port)
 			add_audio(&mgcp_msg, &mgcp_ctx->conn_peer_local);
-		set_conn_mode(&mgcp_msg, &mgcp_ctx->conn_peer_local);
-
 		msg = mgcp_msg_gen(mgcp_ctx->mgcp, &mgcp_msg);
 		OSMO_ASSERT(msg);

@@ -280,11 +255,6 @@ static void mgw_crcx_resp_cb(struct mgcp_response *r, void *priv)
 		return;
 	}
 	LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port);
-	if (r->head.x_osmo_osmux_use) {
-		LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: MGW responded using Osmux %u\n", r->head.x_osmo_osmux_cid);
-		mgcp_ctx->conn_peer_remote.x_osmo_osmux_use = true;
-		mgcp_ctx->conn_peer_remote.x_osmo_osmux_cid = r->head.x_osmo_osmux_cid;
-	}

 	osmo_strlcpy(mgcp_ctx->conn_peer_remote.addr, r->audio_ip, sizeof(mgcp_ctx->conn_peer_remote.addr));
 	mgcp_ctx->conn_peer_remote.port = r->audio_port;
@@ -404,12 +374,6 @@ static void mgw_mdcx_resp_cb(struct mgcp_response *r, void *priv)
 	}
 	LOGPFSML(fi, LOGL_DEBUG, "MGW/MDCX: MGW responded with address %s:%u\n", r->audio_ip, r->audio_port);

-	if (r->head.x_osmo_osmux_use) {
-		LOGPFSML(fi, LOGL_DEBUG, "MGW/CRCX: MGW responded using Osmux %u\n", r->head.x_osmo_osmux_cid);
-		mgcp_ctx->conn_peer_remote.x_osmo_osmux_use = true;
-		mgcp_ctx->conn_peer_remote.x_osmo_osmux_cid = r->head.x_osmo_osmux_cid;
-	}
-
 	osmo_strlcpy(mgcp_ctx->conn_peer_remote.addr, r->audio_ip, sizeof(mgcp_ctx->conn_peer_remote.addr));
 	mgcp_ctx->conn_peer_remote.port = r->audio_port;

@@ -721,25 +685,3 @@ void mgcp_conn_delete(struct osmo_fsm_inst *fi)
 	}
 	osmo_fsm_inst_dispatch(fi, EV_DLCX, mgcp_ctx);
 }
-
-const char *osmo_mgcpc_conn_peer_name(const struct mgcp_conn_peer *info)
-{
-	/* I'd be fine with a smaller buffer and accept truncation, but gcc possibly refuses to build if
-	 * this buffer is too small. */
-	static char buf[1024];
-
-	if (!info)
-		return "NULL";
-
-	if (info->endpoint[0]
-	    && info->addr[0])
-		snprintf(buf, sizeof(buf), "%s:%s:%u",
-			 info->endpoint, info->addr, info->port);
-	else if (info->endpoint[0])
-		snprintf(buf, sizeof(buf), "%s", info->endpoint);
-	else if (info->addr[0])
-		snprintf(buf, sizeof(buf), "%s:%u", info->addr, info->port);
-	else
-		return "empty";
-	return buf;
-}
--- a/src/libosmo-mgcp-client/mgcp_client_vty.c
+++ b/src/libosmo-mgcp-client/mgcp_client_vty.c
@@ -143,13 +143,8 @@ DEFUN(cfg_mgw_endpoint_domain_name,
      MGW_STR "Set the domain name to send in MGCP messages, e.g. the part 'foo' in 'rtpbridge/*@foo'.\n"
      "Domain name, should be alphanumeric.\n")
 {
-	if (osmo_strlcpy(global_mgcp_client_conf->endpoint_domain_name, argv[0],
-			 sizeof(global_mgcp_client_conf->endpoint_domain_name))
-	    >= sizeof(global_mgcp_client_conf->endpoint_domain_name)) {
-		vty_out(vty, "%% Error: 'mgw endpoint-domain' name too long, max length is %zu: '%s'%s",
-			sizeof(global_mgcp_client_conf->endpoint_domain_name) - 1, argv[0], VTY_NEWLINE);
-		return CMD_WARNING;
-	}
+	osmo_strlcpy(global_mgcp_client_conf->endpoint_domain_name, argv[0],
+		     sizeof(global_mgcp_client_conf->endpoint_domain_name));
 	return CMD_SUCCESS;
 }

--- a/src/libosmo-mgcp/iuup_cn_node.c
+++ b/src/libosmo-mgcp/iuup_cn_node.c
@@ -41,6 +41,13 @@
 #define LOG_IUUP_CN(cn, level, fmt, args...) \
 		LOGP(DIUUP, level, "(%s) " fmt, (cn)->name, ## args)

+struct osmo_iuup_cn {
+	struct osmo_iuup_cn_cfg cfg;
+	char *name;
+	uint8_t next_frame_nr;
+	int rtp_payload_type;
+};
+
 struct osmo_iuup_cn *osmo_iuup_cn_init(void *ctx, struct osmo_iuup_cn_cfg *cfg,
 				       const char *name_fmt, ...)
 {
@@ -190,9 +197,7 @@ int osmo_iuup_cn_tx_payload(struct osmo_iuup_cn *cn, struct msgb *pdu)
 	rtp = (void*)msgb_push(pdu, sizeof(*iuup_hdr) - 2);
 	memmove(rtp, rtp_was, sizeof(*rtp));

-	/* The IuUP side negotiated a payload type number to use during Initialization. The RTP packet going to the IuUP
-	 * peer should reflect this payload_type. This should already have happened in mgcp_patch_pt(), but can't hurt
-	 * to patch over it again. */
+	/* Send the same payload type to the peer (erm...) */
 	rtp->payload_type = cn->rtp_payload_type;

 	iuup_hdr = (void*)rtp->data;
--- a/src/libosmo-mgcp/mgcp_codec.c
+++ b/src/libosmo-mgcp/mgcp_codec.c
@@ -56,8 +56,8 @@ void mgcp_codec_summary(struct mgcp_conn_rtp *conn)
 	endp = conn->conn->endp;

 	if (rtp->codecs_assigned == 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR, "conn:%s no codecs available\n",
-			 mgcp_conn_dump(conn->conn));
+		LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x conn:%s no codecs available\n", ENDPOINT_NUMBER(endp),
+		     mgcp_conn_dump(conn->conn));
 		return;
 	}

@@ -65,8 +65,8 @@ void mgcp_codec_summary(struct mgcp_conn_rtp *conn)
 	for (i = 0; i < rtp->codecs_assigned; i++) {
 		codec = &rtp->codecs[i];

-		LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "conn:%s codecs[%u]:%s",
-			 mgcp_conn_dump(conn->conn), i, dump_codec(codec));
+		LOGP(DLMGCP, LOGL_DEBUG, "endpoint:0x%x conn:%s codecs[%u]:%s", ENDPOINT_NUMBER(endp),
+		     mgcp_conn_dump(conn->conn), i, dump_codec(codec));

 		if (codec == rtp->codec)
 			LOGPC(DLMGCP, LOGL_DEBUG, " [selected]");
@@ -76,61 +76,36 @@ void mgcp_codec_summary(struct mgcp_conn_rtp *conn)
 }

 /* Initalize or reset codec information with default data. */
-static void codec_init(struct mgcp_rtp_codec *codec)
-{
-	*codec = (struct mgcp_rtp_codec){
-		.payload_type = -1,
-		.frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM,
-		.frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN,
-		.rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE,
-		.channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS,
-	};
-}
-
-static void codec_free(struct mgcp_rtp_codec *codec)
+void codec_init(struct mgcp_rtp_codec *codec)
 {
 	if (codec->subtype_name)
 		talloc_free(codec->subtype_name);
 	if (codec->audio_name)
 		talloc_free(codec->audio_name);
-	*codec = (struct mgcp_rtp_codec){};
+	memset(codec, 0, sizeof(*codec));
+	codec->payload_type = -1;
+	codec->frame_duration_num = DEFAULT_RTP_AUDIO_FRAME_DUR_NUM;
+	codec->frame_duration_den = DEFAULT_RTP_AUDIO_FRAME_DUR_DEN;
+	codec->rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE;
+	codec->channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS;
 }

 /*! Initalize or reset codec information with default data.
 *  \param[out] conn related rtp-connection. */
 void mgcp_codec_reset_all(struct mgcp_conn_rtp *conn)
 {
-	int i;
-	for (i = 0; i < conn->end.codecs_assigned; i++)
-		codec_free(&conn->end.codecs[i]);
+	memset(conn->end.codecs, 0, sizeof(conn->end.codecs));
 	conn->end.codecs_assigned = 0;
 	conn->end.codec = NULL;
 }

-/*! Add codec configuration depending on payload type and/or codec name. This
- *  function uses the input parameters to extrapolate the full codec information.
- *  \param[out] codec configuration (caller provided memory).
- *  \param[out] conn related rtp-connection.
- *  \param[in] payload_type codec type id (e.g. 3 for GSM, -1 when undefined).
- *  \param[in] audio_name audio codec name, in uppercase (e.g. "GSM/8000/1").
- *  \param[in] param optional codec parameters (set to NULL when unused).
- *  \returns 0 on success, -EINVAL on failure. */
-int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name, const struct mgcp_codec_param *param)
+/* Set members of struct mgcp_rtp_codec, extrapolate in missing information */
+static int codec_set(void *ctx, struct mgcp_rtp_codec *codec,
+		     int payload_type, const char *audio_name, unsigned int pt_offset)
 {
 	int rate;
 	int channels;
 	char audio_codec[64];
-	struct mgcp_rtp_codec *codec;
-	unsigned int pt_offset = conn->end.codecs_assigned;
-	void *ctx = conn->conn;
-
-	/* The amount of codecs we can store is limited, make sure we do not
-	 * overrun this limit. */
-	if (conn->end.codecs_assigned >= MGCP_MAX_CODECS)
-		return -EINVAL;
-
-	/* First unused entry */
-	codec = &conn->end.codecs[conn->end.codecs_assigned];

 	/* Initalize the codec struct with some default data to begin with */
 	codec_init(codec);
@@ -138,13 +113,12 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *aud
 	if (payload_type != PTYPE_UNDEFINED) {
 		/* Make sure we do not get any reserved or undefined type numbers */
 		/* See also: https://www.iana.org/assignments/rtp-parameters/rtp-parameters.xhtml */
-		if ((payload_type == 1 || payload_type == 2 || payload_type == 19)
-		    || (payload_type >= 72 && payload_type <= 76)
-		    || (payload_type >= 127)) {
-			LOGP(DLMGCP, LOGL_ERROR, "Cannot add codec, payload type number %d is reserved\n",
-			     payload_type);
+		if (payload_type == 1 || payload_type == 2 || payload_type == 19)
+			goto error;
+		if (payload_type >= 72 && payload_type <= 76)
+			goto error;
+		if (payload_type >= 127)
 			goto error;
-		}

 		codec->payload_type = payload_type;
 	}
@@ -170,8 +144,6 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *aud
 			/* The given payload type is not known to us, or it
 			 * it is a dynamic payload type for which we do not
 			 * know the audio name. We must give up here */
-			LOGP(DLMGCP, LOGL_ERROR, "No audio codec name given, and payload type %d unknown\n",
-			     payload_type);
 			goto error;
 		}
 	}
@@ -179,23 +151,16 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *aud
 	/* Now we extract the codec subtype name, rate and channels. The latter
 	 * two are optional. If they are not present we use the safe defaults
 	 * above. */
-	if (strlen(audio_name) > sizeof(audio_codec)) {
-		LOGP(DLMGCP, LOGL_ERROR, "Audio codec too long: %s\n", osmo_quote_str(audio_name, -1));
+	if (strlen(audio_name) > sizeof(audio_codec))
 		goto error;
-	}
 	channels = DEFAULT_RTP_AUDIO_DEFAULT_CHANNELS;
 	rate = DEFAULT_RTP_AUDIO_DEFAULT_RATE;
-	if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1) {
-		LOGP(DLMGCP, LOGL_ERROR, "Invalid audio codec: %s\n", osmo_quote_str(audio_name, -1));
+	if (sscanf(audio_name, "%63[^/]/%d/%d", audio_codec, &rate, &channels) < 1)
 		goto error;
-	}

 	/* Note: We only accept configurations with one audio channel! */
-	if (channels != 1) {
-		LOGP(DLMGCP, LOGL_ERROR, "Cannot handle audio codec with more than one channel: %s\n",
-		     osmo_quote_str(audio_name, -1));
+	if (channels != 1)
 		goto error;
-	}

 	codec->rate = rate;
 	codec->channels = channels;
@@ -213,7 +178,6 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *aud

 	/* Derive the payload type if it is unknown */
 	if (codec->payload_type == PTYPE_UNDEFINED) {
-		/* TODO: This is semi dead code, see OS#4150 */

 		/* For the known codecs from the static range we restore
 		 * the IANA or 3GPP assigned payload type number */
@@ -249,32 +213,46 @@ int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *aud
 		 * 110 onwards 3gpp defines prefered codec types, which are
 		 * also fixed, see above)  */
 		if (codec->payload_type < 0) {
-			/* FIXME: pt_offset is completely unrelated and useless here, any of those numbers may already
-			 * have been added to the codecs. Instead, there should be an iterator checking for an actually
-			 * unused dynamic payload type number. */
 			codec->payload_type = 96 + pt_offset;
-			if (codec->payload_type > 109) {
-				LOGP(DLMGCP, LOGL_ERROR, "Ran out of payload type numbers to assign dynamically\n");
+			if (codec->payload_type > 109)
 				goto error;
-			}
 		}
 	}

-	/* Copy over optional codec parameters */
-	if (param) {
-		codec->param = *param;
-		codec->param_present = true;
-	} else
-		codec->param_present = false;
-
-	conn->end.codecs_assigned++;
 	return 0;
 error:
 	/* Make sure we leave a clean codec entry on error. */
-	codec_free(codec);
+	codec_init(codec);
+	memset(codec, 0, sizeof(*codec));
 	return -EINVAL;
 }

+/*! Add codec configuration depending on payload type and/or codec name. This
+ *  function uses the input parameters to extrapolate the full codec information.
+ *  \param[out] codec configuration (caller provided memory).
+ *  \param[out] conn related rtp-connection.
+ *  \param[in] payload_type codec type id (e.g. 3 for GSM, -1 when undefined).
+ *  \param[in] audio_name audio codec name (e.g. "GSM/8000/1").
+ *  \returns 0 on success, -EINVAL on failure. */
+int mgcp_codec_add(struct mgcp_conn_rtp *conn, int payload_type, const char *audio_name)
+{
+	int rc;
+
+	/* The amount of codecs we can store is limited, make sure we do not
+	 * overrun this limit. */
+	if (conn->end.codecs_assigned >= MGCP_MAX_CODECS)
+		return -EINVAL;
+
+	rc = codec_set(conn->conn, &conn->end.codecs[conn->end.codecs_assigned], payload_type, audio_name,
+		       conn->end.codecs_assigned);
+	if (rc != 0)
+		return -EINVAL;
+
+	conn->end.codecs_assigned++;
+
+	return 0;
+}
+
 /* Check if the given codec is applicable on the specified endpoint
 * Helper function for mgcp_codec_decide() */
 static bool is_codec_compatible(const struct mgcp_endpoint *endp, const struct mgcp_rtp_codec *codec)
@@ -364,28 +342,9 @@ int mgcp_codec_decide(struct mgcp_conn_rtp *conn)
 	return -EINVAL;
 }

-/* Return true if octet-aligned is set in the given codec. Default to octet-aligned=0, i.e. bandwidth-efficient mode.
- * See RFC4867 "RTP Payload Format for AMR and AMR-WB" sections "8.1. AMR Media Type Registration" and "8.2. AMR-WB
- * Media Type Registration":
- *
- *    octet-align: Permissible values are 0 and 1.  If 1, octet-aligned
- *                 operation SHALL be used.  If 0 or if not present,
- *                 bandwidth-efficient operation is employed.
- *
- * https://tools.ietf.org/html/rfc4867
- */
-static bool amr_is_octet_aligned(const struct mgcp_rtp_codec *codec)
-{
-	if (!codec->param_present)
-		return false;
-	if (!codec->param.amr_octet_aligned_present)
-		return false;
-	return codec->param.amr_octet_aligned;
-}
-
 /* Compare two codecs, all parameters must match up, except for the payload type
 * number. */
-static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b)
+static bool codecs_cmp(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *codec_b)
 {
 	if (codec_a->rate != codec_b->rate)
 		return false;
@@ -395,12 +354,10 @@ static bool codecs_same(struct mgcp_rtp_codec *codec_a, struct mgcp_rtp_codec *c
 		return false;
 	if (codec_a->frame_duration_den != codec_b->frame_duration_den)
 		return false;
+	if (strcmp(codec_a->audio_name, codec_b->audio_name))
+		return false;
 	if (strcmp(codec_a->subtype_name, codec_b->subtype_name))
 		return false;
-	if (!strcmp(codec_a->subtype_name, "AMR")) {
-		if (amr_is_octet_aligned(codec_a) != amr_is_octet_aligned(codec_b))
-			return false;
-	}

 	return true;
 }
@@ -441,7 +398,7 @@ int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp
 	codecs_assigned = rtp_dst->codecs_assigned;
 	OSMO_ASSERT(codecs_assigned <= MGCP_MAX_CODECS);
 	for (i = 0; i < codecs_assigned; i++) {
-		if (codecs_same(codec_src, &rtp_dst->codecs[i])) {
+		if (codecs_cmp(codec_src, &rtp_dst->codecs[i])) {
 			codec_dst = &rtp_dst->codecs[i];
 			break;
 		}
@@ -451,19 +408,3 @@ int mgcp_codec_pt_translate(struct mgcp_conn_rtp *conn_src, struct mgcp_conn_rtp

 	return codec_dst->payload_type;
 }
-
-const struct mgcp_rtp_codec *mgcp_codec_pt_find_by_subtype_name(struct mgcp_conn_rtp *conn,
-								const char *subtype_name, unsigned int match_nr)
-{
-	int i;
-	for (i = 0; i < conn->end.codecs_assigned; i++) {
-		if (!strcmp(conn->end.codecs[i].subtype_name, subtype_name)) {
-			if (match_nr) {
-				match_nr--;
-				continue;
-			}
-			return &conn->end.codecs[i];
-		}
-	}
-	return NULL;
-}
--- a/src/libosmo-mgcp/mgcp_conn.c
+++ b/src/libosmo-mgcp/mgcp_conn.c
@@ -29,7 +29,6 @@
 #include <osmocom/mgcp/mgcp_codec.h>
 #include <osmocom/gsm/gsm_utils.h>
 #include <osmocom/core/rate_ctr.h>
-#include <osmocom/core/timer.h>
 #include <ctype.h>

 const static struct rate_ctr_group_desc rate_ctr_group_desc = {
@@ -75,13 +74,14 @@ static int mgcp_alloc_id(struct mgcp_endpoint *endp, char *id)
 		}
 	}

-	LOGPENDP(endp, DLMGCP, LOGL_ERROR, "unable to generate a unique connectionIdentifier\n");
+	LOGP(DLMGCP, LOGL_ERROR, "endpoint:0x%x, unable to generate a unique connectionIdentifier\n",
+	     ENDPOINT_NUMBER(endp));

 	return -1;
 }

 /* Initialize rtp connection struct with default values */
-static int mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn)
+static void mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *conn)
 {
 	struct mgcp_rtp_end *end = &conn_rtp->end;
 	/* FIXME: Each new rate counter group requires an unique index. At the
@@ -90,8 +90,7 @@ static int mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *
 	static unsigned int rate_ctr_index = 0;

 	conn_rtp->type = MGCP_RTP_DEFAULT;
-	conn_rtp->osmux.cid_allocated = false;
-	conn_rtp->osmux.cid = 0;
+	conn_rtp->osmux.allocated_cid = -1;

 	/* backpointer to the generic part of the connection */
 	conn->u.rtp.conn = conn;
@@ -109,44 +108,21 @@ static int mgcp_rtp_conn_init(struct mgcp_conn_rtp *conn_rtp, struct mgcp_conn *
 	end->maximum_packet_time = -1;

 	conn_rtp->rate_ctr_group = rate_ctr_group_alloc(conn, &rate_ctr_group_desc, rate_ctr_index);
-	if (!conn_rtp->rate_ctr_group)
-		return -1;
-
 	conn_rtp->state.in_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[IN_STREAM_ERR_TSTMP_CTR];
 	conn_rtp->state.out_stream.err_ts_ctr = &conn_rtp->rate_ctr_group->ctr[OUT_STREAM_ERR_TSTMP_CTR];
 	rate_ctr_index++;

 	/* Make sure codec table is reset */
 	mgcp_codec_reset_all(conn_rtp);
-
-	return 0;
 }

 /* Cleanup rtp connection struct */
 static void mgcp_rtp_conn_cleanup(struct mgcp_conn_rtp *conn_rtp)
 {
-	if (mgcp_conn_rtp_is_osmux(conn_rtp))
-		conn_osmux_disable(conn_rtp);
+	osmux_disable_conn(conn_rtp);
+	osmux_release_cid(conn_rtp);
 	mgcp_free_rtp_port(&conn_rtp->end);
 	rate_ctr_group_free(conn_rtp->rate_ctr_group);
-	mgcp_codec_reset_all(conn_rtp);
-}
-
-void mgcp_conn_watchdog_cb(void *data)
-{
-	struct mgcp_conn *conn = data;
-	LOGPCONN(conn, DLMGCP, LOGL_ERROR, "connection timed out!\n");
-	mgcp_conn_free(conn->endp, conn->id);
-}
-
-void mgcp_conn_watchdog_kick(struct mgcp_conn *conn)
-{
-	int timeout = conn->endp->cfg->conn_timeout;
-	if (!timeout)
-		return;
-
-	LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "watchdog kicked\n");
-	osmo_timer_schedule(&conn->watchdog, timeout, 0);
 }

 /*! allocate a new connection list entry.
@@ -182,10 +158,7 @@ struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp,

 	switch (type) {
 	case MGCP_CONN_TYPE_RTP:
-		if (mgcp_rtp_conn_init(&conn->u.rtp, conn) < 0) {
-			talloc_free(conn);
-			return NULL;
-		}
+		mgcp_rtp_conn_init(&conn->u.rtp, conn);
 		break;
 	default:
 		/* NOTE: This should never be called with an
@@ -194,9 +167,6 @@ struct mgcp_conn *mgcp_conn_alloc(void *ctx, struct mgcp_endpoint *endp,
 		OSMO_ASSERT(false);
 	}

-	/* Initialize watchdog */
-	osmo_timer_setup(&conn->watchdog, mgcp_conn_watchdog_cb, conn);
-	mgcp_conn_watchdog_kick(conn);
 	llist_add(&conn->entry, &endp->conns);

 	return conn;
@@ -304,7 +274,6 @@ void mgcp_conn_free(struct mgcp_endpoint *endp, const char *id)
 		OSMO_ASSERT(false);
 	}

-	osmo_timer_del(&conn->watchdog);
 	llist_del(&conn->entry);
 	talloc_free(conn);
 }
--- a/src/libosmo-mgcp/mgcp_endp.c
+++ b/src/libosmo-mgcp/mgcp_endp.c
@@ -36,7 +36,8 @@ const struct mgcp_endpoint_typeset ep_typeset = {
 *  \param[in] endp endpoint to release */
 void mgcp_endp_release(struct mgcp_endpoint *endp)
 {
-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Releasing endpoint\n");
+	LOGP(DLMGCP, LOGL_DEBUG, "Releasing endpoint:0x%x\n",
+	     ENDPOINT_NUMBER(endp));

 	/* Normally this function should only be called when
 	 * all connections have been removed already. In case
--- a/src/libosmo-mgcp/mgcp_msg.c
+++ b/src/libosmo-mgcp/mgcp_msg.c
@@ -82,8 +82,9 @@ int mgcp_parse_conn_mode(const char *mode, struct mgcp_endpoint *endp,
 	int ret = 0;

 	if (!mode) {
-		LOGPCONN(conn, DLMGCP, LOGL_ERROR,
-			 "missing connection mode\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x missing connection mode\n",
+		     ENDPOINT_NUMBER(endp));
 		return -1;
 	}
 	if (!conn)
@@ -91,17 +92,18 @@ int mgcp_parse_conn_mode(const char *mode, struct mgcp_endpoint *endp,
 	if (!endp)
 		return -1;

-	if (strcasecmp(mode, "recvonly") == 0)
+	if (strcmp(mode, "recvonly") == 0)
 		conn->mode = MGCP_CONN_RECV_ONLY;
-	else if (strcasecmp(mode, "sendrecv") == 0)
+	else if (strcmp(mode, "sendrecv") == 0)
 		conn->mode = MGCP_CONN_RECV_SEND;
-	else if (strcasecmp(mode, "sendonly") == 0)
+	else if (strcmp(mode, "sendonly") == 0)
 		conn->mode = MGCP_CONN_SEND_ONLY;
-	else if (strcasecmp(mode, "loopback") == 0)
+	else if (strcmp(mode, "loopback") == 0)
 		conn->mode = MGCP_CONN_LOOPBACK;
 	else {
-		LOGPCONN(conn, DLMGCP, LOGL_ERROR,
-			 "unknown connection mode: '%s'\n", mode);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x unknown connection mode: '%s'\n",
+		     ENDPOINT_NUMBER(endp), mode);
 		ret = -1;
 	}

@@ -111,15 +113,18 @@ int mgcp_parse_conn_mode(const char *mode, struct mgcp_endpoint *endp,
 		    conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0;
 	}

-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "conn:%s\n", mgcp_conn_dump(conn));
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "endpoint:0x%x conn:%s\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn));

-	LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "connection mode '%s' %d\n",
-		 mode, conn->mode);
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "endpoint:0x%x connection mode '%s' %d\n",
+	     ENDPOINT_NUMBER(endp), mode, conn->mode);

 	/* Special handling für RTP connections */
 	if (conn->type == MGCP_CONN_TYPE_RTP) {
-		LOGPCONN(conn, DLMGCP, LOGL_DEBUG, "output_enabled %d\n",
-			 conn->u.rtp.end.output_enabled);
+		LOGP(DLMGCP, LOGL_DEBUG, "endpoint:0x%x output_enabled %d\n",
+		     ENDPOINT_NUMBER(endp), conn->u.rtp.end.output_enabled);
 	}

 	/* The VTY might change the connection mode at any time, so we have
@@ -192,8 +197,9 @@ static struct mgcp_endpoint *find_free_endpoint(struct mgcp_endpoint *endpoints,
 	for (i = 0; i < number_endpoints; i++) {
 		if (endpoints[i].callid == NULL) {
 			endp = &endpoints[i];
-			LOGPENDP(endp, DLMGCP, LOGL_DEBUG,
-			     "found free endpoint\n");
+			LOGP(DLMGCP, LOGL_DEBUG,
+			     "endpoint:0x%x found free endpoint\n",
+			     ENDPOINT_NUMBER(endp));
 			endp->wildcarded_req = true;
 			return endp;
 		}
@@ -325,7 +331,7 @@ int mgcp_parse_header(struct mgcp_parse_data *pdata, char *data)
 			}
 			break;
 		case 2:
-			if (strcasecmp("MGCP", elem)) {
+			if (strcmp("MGCP", elem)) {
 				LOGP(DLMGCP, LOGL_ERROR,
 				     "MGCP header parsing error\n");
 				return -510;
@@ -354,27 +360,18 @@ int mgcp_parse_header(struct mgcp_parse_data *pdata, char *data)

 /*! Extract OSMUX CID from an MGCP parameter line (string).
 *  \param[in] line single parameter line from the MGCP message
- *  \returns OSMUX CID, -1 wildcard, -2 on error */
+ *  \returns OSMUX CID, -1 on error */
 int mgcp_parse_osmux_cid(const char *line)
 {
 	int osmux_cid;

-
-	if (strcasecmp(line + 2, "Osmux: *") == 0) {
-		LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n");
+	if (sscanf(line + 2, "Osmux: %u", &osmux_cid) != 1)
 		return -1;
-	}
-
-	if (sscanf(line + 2 + 7, "%u", &osmux_cid) != 1) {
-		LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n",
-		     line);
-		return -2;
-	}

 	if (osmux_cid > OSMUX_CID_MAX) {
 		LOGP(DLMGCP, LOGL_ERROR, "Osmux ID too large: %u > %u\n",
 		     osmux_cid, OSMUX_CID_MAX);
-		return -2;
+		return -1;
 	}
 	LOGP(DLMGCP, LOGL_DEBUG, "bsc-nat offered Osmux CID %u\n", osmux_cid);

@@ -422,9 +419,9 @@ int mgcp_verify_call_id(struct mgcp_endpoint *endp, const char *callid)
 		return -1;

 	if (strcmp(endp->callid, callid) != 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "CallIDs mismatch: '%s' != '%s'\n",
-			 endp->callid, callid);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x CallIDs mismatch: '%s' != '%s'\n",
+		     ENDPOINT_NUMBER(endp), endp->callid, callid);
 		return -1;
 	}

@@ -443,23 +440,25 @@ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id)

 	/* Check for null identifiers */
 	if (!conn_id) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "invalid ConnectionIdentifier (missing)\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x invalid ConnectionIdentifier (missing)\n",
+		     ENDPOINT_NUMBER(endp));
 		return 510;
 	}

 	/* Check for empty connection identifiers */
 	if (strlen(conn_id) == 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "invalid ConnectionIdentifier (empty)\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x invalid ConnectionIdentifier (empty)\n",
+		     ENDPOINT_NUMBER(endp));
 		return 510;
 	}

 	/* Check for over long connection identifiers */
 	if (strlen(conn_id) > (MGCP_CONN_ID_MAXLEN-1)) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			"invalid ConnectionIdentifier (too long: %zu > %d) 0x%s\n",
-			 strlen(conn_id), MGCP_CONN_ID_MAXLEN-1, conn_id);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "endpoint:0x%x invalid ConnectionIdentifier (too long: %zu > %d) 0x%s\n",
+		     ENDPOINT_NUMBER(endp), strlen(conn_id), MGCP_CONN_ID_MAXLEN-1, conn_id);
 		return 510;
 	}

@@ -467,8 +466,9 @@ int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id)
 	if (mgcp_conn_get(endp, conn_id))
 		return 0;

-	LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-	     "no connection found under ConnectionIdentifier 0x%s\n", conn_id);
+	LOGP(DLMGCP, LOGL_ERROR,
+	     "endpoint:0x%x no connection found under ConnectionIdentifier 0x%s\n",
+	     ENDPOINT_NUMBER(endp), conn_id);

 	/* When the conn_id was not found, return error code 515 "The transaction refers to an incorrect
 	 * connection-id (may have been already deleted)." */
--- a/src/libosmo-mgcp/mgcp_network.c
+++ b/src/libosmo-mgcp/mgcp_network.c
@@ -34,7 +34,6 @@
 #include <osmocom/core/socket.h>
 #include <osmocom/core/byteswap.h>
 #include <osmocom/netif/rtp.h>
-#include <osmocom/netif/amr.h>
 #include <osmocom/mgcp/mgcp.h>
 #include <osmocom/mgcp/mgcp_common.h>
 #include <osmocom/mgcp/mgcp_internal.h>
@@ -44,7 +43,6 @@
 #include <osmocom/mgcp/mgcp_endp.h>
 #include <osmocom/mgcp/mgcp_codec.h>
 #include <osmocom/mgcp/debug.h>
-#include <osmocom/codec/codec.h>
 #include <osmocom/mgcp/iuup_cn_node.h>
 #include <osmocom/mgcp/iuup_protocol.h>

@@ -80,31 +78,34 @@ void mgcp_get_local_addr(char *addr, struct mgcp_conn_rtp *conn)
 	if (endp->cfg->net_ports.bind_addr_probe && conn->end.addr.s_addr != 0) {
 		rc = osmo_sock_local_ip(addr, inet_ntoa(conn->end.addr));
 		if (rc < 0)
-			LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-				 "local interface auto detection failed, using configured addresses...\n");
+			LOGP(DRTP, LOGL_ERROR,
+			     "endpoint:0x%x CI:%s local interface auto detection failed, using configured addresses...\n",
+			     ENDPOINT_NUMBER(endp), conn->conn->id);
 		else {
-			LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,
-				 "selected local rtp bind ip %s by probing using remote ip %s\n",
-				 addr, inet_ntoa(conn->end.addr));
+			LOGP(DRTP, LOGL_DEBUG,
+			     "endpoint:0x%x CI:%s selected local rtp bind ip %s by probing using remote ip %s\n",
+			     ENDPOINT_NUMBER(endp), conn->conn->id, addr,
+			     inet_ntoa(conn->end.addr));
 			return;
 		}
 	}

-	/* Select from preconfigured IP-Addresses. We don't have bind_addr for Osmux (yet?). */
+	/* Select from preconfigured IP-Addresses */
 	if (endp->cfg->net_ports.bind_addr) {
 		/* Check there is a bind IP for the RTP traffic configured,
 		 * if so, use that IP-Address */
 		osmo_strlcpy(addr, endp->cfg->net_ports.bind_addr, INET_ADDRSTRLEN);
-		LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,
-			 "using configured rtp bind ip as local bind ip %s\n",
-			 addr);
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x CI:%s using configured rtp bind ip as local bind ip %s\n",
+		     ENDPOINT_NUMBER(endp), conn->conn->id, addr);
 	} else {
 		/* No specific bind IP is configured for the RTP traffic, so
 		 * assume the IP where we listen for incoming MGCP messages
 		 * as bind IP */
 		osmo_strlcpy(addr, endp->cfg->source_addr, INET_ADDRSTRLEN);
-		LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,
-			"using mgcp bind ip as local rtp bind ip: %s\n", addr);
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x CI:%s using mgcp bind ip as local rtp bind ip: %s\n",
+		     ENDPOINT_NUMBER(endp), conn->conn->id, addr);
 	}
 }

@@ -134,7 +135,7 @@ static uint32_t get_current_ts(unsigned codec_rate)
 /*! send udp packet.
 *  \param[in] fd associated file descriptor
 *  \param[in] addr destination ip-address
- *  \param[in] port destination UDP port (network byte order)
+ *  \param[in] port destination UDP port
 *  \param[in] buf buffer that holds the data to be send
 *  \param[in] len length of the data to be sent
 *  \returns bytes sent, -1 on error */
@@ -166,8 +167,10 @@ int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 	OSMO_ASSERT(endp);
 	OSMO_ASSERT(conn);

-	LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,"sending dummy packet... %s\n",
-		 mgcp_conn_dump(conn->conn));
+	LOGP(DRTP, LOGL_DEBUG,
+	     "endpoint:0x%x sending dummy packet...\n", ENDPOINT_NUMBER(endp));
+	LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x conn:%s\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn->conn));

 	rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr,
 			   conn->end.rtp_port, buf, 1);
@@ -186,9 +189,9 @@ int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 		return rc;

 failed:
-	LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-		 "Failed to send dummy %s packet.\n",
-		 was_rtcp ? "RTCP" : "RTP");
+	LOGP(DRTP, LOGL_ERROR,
+	     "endpoint:0x%x Failed to send dummy %s packet.\n",
+	     ENDPOINT_NUMBER(endp), was_rtcp ? "RTCP" : "RTP");

 	return -1;
 }
@@ -227,16 +230,16 @@ static int check_rtp_timestamp(struct mgcp_endpoint *endp,
 	if (seq == sstate->last_seq) {
 		if (timestamp != sstate->last_timestamp) {
 			rate_ctr_inc(sstate->err_ts_ctr);
-			LOGPENDP(endp, DRTP, LOGL_ERROR,
-				 "The %s timestamp delta is != 0 but the sequence "
-				 "number %d is the same, "
-				 "TS offset: %d, SeqNo offset: %d "
-				 "on SSRC: %u timestamp: %u "
-				 "from %s:%d\n",
-				 text, seq,
-				 state->patch.timestamp_offset, state->patch.seq_offset,
-				 sstate->ssrc, timestamp, inet_ntoa(addr->sin_addr),
-				 ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_ERROR,
+			     "The %s timestamp delta is != 0 but the sequence "
+			     "number %d is the same, "
+			     "TS offset: %d, SeqNo offset: %d "
+			     "on 0x%x SSRC: %u timestamp: %u "
+			     "from %s:%d\n",
+			     text, seq,
+			     state->patch.timestamp_offset, state->patch.seq_offset,
+			     ENDPOINT_NUMBER(endp), sstate->ssrc, timestamp,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		}
 		return 0;
 	}
@@ -247,25 +250,25 @@ static int check_rtp_timestamp(struct mgcp_endpoint *endp,

 	if (tsdelta == 0) {
 		/* Don't update *tsdelta_out */
-		LOGPENDP(endp, DRTP, LOGL_NOTICE,
-			 "The %s timestamp delta is %d "
-			 "on SSRC: %u timestamp: %u "
-			 "from %s:%d\n",
-			 text, tsdelta,
-			 sstate->ssrc, timestamp,
-			 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_NOTICE,
+		     "The %s timestamp delta is %d "
+		     "on 0x%x SSRC: %u timestamp: %u "
+		     "from %s:%d\n",
+		     text, tsdelta,
+		     ENDPOINT_NUMBER(endp), sstate->ssrc, timestamp,
+		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));

 		return 0;
 	}

 	if (sstate->last_tsdelta != tsdelta) {
 		if (sstate->last_tsdelta) {
-			LOGPENDP(endp, DRTP, LOGL_INFO,
-				 "The %s timestamp delta changes from %d to %d "
-				 "on SSRC: %u timestamp: %u from %s:%d\n",
-				 text, sstate->last_tsdelta, tsdelta,
-				 sstate->ssrc, timestamp,
-				 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_INFO,
+			     "The %s timestamp delta changes from %d to %d "
+			     "on 0x%x SSRC: %u timestamp: %u from %s:%d\n",
+			     text, sstate->last_tsdelta, tsdelta,
+			     ENDPOINT_NUMBER(endp), sstate->ssrc, timestamp,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		}
 	}

@@ -277,18 +280,18 @@ static int check_rtp_timestamp(struct mgcp_endpoint *endp,

 	if (timestamp_error) {
 		rate_ctr_inc(sstate->err_ts_ctr);
-		LOGPENDP(endp, DRTP, LOGL_NOTICE,
-			 "The %s timestamp has an alignment error of %d "
-			 "on SSRC: %u "
-			 "SeqNo delta: %d, TS delta: %d, dTS/dSeq: %d "
-			 "from %s:%d. ptime: %d\n",
-			 text, timestamp_error,
-			 sstate->ssrc,
-			 (int16_t)(seq - sstate->last_seq),
-			 (int32_t)(timestamp - sstate->last_timestamp),
-			 tsdelta,
-			 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port),
-			 state->packet_duration);
+		LOGP(DRTP, LOGL_NOTICE,
+		     "The %s timestamp has an alignment error of %d "
+		     "on 0x%x SSRC: %u "
+		     "SeqNo delta: %d, TS delta: %d, dTS/dSeq: %d "
+		     "from %s:%d. ptime: %d\n",
+		     text, timestamp_error,
+		     ENDPOINT_NUMBER(endp), sstate->ssrc,
+		     (int16_t)(seq - sstate->last_seq),
+		     (int32_t)(timestamp - sstate->last_timestamp),
+		     tsdelta,
+		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port),
+		     state->packet_duration);
 	}
 	return 1;
 }
@@ -307,19 +310,21 @@ static int adjust_rtp_timestamp_offset(struct mgcp_endpoint *endp,
 	if (tsdelta == 0) {
 		tsdelta = state->out_stream.last_tsdelta;
 		if (tsdelta != 0) {
-			LOGPENDP(endp, DRTP, LOGL_NOTICE,
-				 "A fixed packet duration is not available, "
-				 "using last output timestamp delta instead: %d "
-				 "from %s:%d\n", tsdelta,
-				 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_NOTICE,
+			     "A fixed packet duration is not available on 0x%x, "
+			     "using last output timestamp delta instead: %d "
+			     "from %s:%d\n",
+			     ENDPOINT_NUMBER(endp), tsdelta,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		} else {
 			tsdelta = rtp_end->codec->rate * 20 / 1000;
-			LOGPENDP(endp, DRTP, LOGL_NOTICE,
-				 "Fixed packet duration and last timestamp delta "
-				 "are not available, "
-				 "using fixed 20ms instead: %d "
-				 "from %s:%d\n", tsdelta,
-				 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_NOTICE,
+			     "Fixed packet duration and last timestamp delta "
+			     "are not available on 0x%x, "
+			     "using fixed 20ms instead: %d "
+			     "from %s:%d\n",
+			     ENDPOINT_NUMBER(endp), tsdelta,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		}
 	}

@@ -329,12 +334,13 @@ static int adjust_rtp_timestamp_offset(struct mgcp_endpoint *endp,
 	if (state->patch.timestamp_offset != timestamp_offset) {
 		state->patch.timestamp_offset = timestamp_offset;

-		LOGPENDP(endp, DRTP, LOGL_NOTICE,
-			 "Timestamp offset change on SSRC: %u "
-			 "SeqNo delta: %d, TS offset: %d, "
-			 "from %s:%d\n", state->in_stream.ssrc,
-			 delta_seq, state->patch.timestamp_offset,
-			 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_NOTICE,
+		     "Timestamp offset change on 0x%x SSRC: %u "
+		     "SeqNo delta: %d, TS offset: %d, "
+		     "from %s:%d\n",
+		     ENDPOINT_NUMBER(endp), state->in_stream.ssrc,
+		     delta_seq, state->patch.timestamp_offset,
+		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 	}

 	return timestamp_offset;
@@ -360,13 +366,14 @@ static int align_rtp_timestamp_offset(struct mgcp_endpoint *endp,
 	if (ts_error) {
 		state->patch.timestamp_offset += ptime - ts_error;

-		LOGPENDP(endp, DRTP, LOGL_NOTICE,
-			 "Corrected timestamp alignment error of %d on SSRC: %u "
-			 "new TS offset: %d, "
-			 "from %s:%d\n",
-			 ts_error, state->in_stream.ssrc,
-			 state->patch.timestamp_offset, inet_ntoa(addr->sin_addr),
-			 ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_NOTICE,
+		     "Corrected timestamp alignment error of %d on 0x%x SSRC: %u "
+		     "new TS offset: %d, "
+		     "from %s:%d\n",
+		     ts_error,
+		     ENDPOINT_NUMBER(endp), state->in_stream.ssrc,
+		     state->patch.timestamp_offset, inet_ntoa(addr->sin_addr),
+		     ntohs(addr->sin_port));
 	}

 	/* Check we really managed to compensate the timestamp
@@ -392,7 +399,8 @@ int mgcp_rtp_processing_default(struct mgcp_endpoint *endp,
 				struct mgcp_rtp_end *dst_end,
 				char *data, int *len, int buf_size)
 {
-	LOGPENDP(endp, DRTP, LOGL_DEBUG, "transcoding disabled\n");
+	LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x transcoding disabled\n",
+	     ENDPOINT_NUMBER(endp));
 	return 0;
 }

@@ -405,19 +413,23 @@ int mgcp_setup_rtp_processing_default(struct mgcp_endpoint *endp,
 				      struct mgcp_conn_rtp *conn_dst,
 				      struct mgcp_conn_rtp *conn_src)
 {
-	LOGPENDP(endp, DRTP, LOGL_DEBUG, "transcoding disabled\n");
+	LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x transcoding disabled\n",
+	     ENDPOINT_NUMBER(endp));
 	return 0;
 }

 void mgcp_get_net_downlink_format_default(struct mgcp_endpoint *endp,
-					  const struct mgcp_rtp_codec **codec,
+					  int *payload_type,
+					  const char **audio_name,
 					  const char **fmtp_extra,
 					  struct mgcp_conn_rtp *conn)
 {
-	LOGPENDP(endp, DRTP, LOGL_DEBUG, "conn:%s using format defaults\n",
-		 mgcp_conn_dump(conn->conn));
+	LOGP(DRTP, LOGL_DEBUG,
+	     "endpoint:0x%x conn:%s using format defaults\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn->conn));

-	*codec = conn->end.codec;
+	*payload_type = conn->end.codec->payload_type;
+	*audio_name = conn->end.codec->audio_name;
 	*fmtp_extra = conn->end.fmtp_extra;
 }

@@ -451,9 +463,9 @@ void mgcp_rtp_annex_count(struct mgcp_endpoint *endp,
 			if (seq < state->stats.max_seq)
 				state->stats.cycles += RTP_SEQ_MOD;
 		} else if (udelta <= RTP_SEQ_MOD - RTP_MAX_MISORDER) {
-			LOGPENDP(endp, DRTP, LOGL_NOTICE,
-				 "RTP seqno made a very large jump on delta: %u\n",
-				 udelta);
+			LOGP(DRTP, LOGL_NOTICE,
+			     "RTP seqno made a very large jump on 0x%x delta: %u\n",
+			     ENDPOINT_NUMBER(endp), udelta);
 		}
 	}

@@ -479,37 +491,13 @@ static int mgcp_patch_pt(struct mgcp_conn_rtp *conn_src,
 	uint8_t pt_in;
 	int pt_out;

-	if (msg->len < sizeof(struct rtp_hdr)) {
-		LOG_CONN_RTP(conn_src, LOGL_ERROR, "RTP packet too short (%u < %zu)\n",
-			     msg->len, sizeof(struct rtp_hdr));
-		return -EINVAL;
-	}
-
+	OSMO_ASSERT(msg->len >= sizeof(struct rtp_hdr));
 	rtp_hdr = (struct rtp_hdr *)msg->data;

-	if (conn_src->iuup) {
-		/* The source is an IuUP payload. We have received a dynamic payload type number on the IuUP side, and
-		 * towards the pure RTP side it should go out as "AMR/8000". Make sure that the payload type number in
-		 * the RTP packet matches the a=rtpmap:N payload type number configured for AMR. */
-		const struct mgcp_rtp_codec *amr_codec = mgcp_codec_pt_find_by_subtype_name(conn_dst, "AMR", 0);
-
-		if (!amr_codec) {
-			/* There is no AMR codec configured on the outgoing conn. */
-			return -EINVAL;
-		}
-
-		pt_out = amr_codec->payload_type;
-	} else if (conn_dst->iuup) {
-		/* The destination is an IuUP payload. Use whatever payload number was negotiated during IuUP
-		 * Initialization. */
-		pt_out = conn_dst->iuup->rtp_payload_type;
-	} else {
-		/* Both sides are normal RTP payloads. Consult the rtpmap settings received by SDP. */
-		pt_in = rtp_hdr->payload_type;
-		pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in);
-		if (pt_out < 0)
-			return -EINVAL;
-	}
+	pt_in = rtp_hdr->payload_type;
+	pt_out = mgcp_codec_pt_translate(conn_src, conn_dst, pt_in);
+	if (pt_out < 0)
+		return -EINVAL;

 	rtp_hdr->payload_type = (uint8_t) pt_out;
 	return 0;
@@ -558,27 +546,28 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp,
 		state->out_stream.last_tsdelta = 0;
 		state->out_stream.last_timestamp = timestamp;
 		state->out_stream.ssrc = ssrc - 1;	/* force output SSRC change */
-		LOGPENDP(endp, DRTP, LOGL_INFO,
-			 "initializing stream, SSRC: %u timestamp: %u "
-			 "pkt-duration: %d, from %s:%d\n",
-			 state->in_stream.ssrc,
-			 state->patch.seq_offset, state->packet_duration,
-			 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_INFO,
+		     "endpoint:0x%x initializing stream, SSRC: %u timestamp: %u "
+		     "pkt-duration: %d, from %s:%d\n",
+		     ENDPOINT_NUMBER(endp), state->in_stream.ssrc,
+		     state->patch.seq_offset, state->packet_duration,
+		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		if (state->packet_duration == 0) {
 			state->packet_duration =
 			    rtp_end->codec->rate * 20 / 1000;
-			LOGPENDP(endp, DRTP, LOGL_NOTICE,
-				 "fixed packet duration is not available, "
-				 "using fixed 20ms instead: %d from %s:%d\n",
-				 state->packet_duration,
-				 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_NOTICE,
+			     "endpoint:0x%x fixed packet duration is not available, "
+			     "using fixed 20ms instead: %d from %s:%d\n",
+			     ENDPOINT_NUMBER(endp), state->packet_duration,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		}
 	} else if (state->in_stream.ssrc != ssrc) {
-		LOGPENDP(endp, DRTP, LOGL_NOTICE,
-			 "SSRC changed: %u -> %u  "
-			 "from %s:%d\n",
-			 state->in_stream.ssrc, rtp_hdr->ssrc,
-			 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_NOTICE,
+		     "endpoint:0x%x SSRC changed: %u -> %u  "
+		     "from %s:%d\n",
+		     ENDPOINT_NUMBER(endp),
+		     state->in_stream.ssrc, rtp_hdr->ssrc,
+		     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));

 		state->in_stream.ssrc = ssrc;
 		if (rtp_end->force_constant_ssrc) {
@@ -602,12 +591,13 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp,
 			if (rtp_end->force_constant_ssrc != -1)
 				rtp_end->force_constant_ssrc -= 1;

-			LOGPENDP(endp, DRTP, LOGL_NOTICE,
-				 "SSRC patching enabled, SSRC: %u "
-				 "SeqNo offset: %d, TS offset: %d "
-				 "from %s:%d\n", state->in_stream.ssrc,
-				 state->patch.seq_offset, state->patch.timestamp_offset,
-				 inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
+			LOGP(DRTP, LOGL_NOTICE,
+			     "endpoint:0x%x SSRC patching enabled, SSRC: %u "
+			     "SeqNo offset: %d, TS offset: %d "
+			     "from %s:%d\n",
+			     ENDPOINT_NUMBER(endp), state->in_stream.ssrc,
+			     state->patch.seq_offset, state->patch.timestamp_offset,
+			     inet_ntoa(addr->sin_addr), ntohs(addr->sin_port));
 		}

 		state->in_stream.last_tsdelta = 0;
@@ -666,133 +656,6 @@ void mgcp_patch_and_count(struct mgcp_endpoint *endp,
 #endif
 }

-/* There are different dialects used to format and transfer voice data. When
- * the receiving end expects GSM-HR data to be formated after RFC 5993, this
- * function is used to convert between RFC 5993 and TS 101318, which we normally
- * use. */
-static int rfc5993_hr_convert(struct mgcp_endpoint *endp, char *data, int *len)
-{
-	/* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is
-	 * plenty of space available to store the slightly larger, converted
-	 * data */
-
-	struct rtp_hdr *rtp_hdr;
-
-	if (*len < sizeof(struct rtp_hdr)) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n",
-			 *len, sizeof(struct rtp_hdr));
-		return -EINVAL;
-	}
-
-	rtp_hdr = (struct rtp_hdr *)data;
-
-	if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr)) {
-		/* TS 101318 encoding => RFC 5993 encoding */
-		memmove(rtp_hdr->data + 1, rtp_hdr->data, GSM_HR_BYTES);
-		rtp_hdr->data[0] = 0x00;
-		(*len) += 1;
-
-	} else if (*len == GSM_HR_BYTES + sizeof(struct rtp_hdr) + 1) {
-		/* RFC 5993 encoding => TS 101318 encoding */
-		memmove(rtp_hdr->data, rtp_hdr->data + 1, GSM_HR_BYTES);
-		(*len) -= 1;
-	} else {
-		/* It is possible that multiple payloads occur in one RTP
-		 * packet. This is not supported yet. */
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "cannot figure out how to convert RTP packet\n");
-		return -ENOTSUP;
-	}
-	return 0;
-}
-
-/* For AMR RTP two framing modes are defined RFC3267. There is a bandwith
- * efficient encoding scheme where all fields are packed together one after
- * another and an octet aligned mode where all fields are aligned to octet
- * boundaries. This function is used to convert between the two modes */
-static int amr_oa_bwe_convert(struct mgcp_endpoint *endp, char *data, int *len,
-			      bool target_is_oa)
-{
-	/* NOTE: *data has an overall length of RTP_BUF_SIZE, so there is
-	 * plenty of space available to store the slightly larger, converted
-	 * data */
-
-	struct rtp_hdr *rtp_hdr;
-	unsigned int payload_len;
-	int rc;
-
-	if (*len < sizeof(struct rtp_hdr)) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR, "AMR RTP packet too short (%d < %zu)\n", *len, sizeof(struct rtp_hdr));
-		return -EINVAL;
-	}
-
-	rtp_hdr = (struct rtp_hdr *)data;
-
-	payload_len = *len - sizeof(struct rtp_hdr);
-
-	if (osmo_amr_is_oa(rtp_hdr->data, payload_len)) {
-		if (!target_is_oa)
-			/* Input data is oa an target format is bwe
-			 * ==> convert */
-			rc = osmo_amr_oa_to_bwe(rtp_hdr->data, payload_len);
-		else
-			/* Input data is already bew, but we accept it anyway
-			 * ==> no conversion needed */
-			rc = payload_len;
-	} else {
-		if (target_is_oa)
-			/* Input data is bwe an target format is oa
-			 * ==> convert */
-			rc = osmo_amr_bwe_to_oa(rtp_hdr->data, payload_len,
-						RTP_BUF_SIZE);
-		else
-			/* Input data is already oa, but we accept it anyway
-			 * ==> no conversion needed */
-			rc = payload_len;
-	}
-	if (rc < 0) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "AMR RTP packet conversion failed\n");
-		return -EINVAL;
-	}
-
-	*len = rc + sizeof(struct rtp_hdr);
-
-	return 0;
-}
-
-/* Check if a conversion between octet-aligned and bandwith-efficient mode is
- * indicated. */
-static bool amr_oa_bwe_convert_indicated(struct mgcp_rtp_codec *codec)
-{
-	if (codec->param_present == false)
-		return false;
-	if (!codec->param.amr_octet_aligned_present)
-		return false;
-	if (strcmp(codec->subtype_name, "AMR") != 0)
-		return false;
-	return true;
-}
-
-
-/* Check if a given RTP with AMR payload for octet-aligned mode */
-static int amr_oa_check(char *data, int len)
-{
-	struct rtp_hdr *rtp_hdr;
-	unsigned int payload_len;
-
-	if (len < sizeof(struct rtp_hdr))
-		return -EINVAL;
-
-	rtp_hdr = (struct rtp_hdr *)data;
-
-	payload_len = len - sizeof(struct rtp_hdr);
-	if (payload_len < sizeof(struct amr_hdr))
-		return -EINVAL;
-
-	return osmo_amr_is_oa(rtp_hdr->data, payload_len) ? 1 : 0;
-}
-
 /* Forward data to a debug tap. This is debug function that is intended for
 * debugging the voice traffic with tools like gstreamer */
 static void forward_data(int fd, struct mgcp_rtp_tap *tap, struct msgb *msg)
@@ -838,14 +701,19 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 	OSMO_ASSERT(conn_dst);

 	if (is_rtp) {
-		LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTP packet...\n");
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x delivering RTP packet...\n",
+		     ENDPOINT_NUMBER(endp));
 	} else {
-		LOGPENDP(endp, DRTP, LOGL_DEBUG, "delivering RTCP packet...\n");
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x delivering RTCP packet...\n",
+		     ENDPOINT_NUMBER(endp));
 	}

-	LOGPENDP(endp, DRTP, LOGL_DEBUG, "loop:%d, mode:%d%s\n",
-		 tcfg->audio_loop, conn_src->conn->mode,
-		 conn_src->conn->mode == MGCP_CONN_LOOPBACK ? " (loopback)" : "");
+	LOGP(DRTP, LOGL_DEBUG,
+	     "endpoint:0x%x loop:%d, mode:%d%s\n",
+	     ENDPOINT_NUMBER(endp), tcfg->audio_loop, conn_src->conn->mode,
+	     conn_src->conn->mode == MGCP_CONN_LOOPBACK ? " (loopback)" : "");

 	/* FIXME: It is legal that the payload type on the egress connection is
 	 * different from the payload type that has been negotiated on the
@@ -858,8 +726,9 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 	if (is_rtp) {
 		rc = mgcp_patch_pt(conn_src, conn_dst, msg);
 		if (rc < 0) {
-			LOGPENDP(endp, DRTP, LOGL_DEBUG,
-				 "can not patch PT because no suitable egress codec was found.\n");
+			LOGP(DRTP, LOGL_ERROR,
+			     "endpoint:0x%x can not patch PT because no suitable egress codec was found.\n",
+			     ENDPOINT_NUMBER(endp));
 		}
 	}

@@ -871,12 +740,13 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,

 	if (!rtp_end->output_enabled) {
 		rate_ctr_inc(&conn_dst->rate_ctr_group->ctr[RTP_DROPPED_PACKETS_CTR]);
-		LOGPENDP(endp, DRTP, LOGL_DEBUG,
-			 "output disabled, drop to %s %s "
-			 "rtp_port:%u rtcp_port:%u\n",
-			 dest_name,
-			 inet_ntoa(rtp_end->addr),
-			 ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port)
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x output disabled, drop to %s %s "
+		     "rtp_port:%u rtcp_port:%u\n",
+		     ENDPOINT_NUMBER(endp),
+		     dest_name,
+		     inet_ntoa(rtp_end->addr),
+		     ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port)
 		    );
 	} else if (is_rtp) {
 		int cont;
@@ -893,32 +763,13 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 			if (addr)
 				mgcp_patch_and_count(endp, rtp_state, rtp_end,
 						     addr, msg);
-
-			if (amr_oa_bwe_convert_indicated(conn_dst->end.codec)) {
-				rc = amr_oa_bwe_convert(endp, (char*)msg->data, &buflen,
-							conn_dst->end.codec->param.amr_octet_aligned);
-				if (rc < 0) {
-					LOGPENDP(endp, DRTP, LOGL_ERROR,
-						 "Error in AMR octet-aligned <-> bandwidth-efficient mode conversion\n");
-					break;
-				}
-			}
-			else if (rtp_end->rfc5993_hr_convert
-			    && strcmp(conn_src->end.codec->subtype_name,
-				      "GSM-HR-08") == 0) {
-				rc = rfc5993_hr_convert(endp, (char*)msg->data, &buflen);
-				if (rc < 0) {
-					LOGPENDP(endp, DRTP, LOGL_ERROR, "Error while converting to GSM-HR-08\n");
-					break;
-				}
-			}
-
-			LOGPENDP(endp, DRTP, LOGL_DEBUG,
-				 "process/send to %s %s "
-				 "rtp_port:%u rtcp_port:%u\n",
-				 dest_name, inet_ntoa(rtp_end->addr),
-				 ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port)
-				);
+			LOGP(DRTP, LOGL_DEBUG,
+			     "endpoint:0x%x process/send to %s %s "
+			     "rtp_port:%u rtcp_port:%u\n",
+			     ENDPOINT_NUMBER(endp), dest_name,
+			     inet_ntoa(rtp_end->addr), ntohs(rtp_end->rtp_port),
+			     ntohs(rtp_end->rtcp_port)
+			    );

 			/* Forward a copy of the RTP data to a debug ip/port */
 			forward_data(rtp_end->rtp.fd, &conn_src->tap_out,
@@ -937,9 +788,10 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 					data[0] = 0xe4;
 					data[1] = 0x00;
 					rtp_state->patched_first_rtp_payload = true;
-					LOGPENDP(endp, DRTP, LOGL_DEBUG,
-						 "Patching over first two bytes"
-						 " to fake an IuUP Initialization Ack\n");
+					LOGP(DRTP, LOGL_DEBUG,
+					     "endpoint:0x%x Patching over first two bytes"
+					     " to fake an IuUP Initialization Ack\n",
+					     ENDPOINT_NUMBER(endp));
 				}
 			}
 #endif
@@ -961,11 +813,13 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 		} while (buflen > 0);
 		return nbytes;
 	} else if (!tcfg->omit_rtcp) {
-		LOGPENDP(endp, DRTP, LOGL_DEBUG,
-			 "send to %s %s rtp_port:%u rtcp_port:%u\n",
-			 dest_name, inet_ntoa(rtp_end->addr),
-			 ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port)
-			);
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x send to %s %s rtp_port:%u rtcp_port:%u\n",
+		     ENDPOINT_NUMBER(endp),
+		     dest_name,
+		     inet_ntoa(rtp_end->addr),
+		     ntohs(rtp_end->rtp_port), ntohs(rtp_end->rtcp_port)
+		    );

 		len = mgcp_udp_send(rtp_end->rtcp.fd,
 				    &rtp_end->addr,
@@ -985,6 +839,9 @@ int mgcp_send(struct mgcp_endpoint *endp, int is_rtp, struct sockaddr_in *addr,
 static int check_rtp_origin(struct mgcp_conn_rtp *conn,
 			    struct sockaddr_in *addr)
 {
+	struct mgcp_endpoint *endp;
+	endp = conn->conn->endp;
+
 	if (conn->end.addr.s_addr == 0) {
 		switch (conn->conn->mode) {
 		case MGCP_CONN_LOOPBACK:
@@ -995,18 +852,20 @@ static int check_rtp_origin(struct mgcp_conn_rtp *conn,
 			 * Response is received, but the nano3G expects an IuUP Initialization Ack before it even
 			 * sends the RAB Assignment Response. Hence, if the remote address is 0.0.0.0 and the
 			 * MGCP port is in loopback mode, allow looping back the packet to any source. */
-			LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-				 "In loopback mode and remote address not set:"
-				 " allowing data from address: %s\n", inet_ntoa(addr->sin_addr));
+			LOGP(DRTP, LOGL_ERROR,
+			     "endpoint:0x%x In loopback mode and remote address not set:"
+			     " allowing data from address: %s\n",
+			     ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr));
 			return 0;

 		default:
 			/* Receiving early media before the endpoint is configured. Instead of logging
 			 * this as an error that occurs on every call, keep it more low profile to not
 			 * confuse humans with expected errors. */
-			LOGPCONN(conn->conn, DRTP, LOGL_INFO,
-				 "Rx RTP from %s, but remote address not set:"
-				 " dropping early media\n", inet_ntoa(addr->sin_addr));
+			LOGP(DRTP, LOGL_INFO,
+			     "endpoint:0x%x I:%s Rx RTP from %s, but remote address not set:"
+			     " dropping early media\n",
+			     ENDPOINT_NUMBER(endp), conn->conn->id, inet_ntoa(addr->sin_addr));
 			return -1;
 		}
 	}
@@ -1014,11 +873,13 @@ static int check_rtp_origin(struct mgcp_conn_rtp *conn,
 	/* Note: Check if the inbound RTP data comes from the same host to
 	 * which we send our outgoing RTP traffic. */
 	if (conn->end.addr.s_addr != addr->sin_addr.s_addr) {
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-			 "data from wrong address: %s, ", inet_ntoa(addr->sin_addr));
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x data from wrong address: %s, ",
+		     ENDPOINT_NUMBER(endp), inet_ntoa(addr->sin_addr));
 		LOGPC(DRTP, LOGL_ERROR, "expected: %s\n",
 		      inet_ntoa(conn->end.addr));
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n");
+		LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x packet tossed\n",
+		     ENDPOINT_NUMBER(endp));
 		return -1;
 	}

@@ -1028,12 +889,14 @@ static int check_rtp_origin(struct mgcp_conn_rtp *conn,
 	 * plausibility. */
 	if (conn->end.rtp_port != addr->sin_port &&
 	    conn->end.rtcp_port != addr->sin_port) {
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-			 "data from wrong source port: %d, ", ntohs(addr->sin_port));
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x data from wrong source port: %d, ",
+		     ENDPOINT_NUMBER(endp), ntohs(addr->sin_port));
 		LOGPC(DRTP, LOGL_ERROR,
 		      "expected: %d for RTP or %d for RTCP\n",
 		      ntohs(conn->end.rtp_port), ntohs(conn->end.rtcp_port));
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR, "packet tossed\n");
+		LOGP(DRTP, LOGL_ERROR, "endpoint:0x%x packet tossed\n",
+		     ENDPOINT_NUMBER(endp));
 		return -1;
 	}

@@ -1044,26 +907,29 @@ static int check_rtp_origin(struct mgcp_conn_rtp *conn,
 * makes sense */
 static int check_rtp_destin(struct mgcp_conn_rtp *conn)
 {
+	struct mgcp_endpoint *endp;
+	endp = conn->conn->endp;
+
 	/* Note: it is legal to create a connection but never setting a port
 	 * and IP-address for outgoing data. */
 	if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0 && conn->end.rtp_port == 0) {
-		LOGPCONN(conn->conn, DRTP, LOGL_DEBUG,
-			 "destination IP-address and rtp port is (not yet) known (%s:%u)\n",
-			 inet_ntoa(conn->end.addr), conn->end.rtp_port);
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x destination IP-address and rtp port is (not yet) known (%s:%u)\n",
+		     ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port);
 		return -1;
 	}

 	if (strcmp(inet_ntoa(conn->end.addr), "0.0.0.0") == 0) {
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-			 "destination IP-address is invalid (%s:%u)\n",
-			 inet_ntoa(conn->end.addr), conn->end.rtp_port);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x destination IP-address is invalid (%s:%u)\n",
+		     ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port);
 		return -1;
 	}

 	if (conn->end.rtp_port == 0) {
-		LOGPCONN(conn->conn, DRTP, LOGL_ERROR,
-			 "destination rtp port is invalid (%s:%u)\n",
-			 inet_ntoa(conn->end.addr), conn->end.rtp_port);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x destination rtp port is invalid (%s:%u)\n",
+		     ENDPOINT_NUMBER(endp), inet_ntoa(conn->end.addr), conn->end.rtp_port);
 		return -1;
 	}

@@ -1138,8 +1004,8 @@ static int mgcp_send_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg)
 	struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr;
 	struct mgcp_endpoint *endp = conn_src->conn->endp;

-	LOGPENDP(endp, DRTP, LOGL_DEBUG, "destin conn:%s\n",
-		 mgcp_conn_dump(conn_dst->conn));
+	LOGP(DRTP, LOGL_DEBUG, "endpoint:0x%x destin conn:%s\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn_dst->conn));

 	/* Before we try to deliver the packet, we check if the destination
 	 * port and IP-Address make sense at all. If not, we will be unable
@@ -1151,23 +1017,27 @@ static int mgcp_send_rtp(struct mgcp_conn_rtp *conn_dst, struct msgb *msg)
 	 * destination connection. */
 	switch (conn_dst->type) {
 	case MGCP_RTP_DEFAULT:
-		LOGPENDP(endp, DRTP, LOGL_DEBUG,
-			 "endpoint type is MGCP_RTP_DEFAULT, "
-			 "using mgcp_send() to forward data directly\n");
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x endpoint type is MGCP_RTP_DEFAULT, "
+		     "using mgcp_send() to forward data directly\n",
+		     ENDPOINT_NUMBER(endp));
 		return mgcp_send(endp, proto == MGCP_PROTO_RTP,
 				 from_addr, msg, conn_src, conn_dst);
 	case MGCP_OSMUX_BSC_NAT:
 	case MGCP_OSMUX_BSC:
-		LOGPENDP(endp, DRTP, LOGL_DEBUG,
-			 "endpoint type is MGCP_OSMUX_BSC_NAT, "
-			 "using osmux_xfrm_to_osmux() to forward data through OSMUX\n");
+		LOGP(DRTP, LOGL_DEBUG,
+		     "endpoint:0x%x endpoint type is MGCP_OSMUX_BSC_NAT, "
+		     "using osmux_xfrm_to_osmux() to forward data through OSMUX\n",
+		     ENDPOINT_NUMBER(endp));
 		return osmux_xfrm_to_osmux((char*)msg->data, msg->len, conn_dst);
 	}

 	/* If the data has not been handled/forwarded until here, it will
 	 * be discarded, this should not happen, normally the MGCP type
 	 * should be properly set */
-	LOGPENDP(endp, DRTP, LOGL_ERROR, "bad MGCP type -- data discarded!\n");
+	LOGP(DRTP, LOGL_ERROR,
+	     "endpoint:0x%x bad MGCP type -- data discarded!\n",
+	     ENDPOINT_NUMBER(endp));

 	return -1;
 }
@@ -1184,7 +1054,8 @@ int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg)
 	struct mgcp_conn_rtp *conn_src = OSMO_RTP_MSG_CTX(msg)->conn_src;
 	struct mgcp_conn *conn = conn_src->conn;
 	struct mgcp_conn *conn_dst;
-	struct sockaddr_in *from_addr = OSMO_RTP_MSG_CTX(msg)->from_addr;
+	struct mgcp_endpoint *endp;
+	endp = conn->endp;

 	/*! NOTE: This callback function implements the endpoint specific
 	 *  dispatch bahviour of an rtp bridge/proxy endpoint. It is assumed
@@ -1194,21 +1065,6 @@ int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg)
 	 *  destination connection is known the RTP packet is sent via
 	 *  the destination connection. */

-
-	 /* Check if the connection is in loopback mode, if yes, just send the
-	 * incoming data back to the origin */
-	if (conn->mode == MGCP_CONN_LOOPBACK) {
-		/* When we are in loopback mode, we loop back all incoming
-		 * packets back to their origin. We will use the originating
-		 * address data from the UDP packet header to patch the
-		 * outgoing address in connection on the fly */
-		if (conn->u.rtp.end.rtp_port == 0) {
-			conn->u.rtp.end.addr = from_addr->sin_addr;
-			conn->u.rtp.end.rtp_port = from_addr->sin_port;
-		}
-		return mgcp_send_rtp(conn_src, msg);
-	}
-
 	/* Find a destination connection. */
 	/* NOTE: This code path runs every time an RTP packet is received. The
 	 * function mgcp_find_dst_conn() we use to determine the detination
@@ -1225,15 +1081,17 @@ int mgcp_dispatch_rtp_bridge_cb(struct msgb *msg)

 	/* There is no destination conn, stop here */
 	if (!conn_dst) {
-		LOGPCONN(conn, DRTP, LOGL_ERROR,
-			 "unable to find destination conn\n");
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x unable to find destination conn\n",
+		     ENDPOINT_NUMBER(endp));
 		return -1;
 	}

 	/* The destination conn is not an RTP connection */
 	if (conn_dst->type != MGCP_CONN_TYPE_RTP) {
-		LOGPCONN(conn, DRTP, LOGL_ERROR,
-			 "unable to find suitable destination conn\n");
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x unable to find suitable destination conn\n",
+		     ENDPOINT_NUMBER(endp));
 		return -1;
 	}

@@ -1426,18 +1284,18 @@ static int rx_rtp(struct msgb *msg)

 	LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx_rtp(%u bytes)\n", msg->len);

-	mgcp_conn_watchdog_kick(conn_src->conn);
-
-	/* If AMR is configured for the ingress connection a conversion of the
-	 * framing mode (octet-aligned vs. bandwith-efficient is explicitly
-	 * define, then we check if the incoming payload matches that
-	 * expectation. */
-	if (amr_oa_bwe_convert_indicated(conn_src->end.codec)) {
-		int oa = amr_oa_check((char*)msg->data, msg->len);
-		if (oa < 0)
-			return -1;
-		if (((bool)oa) != conn_src->end.codec->param.amr_octet_aligned)
-			return -1;
+	/* Check if the connection is in loopback mode, if yes, just send the
+	 * incoming data back to the origin */
+	if (conn->mode == MGCP_CONN_LOOPBACK) {
+		/* When we are in loopback mode, we loop back all incoming
+		 * packets back to their origin. We will use the originating
+		 * address data from the UDP packet header to patch the
+		 * outgoing address in connection on the fly */
+		if (conn_src->end.rtp_port == 0) {
+			conn_src->end.addr = from_addr->sin_addr;
+			conn_src->end.rtp_port = from_addr->sin_port;
+		}
+		return mgcp_send_rtp(conn_src, msg);
 	}

 	/* Check if the origin of the RTP packet seems plausible */
@@ -1491,21 +1349,20 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,
 {
 	/* NOTE: The port that is used for RTCP is the RTP port incremented by one
 	 * (e.g. RTP-Port = 16000 ==> RTCP-Port = 16001) */
-	 struct mgcp_endpoint *endp = &cfg->trunk.endpoints[endpno];

 	if (mgcp_create_bind(source_addr, &rtp_end->rtp,
 			     rtp_end->local_port) != 0) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "failed to create RTP port: %s:%d\n",
-			 source_addr, rtp_end->local_port);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x failed to create RTP port: %s:%d\n", endpno,
+		     source_addr, rtp_end->local_port);
 		goto cleanup0;
 	}

 	if (mgcp_create_bind(source_addr, &rtp_end->rtcp,
 			     rtp_end->local_port + 1) != 0) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "failed to create RTCP port: %s:%d\n",
-			 source_addr, rtp_end->local_port + 1);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x failed to create RTCP port: %s:%d\n", endpno,
+		     source_addr, rtp_end->local_port + 1);
 		goto cleanup1;
 	}

@@ -1515,17 +1372,17 @@ static int bind_rtp(struct mgcp_config *cfg, const char *source_addr,

 	rtp_end->rtp.when = BSC_FD_READ;
 	if (osmo_fd_register(&rtp_end->rtp) != 0) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "failed to register RTP port %d\n",
-			 rtp_end->local_port);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x failed to register RTP port %d\n", endpno,
+		     rtp_end->local_port);
 		goto cleanup2;
 	}

 	rtp_end->rtcp.when = BSC_FD_READ;
 	if (osmo_fd_register(&rtp_end->rtcp) != 0) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR,
-			 "failed to register RTCP port %d\n",
-			 rtp_end->local_port + 1);
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x failed to register RTCP port %d\n", endpno,
+		     rtp_end->local_port + 1);
 		goto cleanup3;
 	}

@@ -1559,8 +1416,10 @@ int mgcp_bind_net_rtp_port(struct mgcp_endpoint *endp, int rtp_port,
 	end = &conn->end;

 	if (end->rtp.fd != -1 || end->rtcp.fd != -1) {
-		LOGPENDP(endp, DRTP, LOGL_ERROR, "%u was already bound on conn:%s\n",
-			 rtp_port, mgcp_conn_dump(conn->conn));
+		LOGP(DRTP, LOGL_ERROR,
+		     "endpoint:0x%x %u was already bound on conn:%s\n",
+		     ENDPOINT_NUMBER(endp), rtp_port,
+		     mgcp_conn_dump(conn->conn));

 		/* Double bindings should never occour! Since we always allocate
 		 * connections dynamically and free them when they are not
--- a/src/libosmo-mgcp/mgcp_osmux.c
+++ b/src/libosmo-mgcp/mgcp_osmux.c
@@ -15,12 +15,10 @@
 #include <inttypes.h> /* for PRIu64 */
 #include <netinet/in.h>
 #include <osmocom/core/msgb.h>
-#include <osmocom/core/socket.h>
 #include <osmocom/core/talloc.h>

 #include <osmocom/netif/osmux.h>
 #include <osmocom/netif/rtp.h>
-#include <osmocom/netif/amr.h>

 #include <osmocom/mgcp/mgcp.h>
 #include <osmocom/mgcp/mgcp_internal.h>
@@ -36,7 +34,7 @@ struct osmux_handle {
 	struct llist_head head;
 	struct osmux_in_handle *in;
 	struct in_addr rem_addr;
-	int rem_port; /* network byte order */
+	int rem_port;
 	int refcnt;
 };

@@ -179,12 +177,6 @@ int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn)
 	memcpy(msg->data, buf, buf_len);
 	msgb_put(msg, buf_len);

-	if (conn->osmux.state != OSMUX_STATE_ENABLED) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_INFO, "forwarding RTP to Osmux conn not yet enabled, dropping (cid=%d)\n",
-		conn->osmux.cid);
-		return -1;
-	}
-
 	while ((ret = osmux_xfrm_input(conn->osmux.in, msg, conn->osmux.cid)) > 0) {
 		/* batch full, build and deliver it */
 		osmux_xfrm_input_deliver(conn->osmux.in);
@@ -193,49 +185,109 @@ int osmux_xfrm_to_osmux(char *buf, int buf_len, struct mgcp_conn_rtp *conn)
 }

 /* Lookup the endpoint that corresponds to the specified address (port) */
-static struct mgcp_conn_rtp*
-osmux_conn_lookup(struct mgcp_config *cfg, uint8_t cid,
-		struct in_addr *from_addr)
+static struct mgcp_endpoint *
+endpoint_lookup(struct mgcp_config *cfg, int cid,
+		struct in_addr *from_addr, int type)
 {
-	struct mgcp_endpoint *endp;
-	struct mgcp_conn *conn = NULL;
-	struct mgcp_conn_rtp * conn_rtp;
+	struct mgcp_endpoint *endp = NULL;
 	int i;
+	struct mgcp_conn_rtp *conn_net = NULL;
+	struct mgcp_conn_rtp *conn_bts = NULL;

 	for (i=0; i<cfg->trunk.number_endpoints; i++) {
+		struct in_addr *this;

 		endp = &cfg->trunk.endpoints[i];

-		llist_for_each_entry(conn, &endp->conns, entry) {
-			if (conn->type != MGCP_CONN_TYPE_RTP)
-				continue;
+#if 0
+		if (!tmp->allocated)
+			continue;
+#endif

-			conn_rtp = &conn->u.rtp;
-			if (!mgcp_conn_rtp_is_osmux(conn_rtp))
-				continue;
-
-			if (conn_rtp->osmux.cid == cid)
-				return conn_rtp;
+		switch(type) {
+		case MGCP_DEST_NET:
+			/* FIXME: Get rid of CONN_ID_XXX! */
+			conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
+			if (conn_net)
+				this = &conn_net->end.addr;
+			else
+				this = NULL;
+			break;
+		case MGCP_DEST_BTS:
+			/* FIXME: Get rid of CONN_ID_XXX! */
+			conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS);
+			if (conn_bts)
+				this = &conn_bts->end.addr;
+			else
+				this = NULL;
+			break;
+		default:
+			/* Should not ever happen */
+			LOGP(DLMGCP, LOGL_ERROR, "Bad type %d. Fix your code.\n", type);
+			return NULL;
 		}
+
+		/* FIXME: Get rid of CONN_ID_XXX! */
+		conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
+		if (conn_net && this && conn_net->osmux.cid == cid
+		    && this->s_addr == from_addr->s_addr)
+			return endp;
 	}

-	LOGP(DLMGCP, LOGL_ERROR, "Cannot find osmux conn with cid=%d\n", cid);
+	LOGP(DLMGCP, LOGL_ERROR, "Cannot find endpoint with cid=%d\n", cid);

 	return NULL;
 }

-/* FIXME: this is declared and used in mgcp_network.c, but documentation of mgcp_dispatch_rtp_bridge_cb() states another enum is to be used */
-enum {
-	MGCP_PROTO_RTP,
-	MGCP_PROTO_RTCP,
-};
-
-static void scheduled_from_osmux_tx_rtp_cb(struct msgb *msg, void *data)
+static void scheduled_tx_net_cb(struct msgb *msg, void *data)
 {
-	struct mgcp_conn_rtp *conn = data;
-	struct mgcp_endpoint *endp = conn->conn->endp;
+	struct mgcp_endpoint *endp = data;
+	struct mgcp_conn_rtp *conn_net = NULL;
+	struct mgcp_conn_rtp *conn_bts = NULL;

-	endp->type->dispatch_rtp_cb(msg);
+	/* FIXME: Get rid of CONN_ID_XXX! */
+	conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS);
+	conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
+	if (!conn_bts || !conn_net)
+		return;
+
+	struct sockaddr_in addr = {
+		.sin_addr = conn_net->end.addr,
+		.sin_port = conn_net->end.rtp_port,
+	};
+
+	rate_ctr_inc(&conn_bts->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);
+	rate_ctr_add(&conn_bts->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len);
+
+	/* Send RTP data to NET */
+	/* FIXME: Get rid of conn_bts and conn_net! */
+	mgcp_send(endp, 1, &addr, msg, conn_bts, conn_net);
+	msgb_free(msg);
+}
+
+static void scheduled_tx_bts_cb(struct msgb *msg, void *data)
+{
+	struct mgcp_endpoint *endp = data;
+	struct mgcp_conn_rtp *conn_net = NULL;
+	struct mgcp_conn_rtp *conn_bts = NULL;
+
+	/* FIXME: Get rid of CONN_ID_XXX! */
+	conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS);
+	conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
+	if (!conn_bts || !conn_net)
+		return;
+
+	struct sockaddr_in addr = {
+		.sin_addr = conn_bts->end.addr,
+		.sin_port = conn_bts->end.rtp_port,
+	};
+
+	rate_ctr_inc(&conn_net->rate_ctr_group->ctr[RTP_PACKETS_TX_CTR]);
+	rate_ctr_add(&conn_net->rate_ctr_group->ctr[RTP_OCTETS_TX_CTR], msg->len);
+
+	/* Send RTP data to BTS */
+	/* FIXME: Get rid of conn_bts and conn_net! */
+	mgcp_send(endp, 1, &addr, msg, conn_net, conn_bts);
 	msgb_free(msg);
 }

@@ -268,26 +320,24 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_r
 {
 	switch(conn->osmux.state) {
 	case OSMUX_STATE_ACTIVATING:
-	if (osmux_enable_conn(endp, conn, &conn->end.addr, conn->end.rtp_port) < 0) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-				 "Could not enable osmux for conn on %s: %s\n",
-				 sending ? "sent" : "received",
-				 mgcp_conn_dump(conn->conn));
+	if (osmux_enable_conn(endp, conn, &conn->end.addr, htons(endp->cfg->osmux_port)) < 0) {
+			LOGP(DLMGCP, LOGL_ERROR,
+				"Could not enable osmux for conn:%s\n",
+				mgcp_conn_dump(conn->conn));
 			return -1;
 		}
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			 "Osmux %s CID %u towards %s:%u is now enabled\n",
-			 sending ? "sent" : "received",
-			 conn->osmux.cid, inet_ntoa(conn->end.addr),
-			 ntohs(conn->end.rtp_port));
+		LOGP(DLMGCP, LOGL_ERROR,
+		    "Osmux CID %u for %s:%u is now enabled\n",
+		    conn->osmux.cid, inet_ntoa(conn->end.addr),
+		    endp->cfg->osmux_port);
 		return 0;
 	case OSMUX_STATE_ENABLED:
 		return 0;
 	default:
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			 "Osmux %s in conn %s without full negotiation, state %d\n",
-			 sending ? "sent" : "received",
-			 mgcp_conn_dump(conn->conn), conn->osmux.state);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "Osmux %s in conn %s without full negotiation, state %d\n",
+		     sending ? "sent" : "received",
+		     mgcp_conn_dump(conn->conn), conn->osmux.state);
 		return -1;
 	}
 }
@@ -295,9 +345,9 @@ static int endp_osmux_state_check(struct mgcp_endpoint *endp, struct mgcp_conn_r
 static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *msg,
 					uint8_t *osmux_cid)
 {
-	if (msg->len < 1 + sizeof(*osmux_cid)) {
+	if (msg->len < 1 + sizeof(osmux_cid)) {
 		LOGP(DLMGCP, LOGL_ERROR,
-		     "Discarding truncated Osmux dummy load: %s\n", osmo_hexdump(msg->data, msg->len));
+		     "Discarding truncated Osmux dummy load\n");
 		return -1;
 	}

@@ -306,40 +356,16 @@ static int osmux_legacy_dummy_parse_cid(struct sockaddr_in *addr, struct msgb *m
 	return 0;
 }

-/* This is called from the bsc-nat */
-static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr,
-			      struct msgb *msg)
-{
-	uint8_t osmux_cid;
-	struct mgcp_conn_rtp *conn;
-
-	if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0)
-		goto out;
-
-	conn = osmux_conn_lookup(cfg, osmux_cid, &addr->sin_addr);
-	if (!conn) {
-		LOGP(DLMGCP, LOGL_ERROR,
-		     "Cannot find conn for Osmux CID %d\n", osmux_cid);
-		goto out;
-	}
-
-	endp_osmux_state_check(conn->conn->endp, conn, false);
-	/* Only needed to punch hole in firewall, it can be dropped */
-out:
-	msgb_free(msg);
-	return 0;
-}
-
 #define osmux_chunk_length(msg, rem) (rem - msg->len);

-static int osmux_read_fd_cb(struct osmo_fd *ofd, unsigned int what)
+int osmux_read_from_bsc_nat_cb(struct osmo_fd *ofd, unsigned int what)
 {
 	struct msgb *msg;
 	struct osmux_hdr *osmuxh;
 	struct sockaddr_in addr;
 	struct mgcp_config *cfg = ofd->data;
 	uint32_t rem;
-	struct mgcp_conn_rtp *conn_src;
+	struct mgcp_conn_rtp *conn_bts = NULL;

 	msg = osmux_recv(ofd, &addr);
 	if (!msg)
@@ -353,32 +379,115 @@ static int osmux_read_fd_cb(struct osmo_fd *ofd, unsigned int what)

 	/* not any further processing dummy messages */
 	if (msg->data[0] == MGCP_DUMMY_LOAD)
-		return osmux_handle_dummy(cfg, &addr, msg);
+		goto out;

 	rem = msg->len;
 	while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) {
+		struct mgcp_endpoint *endp;

-		conn_src = osmux_conn_lookup(cfg, osmuxh->circuit_id,
-					     &addr.sin_addr);
-		if (!conn_src) {
+		/* Yes, we use MGCP_DEST_NET to locate the origin */
+		endp = endpoint_lookup(cfg, osmuxh->circuit_id,
+				       &addr.sin_addr, MGCP_DEST_NET);
+
+		/* FIXME: Get rid of CONN_ID_XXX! */
+		conn_bts = mgcp_conn_get_rtp(endp, CONN_ID_BTS);
+		if (!conn_bts)
+			continue;
+
+		if (!endp) {
 			LOGP(DLMGCP, LOGL_ERROR,
-			     "Cannot find a src conn for circuit_id=%d\n",
+			     "Cannot find an endpoint for circuit_id=%d\n",
 			     osmuxh->circuit_id);
 			goto out;
 		}
+		if (endp_osmux_state_check(endp, conn_bts, false) == 0) {
+			conn_bts->osmux.stats.octets += osmux_chunk_length(msg, rem);
+			conn_bts->osmux.stats.chunks++;
+			osmux_xfrm_output_sched(&conn_bts->osmux.out, osmuxh);
+		}
+		rem = msg->len;
+	}
+out:
+	msgb_free(msg);
+	return 0;
+}

-		/*conn_dst = mgcp_find_dst_conn(conn_src->conn);
-		if (!conn_dst) {
+/* This is called from the bsc-nat */
+static int osmux_handle_dummy(struct mgcp_config *cfg, struct sockaddr_in *addr,
+			      struct msgb *msg, int endp_type)
+{
+	struct mgcp_endpoint *endp;
+	uint8_t osmux_cid;
+	struct mgcp_conn_rtp *conn = NULL;
+
+	if (osmux_legacy_dummy_parse_cid(addr, msg, &osmux_cid) < 0)
+		goto out;
+
+	endp = endpoint_lookup(cfg, osmux_cid, &addr->sin_addr, endp_type);
+	if (!endp) {
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "Cannot find endpoint for Osmux CID %d\n", osmux_cid);
+		goto out;
+	}
+
+	/* FIXME: Get rid of CONN_ID_XXX! */
+	conn = mgcp_conn_get_rtp(endp, endp_type == MGCP_DEST_BTS ? CONN_ID_NET : CONN_ID_BTS);
+	if (!conn)
+		goto out;
+
+	endp_osmux_state_check(endp, conn, false);
+	/* Only needed to punch hole in firewall, it can be dropped */
+out:
+	msgb_free(msg);
+	return 0;
+}
+
+int osmux_read_from_bsc_cb(struct osmo_fd *ofd, unsigned int what)
+{
+	struct msgb *msg;
+	struct osmux_hdr *osmuxh;
+	struct sockaddr_in addr;
+	struct mgcp_config *cfg = ofd->data;
+	uint32_t rem;
+	struct mgcp_conn_rtp *conn_net = NULL;
+
+	msg = osmux_recv(ofd, &addr);
+	if (!msg)
+		return -1;
+
+	if (!cfg->osmux) {
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "bsc wants to use Osmux but bsc-nat did not request it\n");
+		goto out;
+	}
+
+	/* not any further processing dummy messages */
+	if (msg->data[0] == MGCP_DUMMY_LOAD)
+		return osmux_handle_dummy(cfg, &addr, msg, MGCP_DEST_BTS);
+
+	rem = msg->len;
+	while((osmuxh = osmux_xfrm_output_pull(msg)) != NULL) {
+		struct mgcp_endpoint *endp;
+
+		/* Yes, we use MGCP_DEST_BTS to locate the origin */
+		endp = endpoint_lookup(cfg, osmuxh->circuit_id,
+				       &addr.sin_addr, MGCP_DEST_BTS);
+
+		/* FIXME: Get rid of CONN_ID_XXX! */
+		conn_net = mgcp_conn_get_rtp(endp, CONN_ID_NET);
+		if (!conn_net)
+			continue;
+
+		if (!endp) {
 			LOGP(DLMGCP, LOGL_ERROR,
-			     "Cannot find a dst conn for circuit_id=%d\n",
+			     "Cannot find an endpoint for circuit_id=%d\n",
 			     osmuxh->circuit_id);
 			goto out;
-		}*/
-
-		if (endp_osmux_state_check(conn_src->conn->endp, conn_src, false) == 0) {
-			conn_src->osmux.stats.octets += osmux_chunk_length(msg, rem);
-			conn_src->osmux.stats.chunks++;
-			osmux_xfrm_output_sched(&conn_src->osmux.out, osmuxh);
+		}
+		if (endp_osmux_state_check(endp, conn_net, false) == 0) {
+			conn_net->osmux.stats.octets += osmux_chunk_length(msg, rem);
+			conn_net->osmux.stats.chunks++;
+			osmux_xfrm_output_sched(&conn_net->osmux.out, osmuxh);
 		}
 		rem = msg->len;
 	}
@@ -391,13 +500,22 @@ int osmux_init(int role, struct mgcp_config *cfg)
 {
 	int ret;

-	osmux_fd.cb = osmux_read_fd_cb;
+	switch(role) {
+	case OSMUX_ROLE_BSC:
+		osmux_fd.cb = osmux_read_from_bsc_nat_cb;
+		break;
+	case OSMUX_ROLE_BSC_NAT:
+		osmux_fd.cb = osmux_read_from_bsc_cb;
+		break;
+	default:
+		LOGP(DLMGCP, LOGL_ERROR, "wrong role for OSMUX\n");
+		return -1;
+	}
 	osmux_fd.data = cfg;

 	ret = mgcp_create_bind(cfg->osmux_addr, &osmux_fd, cfg->osmux_port);
 	if (ret < 0) {
-		LOGP(DLMGCP, LOGL_ERROR, "cannot bind OSMUX socket to %s:%u\n",
-		     cfg->osmux_addr, cfg->osmux_port);
+		LOGP(DLMGCP, LOGL_ERROR, "cannot bind OSMUX socket\n");
 		return ret;
 	}
 	mgcp_set_ip_tos(osmux_fd.fd, cfg->endp_dscp);
@@ -405,15 +523,11 @@ int osmux_init(int role, struct mgcp_config *cfg)

 	ret = osmo_fd_register(&osmux_fd);
 	if (ret < 0) {
-		LOGP(DLMGCP, LOGL_ERROR, "cannot register OSMUX socket %s\n",
-		     osmo_sock_get_name2(osmux_fd.fd));
+		LOGP(DLMGCP, LOGL_ERROR, "cannot register OSMUX socket\n");
 		return ret;
 	}
 	cfg->osmux_init = 1;

-	LOGP(DLMGCP, LOGL_INFO, "OSMUX socket listening on %s\n",
-		 osmo_sock_get_name2(osmux_fd.fd));
-
 	return 0;
 }

@@ -421,7 +535,7 @@ int osmux_init(int role, struct mgcp_config *cfg)
 *  \param[in] endp mgcp endpoint (configuration)
 *  \param[in] conn connection to disable
 *  \param[in] addr IP address of remote OSMUX endpoint
- *  \param[in] port portnumber of the remote OSMUX endpoint (in network byte order)
+ *  \param[in] port portnumber of the remote OSMUX endpoint
 *  \returns 0 on success, -1 on ERROR */
 int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,
 		      struct in_addr *addr, uint16_t port)
@@ -435,46 +549,44 @@ int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,
 	 *  overlapping RTP SSRC traveling to the BTSes behind the BSC,
 	 *  similarly, for flows traveling to the MSC.
 	 */
-	struct in_addr addr_unset = {};
 	static const uint32_t rtp_ssrc_winlen = UINT32_MAX / (OSMUX_CID_MAX + 1);
 	uint16_t osmux_dummy = endp->cfg->osmux_dummy;

 	/* Check if osmux is enabled for the specified connection */
 	if (conn->osmux.state != OSMUX_STATE_ACTIVATING) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			 "conn:%s didn't negotiate Osmux, state %d\n",
-			 mgcp_conn_dump(conn->conn), conn->osmux.state);
-		return -1;
-	}
-
-	/* Wait until we have the connection information from MDCX */
-	if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,
-			"Osmux remote address/port still unknown\n");
+		LOGP(DLMGCP, LOGL_ERROR, "conn:%s didn't negotiate Osmux, state %d\n",
+		     mgcp_conn_dump(conn->conn), conn->osmux.state);
 		return -1;
 	}

 	conn->osmux.in = osmux_handle_lookup(endp->cfg, addr, port);
 	if (!conn->osmux.in) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			"Cannot allocate input osmux handle for conn:%s\n",
-			mgcp_conn_dump(conn->conn));
+		LOGP(DLMGCP, LOGL_ERROR, "Cannot allocate input osmux handle for conn:%s\n",
+		     mgcp_conn_dump(conn->conn));
 		return -1;
 	}
-	if (osmux_xfrm_input_open_circuit(conn->osmux.in, conn->osmux.cid, osmux_dummy) < 0) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			"Cannot open osmux circuit %u for conn:%s\n",
+	if (!osmux_xfrm_input_open_circuit(conn->osmux.in, conn->osmux.cid, osmux_dummy)) {
+		LOGP(DLMGCP, LOGL_ERROR, "Cannot open osmux circuit %u for conn:%s\n",
 		     conn->osmux.cid, mgcp_conn_dump(conn->conn));
 		return -1;
 	}

-	osmux_xfrm_output_init2(&conn->osmux.out,
+	osmux_xfrm_output_init(&conn->osmux.out,
 			       (conn->osmux.cid * rtp_ssrc_winlen) +
-			        (random() % rtp_ssrc_winlen),
-			       conn->end.codec->payload_type);
+			       (random() % rtp_ssrc_winlen));

-	osmux_xfrm_output_set_tx_cb(&conn->osmux.out,
-				    scheduled_from_osmux_tx_rtp_cb, conn);
+	switch (endp->cfg->role) {
+		case MGCP_BSC_NAT:
+			conn->type = MGCP_OSMUX_BSC_NAT;
+			osmux_xfrm_output_set_tx_cb(&conn->osmux.out,
+							scheduled_tx_net_cb, endp);
+			break;
+		case MGCP_BSC:
+			conn->type = MGCP_OSMUX_BSC;
+			osmux_xfrm_output_set_tx_cb(&conn->osmux.out,
+							scheduled_tx_bts_cb, endp);
+			break;
+	}

 	conn->osmux.state = OSMUX_STATE_ENABLED;

@@ -483,65 +595,48 @@ int osmux_enable_conn(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn,

 /*! disable OSXMUX circuit for a specified connection.
 *  \param[in] conn connection to disable */
-void conn_osmux_disable(struct mgcp_conn_rtp *conn)
+void osmux_disable_conn(struct mgcp_conn_rtp *conn)
 {
+	if (!conn)
+		return;

-	OSMO_ASSERT(conn->osmux.state != OSMUX_STATE_DISABLED);
+	if (conn->osmux.state != OSMUX_STATE_ENABLED)
+		return;

-	LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,
-		"Releasing connection using Osmux CID %u\n", conn->osmux.cid);
+	LOGP(DLMGCP, LOGL_INFO, "Releasing connection %s using Osmux CID %u\n",
+	     conn->conn->id, conn->osmux.cid);

-	if (conn->osmux.state == OSMUX_STATE_ENABLED) {
-		/* We are closing, we don't need pending RTP packets to be transmitted */
-		osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL);
-		osmux_xfrm_output_flush(&conn->osmux.out);
+	/* We are closing, we don't need pending RTP packets to be transmitted */
+	osmux_xfrm_output_set_tx_cb(&conn->osmux.out, NULL, NULL);
+	osmux_xfrm_output_flush(&conn->osmux.out);

-		osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid);
-		conn->osmux.state = OSMUX_STATE_DISABLED;
-		conn_osmux_release_cid(conn);
-		osmux_handle_put(conn->osmux.in);
-	}
-	conn_osmux_release_cid(conn);
+	osmux_xfrm_input_close_circuit(conn->osmux.in, conn->osmux.cid);
+	conn->osmux.state = OSMUX_STATE_DISABLED;
+	conn->osmux.cid = -1;
+	osmux_handle_put(conn->osmux.in);
 }

 /*! relase OSXMUX cid, that had been allocated to this connection.
 *  \param[in] conn connection with OSMUX cid to release */
-void conn_osmux_release_cid(struct mgcp_conn_rtp *conn)
+void osmux_release_cid(struct mgcp_conn_rtp *conn)
 {
-	if (conn->osmux.cid_allocated)
-		osmux_cid_pool_put(conn->osmux.cid);
-	conn->osmux.cid = 0;
-	conn->osmux.cid_allocated = false;
+	if (!conn)
+		return;
+
+	if (conn->osmux.state != OSMUX_STATE_ENABLED)
+		return;
+
+	if (conn->osmux.allocated_cid >= 0)
+		osmux_put_cid(conn->osmux.allocated_cid);
+	conn->osmux.allocated_cid = -1;
 }

 /*! allocate OSXMUX cid to connection.
- *  \param[in] conn connection for which we allocate the OSMUX cid
- * \param[in] osmux_cid OSMUX cid to allocate. -1 Means take next available one.
- * \returns Allocated OSMUX cid, -1 on error (no free  cids avail, or selected one is already taken).
- */
-int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid)
+ *  \param[in] conn connection for which we allocate the OSMUX cid*/
+void osmux_allocate_cid(struct mgcp_conn_rtp *conn)
 {
-	if (osmux_cid != -1 && osmux_cid_pool_allocated((uint8_t) osmux_cid)) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,
-			 "Osmux CID %d already allocated!\n",
-			 osmux_cid);
-		return -1;
-	}
-
-	if (osmux_cid == -1) {
-		osmux_cid = osmux_cid_pool_get_next();
-		if (osmux_cid == -1) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_INFO,
-				 "no available Osmux CID to allocate!\n");
-			return -1;
-		}
-	} else
-		osmux_cid_pool_get(osmux_cid);
-
-	conn->osmux.cid = (uint8_t) osmux_cid;
-	conn->osmux.cid_allocated = true;
-	conn->type = MGCP_OSMUX_BSC;
-	return osmux_cid;
+	osmux_release_cid(conn);
+	conn->osmux.allocated_cid = osmux_get_cid();
 }

 /*! send RTP dummy packet to OSMUX connection port.
@@ -550,8 +645,7 @@ int conn_osmux_allocate_cid(struct mgcp_conn_rtp *conn, int osmux_cid)
 *  \returns bytes sent, -1 on error */
 int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 {
-	struct osmux_hdr *osmuxh;
-	int buf_len;
+	char buf[1 + sizeof(uint8_t)];
 	struct in_addr addr_unset = {};

 	/*! The dummy packet will not be sent via the actual OSMUX connection,
@@ -563,6 +657,9 @@ int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 	 *  endpoint may have already punched the hole in the firewall. This
 	 *  approach is simple though. */

+	buf[0] = MGCP_DUMMY_LOAD;
+	memcpy(&buf[1], &conn->osmux.cid, sizeof(conn->osmux.cid));
+
 	/* Wait until we have the connection information from MDCX */
 	if (memcmp(&conn->end.addr, &addr_unset, sizeof(addr_unset)) == 0)
 		return 0;
@@ -570,19 +667,12 @@ int osmux_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 	if (endp_osmux_state_check(endp, conn, true) < 0)
 		return 0;

-	buf_len = sizeof(struct osmux_hdr) + osmo_amr_bytes(AMR_FT_0);
-	osmuxh = (struct osmux_hdr *) alloca(buf_len);
-	memset(osmuxh, 0, buf_len);
-	osmuxh->ft = OSMUX_FT_DUMMY;
-	osmuxh->amr_ft = AMR_FT_0;
-	osmuxh->circuit_id = conn->osmux.cid;
-
-	LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG,
-		 "sending OSMUX dummy load to %s:%u CID %u\n",
-		 inet_ntoa(conn->end.addr), ntohs(conn->end.rtp_port), conn->osmux.cid);
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "sending OSMUX dummy load to %s CID %u\n",
+	     inet_ntoa(conn->end.addr), conn->osmux.cid);

 	return mgcp_udp_send(osmux_fd.fd, &conn->end.addr,
-			     conn->end.rtp_port, (char*)osmuxh, buf_len);
+			     htons(endp->cfg->osmux_port), buf, sizeof(buf));
 }

 /* bsc-nat allocates/releases the Osmux circuit ID. +7 to round up to 8 bit boundary. */
@@ -590,7 +680,7 @@ static uint8_t osmux_cid_bitmap[(OSMUX_CID_MAX + 1 + 7) / 8];

 /*! count the number of taken OSMUX cids.
 *  \returns number of OSMUX cids in use */
-int osmux_cid_pool_count_used(void)
+int osmux_used_cid(void)
 {
 	int i, j, used = 0;

@@ -606,7 +696,7 @@ int osmux_cid_pool_count_used(void)

 /*! take a free OSMUX cid.
 *  \returns OSMUX cid */
-int osmux_cid_pool_get_next(void)
+int osmux_get_cid(void)
 {
 	int i, j;

@@ -626,24 +716,10 @@ int osmux_cid_pool_get_next(void)
 	return -1;
 }

-/*! take a specific OSMUX cid.
- *  \param[in] osmux_cid OSMUX cid */
-void osmux_cid_pool_get(uint8_t osmux_cid)
-{
-	LOGP(DLMGCP, LOGL_DEBUG, "Allocating Osmux CID %u from pool\n", osmux_cid);
-	osmux_cid_bitmap[osmux_cid / 8] |= (1 << (osmux_cid % 8));
-}
-
 /*! put back a no longer used OSMUX cid.
 *  \param[in] osmux_cid OSMUX cid */
-void osmux_cid_pool_put(uint8_t osmux_cid)
+void osmux_put_cid(uint8_t osmux_cid)
 {
 	LOGP(DLMGCP, LOGL_DEBUG, "Osmux CID %u is back to the pool\n", osmux_cid);
 	osmux_cid_bitmap[osmux_cid / 8] &= ~(1 << (osmux_cid % 8));
 }
-
-/*! check if OSMUX cid is already taken */
-bool osmux_cid_pool_allocated(uint8_t osmux_cid)
-{
-	return !!(osmux_cid_bitmap[osmux_cid / 8] & (1 << (osmux_cid % 8)));
-}
--- a/src/libosmo-mgcp/mgcp_protocol.c
+++ b/src/libosmo-mgcp/mgcp_protocol.c
@@ -147,15 +147,17 @@ static int setup_rtp_processing(struct mgcp_endpoint *endp,
 	struct mgcp_conn_rtp *conn_dst = conn;
 	struct mgcp_conn *_conn;

-	if (conn->type != MGCP_RTP_DEFAULT && !mgcp_conn_rtp_is_osmux(conn)) {
-		LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-			 "RTP-setup: Endpoint is not configured as RTP default, stopping here!\n");
+	if (conn->type != MGCP_RTP_DEFAULT) {
+		LOGP(DLMGCP, LOGL_NOTICE,
+		     "endpoint:%x RTP-setup: Endpoint is not configured as RTP default, stopping here!\n",
+		     ENDPOINT_NUMBER(endp));
 		return 0;
 	}

 	if (conn->conn->mode == MGCP_CONN_LOOPBACK) {
-		LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-			 "RTP-setup: Endpoint is in loopback mode, stopping here!\n");
+		LOGP(DLMGCP, LOGL_NOTICE,
+		     "endpoint:%x RTP-setup: Endpoint is in loopback mode, stopping here!\n",
+		     ENDPOINT_NUMBER(endp));
 		return 0;
 	}

@@ -175,13 +177,13 @@ static int setup_rtp_processing(struct mgcp_endpoint *endp,
 * for performance reasons. */
 static const struct mgcp_request mgcp_requests[] = {
 	MGCP_REQUEST("AUEP", handle_audit_endpoint, "AuditEndpoint")
-	MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection")
-	MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection")
-	MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection")
-	MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest")
+	    MGCP_REQUEST("CRCX", handle_create_con, "CreateConnection")
+	    MGCP_REQUEST("DLCX", handle_delete_con, "DeleteConnection")
+	    MGCP_REQUEST("MDCX", handle_modify_con, "ModifiyConnection")
+	    MGCP_REQUEST("RQNT", handle_noti_req, "NotificationRequest")

-	/* SPEC extension */
-	MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress")
+	    /* SPEC extension */
+	    MGCP_REQUEST("RSIP", handle_rsip, "ReSetInProgress")
 };

 /* Helper function to allocate some memory for responses and retransmissions */
@@ -223,13 +225,13 @@ static struct msgb *create_resp(struct mgcp_endpoint *endp, int code,
 	len = snprintf((char *)res->data, 2048, "%d %s%s%s\r\n%s",
 		       code, trans, txt, param ? param : "", sdp ? sdp : "");
 	if (len < 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR, "Failed to sprintf MGCP response.\n");
+		LOGP(DLMGCP, LOGL_ERROR, "Failed to sprintf MGCP response.\n");
 		msgb_free(res);
 		return NULL;
 	}

 	res->l2h = msgb_put(res, len);
-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "Generated response: code=%d\n", code);
+	LOGP(DLMGCP, LOGL_DEBUG, "Generated response: code=%d\n", code);
 	mgcp_disp_msg(res->l2h, msgb_l2len(res), "Generated response");

 	/*
@@ -300,13 +302,11 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
 					     const char *trans_id,
 					     bool add_conn_params)
 {
-	/* TODO: we may want to define another local_ip_osmux var to us for
-	   OSMUX connections. Perhaps adding a new internal API to get it based
-	   on conn type */
 	const char *addr = endp->cfg->local_ip;
 	struct msgb *sdp;
 	int rc;
 	struct msgb *result;
+	char osmux_extension[strlen("X-Osmux: 255") + 1];
 	char local_ip_addr[INET_ADDRSTRLEN];

 	sdp = msgb_alloc_headroom(4096, 128, "sdp record");
@@ -318,6 +318,13 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
 		addr = local_ip_addr;
 	}

+	if (conn->osmux.state == OSMUX_STATE_NEGOTIATING) {
+		sprintf(osmux_extension, "X-Osmux: %u", conn->osmux.cid);
+		conn->osmux.state = OSMUX_STATE_ACTIVATING;
+	} else {
+		osmux_extension[0] = '\0';
+	}
+
 	/* Attach optional connection parameters */
 	if (add_conn_params) {
 		rc = add_params(sdp, endp, conn);
@@ -326,8 +333,8 @@ static struct msgb *create_response_with_sdp(struct mgcp_endpoint *endp,
 	}

 	/* Attach optional OSMUX parameters */
-	if (mgcp_conn_rtp_is_osmux(conn)) {
-		rc = msgb_printf(sdp, "X-Osmux: %u\r\n", conn->osmux.cid);
+	if (conn->osmux.state == OSMUX_STATE_NEGOTIATING) {
+		rc = msgb_printf(sdp, "%s\r\n", osmux_extension);
 		if (rc < 0)
 			goto error;
 	}
@@ -423,15 +430,15 @@ struct msgb *mgcp_handle_message(struct mgcp_config *cfg, struct msgb *msg)
 /* AUEP command handler, processes the received command */
 static struct msgb *handle_audit_endpoint(struct mgcp_parse_data *p)
 {
-	LOGPENDP(p->endp, DLMGCP, LOGL_NOTICE, "AUEP: auditing endpoint ...\n");
+	LOGP(DLMGCP, LOGL_NOTICE, "AUEP: auditing endpoint ...\n");
 	return create_ok_response(p->endp, 200, "AUEP", p->trans);
 }

 /* Try to find a free port by attempting to bind on it. Also handle the
 * counter that points on the next free port. Since we have a pointer
 * to the next free port, binding should in work on the first attempt in
- * general. In case of failure the next port is tried until the whole port
- * range is tried once. */
+ * general. In case of failure the next port is tryed until the whole port
+ * range is tryed once. */
 static int allocate_port(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)
 {
 	int i;
@@ -462,9 +469,9 @@ static int allocate_port(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)

 	}

-	LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-	     "Allocating a RTP/RTCP port failed %u times.\n",
-	     tries);
+	LOGP(DLMGCP, LOGL_ERROR,
+	     "Allocating a RTP/RTCP port failed %u times 0x%x.\n",
+	     tries, ENDPOINT_NUMBER(endp));
 	return -1;
 }

@@ -559,7 +566,7 @@ int check_local_cx_options(void *ctx, const char *options)
 		 * before. If yes, we must bail, an LCO must only appear once
 		 * in the LCO string */
 		for (i = 0; i < lco_seen_n; i++) {
-			if (strcasecmp(lco_seen[i], lco_identifier) == 0)
+			if (strcmp(lco_seen[i], lco_identifier) == 0)
 				goto error;
 		}
 		lco_seen[lco_seen_n] = lco_identifier;
@@ -590,9 +597,8 @@ error:
 static int set_local_cx_options(void *ctx, struct mgcp_lco *lco,
 				 const char *options)
 {
-	char *lco_id;
+	char *p_opt, *a_opt;
 	char codec[17];
-	int len;

 	if (!options)
 		return 0;
@@ -609,37 +615,18 @@ static int set_local_cx_options(void *ctx, struct mgcp_lco *lco,
 	talloc_free(lco->string);
 	lco->string = talloc_strdup(ctx, options);

-	lco_id = lco->string;
-	while ((lco_id = get_lco_identifier(lco_id))) {
-		switch (tolower(lco_id[0])) {
-		case 'p':
-			if (sscanf(lco_id + 1, ":%d-%d",
-				   &lco->pkt_period_min, &lco->pkt_period_max) == 1)
-				lco->pkt_period_max = lco->pkt_period_min;
-			break;
-		case 'a':
-			/* FIXME: LCO also supports the negotiation of more then one codec.
-			 * (e.g. a:PCMU;G726-32) But this implementation only supports a single
-			 * codec only. */
-			if (sscanf(lco_id + 1, ":%16[^,]", codec) == 1) {
-				talloc_free(lco->codec);
-				/* MGCP header is case insensive, and we'll need
-				   codec in uppercase when using it later: */
-				len = strlen(codec);
-				lco->codec = talloc_size(ctx, len + 1);
-				osmo_str_toupper_buf(lco->codec, len + 1, codec);
-			}
-			break;
-		default:
-			LOGP(DLMGCP, LOGL_NOTICE,
-			     "LCO: unhandled option: '%c'/%d in \"%s\"\n",
-			     *lco_id, *lco_id, lco->string);
-			break;
-		}
+	p_opt = strstr(lco->string, "p:");
+	if (p_opt && sscanf(p_opt, "p:%d-%d",
+			    &lco->pkt_period_min, &lco->pkt_period_max) == 1)
+		lco->pkt_period_max = lco->pkt_period_min;

-		lco_id = strchr(lco_id, ',');
-		if (!lco_id)
-			break;
+	/* FIXME: LCO also supports the negotiation of more then one codec.
+	 * (e.g. a:PCMU;G726-32) But this implementation only supports a single
+	 * codec only. */
+	a_opt = strstr(lco->string, "a:");
+	if (a_opt && sscanf(a_opt, "a:%16[^,]", codec) == 1) {
+		talloc_free(lco->codec);
+		lco->codec = talloc_strdup(ctx, codec);
 	}

 	LOGP(DLMGCP, LOGL_DEBUG,
@@ -665,13 +652,12 @@ void mgcp_rtp_end_config(struct mgcp_endpoint *endp, int expect_ssrc_change,

 	rtp->force_aligned_timing = tcfg->force_aligned_timing;
 	rtp->force_constant_ssrc = patch_ssrc ? 1 : 0;
-	rtp->rfc5993_hr_convert = tcfg->rfc5993_hr_convert;

-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG,
-		 "Configuring RTP endpoint: local port %d%s%s\n",
-		 ntohs(rtp->rtp_port),
-		 rtp->force_aligned_timing ? ", force constant timing" : "",
-		 rtp->force_constant_ssrc ? ", force constant ssrc" : "");
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "Configuring RTP endpoint: local port %d%s%s\n",
+	     ntohs(rtp->rtp_port),
+	     rtp->force_aligned_timing ? ", force constant timing" : "",
+	     rtp->force_constant_ssrc ? ", force constant ssrc" : "");
 }

 uint32_t mgcp_rtp_packet_duration(struct mgcp_endpoint *endp,
@@ -693,19 +679,14 @@ uint32_t mgcp_rtp_packet_duration(struct mgcp_endpoint *endp,
 	    rtp->codec->frame_duration_den;
 }

-/*! Initializes osmux socket if not yet initialized. Parses Osmux CID from MGCP line.
- *  \param[in] endp Endpoint willing to initialize osmux
- *  \param[in] line Line X-Osmux from MGCP header msg to parse
- *  \returns OSMUX CID, -1 for wildcard, -2 on parse error, -3 on osmux initalize error
- */
 static int mgcp_osmux_setup(struct mgcp_endpoint *endp, const char *line)
 {
 	if (!endp->cfg->osmux_init) {
 		if (osmux_init(OSMUX_ROLE_BSC, endp->cfg) < 0) {
-			LOGPENDP(endp, DLMGCP, LOGL_ERROR, "Cannot init OSMUX\n");
-			return -3;
+			LOGP(DLMGCP, LOGL_ERROR, "Cannot init OSMUX\n");
+			return -1;
 		}
-		LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "OSMUX socket has been set up\n");
+		LOGP(DLMGCP, LOGL_NOTICE, "OSMUX socket has been set up\n");
 	}

 	return mgcp_parse_osmux_cid(line);
@@ -731,8 +712,9 @@ static int handle_codec_info(struct mgcp_conn_rtp *conn,
 		mgcp_codec_reset_all(conn);
 		rc = mgcp_parse_sdp_data(endp, conn, p);
 		if (rc != 0) {
-			LOGPCONN(conn->conn, DLMGCP,  LOGL_ERROR,
-				 "%s: sdp not parseable\n", cmd);
+			LOGP(DLMGCP, LOGL_ERROR,
+			     "%s: endpoint:%x sdp not parseable\n", cmd,
+			     ENDPOINT_NUMBER(endp));

 			/* See also RFC 3661: Protocol error */
 			return 510;
@@ -741,7 +723,7 @@ static int handle_codec_info(struct mgcp_conn_rtp *conn,
 		/* When no SDP is available, we use the codec information from
 		 * the local connection options (if present) */
 		mgcp_codec_reset_all(conn);
-		rc = mgcp_codec_add(conn, PTYPE_UNDEFINED, endp->local_options.codec, NULL);
+		rc = mgcp_codec_add(conn, PTYPE_UNDEFINED, endp->local_options.codec);
 		if (rc != 0)
 			goto error;
 	}
@@ -752,7 +734,7 @@ static int handle_codec_info(struct mgcp_conn_rtp *conn,
 		 * than it makes sense to pick a sane default: (payload-type 0,
 		 * PCMU), see also: OS#2658 */
 		mgcp_codec_reset_all(conn);
-		rc = mgcp_codec_add(conn, 0, NULL, NULL);
+		rc = mgcp_codec_add(conn, 0, NULL);
 		if (rc != 0)
 			goto error;
 	}
@@ -764,8 +746,9 @@ static int handle_codec_info(struct mgcp_conn_rtp *conn,
 	return 0;

 error:
-	LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-	     "%s: codec negotiation failure\n", cmd);
+	LOGP(DLMGCP, LOGL_ERROR,
+	     "%s: endpoint:0x%x codec negotiation failure\n", cmd,
+	     ENDPOINT_NUMBER(endp));

 	/* See also RFC 3661: Codec negotiation failure */
 	return 534;
@@ -785,10 +768,11 @@ static bool parse_x_osmo_ign(struct mgcp_endpoint *endp, char *line)
 		if (!token)
 			break;

-		if (!strcasecmp(token, "C"))
+		if (!strcmp(token, "C"))
 			endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;
 		else
-			LOGPENDP(endp, DLMGCP, LOGL_ERROR, "received unknown X-Osmo-IGN item '%s'\n", token);
+			LOGP(DLMGCP, LOGL_ERROR, "endpoint 0x%x: received unknown X-Osmo-IGN item '%s'\n",
+			     ENDPOINT_NUMBER(endp), token);
 	}

 	return true;
@@ -805,20 +789,20 @@ static struct msgb *handle_create_con(struct mgcp_parse_data *p)
 	const char *callid = NULL;
 	const char *mode = NULL;
 	char *line;
-	int have_sdp = 0, osmux_cid = -2;
+	int have_sdp = 0, osmux_cid = -1;
 	struct mgcp_conn_rtp *conn = NULL;
 	struct mgcp_conn *_conn = NULL;
 	char conn_name[512];
 	int rc;

-	LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "CRCX: creating new connection ...\n");
+	LOGP(DLMGCP, LOGL_NOTICE, "CRCX: creating new connection ...\n");

 	/* parse CallID C: and LocalParameters L: */
 	for_each_line(line, p->save) {
 		if (!mgcp_check_param(endp, line))
 			continue;

-		switch (toupper(line[0])) {
+		switch (line[0]) {
 		case 'L':
 			local_options = (const char *)line + 3;
 			break;
@@ -836,7 +820,7 @@ static struct msgb *handle_create_con(struct mgcp_parse_data *p)
 			mode = (const char *)line + 3;
 			break;
 		case 'X':
-			if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {
+			if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {
 				/* If osmux is disabled, just skip setting it up */
 				if (!p->endp->cfg->osmux)
 					break;
@@ -853,8 +837,9 @@ static struct msgb *handle_create_con(struct mgcp_parse_data *p)
 			have_sdp = 1;
 			goto mgcp_header_done;
 		default:
-			LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-				 "CRCX: unhandled option: '%c'/%d\n", *line, *line);
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "CRCX: endpoint:%x unhandled option: '%c'/%d\n",
+			     ENDPOINT_NUMBER(endp), *line, *line);
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_UNHANDLED_PARAM]);
 			return create_err_response(NULL, 539, "CRCX", p->trans);
 			break;
@@ -864,24 +849,26 @@ static struct msgb *handle_create_con(struct mgcp_parse_data *p)
 mgcp_header_done:
 	/* Check parameters */
 	if (!callid) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "CRCX: insufficient parameters, missing callid\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:%x insufficient parameters, missing callid\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_MISSING_CALLID]);
 		return create_err_response(endp, 516, "CRCX", p->trans);
 	}

 	if (!mode) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "CRCX: insufficient parameters, missing mode\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:%x insufficient parameters, missing mode\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_MODE]);
 		return create_err_response(endp, 517, "CRCX", p->trans);
 	}

 	/* Check if we are able to accept the creation of another connection */
 	if (llist_count(&endp->conns) >= endp->type->max_conns) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			"CRCX: endpoint full, max. %i connections allowed!\n",
-			endp->type->max_conns);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:%x endpoint full, max. %i connections allowed!\n",
+		     endp->type->max_conns, ENDPOINT_NUMBER(endp));
 		if (tcfg->force_realloc) {
 			/* There is no more room for a connection, make some
 			 * room by blindly tossing the oldest of the two two
@@ -898,9 +885,9 @@ mgcp_header_done:
 	/* Check if this endpoint already serves a call, if so, check if the
 	 * callids match up so that we are sure that this is our call */
 	if (endp->callid && mgcp_verify_call_id(endp, callid)) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "CRCX: already seized by other call (%s)\n",
-			 endp->callid);
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:0x%x allready seized by other call (%s)\n",
+		     ENDPOINT_NUMBER(endp), endp->callid);
 		if (tcfg->force_realloc)
 			/* This is not our call, toss everything by releasing
 			 * the entire endpoint. (rude!) */
@@ -921,8 +908,9 @@ mgcp_header_done:
 	snprintf(conn_name, sizeof(conn_name), "%s", callid);
 	_conn = mgcp_conn_alloc(NULL, endp, MGCP_CONN_TYPE_RTP, conn_name);
 	if (!_conn) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "CRCX: unable to allocate RTP connection\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:0x%x unable to allocate RTP connection\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_ALLOC_CONN]);
 		goto error2;

@@ -939,15 +927,13 @@ mgcp_header_done:
 	/* Annotate Osmux circuit ID and set it to negotiating state until this
 	 * is fully set up from the dummy load. */
 	conn->osmux.state = OSMUX_STATE_DISABLED;
-	if (osmux_cid >= -1) { /* -1 is wilcard, alloc next avail CID */
-		conn->osmux.state = OSMUX_STATE_ACTIVATING;
-		if (conn_osmux_allocate_cid(conn, osmux_cid) == -1) {
-			rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]);
-			goto error2;
-		}
+	if (osmux_cid >= 0) {
+		conn->osmux.cid = osmux_cid;
+		conn->osmux.state = OSMUX_STATE_NEGOTIATING;
 	} else if (endp->cfg->osmux == OSMUX_USAGE_ONLY) {
-		LOGPCONN(_conn, DLMGCP, LOGL_ERROR,
-			 "CRCX: osmux only and no osmux offered\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:0x%x osmux only and no osmux offered\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_OSMUX]);
 		goto error2;
 	}
@@ -957,8 +943,9 @@ mgcp_header_done:
 		rc = set_local_cx_options(endp->tcfg->endpoints,
 					  &endp->local_options, local_options);
 		if (rc != 0) {
-			LOGPCONN(_conn, DLMGCP, LOGL_ERROR,
-				 "CRCX: inavlid local connection options!\n");
+			LOGP(DLMGCP, LOGL_ERROR,
+			     "CRCX: endpoint:%x inavlid local connection options!\n",
+			     ENDPOINT_NUMBER(endp));
 			error_code = rc;
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_INVALID_CONN_OPTIONS]);
 			goto error2;
@@ -988,8 +975,9 @@ mgcp_header_done:
 	if (conn->conn->mode != MGCP_CONN_LOOPBACK
 	    && conn->conn->mode != MGCP_CONN_RECV_ONLY
 	    && conn->end.rtp_port == 0) {
-		LOGPCONN(_conn, DLMGCP, LOGL_ERROR,
-			 "CRCX: selected connection mode type requires an opposite end!\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:%x selected connection mode type requires an opposite end!\n",
+		     ENDPOINT_NUMBER(endp));
 		error_code = 527;
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_NO_REMOTE_CONN_DESC]);
 		goto error2;
@@ -1001,8 +989,9 @@ mgcp_header_done:
 	}

 	if (setup_rtp_processing(endp, conn) != 0) {
-		LOGPCONN(_conn, DLMGCP, LOGL_ERROR,
-			 "CRCX: could not start RTP processing!\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "CRCX: endpoint:0x%x could not start RTP processing!\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_START_RTP]);
 		goto error2;
 	}
@@ -1014,8 +1003,9 @@ mgcp_header_done:
 				       MGCP_ENDP_CRCX, p->trans);
 		switch (rc) {
 		case MGCP_POLICY_REJECT:
-			LOGPCONN(_conn, DLMGCP, LOGL_NOTICE,
-				 "CRCX: CRCX rejected by policy\n");
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "CRCX: endpoint:0x%x CRCX rejected by policy\n",
+			     ENDPOINT_NUMBER(endp));
 			mgcp_endp_release(endp);
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_FAIL_REJECTED_BY_POLICY]);
 			return create_err_response(endp, 400, "CRCX", p->trans);
@@ -1030,8 +1020,9 @@ mgcp_header_done:
 		}
 	}

-	LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG,
-		 "CRCX: Creating connection: port: %u\n", conn->end.local_port);
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "CRCX: endpoint:0x%x Creating connection: CI: %s port: %u\n",
+	     ENDPOINT_NUMBER(endp), conn->conn->id, conn->end.local_port);
 	if (p->cfg->change_cb)
 		p->cfg->change_cb(tcfg, ENDPOINT_NUMBER(endp), MGCP_ENDP_CRCX);

@@ -1041,14 +1032,16 @@ mgcp_header_done:
 	    && tcfg->keepalive_interval != MGCP_KEEPALIVE_NEVER)
 		send_dummy(endp, conn);

-	LOGPCONN(_conn, DLMGCP, LOGL_NOTICE,
-		 "CRCX: connection successfully created\n");
+	LOGP(DLMGCP, LOGL_NOTICE,
+	     "CRCX: endpoint:0x%x connection successfully created\n",
+	     ENDPOINT_NUMBER(endp));
 	rate_ctr_inc(&rate_ctrs->ctr[MGCP_CRCX_SUCCESS]);
 	return create_response_with_sdp(endp, conn, "CRCX", p->trans, true);
 error2:
 	mgcp_endp_release(endp);
-	LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-		 "CRCX: unable to create connection\n");
+	LOGP(DLMGCP, LOGL_NOTICE,
+	     "CRCX: endpoint:0x%x unable to create connection\n",
+	     ENDPOINT_NUMBER(endp));
 	return create_err_response(endp, error_code, "CRCX", p->trans);
 }

@@ -1070,22 +1063,23 @@ static struct msgb *handle_modify_con(struct mgcp_parse_data *p)
 	const char *mode = NULL;
 	struct mgcp_conn_rtp *conn = NULL;
        const char *conn_id = NULL;
-	int osmux_cid = -2;
 	int rc;

-	LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "MDCX: modifying existing connection ...\n");
+	LOGP(DLMGCP, LOGL_NOTICE, "MDCX: modifying existing connection ...\n");

 	/* Prohibit wildcarded requests */
 	if (endp->wildcarded_req) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "MDCX: wildcarded endpoint names not supported.\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "MDCX: endpoint:0x%x wildcarded endpoint names not supported.\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_WILDCARD]);
 		return create_err_response(endp, 507, "MDCX", p->trans);
 	}

 	if (llist_count(&endp->conns) <= 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "MDCX: endpoint is not holding a connection.\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "MDCX: endpoint:0x%x endpoint is not holding a connection.\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONN]);
 		return create_err_response(endp, 400, "MDCX", p->trans);
 	}
@@ -1094,7 +1088,7 @@ static struct msgb *handle_modify_con(struct mgcp_parse_data *p)
 		if (!mgcp_check_param(endp, line))
 			continue;

-		switch (toupper(line[0])) {
+		switch (line[0]) {
 		case 'C':
 			if (mgcp_verify_call_id(endp, line + 3) != 0) {
 				rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CALLID]);
@@ -1116,26 +1110,16 @@ static struct msgb *handle_modify_con(struct mgcp_parse_data *p)
 			mode = (const char *)line + 3;
 			break;
 		case 'Z':
-			silent = strcasecmp("noanswer", line + 3) == 0;
-			break;
-		case 'X':
-			if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {
-				/* If osmux is disabled, just skip setting it up */
-				if (!p->endp->cfg->osmux)
-					break;
-				osmux_cid = mgcp_osmux_setup(endp, line);
-				break;
-			}
-			/* Ignore unknown X-headers */
+			silent = strcmp("noanswer", line + 3) == 0;
 			break;
 		case '\0':
 			have_sdp = 1;
 			goto mgcp_header_done;
 			break;
 		default:
-			LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-				 "MDCX: Unhandled MGCP option: '%c'/%d\n",
-				 line[0], line[0]);
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "MDCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n",
+			     ENDPOINT_NUMBER(endp), line[0], line[0]);
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_UNHANDLED_PARAM]);
 			return create_err_response(NULL, 539, "MDCX", p->trans);
 			break;
@@ -1144,8 +1128,9 @@ static struct msgb *handle_modify_con(struct mgcp_parse_data *p)

 mgcp_header_done:
 	if (!conn_id) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "MDCX: insufficient parameters, missing ci (connectionIdentifier)\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "MDCX: endpoint:0x%x insufficient parameters, missing ci (connectionIdentifier)\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_CONNID]);
 		return create_err_response(endp, 515, "MDCX", p->trans);
 	}
@@ -1156,8 +1141,6 @@ mgcp_header_done:
 		return create_err_response(endp, 400, "MDCX", p->trans);
 	}

-	mgcp_conn_watchdog_kick(conn->conn);
-
 	if (mode) {
 		if (mgcp_parse_conn_mode(mode, endp, conn->conn) != 0) {
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_MODE]);
@@ -1165,15 +1148,16 @@ mgcp_header_done:
 			goto error3;
 		}
 	} else
-		conn->conn->mode = conn->conn->mode_orig;
+			conn->conn->mode = conn->conn->mode_orig;

 	/* Set local connection options, if present */
 	if (local_options) {
 		rc = set_local_cx_options(endp->tcfg->endpoints,
 					  &endp->local_options, local_options);
 		if (rc != 0) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-				 "MDCX: invalid local connection options!\n");
+			LOGP(DLMGCP, LOGL_ERROR,
+			     "MDCX: endpoint:%x invalid local connection options!\n",
+			     ENDPOINT_NUMBER(endp));
 			error_code = rc;
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_INVALID_CONN_OPTIONS]);
 			goto error3;
@@ -1192,32 +1176,14 @@ mgcp_header_done:
 	if (conn->conn->mode != MGCP_CONN_LOOPBACK
 	    && conn->conn->mode != MGCP_CONN_RECV_ONLY
 	    && conn->end.rtp_port == 0) {
-		LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-			 "MDCX: selected connection mode type requires an opposite end!\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "MDCX: endpoint:%x selected connection mode type requires an opposite end!\n",
+		     ENDPOINT_NUMBER(endp));
 		error_code = 527;
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_NO_REMOTE_CONN_DESC]);
 		goto error3;
 	}

-	if (mgcp_conn_rtp_is_osmux(conn)) {
-		OSMO_ASSERT(conn->osmux.cid_allocated);
-		if (osmux_cid < -1) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-				 "MDCX: Failed to parse Osmux CID!\n");
-			goto error3;
-		} else if (osmux_cid == -1) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-				 "MDCX: wilcard in MDCX is not supported!\n");
-			goto error3;
-		} else if (osmux_cid != (int) conn->osmux.cid) {
-			LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR,
-				 "MDCX: changing already allocated CID is not supported!\n");
-			goto error3;
-		}
-		/* TODO: In the future (when we have recvCID!=sendCID), we need to
-		   tell Osmux code that osmux_cid is to be used as sendCID for
-		   that conn. */
-	}

 	if (setup_rtp_processing(endp, conn) != 0) {
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_START_RTP]);
@@ -1232,8 +1198,9 @@ mgcp_header_done:
 				       MGCP_ENDP_MDCX, p->trans);
 		switch (rc) {
 		case MGCP_POLICY_REJECT:
-			LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE,
-				 "MDCX: rejected by policy\n");
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "MDCX: endpoint:0x%x rejected by policy\n",
+			     ENDPOINT_NUMBER(endp));
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_FAIL_REJECTED_BY_POLICY]);
 			if (silent)
 				goto out_silent;
@@ -1241,8 +1208,9 @@ mgcp_header_done:
 			break;
 		case MGCP_POLICY_DEFER:
 			/* stop processing */
-			LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG,
-				 "MDCX: deferred by policy\n");
+			LOGP(DLMGCP, LOGL_DEBUG,
+			     "MDCX: endpoint:0x%x deferred by policy\n",
+			     ENDPOINT_NUMBER(endp));
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_MDCX_DEFERRED_BY_POLICY]);
 			return NULL;
 			break;
@@ -1255,8 +1223,9 @@ mgcp_header_done:
 	mgcp_rtp_end_config(endp, 1, &conn->end);

 	/* modify */
-	LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG,
-		 "MDCX: modified conn:%s\n", mgcp_conn_dump(conn->conn));
+	LOGP(DLMGCP, LOGL_DEBUG,
+	     "MDCX: endpoint:0x%x modified conn:%s\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn->conn));
 	if (p->cfg->change_cb)
 		p->cfg->change_cb(endp->tcfg, ENDPOINT_NUMBER(endp),
 				  MGCP_ENDP_MDCX);
@@ -1271,14 +1240,16 @@ mgcp_header_done:
 	if (silent)
 		goto out_silent;

-	LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE,
-		 "MDCX: connection successfully modified\n");
+	LOGP(DLMGCP, LOGL_NOTICE,
+	     "MDCX: endpoint:0x%x connection successfully modified\n",
+	     ENDPOINT_NUMBER(endp));
 	return create_response_with_sdp(endp, conn, "MDCX", p->trans, false);
 error3:
 	return create_err_response(endp, error_code, "MDCX", p->trans);

 out_silent:
-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "MDCX: silent exit\n");
+	LOGP(DLMGCP, LOGL_DEBUG, "MDCX: endpoint:0x%x silent exit\n",
+	     ENDPOINT_NUMBER(endp));
 	return NULL;
 }

@@ -1295,20 +1266,23 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 	const char *conn_id = NULL;
 	struct mgcp_conn_rtp *conn = NULL;

-	LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-		 "DLCX: deleting connection ...\n");
+	LOGP(DLMGCP, LOGL_NOTICE,
+	     "DLCX: endpoint:0x%x deleting connection ...\n",
+	     ENDPOINT_NUMBER(endp));

 	/* Prohibit wildcarded requests */
 	if (endp->wildcarded_req) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "DLCX: wildcarded endpoint names not supported.\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "DLCX: endpoint:0x%x wildcarded endpoint names not supported.\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_WILDCARD]);
 		return create_err_response(endp, 507, "DLCX", p->trans);
 	}

 	if (llist_count(&endp->conns) <= 0) {
-		LOGPENDP(endp, DLMGCP, LOGL_ERROR,
-			 "DLCX: endpoint is not holding a connection.\n");
+		LOGP(DLMGCP, LOGL_ERROR,
+		     "DLCX: endpoint:0x%x endpoint is not holding a connection.\n",
+		     ENDPOINT_NUMBER(endp));
 		rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_NO_CONN]);
 		return create_err_response(endp, 515, "DLCX", p->trans);
 	}
@@ -1317,7 +1291,7 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 		if (!mgcp_check_param(endp, line))
 			continue;

-		switch (toupper(line[0])) {
+		switch (line[0]) {
 		case 'C':
 			if (mgcp_verify_call_id(endp, line + 3) != 0) {
 				error_code = 516;
@@ -1333,12 +1307,12 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 			}
 			break;
 		case 'Z':
-			silent = strcasecmp("noanswer", line + 3) == 0;
+			silent = strcmp("noanswer", line + 3) == 0;
 			break;
 		default:
-			LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-				 "DLCX: Unhandled MGCP option: '%c'/%d\n",
-				 line[0], line[0]);
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "DLCX: endpoint:0x%x Unhandled MGCP option: '%c'/%d\n",
+			     ENDPOINT_NUMBER(endp), line[0], line[0]);
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_UNHANDLED_PARAM]);
 			return create_err_response(NULL, 539, "DLCX", p->trans);
 			break;
@@ -1352,7 +1326,9 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 				       MGCP_ENDP_DLCX, p->trans);
 		switch (rc) {
 		case MGCP_POLICY_REJECT:
-			LOGPENDP(endp, DLMGCP, LOGL_NOTICE, "DLCX: rejected by policy\n");
+			LOGP(DLMGCP, LOGL_NOTICE,
+			     "DLCX: endpoint:0x%x rejected by policy\n",
+			     ENDPOINT_NUMBER(endp));
 			rate_ctr_inc(&rate_ctrs->ctr[MGCP_DLCX_FAIL_REJECTED_BY_POLICY]);
 			if (silent)
 				goto out_silent;
@@ -1374,9 +1350,9 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 	 * RFC3435 Section F.7) */
 	if (!conn_id) {
 		int num_conns = llist_count(&endp->conns);
-		LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-			 "DLCX: missing ci (connectionIdentifier), will remove all connections (%d total) at once\n",
-			 num_conns);
+		LOGP(DLMGCP, LOGL_NOTICE,
+		     "DLCX: endpoint:0x%x missing ci (connectionIdentifier), will remove all connections (%d total) at once\n",
+		     num_conns, ENDPOINT_NUMBER(endp));

 		if (num_conns > 0)
 			rate_ctr_add(&rate_ctrs->ctr[MGCP_DLCX_SUCCESS], num_conns);
@@ -1399,17 +1375,20 @@ static struct msgb *handle_delete_con(struct mgcp_parse_data *p)
 	mgcp_format_stats(stats, sizeof(stats), conn->conn);

 	/* delete connection */
-	LOGPCONN(conn->conn, DLMGCP, LOGL_DEBUG, "DLCX: deleting conn:%s\n",
-		 mgcp_conn_dump(conn->conn));
+	LOGP(DLMGCP, LOGL_DEBUG, "DLCX: endpoint:0x%x deleting conn:%s\n",
+	     ENDPOINT_NUMBER(endp), mgcp_conn_dump(conn->conn));
 	mgcp_conn_free(endp, conn_id);
-	LOGPENDP(endp, DLMGCP, LOGL_NOTICE,
-		 "DLCX: connection successfully deleted\n");
+	LOGP(DLMGCP, LOGL_NOTICE,
+	     "DLCX: endpoint:0x%x connection successfully deleted\n",
+	     ENDPOINT_NUMBER(endp));

 	/* When all connections are closed, the endpoint will be released
 	 * in order to be ready to be used by another call. */
 	if (llist_count(&endp->conns) <= 0) {
 		mgcp_endp_release(endp);
-		LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "DLCX: endpoint released\n");
+		LOGP(DLMGCP, LOGL_DEBUG,
+		     "DLCX: endpoint:0x%x endpoint released\n",
+		     ENDPOINT_NUMBER(endp));
 	}

 	if (p->cfg->change_cb)
@@ -1425,7 +1404,8 @@ error3:
 	return create_err_response(endp, error_code, "DLCX", p->trans);

 out_silent:
-	LOGPENDP(endp, DLMGCP, LOGL_DEBUG, "DLCX: silent exit\n");
+	LOGP(DLMGCP, LOGL_DEBUG, "DLCX: endpoint:0x%x silent exit\n",
+	     ENDPOINT_NUMBER(endp));
 	return NULL;
 }

@@ -1468,7 +1448,7 @@ static struct msgb *handle_noti_req(struct mgcp_parse_data *p)
 	LOGP(DLMGCP, LOGL_NOTICE, "RQNT: processing request for notification ...\n");

 	for_each_line(line, p->save) {
-		switch (toupper(line[0])) {
+		switch (line[0]) {
 		case 'S':
 			tone = extract_tone(line);
 			break;
@@ -1551,7 +1531,7 @@ static int free_rate_counter_group(struct rate_ctr_group *rate_ctr_group)
 	return 0;
 }

-static int alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)
+static void alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)
 {
 	/* FIXME: Each new rate counter group requires a unique index. At the
 	 * moment we generate an index using a counter, but perhaps there is
@@ -1563,34 +1543,25 @@ static int alloc_mgcp_rate_counters(struct mgcp_trunk_config *trunk, void *ctx)

 	if (trunk->mgcp_crcx_ctr_group == NULL) {
 		trunk->mgcp_crcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_crcx_ctr_group_desc, crcx_rate_ctr_index);
-		if (!trunk->mgcp_crcx_ctr_group)
-			return -1;
 		talloc_set_destructor(trunk->mgcp_crcx_ctr_group, free_rate_counter_group);
 		crcx_rate_ctr_index++;
 	}
 	if (trunk->mgcp_mdcx_ctr_group == NULL) {
 		trunk->mgcp_mdcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_mdcx_ctr_group_desc, mdcx_rate_ctr_index);
-		if (!trunk->mgcp_mdcx_ctr_group)
-			return -1;
 		talloc_set_destructor(trunk->mgcp_mdcx_ctr_group, free_rate_counter_group);
 		mdcx_rate_ctr_index++;
 	}
 	if (trunk->mgcp_dlcx_ctr_group == NULL) {
 		trunk->mgcp_dlcx_ctr_group = rate_ctr_group_alloc(ctx, &mgcp_dlcx_ctr_group_desc, dlcx_rate_ctr_index);
-		if (!trunk->mgcp_dlcx_ctr_group)
-			return -1;
 		talloc_set_destructor(trunk->mgcp_dlcx_ctr_group, free_rate_counter_group);
 		dlcx_rate_ctr_index++;
 	}
 	if (trunk->all_rtp_conn_stats == NULL) {
 		trunk->all_rtp_conn_stats = rate_ctr_group_alloc(ctx, &all_rtp_conn_rate_ctr_group_desc,
 								 all_rtp_conn_rate_ctr_index);
-		if (!trunk->all_rtp_conn_stats)
-			return -1;
 		talloc_set_destructor(trunk->all_rtp_conn_stats, free_rate_counter_group);
 		all_rtp_conn_rate_ctr_index++;
 	}
-	return 0;
 }

 /*! allocate configuration with default values.
@@ -1630,10 +1601,7 @@ struct mgcp_config *mgcp_config_alloc(void)
 	cfg->trunk.audio_send_name = 1;
 	cfg->trunk.omit_rtcp = 0;
 	mgcp_trunk_set_keepalive(&cfg->trunk, MGCP_KEEPALIVE_ONCE);
-	if (alloc_mgcp_rate_counters(&cfg->trunk, cfg) < 0) {
-		talloc_free(cfg);
-		return NULL;
-	}
+	alloc_mgcp_rate_counters(&cfg->trunk, cfg);

 	INIT_LLIST_HEAD(&cfg->trunks);

@@ -1706,18 +1674,9 @@ int mgcp_endpoints_allocate(struct mgcp_trunk_config *tcfg)
 		tcfg->endpoints[i].cfg = tcfg->cfg;
 		tcfg->endpoints[i].tcfg = tcfg;

-		switch (tcfg->trunk_type) {
-		case MGCP_TRUNK_VIRTUAL:
-			tcfg->endpoints[i].type = &ep_typeset.rtp;
-			break;
-		case MGCP_TRUNK_E1:
-			/* FIXME: Implement E1 allocation */
-			LOGP(DLMGCP, LOGL_FATAL, "E1 trunks not implemented!\n");
-			break;
-		default:
-			osmo_panic("Cannot allocate unimplemented trunk type %d! %s:%d\n",
-				   tcfg->trunk_type, __FILE__, __LINE__);
-		}
+		/* NOTE: Currently all endpoints are of type RTP, this will
+		 * change when new variations are implemented */
+		tcfg->endpoints[i].type = &ep_typeset.rtp;
 	}

 	tcfg->number_endpoints = tcfg->vty_number_endpoints;
--- a/src/libosmo-mgcp/mgcp_sdp.c
+++ b/src/libosmo-mgcp/mgcp_sdp.c
@@ -26,15 +26,12 @@
 #include <osmocom/mgcp/mgcp_msg.h>
 #include <osmocom/mgcp/mgcp_endp.h>
 #include <osmocom/mgcp/mgcp_codec.h>
-#include <osmocom/mgcp/mgcp_sdp.h>

 #include <errno.h>
-#include <stdlib.h>
-#include <limits.h>

-/* Two structs to store intermediate parsing results. The function
- * mgcp_parse_sdp_data() is using the following two structs as temporary
- * storage for parsing the SDP codec information. */
+/* A struct to store intermediate parsing results. The function
+ * mgcp_parse_sdp_data() is using it as temporary storage for parsing the SDP
+ * codec information. */
 struct sdp_rtp_map {
 	/* the type */
 	int payload_type;
@@ -46,11 +43,6 @@ struct sdp_rtp_map {
 	int rate;
 	int channels;
 };
-struct sdp_fmtp_param {
-	int payload_type;
-	struct mgcp_codec_param param;
-};
-

 /* Helper function to extrapolate missing codec parameters in a codec mao from
 * an already filled in payload_type, called from: mgcp_parse_sdp_data() */
@@ -131,8 +123,7 @@ static int pt_from_sdp(void *ctx, struct sdp_rtp_map *codecs,
 	char *str;
 	char *str_ptr;
 	char *pt_str;
-	char *pt_end;
-	unsigned long int pt;
+	unsigned int pt;
 	unsigned int count = 0;
 	unsigned int i;

@@ -157,14 +148,7 @@ static int pt_from_sdp(void *ctx, struct sdp_rtp_map *codecs,
 		if (!pt_str)
 			break;

-		errno = 0;
-		pt = strtoul(pt_str, &pt_end, 0);
-		if ((errno == ERANGE && pt == ULONG_MAX) || (errno && !pt) ||
-		    pt_str == pt_end)
-			goto error;
-
-		if (pt >> 7) /* PT is 7 bit field, higher values not allowed */
-			goto error;
+		pt = atoi(pt_str);

 		/* Do not allow duplicate payload types */
 		for (i = 0; i < count; i++)
@@ -183,92 +167,6 @@ error:
 	return -EINVAL;
 }

-/* Extract fmtp parameters from SDP, called from: mgcp_parse_sdp_data() */
-static int fmtp_from_sdp(void *ctx, struct sdp_fmtp_param *fmtp_param, char *sdp)
-{
-	char *str;
-	char *str_ptr;
-	char *param_str;
-	unsigned int pt;
-	unsigned int count = 0;
-	char delimiter;
-	unsigned int amr_octet_aligned;
-
-	memset(fmtp_param, 0, sizeof(*fmtp_param));
-
-	str = talloc_zero_size(ctx, strlen(sdp) + 1);
-	str_ptr = str;
-	strcpy(str_ptr, sdp);
-
-	/* Check if the input string begins with an fmtp token */
-	str_ptr = strstr(str_ptr, "fmtp:");
-	if (!str_ptr)
-		goto exit;
-	str_ptr += 5;
-
-	/* Extract payload type */
-	if (sscanf(str_ptr, "%u ", &pt) != 1)
-		goto error;
-	fmtp_param->payload_type = pt;
-
-	/* Advance pointer to the beginning of the parameter section and
-	 * tokenize string */
-	str_ptr = strstr(str_ptr, " ");
-	if (!str_ptr)
-		goto error;
-	str_ptr++;
-
-	param_str = strtok(str_ptr, " ");
-	if (!param_str)
-		goto exit;
-
-	while (1) {
-		/* Make sure that we don't get trapped in an endless loop */
-		if (count > 256)
-			goto error;
-
-		/* Chop off delimiters ';' at the end */
-		delimiter = str_ptr[strlen(str_ptr) - 1];
-		if (delimiter == ';' || delimiter == ',')
-			str_ptr[strlen(str_ptr) - 1] = '\0';
-
-		/* AMR octet aligned parameter */
-		if (sscanf(param_str, "octet-align=%d", &amr_octet_aligned) == 1) {
-			fmtp_param->param.amr_octet_aligned_present = true;
-			fmtp_param->param.amr_octet_aligned = false;
-			if (amr_octet_aligned == 1)
-				fmtp_param->param.amr_octet_aligned = true;
-
-		}
-
-		param_str = strtok(NULL, " ");
-		if (!param_str)
-			break;
-		count++;
-	}
-
-exit:
-	talloc_free(str);
-	return 0;
-error:
-	talloc_free(str);
-	return -EINVAL;
-}
-
-/* Pick optional fmtp parameters by payload type, if there are no fmtp
- * parameters, a nullpointer is returned */
-static struct mgcp_codec_param *param_by_pt(int pt, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len)
-{
-	unsigned int i;
-
-	for (i = 0; i < fmtp_params_len; i++) {
-		if (fmtp_params[i].payload_type == pt)
-			return &fmtp_params[i].param;
-	}
-
-	return NULL;
-}
-
 /*! Analyze SDP input string.
 *  \param[in] endp trunk endpoint.
 *  \param[out] conn associated rtp connection.
@@ -282,9 +180,6 @@ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp,
 {
 	struct sdp_rtp_map codecs[MGCP_MAX_CODECS];
 	unsigned int codecs_used = 0;
-	struct sdp_fmtp_param fmtp_params[MGCP_MAX_CODECS];
-	unsigned int fmtp_used = 0;
-	struct mgcp_codec_param *codec_param;
 	char *line;
 	unsigned int i;
 	void *tmp_ctx = talloc_new(NULL);
@@ -312,31 +207,20 @@ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp,
 			/* skip these SDP attributes */
 			break;
 		case 'a':
-			if (sscanf(line, "a=rtpmap:%d %63s", &payload, audio_name) == 2) {
-				codecs_update(tmp_ctx, codecs, codecs_used, payload, audio_name);
-				break;
-			}
-
-			if (sscanf(line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) {
+			if (sscanf(line, "a=rtpmap:%d %63s",
+				   &payload, audio_name) == 2) {
+				codecs_update(tmp_ctx, codecs,
+					      codecs_used, payload, audio_name);
+			} else
+			    if (sscanf
+				(line, "a=ptime:%d-%d", &ptime, &ptime2) >= 1) {
 				if (ptime2 > 0 && ptime2 != ptime)
 					rtp->packet_duration_ms = 0;
 				else
 					rtp->packet_duration_ms = ptime;
-				break;
-			}
-
-			if (sscanf(line, "a=maxptime:%d", &ptime2) == 1) {
+			} else if (sscanf(line, "a=maxptime:%d", &ptime2) == 1) {
 				rtp->maximum_packet_time = ptime2;
-				break;
 			}
-
-			if (strncmp("a=fmtp:", line, 6) == 0) {
-				rc = fmtp_from_sdp(conn->conn, &fmtp_params[fmtp_used], line);
-				if (rc >= 0)
-					fmtp_used++;
-				break;
-			}
-
 			break;
 		case 'm':
 			rc = sscanf(line, "m=audio %d RTP/AVP", &port);
@@ -378,15 +262,14 @@ int mgcp_parse_sdp_data(const struct mgcp_endpoint *endp,

 	/* Store parsed codec information */
 	for (i = 0; i < codecs_used; i++) {
-		codec_param = param_by_pt(codecs[i].payload_type, fmtp_params, fmtp_used);
-		rc = mgcp_codec_add(conn, codecs[i].payload_type, codecs[i].map_line, codec_param);
+		rc = mgcp_codec_add(conn, codecs[i].payload_type, codecs[i].map_line);
 		if (rc < 0)
 			LOGP(DLMGCP, LOGL_NOTICE, "endpoint:0x%x, failed to add codec\n", ENDPOINT_NUMBER(p->endp));
 	}

 	talloc_free(tmp_ctx);

-	LOGPCONN(conn->conn, DLMGCP, LOGL_NOTICE,
+	LOGP(DLMGCP, LOGL_NOTICE,
 	     "Got media info via SDP: port:%d, addr:%s, duration:%d, payload-types:",
 	     ntohs(rtp->rtp_port), inet_ntoa(rtp->addr),
 	     rtp->packet_duration_ms);
@@ -421,12 +304,15 @@ static int add_rtpmap(struct msgb *sdp, int payload_type, const char *audio_name
 	return 0;
 }

-/* Add audio strings to sdp payload */
+/* Add audio string to sdp payload */
 static int add_audio(struct msgb *sdp, int *payload_types, unsigned int payload_types_len, int local_port)
 {
 	int rc;
 	unsigned int i;

+	if (payload_types_len < 0)
+		return -EINVAL;
+
 	rc = msgb_printf(sdp, "m=audio %d RTP/AVP", local_port);
 	if (rc < 0)
 		return -EINVAL;
@@ -444,64 +330,6 @@ static int add_audio(struct msgb *sdp, int *payload_types, unsigned int payload_
 	return 0;
 }

-/* Add fmtp strings to sdp payload */
-static int add_fmtp(struct msgb *sdp, struct sdp_fmtp_param *fmtp_params, unsigned int fmtp_params_len,
-		    const char *fmtp_extra)
-{
-	unsigned int i;
-	int rc;
-	int fmtp_extra_pt = -1;
-	char *fmtp_extra_pars = "";
-
-	/* When no fmtp parameters ara available but an fmtp extra string
-	 * is configured, just add the fmtp extra string */
-	if (fmtp_params_len == 0 && fmtp_extra) {
-		return msgb_printf(sdp, "%s\r\n", fmtp_extra);
-	}
-
-	/* When there is fmtp extra configured we dissect it in order to drop
-	 * in the configured extra parameters at the right place when
-	 * generating the fmtp strings. */
-	if (fmtp_extra) {
-		if (sscanf(fmtp_extra, "a=fmtp:%d ", &fmtp_extra_pt) != 1)
-			fmtp_extra_pt = -1;
-
-		fmtp_extra_pars = strstr(fmtp_extra, " ");
-
-		if (!fmtp_extra_pars)
-			fmtp_extra_pars = "";
-		else
-			fmtp_extra_pars++;
-	}
-
-	for (i = 0; i < fmtp_params_len; i++) {
-		rc = msgb_printf(sdp, "a=fmtp:%u", fmtp_params[i].payload_type);
-
-		/* Add amr octet align parameter */
-		if (fmtp_params[i].param.amr_octet_aligned_present) {
-			if (fmtp_params[i].param.amr_octet_aligned)
-				rc = msgb_printf(sdp, " octet-align=1");
-			else
-				rc = msgb_printf(sdp, " octet-align=0");
-			if (rc < 0)
-				return -EINVAL;
-		}
-
-		/* Append extra parameters from fmtp extra */
-		if (fmtp_params[i].payload_type == fmtp_extra_pt) {
-			rc = msgb_printf(sdp, " %s", fmtp_extra_pars);
-			if (rc < 0)
-				return -EINVAL;
-		}
-
-		rc = msgb_printf(sdp, "\r\n", fmtp_params[i].payload_type);
-		if (rc < 0)
-			return -EINVAL;
-	}
-
-	return 0;
-}
-
 /*! Generate SDP response string.
 *  \param[in] endp trunk endpoint.
 *  \param[in] conn associated rtp connection.
@@ -512,16 +340,11 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,
 			    const struct mgcp_conn_rtp *conn, struct msgb *sdp,
 			    const char *addr)
 {
-	const struct mgcp_rtp_codec *codec;
 	const char *fmtp_extra;
 	const char *audio_name;
 	int payload_type;
-	struct sdp_fmtp_param fmtp_param;
 	int rc;
 	int payload_types[1];
-	int local_port;
-	struct sdp_fmtp_param fmtp_params[1];
-        unsigned int fmtp_params_len = 0;

 	OSMO_ASSERT(endp);
 	OSMO_ASSERT(conn);
@@ -530,12 +353,10 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,

 	/* FIXME: constify endp and conn args in get_net_donwlink_format_cb() */
 	endp->cfg->get_net_downlink_format_cb((struct mgcp_endpoint *)endp,
-					      &codec, &fmtp_extra,
+					      &payload_type, &audio_name,
+					      &fmtp_extra,
 					      (struct mgcp_conn_rtp *)conn);

-	audio_name = codec->audio_name;
-	payload_type = codec->payload_type;
-
 	rc = msgb_printf(sdp,
 			 "v=0\r\n"
 			 "o=- %s 23 IN IP4 %s\r\n"
@@ -549,11 +370,7 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,
 	if (payload_type >= 0) {

 		payload_types[0] = payload_type;
-		if (mgcp_conn_rtp_is_osmux(conn))
-			local_port = endp->cfg->osmux_port;
-		else
-			local_port = conn->end.local_port;
-		rc = add_audio(sdp, payload_types, 1, local_port);
+		rc = add_audio(sdp, payload_types, 1, conn->end.local_port);
 		if (rc < 0)
 			goto buffer_too_small;

@@ -563,15 +380,12 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,
 				goto buffer_too_small;
 		}

-		if (codec->param_present) {
-			fmtp_param.payload_type = payload_type;
-			fmtp_param.param = codec->param;
-			fmtp_params[0] = fmtp_param;
-			fmtp_params_len = 1;
+		if (fmtp_extra) {
+			rc = msgb_printf(sdp, "%s\r\n", fmtp_extra);
+
+			if (rc < 0)
+				goto buffer_too_small;
 		}
-		rc = add_fmtp(sdp, fmtp_params, fmtp_params_len, fmtp_extra);
-		if (rc < 0)
-			goto buffer_too_small;
 	}
 	if (conn->end.packet_duration_ms > 0 && endp->tcfg->audio_send_ptime) {
 		rc = msgb_printf(sdp, "a=ptime:%u\r\n",
@@ -583,6 +397,6 @@ int mgcp_write_response_sdp(const struct mgcp_endpoint *endp,
 	return 0;

 buffer_too_small:
-	LOGPCONN(conn->conn, DLMGCP, LOGL_ERROR, "SDP messagebuffer too small\n");
+	LOGP(DLMGCP, LOGL_ERROR, "SDP messagebuffer too small\n");
 	return -1;
 }
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -37,8 +37,6 @@
 #define RTCP_OMIT_STR "Drop RTCP packets in both directions\n"
 #define RTP_PATCH_STR "Modify RTP packet header in both directions\n"
 #define RTP_KEEPALIVE_STR "Send dummy UDP packet to net RTP destination\n"
-#define RTP_TS101318_RFC5993_CONV_STR "Convert GSM-HR from TS101318 to RFC5993 and vice versa\n"
-

 static struct mgcp_config *g_cfg = NULL;

@@ -98,17 +96,13 @@ static int config_write_mgcp(struct vty *vty)
 	else
 		vty_out(vty, "  no rtcp-omit%s", VTY_NEWLINE);
 	if (g_cfg->trunk.force_constant_ssrc
-	    || g_cfg->trunk.force_aligned_timing
-	    || g_cfg->trunk.rfc5993_hr_convert) {
+	    || g_cfg->trunk.force_aligned_timing) {
 		vty_out(vty, "  %srtp-patch ssrc%s",
 			g_cfg->trunk.force_constant_ssrc ? "" : "no ",
 			VTY_NEWLINE);
 		vty_out(vty, "  %srtp-patch timestamp%s",
 			g_cfg->trunk.force_aligned_timing ? "" : "no ",
 			VTY_NEWLINE);
-		vty_out(vty, "  %srtp-patch rfc5993hr%s",
-			g_cfg->trunk.rfc5993_hr_convert ? "" : "no ",
-			VTY_NEWLINE);
 	} else
 		vty_out(vty, "  no rtp-patch%s", VTY_NEWLINE);
 	if (g_cfg->trunk.audio_payload != -1)
@@ -160,10 +154,6 @@ static int config_write_mgcp(struct vty *vty)
 		vty_out(vty, "  osmux dummy %s%s",
 			g_cfg->osmux_dummy ? "on" : "off", VTY_NEWLINE);
 	}
-
-	if (g_cfg->conn_timeout)
-		vty_out(vty, "  conn-timeout %u%s", g_cfg->conn_timeout, VTY_NEWLINE);
-
 	return CMD_SUCCESS;
 }

@@ -225,13 +215,6 @@ static void dump_endpoint(struct vty *vty, struct mgcp_endpoint *endp, int epidx
 		vty_out(vty, "   CONN: %s%s", mgcp_conn_dump(conn), VTY_NEWLINE);

 		if (show_stats) {
-			if (endp->cfg->conn_timeout) {
-				struct timeval remaining;
-				osmo_timer_remaining(&conn->watchdog, NULL, &remaining);
-				vty_out(vty, "   Currently remaining timeout (seconds): %d.%06d%s",
-					(int)remaining.tv_sec, (int)remaining.tv_usec, VTY_NEWLINE);
-			}
-
 			/* FIXME: Also add verbosity for other
 			 * connection types (E1) as soon as
 			 * the implementation is available */
@@ -297,7 +280,7 @@ DEFUN(show_mcgp, show_mgcp_cmd,
 	    dump_trunk(vty, trunk, show_stats);

 	if (g_cfg->osmux)
-		vty_out(vty, "Osmux used CID: %d%s", osmux_cid_pool_count_used(),
+		vty_out(vty, "Osmux used CID: %d%s", osmux_used_cid(),
 			VTY_NEWLINE);

 	return CMD_SUCCESS;
@@ -728,28 +711,11 @@ DEFUN(cfg_mgcp_no_patch_rtp_ts,
 	return CMD_SUCCESS;
 }

-DEFUN(cfg_mgcp_patch_rtp_rfc5993hr,
-      cfg_mgcp_patch_rtp_rfc5993hr_cmd,
-      "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)
-{
-	g_cfg->trunk.rfc5993_hr_convert = true;
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_mgcp_no_patch_rtp_rfc5993hr,
-      cfg_mgcp_no_patch_rtp_rfc5993hr_cmd,
-      "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)
-{
-	g_cfg->trunk.rfc5993_hr_convert = false;
-	return CMD_SUCCESS;
-}
-
 DEFUN(cfg_mgcp_no_patch_rtp,
      cfg_mgcp_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)
 {
 	g_cfg->trunk.force_constant_ssrc = 0;
 	g_cfg->trunk.force_aligned_timing = 0;
-	g_cfg->trunk.rfc5993_hr_convert = false;
 	return CMD_SUCCESS;
 }

@@ -846,17 +812,13 @@ static int config_write_trunk(struct vty *vty)
 			vty_out(vty, "  rtcp-omit%s", VTY_NEWLINE);
 		else
 			vty_out(vty, "  no rtcp-omit%s", VTY_NEWLINE);
-		if (trunk->force_constant_ssrc || trunk->force_aligned_timing
-		    || g_cfg->trunk.rfc5993_hr_convert) {
+		if (trunk->force_constant_ssrc || trunk->force_aligned_timing) {
 			vty_out(vty, "  %srtp-patch ssrc%s",
 				trunk->force_constant_ssrc ? "" : "no ",
 				VTY_NEWLINE);
 			vty_out(vty, "  %srtp-patch timestamp%s",
 				trunk->force_aligned_timing ? "" : "no ",
 				VTY_NEWLINE);
-			vty_out(vty, "  %srtp-patch rfc5993hr%s",
-				trunk->rfc5993_hr_convert ? "" : "no ",
-				VTY_NEWLINE);
 		} else
 			vty_out(vty, "  no rtp-patch%s", VTY_NEWLINE);
 		if (trunk->audio_fmtp_extra)
@@ -1022,31 +984,12 @@ DEFUN(cfg_trunk_no_patch_rtp_ts,
 	return CMD_SUCCESS;
 }

-DEFUN(cfg_trunk_patch_rtp_rfc5993hr,
-      cfg_trunk_patch_rtp_rfc5993hr_cmd,
-      "rtp-patch rfc5993hr", RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)
-{
-	struct mgcp_trunk_config *trunk = vty->index;
-	trunk->rfc5993_hr_convert = true;
-	return CMD_SUCCESS;
-}
-
-DEFUN(cfg_trunk_no_patch_rtp_rfc5993hr,
-      cfg_trunk_no_patch_rtp_rfc5993hr_cmd,
-      "no rtp-patch rfc5993hr", NO_STR RTP_PATCH_STR RTP_TS101318_RFC5993_CONV_STR)
-{
-	struct mgcp_trunk_config *trunk = vty->index;
-	trunk->rfc5993_hr_convert = false;
-	return CMD_SUCCESS;
-}
-
 DEFUN(cfg_trunk_no_patch_rtp,
      cfg_trunk_no_patch_rtp_cmd, "no rtp-patch", NO_STR RTP_PATCH_STR)
 {
 	struct mgcp_trunk_config *trunk = vty->index;
 	trunk->force_constant_ssrc = 0;
 	trunk->force_aligned_timing = 0;
-	trunk->rfc5993_hr_convert = false;
 	return CMD_SUCCESS;
 }

@@ -1305,7 +1248,14 @@ DEFUN(cfg_mgcp_osmux,
 	if (strcmp(argv[0], "off") == 0) {
 		g_cfg->osmux = OSMUX_USAGE_OFF;
 		return CMD_SUCCESS;
-	} else if (strcmp(argv[0], "on") == 0)
+	}
+
+	/* Since OSMUX support is not finished, we do not
+	 * allow to turn it on yet. */
+	vty_out(vty, "OSMUX currently unavailable in this software version.%s", VTY_NEWLINE);
+	return CMD_WARNING;
+#if 0
+	if (strcmp(argv[0], "on") == 0)
 		g_cfg->osmux = OSMUX_USAGE_ON;
 	else if (strcmp(argv[0], "only") == 0)
 		g_cfg->osmux = OSMUX_USAGE_ONLY;
@@ -1316,7 +1266,7 @@ DEFUN(cfg_mgcp_osmux,
 	}

 	return CMD_SUCCESS;
-
+#endif
 }

 DEFUN(cfg_mgcp_osmux_ip,
@@ -1377,19 +1327,6 @@ DEFUN(cfg_mgcp_domain,
 	return CMD_SUCCESS;
 }

-DEFUN(cfg_mgcp_conn_timeout,
-      cfg_mgcp_conn_timeout_cmd,
-      "conn-timeout <0-65534>",
-      "Set a time after which inactive connections (CIs) are closed. Set to 0 to disable timeout. This can be used to"
-      " work around interoperability problems causing connections to stay open forever, and slowly exhausting all"
-      " available ports. Enable keep-alive packets in MGW clients when using this option together with LCLS (OsmoBSC,"
-      " OsmoMSC: 'rtp keep-alive')!\n"
-      "Timeout value (sec.)\n")
-{
-	g_cfg->conn_timeout = strtoul(argv[0], NULL, 10);
-	return CMD_SUCCESS;
-}
-
 int mgcp_vty_init(void)
 {
 	install_element_ve(&show_mgcp_cmd);
@@ -1440,8 +1377,6 @@ int mgcp_vty_init(void)
 	install_element(MGCP_NODE, &cfg_mgcp_patch_rtp_ts_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_ts_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_cmd);
-	install_element(MGCP_NODE, &cfg_mgcp_patch_rtp_rfc5993hr_cmd);
-	install_element(MGCP_NODE, &cfg_mgcp_no_patch_rtp_rfc5993hr_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_sdp_fmtp_extra_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_send_ptime_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_no_sdp_payload_send_ptime_cmd);
@@ -1456,7 +1391,6 @@ int mgcp_vty_init(void)
 	install_element(MGCP_NODE, &cfg_mgcp_allow_transcoding_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_no_allow_transcoding_cmd);
 	install_element(MGCP_NODE, &cfg_mgcp_domain_cmd);
-	install_element(MGCP_NODE, &cfg_mgcp_conn_timeout_cmd);

 	install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);
 	install_node(&trunk_node, config_write_trunk);
@@ -1473,8 +1407,6 @@ int mgcp_vty_init(void)
 	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ssrc_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ssrc_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_ts_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_patch_rtp_rfc5993hr_cmd);
-	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_rfc5993hr_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_ts_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_no_patch_rtp_cmd);
 	install_element(TRUNK_NODE, &cfg_trunk_sdp_fmtp_extra_cmd);
--- a/src/osmo-mgw/mgw_main.c
+++ b/src/osmo-mgw/mgw_main.c
@@ -276,9 +276,9 @@ int main(int argc, char **argv)

 	vty_info.copyright = osmomgw_copyright;
 	vty_init(&vty_info);
-	logging_vty_add_cmds();
+	logging_vty_add_cmds(NULL);
 	osmo_talloc_vty_add_cmds();
-	osmo_stats_vty_add_cmds();
+	osmo_stats_vty_add_cmds(&log_info);
 	mgcp_vty_init();

 	handle_options(argc, argv);
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -166,7 +166,7 @@ static void test_strline(void)

 #define MDCX4_PT1 \
 	"MDCX 18983217 1@mgw MGCP 1.0\r\n" \
-	"M: SENDRECV\r" \
+	"M: sendrecv\r" \
 	"C: 2\r\n" \
 	"I: %s\r\n" \
 	"L: p:20-40, a:AMR, nt:IN\r\n" \
@@ -209,24 +209,8 @@ static void test_strline(void)
 	"a=rtpmap:99 AMR/8000\r\n" \
 	"a=ptime:40\r\n"

-/* Test different upper/lower case in options */
-#define MDCX4_PT4 \
-	"MDCX 18983220 1@mgw MGCP 1.0\r\n" \
-	"m: sendrecv\r" \
-	"c: 2\r\n" \
-	"i: %s\r\n" \
-	"l: A:amr, NT:IN\r\n" \
-	"\n" \
-	"v=0\r\n" \
-	"o=- %s 23 IN IP4 0.0.0.0\r\n" \
-	"c=IN IP4 0.0.0.0\r\n" \
-	"t=0 0\r\n" \
-	"m=audio 4441 RTP/AVP 99\r\n" \
-	"a=rtpmap:99 AMR/8000\r\n" \
-	"a=ptime:40\r\n"
-
 #define MDCX4_SO \
-	"MDCX 18983221 1@mgw MGCP 1.0\r\n" \
+	"MDCX 18983220 1@mgw MGCP 1.0\r\n" \
 	"M: sendonly\r" \
 	"C: 2\r\n" \
 	"I: %s\r\n" \
@@ -241,17 +225,17 @@ static void test_strline(void)
 	"a=ptime:40\r\n"

 #define MDCX4_RO \
-	"MDCX 18983222 1@mgw MGCP 1.0\r\n" \
+	"MDCX 18983221 1@mgw MGCP 1.0\r\n" \
 	"M: recvonly\r" \
 	"C: 2\r\n" \
 	"I: %s\r\n" \
 	"L: p:20, a:AMR, nt:IN\r\n"

 #define MDCX_TOO_LONG_CI \
-	"MDCX 18983223 1@mgw MGCP 1.0\r\n" \
+	"MDCX 18983222 1@mgw MGCP 1.0\r\n" \
 	"I: 123456789012345678901234567890123\n"

-#define MDCX_TOO_LONG_CI_RET "510 18983223 FAIL\r\n"
+#define MDCX_TOO_LONG_CI_RET "510 18983222 FAIL\r\n"

 #define SHORT2	"CRCX 1"
 #define SHORT2_RET "510 000000 FAIL\r\n"
@@ -261,7 +245,7 @@ static void test_strline(void)

 #define CRCX \
 	"CRCX 2 1@mgw MGCP 1.0\r\n" \
-	"m: recvonly\r\n" \
+	"M: recvonly\r\n" \
 	"C: 2\r\n" \
 	"L: p:20\r\n" \
 	"\r\n" \
@@ -484,34 +468,6 @@ static void test_strline(void)
 	"M: recvonly\r\n" \
 	"C: 2\r\n"

-#define CRCX_AMR_WITH_FMTP \
-	"CRCX 2 7@mgw MGCP 1.0\r\n" \
-	"M: recvonly\r\n" \
-	"C: 2\r\n" \
-	"X\r\n" \
-	"L: p:20\r\n" \
-	"\r\n" \
-	"v=0\r\n" \
-	"c=IN IP4 123.12.12.123\r\n" \
-	"m=audio 5904 RTP/AVP 111\r\n" \
-	"a=rtpmap:111 AMR/8000/1\r\n" \
-	"a=ptime:20\r\n" \
-	"a=fmtp:111 mode-change-capability=2; octet-align=1\r\n" \
-
-#define CRCX_AMR_WITH_FMTP_RET \
-	"200 2 OK\r\n" \
-	"I: %s\r\n" \
-	"\r\n" \
-	"v=0\r\n" \
-	"o=- %s 23 IN IP4 0.0.0.0\r\n" \
-	"s=-\r\n" \
-	"c=IN IP4 0.0.0.0\r\n" \
-	"t=0 0\r\n" \
-	"m=audio 16012 RTP/AVP 111\r\n" \
-	"a=rtpmap:111 AMR/8000/1\r\n" \
-	"a=fmtp:111 octet-align=1\r\n" \
-	"a=ptime:20\r\n"
-
 #define CRCX_NO_LCO_NO_SDP_RET \
 	"200 2 OK\r\n" \
 	"I: %s\r\n" \
@@ -543,9 +499,8 @@ static const struct mgcp_test tests[] = {
 	{"MDCX4_PT1", MDCX4_PT1, MDCX4_RET("18983217"), 99},
 	{"MDCX4_PT2", MDCX4_PT2, MDCX4_RET("18983218"), 99},
 	{"MDCX4_PT3", MDCX4_PT3, MDCX4_RET("18983219"), 99},
-	{"MDCX4_PT4", MDCX4_PT4, MDCX4_RET("18983220"), 99},
-	{"MDCX4_SO", MDCX4_SO, MDCX4_RET("18983221"), 99},
-	{"MDCX4_RO", MDCX4_RO, MDCX4_RO_RET("18983222"), PTYPE_IGNORE},
+	{"MDCX4_SO", MDCX4_SO, MDCX4_RET("18983220"), 99},
+	{"MDCX4_RO", MDCX4_RO, MDCX4_RO_RET("18983221"), PTYPE_IGNORE},
 	{"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE},
 	{"CRCX_ZYN", CRCX_ZYN, CRCX_ZYN_RET, 97},
 	{"EMPTY", EMPTY, EMPTY_RET},
@@ -563,7 +518,6 @@ static const struct mgcp_test tests[] = {
 	{"CRCX", CRCX_NO_LCO_NO_SDP, CRCX_NO_LCO_NO_SDP_RET, 97},
 	{"CRCX", CRCX_X_OSMO_IGN, CRCX_X_OSMO_IGN_RET, 97},
 	{"MDCX_TOO_LONG_CI", MDCX_TOO_LONG_CI, MDCX_TOO_LONG_CI_RET},
-	{"CRCX", CRCX_AMR_WITH_FMTP, CRCX_AMR_WITH_FMTP_RET},
 };

 static const struct mgcp_test retransmit[] = {
@@ -1017,7 +971,6 @@ static void test_packet_loss_calc(void)
 {
 	int i;
 	struct mgcp_endpoint endp;
-	struct mgcp_config cfg = {0};
 	struct mgcp_trunk_config trunk;

 	printf("Testing packet loss calculation.\n");
@@ -1025,7 +978,6 @@ static void test_packet_loss_calc(void)
 	memset(&endp, 0, sizeof(endp));
 	memset(&trunk, 0, sizeof(trunk));

-	endp.cfg = &cfg;
 	endp.type = &ep_typeset.rtp;
 	trunk.vty_number_endpoints = 1;
 	trunk.endpoints = &endp;
@@ -1246,7 +1198,6 @@ static void test_packet_error_detection(int patch_ssrc, int patch_ts)

 	struct mgcp_trunk_config trunk;
 	struct mgcp_endpoint endp;
-	struct mgcp_config cfg = {0};
 	struct mgcp_rtp_state state;
 	struct mgcp_rtp_end *rtp;
 	struct sockaddr_in addr = { 0 };
@@ -1273,7 +1224,6 @@ static void test_packet_error_detection(int patch_ssrc, int patch_ts)
 	state.in_stream.err_ts_ctr = &test_ctr_in;
 	state.out_stream.err_ts_ctr = &test_ctr_out;

-	endp.cfg = &cfg;
 	endp.type = &ep_typeset.rtp;

 	trunk.vty_number_endpoints = 1;
@@ -1292,7 +1242,7 @@ static void test_packet_error_detection(int patch_ssrc, int patch_ts)

 	rtp = &conn->end;

-	OSMO_ASSERT(mgcp_codec_add(conn, PTYPE_UNDEFINED, "AMR/8000/1", NULL) == 0);
+	OSMO_ASSERT(mgcp_codec_add(conn, PTYPE_UNDEFINED, "AMR/8000/1") == 0);
 	rtp->codec = &rtp->codecs[0];

 	for (i = 0; i < ARRAY_SIZE(test_rtp_packets1); ++i) {
@@ -1574,34 +1524,25 @@ static void test_osmux_cid(void)
 {
 	int id, i;

-	OSMO_ASSERT(osmux_cid_pool_count_used() == 0);
-
-	id = osmux_cid_pool_get_next();
+	OSMO_ASSERT(osmux_used_cid() == 0);
+	id = osmux_get_cid();
 	OSMO_ASSERT(id == 0);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 1);
-
-	osmux_cid_pool_get(30);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 2);
-        osmux_cid_pool_get(30);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 2);
-
-	osmux_cid_pool_put(id);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 1);
-	osmux_cid_pool_put(30);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 0);
+	OSMO_ASSERT(osmux_used_cid() == 1);
+	osmux_put_cid(id);
+	OSMO_ASSERT(osmux_used_cid() == 0);

 	for (i = 0; i < 256; ++i) {
-		id = osmux_cid_pool_get_next();
+		id = osmux_get_cid();
 		OSMO_ASSERT(id == i);
-		OSMO_ASSERT(osmux_cid_pool_count_used() == i + 1);
+		OSMO_ASSERT(osmux_used_cid() == i + 1);
 	}

-	id = osmux_cid_pool_get_next();
+	id = osmux_get_cid();
 	OSMO_ASSERT(id == -1);

 	for (i = 0; i < 256; ++i)
-		osmux_cid_pool_put(i);
-	OSMO_ASSERT(osmux_cid_pool_count_used() == 0);
+		osmux_put_cid(i);
+	OSMO_ASSERT(osmux_used_cid() == 0);
 }

 static const struct log_info_cat log_categories[] = {
@@ -1714,335 +1655,98 @@ static void test_check_local_cx_options(void *ctx)
 	OSMO_ASSERT(check_local_cx_options(ctx, ",,,") == -1);
 }

-static const struct mgcp_codec_param amr_param_octet_aligned_true = {
-	.amr_octet_aligned_present = true,
-	.amr_octet_aligned = true,
-};
-
-static const struct mgcp_codec_param amr_param_octet_aligned_false = {
-	.amr_octet_aligned_present = true,
-	.amr_octet_aligned = false,
-};
-
-static const struct mgcp_codec_param amr_param_octet_aligned_unset = {
-	.amr_octet_aligned_present = false,
-};
-
-struct testcase_mgcp_codec_pt_translate_codec {
-	int payload_type;
-	const char *audio_name;
-	const struct mgcp_codec_param *param;
-	int expect_rc;
-};
-
-struct testcase_mgcp_codec_pt_translate_expect {
-	bool end;
-	int payload_type_map[2];
-};
-
-struct testcase_mgcp_codec_pt_translate {
-	const char *descr;
-	/* two conns on an endpoint, each with N configured codecs */
-	struct testcase_mgcp_codec_pt_translate_codec codecs[2][10];
-	struct testcase_mgcp_codec_pt_translate_expect expect[32];
-};
-
-static const struct testcase_mgcp_codec_pt_translate test_mgcp_codec_pt_translate_cases[] = {
-	{
-		.descr = "same order, but differing payload type numbers",
-		.codecs = {
-			{
-				{ 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 111, "GSM-HR-08/8000/1", NULL, },
-			},
-			{
-				{ 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 97, "GSM-HR-08/8000/1", NULL, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, 96}, },
-			{ .payload_type_map = {0, 0}, },
-			{ .payload_type_map = {111, 97} },
-			{ .payload_type_map = {123, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "different order and different payload type numbers",
-		.codecs = {
-			{
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 111, "GSM-HR-08/8000/1", NULL, },
-				{ 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-			{
-				{ 97, "GSM-HR-08/8000/1", NULL, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, 96}, },
-			{ .payload_type_map = {0, 0}, },
-			{ .payload_type_map = {111, 97} },
-			{ .payload_type_map = {123, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "both sides have the same payload_type numbers assigned to differing codecs",
-		.codecs = {
-			{
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 96, "GSM-HR-08/8000/1", NULL, },
-				{ 97, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-			{
-				{ 97, "GSM-HR-08/8000/1", NULL, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {96, 97}, },
-			{ .payload_type_map = {97, 96}, },
-			{ .payload_type_map = {0, 0}, },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "conn0 has no codecs",
-		.codecs = {
-			{
-				/* no codecs */
-			},
-			{
-				{ 96, "AMR/8000/1", &amr_param_octet_aligned_true, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 97, "GSM-HR-08/8000/1", NULL, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, -EINVAL}, },
-			{ .payload_type_map = {0, -EINVAL}, },
-			{ .payload_type_map = {111, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "conn1 has no codecs",
-		.codecs = {
-			{
-				{ 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 111, "GSM-HR-08/8000/1", NULL, },
-			},
-			{
-				/* no codecs */
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, -EINVAL}, },
-			{ .payload_type_map = {0, -EINVAL}, },
-			{ .payload_type_map = {111, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "test AMR with differing octet-aligned settings",
-		.codecs = {
-			{
-				{ 111, "AMR/8000", &amr_param_octet_aligned_true, },
-				{ 112, "AMR/8000", &amr_param_octet_aligned_false, },
-			},
-			{
-				{ 122, "AMR/8000", &amr_param_octet_aligned_false, },
-				{ 121, "AMR/8000", &amr_param_octet_aligned_true, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {111, 121}, },
-			{ .payload_type_map = {112, 122} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "test AMR with missing octet-aligned settings (defaults to 0)",
-		.codecs = {
-			{
-				{ 111, "AMR/8000", &amr_param_octet_aligned_true, },
-				{ 112, "AMR/8000", &amr_param_octet_aligned_false, },
-			},
-			{
-				{ 122, "AMR/8000", &amr_param_octet_aligned_unset, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {111, -EINVAL}, },
-			{ .payload_type_map = {112, 122} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "test AMR with NULL param (defaults to 0)",
-		.codecs = {
-			{
-				{ 111, "AMR/8000", &amr_param_octet_aligned_true, },
-				{ 112, "AMR/8000", &amr_param_octet_aligned_false, },
-			},
-			{
-				{ 122, "AMR/8000", NULL, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {111, -EINVAL}, },
-			{ .payload_type_map = {112, 122} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "match FOO/8000/1 and FOO/8000 as identical, single channel is implicit",
-		.codecs = {
-			{
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 111, "GSM-HR-08/8000/1", NULL, },
-				{ 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-			{
-				{ 97, "GSM-HR-08/8000", NULL, },
-				{ 0, "PCMU/8000", NULL, },
-				{ 96, "AMR/8000", &amr_param_octet_aligned_true, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, 96}, },
-			{ .payload_type_map = {0, 0}, },
-			{ .payload_type_map = {111, 97} },
-			{ .payload_type_map = {123, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "match FOO/8000/1 and FOO as identical, 8k and single channel are implicit",
-		.codecs = {
-			{
-				{ 0, "PCMU/8000/1", NULL, },
-				{ 111, "GSM-HR-08/8000/1", NULL, },
-				{ 112, "AMR/8000/1", &amr_param_octet_aligned_true, },
-			},
-			{
-				{ 97, "GSM-HR-08", NULL, },
-				{ 0, "PCMU", NULL, },
-				{ 96, "AMR", &amr_param_octet_aligned_true, },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {112, 96}, },
-			{ .payload_type_map = {0, 0}, },
-			{ .payload_type_map = {111, 97} },
-			{ .payload_type_map = {123, -EINVAL} },
-			{ .end = true },
-		},
-	},
-	{
-		.descr = "test whether channel number matching is waterproof",
-		.codecs = {
-			{
-				{ 111, "GSM-HR-08/8000", },
-				{ 112, "GSM-HR-08/8000/2", .expect_rc = -22},
-				{ 113, "GSM-HR-08/8000/3", .expect_rc = -22},
-			},
-			{
-				{ 122, "GSM-HR-08/8000/2", .expect_rc = -22},
-				{ 121, "GSM-HR-08/8000/1", },
-			},
-		},
-		.expect = {
-			{ .payload_type_map = {111, 121}, },
-			{ .payload_type_map = {112, -EINVAL} },
-			{ .payload_type_map = {113, -EINVAL} },
-			{ .end = true },
-		},
-	},
-};
+static void test_mgcp_codec_pt_translate_pars(struct mgcp_rtp_codec *c)
+{
+	c->rate = 8000;
+	c->channels = 1;
+	c->frame_duration_num = 23;
+	c->frame_duration_den = 42;
+}

 static void test_mgcp_codec_pt_translate(void)
 {
-	int i;
-	bool ok = true;
-	printf("\nTesting mgcp_codec_pt_translate()\n");
+	struct mgcp_conn_rtp conn_src;
+	struct mgcp_conn_rtp conn_dst;
+	int pt_dst;

-	for (i = 0; i < ARRAY_SIZE(test_mgcp_codec_pt_translate_cases); i++) {
-		const struct testcase_mgcp_codec_pt_translate *t = &test_mgcp_codec_pt_translate_cases[i];
-		struct mgcp_conn_rtp conn[2] = {};
-		int rc;
-		int conn_i;
-		int c;
+	/* Setup a realistic set of codec configurations on both
+	 * ends. AMR and HR will use different payload types. PCMU
+	 * must use 0 on both ends since this is not a dynamic payload
+	 * type */
+	test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[0]);
+	test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[0]);
+	test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[1]);
+	test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[1]);
+	test_mgcp_codec_pt_translate_pars(&conn_src.end.codecs[2]);
+	test_mgcp_codec_pt_translate_pars(&conn_dst.end.codecs[2]);
+	conn_src.end.codecs[0].payload_type = 112;
+	conn_dst.end.codecs[0].payload_type = 96;
+	conn_src.end.codecs[1].payload_type = 0;
+	conn_dst.end.codecs[1].payload_type = 0;
+	conn_src.end.codecs[2].payload_type = 111;
+	conn_dst.end.codecs[2].payload_type = 97;
+	conn_src.end.codecs[0].audio_name = "AMR/8000/1";
+	conn_dst.end.codecs[0].audio_name = "AMR/8000/1";
+	conn_src.end.codecs[1].audio_name = "PCMU/8000/1";
+	conn_dst.end.codecs[1].audio_name = "PCMU/8000/1";
+	conn_src.end.codecs[2].audio_name = "GSM-HR-08/8000/1";
+	conn_dst.end.codecs[2].audio_name = "GSM-HR-08/8000/1";
+	conn_src.end.codecs[0].subtype_name = "AMR";
+	conn_dst.end.codecs[0].subtype_name = "AMR";
+	conn_src.end.codecs[1].subtype_name = "PCMU";
+	conn_dst.end.codecs[1].subtype_name = "PCMU";
+	conn_src.end.codecs[2].subtype_name = "GSM-HR-08";
+	conn_dst.end.codecs[2].subtype_name = "GSM-HR-08";
+	conn_src.end.codecs_assigned = 3;
+	conn_dst.end.codecs_assigned = 3;

-		printf("#%d: %s\n", i, t->descr);
+	/* We expect the function to find the PT we must use when we send the
+	 * packet out to the destination. All we know is the context for both
+	 * connections and the payload type from the source packet */
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[0].payload_type);
+	OSMO_ASSERT(pt_dst == conn_dst.end.codecs[0].payload_type);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[1].payload_type);
+	OSMO_ASSERT(pt_dst == conn_dst.end.codecs[1].payload_type);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[2].payload_type);
+	OSMO_ASSERT(pt_dst == conn_dst.end.codecs[2].payload_type);

-		for (conn_i = 0; conn_i < 2; conn_i++) {
-			printf(" - add codecs on conn%d:\n", conn_i);
-			for (c = 0; c < ARRAY_SIZE(t->codecs[conn_i]); c++) {
-				const struct testcase_mgcp_codec_pt_translate_codec *codec = &t->codecs[conn_i][c];
-				if (!codec->audio_name)
-					break;
-
-				rc = mgcp_codec_add(&conn[conn_i], codec->payload_type, codec->audio_name, codec->param);
-
-				printf("   %2d: %3d %s%s  -> rc=%d\n", c, codec->payload_type, codec->audio_name,
-				       codec->param ?
-					       (codec->param->amr_octet_aligned_present?
-							(codec->param->amr_octet_aligned ?
-								" octet-aligned=1" : " octet-aligned=0")
-							: " octet-aligned=unset")
-						: "",
-						rc);
-				if (rc != codec->expect_rc) {
-					printf("     ERROR: expected rc=%d\n", codec->expect_rc);
-					ok = false;
-				}
-			}
-			if (!c)
-				printf("    (none)\n");
-		}
-
-		for (c = 0; c < ARRAY_SIZE(t->expect); c++) {
-			const struct testcase_mgcp_codec_pt_translate_expect *expect = &t->expect[c];
-			int result;
-
-			if (expect->end)
-				break;
-
-			result = mgcp_codec_pt_translate(&conn[0], &conn[1], expect->payload_type_map[0]);
-			printf(" - mgcp_codec_pt_translate(conn0, conn1, %d) -> %d\n",
-			       expect->payload_type_map[0], result);
-			if (result != expect->payload_type_map[1]) {
-				printf("     ERROR: expected -> %d\n", expect->payload_type_map[1]);
-				ok = false;
-			}
-
-			/* If the expected result is an error, don't do reverse map test */
-			if (expect->payload_type_map[1] < 0)
-				continue;
-
-			result = mgcp_codec_pt_translate(&conn[1], &conn[0], expect->payload_type_map[1]);
-			printf(" - mgcp_codec_pt_translate(conn1, conn0, %d) -> %d\n",
-			       expect->payload_type_map[1], result);
-			if (result != expect->payload_type_map[0]) {
-				printf("     ERROR: expected -> %d\n", expect->payload_type_map[0]);
-				ok = false;
-			}
-		}
-
-		for (conn_i = 0; conn_i < 2; conn_i++)
-			mgcp_codec_reset_all(&conn[conn_i]);
-	}
-
-	OSMO_ASSERT(ok);
+	/* Try some constellations that must fail */
+	pt_dst = mgcp_codec_pt_translate(&conn_src, &conn_dst, 123);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	conn_src.end.codecs_assigned = 0;
+	conn_dst.end.codecs_assigned = 3;
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[0].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[1].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[2].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	conn_src.end.codecs_assigned = 3;
+	conn_dst.end.codecs_assigned = 0;
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[0].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[1].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
+	pt_dst =
+	    mgcp_codec_pt_translate(&conn_src, &conn_dst,
+				    conn_src.end.codecs[2].payload_type);
+	OSMO_ASSERT(pt_dst == -EINVAL);
 }

 void test_conn_id_matching()
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -65,7 +65,7 @@ Testing CRCX
 creating message from statically defined input:
 ---------8<---------
 CRCX 2 1@mgw MGCP 1.0
-m: recvonly
+M: recvonly
 C: 2
 L: p:20

@@ -125,7 +125,7 @@ Testing MDCX4_PT1
 Testing MDCX4_PT1
 creating message from statically defined input:
 ---------8<---------
-MDCX 18983217 1@mgw MGCP 1.0
+MDCX 18983217 1@mgw MGCP 1.0
 M: sendrecv
 C: 2
 I: %s
@@ -192,35 +192,11 @@ Response matches our expectations.
 ---------8<---------
 checking response:
 using message with patched conn_id for comparison
-Response matches our expectations.
-(response contains a connection id)
-Dummy packets: 2
-
-================================================
-Testing MDCX4_PT4
-creating message from statically defined input:
---------8<---------
-MDCX 18983220 1@mgw MGCP 1.0
-m: sendrecv
-c: 2
-i: %s
-l: A:amr, NT:IN
-
-v=0
-o=- %s 23 IN IP4 0.0.0.0
-c=IN IP4 0.0.0.0
-t=0 0
-m=audio 4441 RTP/AVP 99
-a=rtpmap:99 AMR/8000
-a=ptime:40
-
---------8<---------
-checking response:
 Response matches our expectations.
 (response contains a connection id)
 Dummy packets: 2

-
+================================================
 Testing MDCX4_SO
 creating message from statically defined input:
 ---------8<---------
@@ -243,7 +219,7 @@ Response matches our expectations.
 using message with patched conn_id for comparison
 Response matches our expectations.
 (response contains a connection id)
-(response contains a connection id)
+
 ================================================
 Testing MDCX4_RO
 creating message from statically defined input:
@@ -383,7 +359,7 @@ Testing CRCX
 I: %s
 C: 2

-
+---------8<---------
 checking response:
 using message as statically defined for comparison
 Response matches our expectations.
@@ -470,7 +446,7 @@ Dummy packets: 2
 a=rtpmap:97 GSM-EFR/8000
 a=ptime:40

-
+---------8<---------
 checking response:
 using message with patched conn_id for comparison
 Response matches our expectations.
@@ -479,36 +455,12 @@ using message as statically defined for comparison

 ================================================
 Testing MDCX_TOO_LONG_CI
-Testing MDCX_TOO_LONG_CI
-creating message from statically defined input:
---------8<---------
-MDCX 18983223 1@mgw MGCP 1.0
-I: 123456789012345678901234567890123
-
---------8<---------
-checking response:
-using message as statically defined for comparison
-Response matches our expectations.
-(response does not contain a connection id)
-
-================================================
-Testing CRCX
-creating message from statically defined input:
---------8<---------
-CRCX 2 7@mgw MGCP 1.0
-M: recvonly
-C: 2
-X
-L: p:20
-
-v=0
-c=IN IP4 123.12.12.123
 creating message from statically defined input:
 ---------8<---------
 MDCX 18983222 1@mgw MGCP 1.0
 I: 123456789012345678901234567890123

---------8<---------
+---------8<---------
 checking response:
 using message as statically defined for comparison
 Response matches our expectations.
@@ -526,7 +478,7 @@ Re-transmitting CRCX
 v=0
 c=IN IP4 123.12.12.123
 m=audio 5904 RTP/AVP 97
-m=audio 5904 RTP/AVP 97
+a=rtpmap:97 GSM-EFR/8000
 a=ptime:40

 ---------8<---------
@@ -638,7 +590,7 @@ Testing packet loss calculation.
 creating message from statically defined input:
 ---------8<---------
 DLCX 7 1@mgw MGCP 1.0
-DLCX 7 1@mgw MGCP 1.0
+I: %s
 C: 2

 ---------8<---------
@@ -1189,7 +1141,7 @@ Testing no rtpmap name
 a=rtpmap:96 iLBC/8000
 a=fmtp:96 mode=20
 a=rtpmap:97 iLBC/8000
-a=rtpmap:97 iLBC/8000
+a=fmtp:97 mode=30
 a=rtpmap:101 telephone-event/8000
 a=fmtp:101 0-15
 a=recvonly
@@ -1218,148 +1170,6 @@ p:10, a:PCMU -> p:10, a:PCMU
 p:10, a:PCMU -> p:10, a:PCMU
 p:10, a:PCMU -> p:10, a:PCMU
 'XXXX, p:10, a:PCMU' -> 'p:10, a:PCMU'
-'XXXX, p:10, a:PCMU' -> 'p:10, a:PCMU'
-'XXXX,p:10,a:PCMU' -> 'p:10,a:PCMU'
-'10,a:PCMU' -> 'a:PCMU'
-'10, a:PCMU' -> 'a:PCMU'
-'10,a: PCMU' -> 'a: PCMU'
-'10 ,a: PCMU' -> 'a: PCMU'
-', a:PCMU' -> 'a:PCMU'
-' a:PCMU' -> 'a:PCMU'
-'' -> '(null)'
-p10, aPCMU -> (null)
-'10,a :PCMU' -> '(null)'
-
-Testing mgcp_codec_pt_translate()
-#0: same order, but differing payload type numbers
- - add codecs on conn0:
-    0: 112 AMR/8000/1 octet-aligned=1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2: 111 GSM-HR-08/8000/1  -> rc=0
- - add codecs on conn1:
-    0:  96 AMR/8000/1 octet-aligned=1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2:  97 GSM-HR-08/8000/1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
- - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
- - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
- - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
- - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
-#1: different order and different payload type numbers
- - add codecs on conn0:
-    0:   0 PCMU/8000/1  -> rc=0
-    1: 111 GSM-HR-08/8000/1  -> rc=0
-    2: 112 AMR/8000/1 octet-aligned=1  -> rc=0
- - add codecs on conn1:
-    0:  97 GSM-HR-08/8000/1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2:  96 AMR/8000/1 octet-aligned=1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
- - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
- - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
- - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
- - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
-#2: both sides have the same payload_type numbers assigned to differing codecs
- - add codecs on conn0:
-    0:   0 PCMU/8000/1  -> rc=0
-    1:  96 GSM-HR-08/8000/1  -> rc=0
-    2:  97 AMR/8000/1 octet-aligned=1  -> rc=0
- - add codecs on conn1:
-    0:  97 GSM-HR-08/8000/1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2:  96 AMR/8000/1 octet-aligned=1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 96) -> 97
- - mgcp_codec_pt_translate(conn1, conn0, 97) -> 96
- - mgcp_codec_pt_translate(conn0, conn1, 97) -> 96
- - mgcp_codec_pt_translate(conn1, conn0, 96) -> 97
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
- - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
-#3: conn0 has no codecs
- - add codecs on conn0:
-    (none)
- - add codecs on conn1:
-    0:  96 AMR/8000/1 octet-aligned=1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2:  97 GSM-HR-08/8000/1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
-#4: conn1 has no codecs
- - add codecs on conn0:
-    0: 112 AMR/8000/1 octet-aligned=1  -> rc=0
-    1:   0 PCMU/8000/1  -> rc=0
-    2: 111 GSM-HR-08/8000/1  -> rc=0
- - add codecs on conn1:
-    (none)
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
-#5: test AMR with differing octet-aligned settings
- - add codecs on conn0:
-    0: 111 AMR/8000 octet-aligned=1  -> rc=0
-    1: 112 AMR/8000 octet-aligned=0  -> rc=0
- - add codecs on conn1:
-    0: 122 AMR/8000 octet-aligned=0  -> rc=0
-    1: 121 AMR/8000 octet-aligned=1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> 121
- - mgcp_codec_pt_translate(conn1, conn0, 121) -> 111
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
- - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
-#6: test AMR with missing octet-aligned settings (defaults to 0)
- - add codecs on conn0:
-    0: 111 AMR/8000 octet-aligned=1  -> rc=0
-    1: 112 AMR/8000 octet-aligned=0  -> rc=0
- - add codecs on conn1:
-    0: 122 AMR/8000 octet-aligned=unset  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
- - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
-#7: test AMR with NULL param (defaults to 0)
- - add codecs on conn0:
-    0: 111 AMR/8000 octet-aligned=1  -> rc=0
-    1: 112 AMR/8000 octet-aligned=0  -> rc=0
- - add codecs on conn1:
-    0: 122 AMR/8000  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> -22
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 122
- - mgcp_codec_pt_translate(conn1, conn0, 122) -> 112
-#8: match FOO/8000/1 and FOO/8000 as identical, single channel is implicit
- - add codecs on conn0:
-    0:   0 PCMU/8000/1  -> rc=0
-    1: 111 GSM-HR-08/8000/1  -> rc=0
-    2: 112 AMR/8000/1 octet-aligned=1  -> rc=0
- - add codecs on conn1:
-    0:  97 GSM-HR-08/8000  -> rc=0
-    1:   0 PCMU/8000  -> rc=0
-    2:  96 AMR/8000 octet-aligned=1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
- - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
- - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
- - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
- - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
-#9: match FOO/8000/1 and FOO as identical, 8k and single channel are implicit
- - add codecs on conn0:
-    0:   0 PCMU/8000/1  -> rc=0
-    1: 111 GSM-HR-08/8000/1  -> rc=0
-    2: 112 AMR/8000/1 octet-aligned=1  -> rc=0
- - add codecs on conn1:
-    0:  97 GSM-HR-08  -> rc=0
-    1:   0 PCMU  -> rc=0
-    2:  96 AMR octet-aligned=1  -> rc=0
- - mgcp_codec_pt_translate(conn0, conn1, 112) -> 96
- - mgcp_codec_pt_translate(conn1, conn0, 96) -> 112
- - mgcp_codec_pt_translate(conn0, conn1, 0) -> 0
- - mgcp_codec_pt_translate(conn1, conn0, 0) -> 0
- - mgcp_codec_pt_translate(conn0, conn1, 111) -> 97
- - mgcp_codec_pt_translate(conn1, conn0, 97) -> 111
- - mgcp_codec_pt_translate(conn0, conn1, 123) -> -22
-#10: test whether channel number matching is waterproof
 'XXXX,p:10,a:PCMU' -> 'p:10,a:PCMU'
 '10,a:PCMU' -> 'a:PCMU'
 '10, a:PCMU' -> 'a:PCMU'
--- a/tests/mgcp_client/mgcp_client_test.c
+++ b/tests/mgcp_client/mgcp_client_test.c
@@ -113,9 +113,9 @@ void test_response_cb(struct mgcp_response *response, void *priv)
 	printf("  ptmap_len = %u\n", response->ptmap_len);
 	for(i=0;i<response->ptmap_len;i++) {
 		printf("  ptmap[%u].codec = %u\n", i, response->ptmap[i].codec);
-		printf("  ptmap[%u].pt = %u\n", i, response->ptmap[i].pt);
+		printf("  ptmap[%u].pt = %u\n", i, response->ptmap[i].pt);		
 	}
-
+	
 }

 mgcp_trans_id_t dummy_mgcp_send(struct msgb *msg)
@@ -157,7 +157,6 @@ void test_mgcp_msg(void)
 		.ptmap[0].pt = 96,
 		.ptmap_len = 1,
 		.x_osmo_ign = MGCP_X_OSMO_IGN_CALLID,
-		.x_osmo_osmux_cid = -1, /* wildcard */
 	};

 	if (mgcp)
@@ -181,7 +180,7 @@ void test_mgcp_msg(void)
 	     MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE);
 	mgcp_msg.codecs_len = 2;
 	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.codecs_len = 1;
+	mgcp_msg.codecs_len = 1;	
 	printf("%s\n", (char *)msg->data);

 	printf("Generated CRCX message (three codecs, one with custom pt):\n");
@@ -191,8 +190,8 @@ void test_mgcp_msg(void)
 	     MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE);
 	mgcp_msg.codecs_len = 3;
 	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.codecs_len = 1;
-	printf("%s\n", (char *)msg->data);
+	mgcp_msg.codecs_len = 1;	
+	printf("%s\n", (char *)msg->data);		

 	printf("Generated MDCX message:\n");
 	mgcp_msg.verb = MGCP_VERB_MDCX;
@@ -211,7 +210,7 @@ void test_mgcp_msg(void)
 	     MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT);
 	mgcp_msg.codecs_len = 2;
 	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.codecs_len = 1;
+	mgcp_msg.codecs_len = 1;	
 	printf("%s\n", (char *)msg->data);

 	printf("Generated MDCX message (three codecs, one with custom pt):\n");
@@ -222,8 +221,8 @@ void test_mgcp_msg(void)
 	     MGCP_MSG_PRESENCE_AUDIO_IP | MGCP_MSG_PRESENCE_AUDIO_PORT);
 	mgcp_msg.codecs_len = 3;
 	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.codecs_len = 1;
-	printf("%s\n", (char *)msg->data);
+	mgcp_msg.codecs_len = 1;	
+	printf("%s\n", (char *)msg->data);	

 	printf("Generated DLCX message:\n");
 	mgcp_msg.verb = MGCP_VERB_DLCX;
@@ -255,38 +254,6 @@ void test_mgcp_msg(void)
 	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
 	printf("%s\n", (char *)msg->data);

-	printf("Generate X-Osmo-Osmux message:\n");
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.verb = MGCP_VERB_CRCX;
-	mgcp_msg.presence =
-	    (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID |
-	     MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE
-	     | MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID);
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	printf("%s\n", (char *)msg->data);
-
-	printf("Generate X-Osmo-Osmux message (fixed CID 2):\n");
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.verb = MGCP_VERB_CRCX;
-	mgcp_msg.x_osmo_osmux_cid = 2;
-	mgcp_msg.presence =
-	    (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID |
-	     MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE
-	     | MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID);
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	printf("%s\n", (char *)msg->data);
-
-	printf("Generate X-Osmo-Osmux message (MDCX):\n");
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	mgcp_msg.verb = MGCP_VERB_MDCX;
-	mgcp_msg.x_osmo_osmux_cid = 2;
-	mgcp_msg.presence =
-	    (MGCP_MSG_PRESENCE_ENDPOINT | MGCP_MSG_PRESENCE_CALL_ID |
-	     MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE
-	     | MGCP_MSG_PRESENCE_X_OSMO_OSMUX_CID);
-	msg = mgcp_msg_gen(mgcp, &mgcp_msg);
-	printf("%s\n", (char *)msg->data);
-
 	printf("Overfolow test:\n");
 	mgcp_msg.verb = MGCP_VERB_MDCX;
 	mgcp_msg.presence =
@@ -319,7 +286,7 @@ void test_mgcp_client_cancel()
 			     | MGCP_MSG_PRESENCE_CONN_ID | MGCP_MSG_PRESENCE_CONN_MODE),
 		.ptime = 20,
 		.codecs[0] = CODEC_AMR_8000_1,
-		.codecs_len = 1
+		.codecs_len = 1		
 	};

 	printf("\n%s():\n", __func__);
--- a/tests/mgcp_client/mgcp_client_test.ok
+++ b/tests/mgcp_client/mgcp_client_test.ok
@@ -84,30 +84,6 @@ L: p:20, a:GSM, nt:IN
 M: sendrecv
 X-Osmo-IGN: C

-Generate X-Osmo-Osmux message:
-CRCX 13 23@mgw MGCP 1.0
-C: 2f
-I: 11
-L: p:20, a:GSM, nt:IN
-M: sendrecv
-X-Osmux: *
-
-Generate X-Osmo-Osmux message (fixed CID 2):
-CRCX 15 23@mgw MGCP 1.0
-C: 2f
-I: 11
-L: p:20, a:GSM, nt:IN
-M: sendrecv
-X-Osmux: 2
-
-Generate X-Osmo-Osmux message (MDCX):
-MDCX 17 23@mgw MGCP 1.0
-C: 2f
-I: 11
-L: p:20, a:GSM, nt:IN
-M: sendrecv
-X-Osmux: 2
-
 Overfolow test:
Author	SHA1	Message	Date
Neels Hofmeyr	3ed3eb8e0f	systemd service: add save_log_tail Change-Id: I36d149d1dbfe30a4e51122e671ab801b6fd18c74	2018-12-27 17:40:10 +01:00
Neels Hofmeyr	fdc5f111aa	fix double free: fix wrong fix of earlier msgb leaks Change-Id: I432559b2be703ac8db6e8d219936dd997b5b38e9	2018-12-27 16:31:40 +01:00
Neels Hofmeyr	02d612a926	osmo-mgw: fix RTP-rx memleaks introduced by IuUP patch Change-Id: Iafe52e5f29a53f31a1e374aebe3a92c929b2ac2d	2018-12-27 15:46:14 +01:00
efistokl	944af2f641	iuup_cn_node.c: make it work for AMR 12.2k codec rx_data: prepend hardcoded AMR 12.2 header "0xf03c" to the front of RTP payload osmo_iuup_cn_tx_payload: strip AMR header (2 bytes) from the front of RTP payload	2018-12-21 23:38:44 +01:00
Neels Hofmeyr	f2a65b8bbb	add simplistic IuUP FSM and strip/add IuUP headers This should really be using the FSM in libosmocore/laforge/iu_up: take the best of both sides and integate in the libosmocore FSM implementation, then use it here. - in libosmocore, the FSM definition is nicer. - here, we have correct header checksums. This patch here also adds RTP header stripping/adding functionality, after introducing using msgb to pass data around. Change-Id: Ibc70e0aa00476926dd1f4ea8139c34f31f9cdfa3	2018-12-21 23:36:29 +01:00
Neels Hofmeyr	332308d994	mgcp_client: tweak some log levels INFO -> {DEBUG,ERROR} Change-Id: Ie4ecb4b82a7a1e476c58d0a6056525733254adbb	2018-12-21 03:07:53 +01:00
Neels Hofmeyr	099332824e	mgcp_client: make domain part of endpoint configurable So far, both osmo-msc and osmo-bsc always pass endpoint names of the form '...@mgw' to osmo-mgw. Allow configuring the 'mgw' part. Note that the actual way to pass a differing name is to pass a composed 'rtpbridge/@foo' to mgcp_msg_gen() in the struct mgcp_msg. So this merely adds a common VTY config for the domain name part, changes to clients are necessary. - add mgcp_client_rtpbridge_wildcard() (useful for AoIP endpoints) - add mgcp_client_endpoint_domain() (useful for SCCPlite endpoints) - add mgcp client vty cfg 'mgw endpoint-domain NAME' Rationale: reading pcaps becomes so much easier when each of osmo-bsc and osmo-msc address their MGW with differing domain names. Otherwise, both will have a '0@mgw' endpoint and it gets really confusing. Also: our MGCP clients osmo-bsc and osmo-msc use code dup to compose the initial 'rtpbridge/@mgw' rtpbridge wildcard. It should be defined by this API instead. This will be used by: * osmo-msc I87ac11847d1a6d165ee9a2b5d8a4978e7ac73433 * osmo-bsc I492023e9dca0233ec0a077032455d9f2e3880f78 After these, with according configuration, there can be a '0@bsc' and a '0@msc' endpoint. osmo-mgw-for-bsc.cfg: mgcp domain bsc osmo-bsc.cfg: msc 0 mgw endpoint-domain bsc osmo-mgw-for-msc.cfg: mgcp domain msc osmo-msc.cfg: msc mgw endpoint-domain msc (By default, everything will still use '@mgw') Change-Id: Ia662016f29dd8727d9c4626d726729641e21e1f8	2018-12-20 00:34:17 +01:00