mgw: MDCX: Simplify early return code paths

Change-Id: Icb03a95e34e0c7d9396fefc2e37ee33ab09daa89
mgw: Remove wrong TODO comment
2025-11-02 21:13:44 +00:00 · 2025-01-21 16:43:52 +01:00 · 2025-01-21 16:43:52 +01:00 · 2025-01-21 16:43:52 +01:00 · 2025-01-21 16:43:52 +01:00 · 2025-01-21 16:43:52 +01:00
8 changed files with 157 additions and 199 deletions
--- a/configure.ac
+++ b/configure.ac
@@ -44,13 +44,13 @@ AC_SEARCH_LIBS([dlsym], [dl dld], [LIBRARY_DLSYM="$LIBS";LIBS=""])
 AC_SUBST(LIBRARY_DLSYM)


-PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.11.0)
-PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.11.0)
-PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.11.0)
-PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.11.0)
-PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.6.0)
-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 2.0.0)
-PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 2.0.0)
+PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.10.0)
+PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.10.0)
+PKG_CHECK_MODULES(LIBOSMOCTRL, libosmoctrl >= 1.10.0)
+PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 1.10.0)
+PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.5.0)
+PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.6.0)
+PKG_CHECK_MODULES(LIBOSMOTRAU, libosmotrau >= 1.6.0)

 CFLAGS="$CFLAGS -DBUILDING_LIBOSMOMGCPCLIENT -pthread"
 CPPFLAGS="$CPPFLAGS -DBUILDING_LIBOSMOMGCPCLIENT -pthread"
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,52 +1,3 @@
-osmo-mgw (1.14.0) unstable; urgency=medium
-
-  [ Pau Espin Pedrol ]
-  * jenkins.sh: libosmo-netif no longer depends on libosmo-abis
-  * jenkins.sh: Use --disable-doxygen configure param
-  * mgcp-client: Fix wrong value passed to strerror()
-  * mgcp_client_internal.h: Add missing header dependency
-  * mgcp-cli: Mark iofd ptr as NULL when freed
-  * mgcp-cli: Improve error handling around mgcp_msg_gen() return
-  * mgcp-cli: Fix filling in wrong local IP address of SDP Origin o=
-  * mgw: Drop own MGCP extension 'noanswer'
-  * cosmetic: mgw: Fix indentation whitespace
-  * mgcp-client: Fix regression checking null ptr
-  * mgw: Rename and move code freeing endp connection
-  * mgw: Rename and move several get_conn funcs acting on endp object
-  * mgw: mgcp_network.c: Simplify use of conn_rtp ptr
-  * mgw: Clean up access to conn_rtp from conn
-  * mgw: Avoid 2nd lookup of conn in endp during CRCX
-  * cosmetic: mgw: iuup: Update comment
-  * mgw: constify mgcp_endp_avail() param
-  * mgcp_endp: Add helpers accessing endp connections
-  * mgw: mgcp_protocol: assert freeing last conn allows creating new conn
-  * mgw: Split conn mode parsing and applying into conn
-  * mgw: CRCXMDCX/DLCX: rename conn and conn_rtp variables
-  * mgw: Use bool instead of int in local var
-  * Rename mgcp_free_rtp_port() to mgcp_rtp_end_free_port()
-  * mgw: Split mgcp_rtp_end to its own file
-  * mgw: Introduce mgcp_rtp_end_init()
-  * mgw: Introduce struct mgcp_codecset struct
-  * mgw: Cleanup rtp_endp fields in its own function
-  * mgw: Move force_ptime logic outside of main CRCX func handler
-  * mgw: Move several params setting to mgcp_rtp_end_init()
-  * mgw: Simplify and redo code around ssrc patch feature
-  * mgw: Clean up code allocating conn_rtp rtp/rtcp sockets
-  * mgw: Rename and cleanup code allocating rtp/rtcp ports in trunk
-  * mgw: CRCX: Split mgcp header pars parsing into a previous step
-  * mgw: MDCX: Split mgcp header pars parsing into a previous step
-  * mgw: DLCX: Split mgcp header pars parsing into a previous step
-  * mgw: Decouple SDP parsing step from conn obj update
-  * mgw: Remove wrong TODO comment
-  * mgw: MDCX: Simplify early return code paths
-
-  [ Mychaela N. Falconia ]
-  * E1 cosmetic: reduce white space in hard-coded TRAU-DL frames
-  * E1: replace idle_tf_efr[] with a better version
-  * E1: replace idle_tf_fr[] with a better version
-
- -- Oliver Smith <osmith@sysmocom.de>  Wed, 12 Feb 2025 12:30:33 +0100
-
 osmo-mgw (1.13.1) unstable; urgency=medium

  [ Philipp Maier ]
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,10 @@ Build-Depends: debhelper (>= 10),
               dh-autoreconf,
               pkg-config,
               autotools-dev,
-               libosmocore-dev (>= 1.11.0),
-               libosmo-netif-dev (>= 1.6.0),
-               libosmo-abis-dev (>= 2.0.0),
+               libosmocore-dev (>= 1.10.0),
+               libosmo-netif-dev (>= 1.5.0),
+               libosmo-abis-dev (>= 1.6.0),
+               osmo-gsm-manuals-dev (>= 1.6.0)
 Standards-Version: 3.9.8
 Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw
 Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw
@@ -35,3 +36,11 @@ Multi-Arch: same
 Depends: libosmo-mgcp-client14 (= ${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/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ 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
+	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:
--- a/src/libosmo-mgcp-client/Makefile.am
+++ b/src/libosmo-mgcp-client/Makefile.am
@@ -19,7 +19,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=14:1:0
+MGCP_CLIENT_LIBVERSION=14:0:0

 lib_LTLIBRARIES = \
 	libosmo-mgcp-client.la \
--- a/src/libosmo-mgcp/mgcp_e1.c
+++ b/src/libosmo-mgcp/mgcp_e1.c
@@ -56,147 +56,133 @@ static const struct e1inp_line_ops dummy_e1_line_ops = {
 	.sign_link = NULL,
 };

-/* The following EFR TRAU-DL frame is a dummy to be transmitted in the absence
- * of RTP-derived TRAU-DL frames.  The payload bit content here is the decoder
- * homing frame (DHF) of TS 46.060 section 8.2 Table 7 - the best we can do
- * in the absence of a proper TFO transform for EFR - while the full TRAU-DL
- * frame was generated by passing said EFR DHF through osmo_rtp2trau().
- */
-static const ubit_t idle_tf_efr[] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 1, 1, 0, 1, 0, 0, 0,
-	0, 0, 0, 0, 1, 1, 1, 1,
-	1, 1, 0, 0, 0, 0, 1, 0,
-	0, 0, 0, 1, 0, 1, 1, 1,
-	1, 1, 0, 1, 0, 1, 1, 0,
-	1, 0, 0, 1, 0, 0, 1, 0,
-	1, 0, 0, 0, 1, 1, 1, 1,
-	1, 0, 0, 1, 0, 1, 0, 1,
-	1, 0, 1, 0, 1, 1, 0, 1,
-	0, 1, 1, 0, 0, 0, 0, 0,
-	1, 0, 0, 1, 1, 1, 1, 1,
-	0, 0, 0, 1, 1, 1, 0, 1,
-	1, 0, 0, 0, 0, 1, 1, 0,
-	0, 0, 0, 1, 1, 0, 0, 0,
-	1, 0, 0, 0, 1, 1, 1, 1,
-	0, 1, 1, 0, 1, 1, 0, 0,
-	1, 0, 0, 1, 1, 0, 0, 0,
-	1, 0, 0, 0, 0, 1, 0, 1,
-	1, 1, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 1, 0, 0, 1, 0, 0,
-	0, 0, 0, 0, 0, 0, 1, 0,
-	1, 0, 1, 0, 1, 0, 1, 0,
-	1, 1, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 1, 1, 1, 0,
-	1, 1, 1, 0, 1, 0, 1, 1,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 0, 0, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
+/* EFR idle frame */
+static const ubit_t idle_tf_efr[] = { 0, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 1, 1, 0, 1, 0, 0, 0,
+				      0, 0, 0, 0, 1, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 0, 0,
+				      0, 0, 0, 0, 0, 0, 0, 0,
+				      1, 0, 0, 0, 0, 0, 1, 0,
+				      1, 1, 1, 1, 1, 1, 1, 1,
 };

-/* The following FRv1 TRAU-DL frame is a dummy to be transmitted in the absence
- * of RTP-derived TRAU-DL frames.  The payload bit content here is the silence
- * frame of TS 46.011 Table 1 - the best we can do without integrating the
- * TFO transform for FRv1 from Themyscira libgsmfr2 - while the full TRAU-DL
- * frame was generated by passing said FRv1 silence frame through
- * osmo_rtp2trau().
- */
-static const ubit_t idle_tf_fr[] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 1, 1, 1, 0, 0, 0, 0,
-	0, 0, 0, 0, 1, 1, 1, 1,
-	1, 0, 1, 0, 1, 0, 1, 1,
-	1, 1, 0, 0, 1, 1, 0, 1,
-	1, 0, 1, 0, 1, 0, 1, 0,
-	1, 0, 0, 1, 0, 0, 1, 0,
-	1, 1, 1, 0, 0, 1, 0, 0,
-	0, 0, 1, 0, 1, 0, 0, 0,
-	1, 1, 0, 0, 0, 0, 0, 0,
-	0, 1, 1, 0, 0, 0, 1, 1,
-	1, 1, 0, 0, 0, 1, 0, 0,
-	1, 1, 1, 0, 1, 1, 0, 1,
-	1, 1, 0, 1, 1, 0, 0, 0,
-	1, 0, 0, 1, 1, 1, 0, 1,
-	1, 1, 0, 0, 0, 0, 1, 0,
-	1, 0, 0, 0, 1, 0, 0, 0,
-	1, 0, 0, 0, 0, 1, 1, 0,
-	0, 0, 1, 1, 1, 0, 0, 0,
-	1, 1, 0, 0, 1, 1, 1, 0,
-	1, 1, 0, 1, 1, 0, 1, 1,
-	1, 0, 0, 0, 1, 0, 0, 1,
-	1, 1, 0, 1, 1, 0, 0, 0,
-	1, 0, 1, 0, 1, 0, 0, 0,
-	1, 0, 0, 0, 0, 0, 0, 0,
-	1, 1, 1, 0, 0, 0, 1, 1,
-	1, 0, 0, 0, 1, 0, 0, 1,
-	1, 1, 1, 0, 1, 1, 0, 1,
-	1, 0, 1, 1, 0, 0, 0, 1,
-	1, 0, 0, 1, 1, 1, 0, 1,
-	1, 0, 0, 0, 0, 1, 0, 1,
-	1, 0, 0, 0, 1, 0, 0, 0,
-	0, 0, 0, 0, 1, 1, 0, 0,
-	1, 0, 1, 1, 1, 0, 0, 0,
-	1, 0, 0, 1, 1, 1, 0, 1,
-	1, 1, 0, 1, 1, 0, 1, 1,
-	0, 0, 0, 1, 0, 0, 1, 1,
-	1, 1, 0, 1, 1, 0, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
+/* FR idle frame */
+static const ubit_t idle_tf_fr[] = { 0, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 1, 1, 1, 0, 0, 0, 0,
+				     0, 0, 0, 0, 1, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 0, 0,
+				     0, 0, 0, 0, 0, 0, 0, 0,
+				     1, 0, 0, 0, 0, 0, 1, 0,
+				     1, 1, 1, 1, 1, 1, 1, 1,
 };

 /* Idle speech frame, see also GSM 08.60, chapter 3.4 */
-static const ubit_t idle_tf_spch[] = {
-	0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0,
-	1, 0, 1, 1, 1, 0, 0, 0,
-	0, 0, 0, 0, 1, 0, 0, 0,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 1,
-	1, 1, 1, 1, 1, 1, 1, 0,
-	1, 1, 1, 1, 1, 1, 1, 1,
+static const ubit_t idle_tf_spch[] = { 0, 0, 0, 0, 0, 0, 0, 0,
+				       0, 0, 0, 0, 0, 0, 0, 0,
+				       1, 0, 1, 1, 1, 0, 0, 0,
+				       0, 0, 0, 0, 1, 0, 0, 0,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 1,
+				       1, 1, 1, 1, 1, 1, 1, 0,
+				       1, 1, 1, 1, 1, 1, 1, 1,
 };

 /* If the RTP transmission has dropouts for some reason the I.460 TX-Queue may
--- a/src/libosmo-mgcp/mgcp_msg.c
+++ b/src/libosmo-mgcp/mgcp_msg.c
@@ -164,7 +164,7 @@ static bool parse_x_osmo_ign(struct mgcp_parse_data *pdata, char *line)
 		if (!strcasecmp(token, "C"))
 			pdata->hpars.x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;
 		else
-			LOG_MGCP_PDATA(pdata, LOGL_ERROR, "received unknown X-Osmo-IGN item '%s'\n", token);
+			LOG_MGCP_PDATA(pdata, LOGL_ERROR,"received unknown X-Osmo-IGN item '%s'\n", token);
 	}

 	return true;
--- a/src/osmo-mgw/mgw_main.c
+++ b/src/osmo-mgw/mgw_main.c
@@ -249,6 +249,17 @@ static int read_call_agent(struct osmo_fd *fd, unsigned int what)
 	return 0;
 }

+int mgcp_vty_is_config_node(struct vty *vty, int node)
+{
+	switch (node) {
+	case CONFIG_NODE:
+		return 0;
+
+	default:
+		return 1;
+	}
+}
+
 int mgcp_vty_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
@@ -258,7 +269,7 @@ int mgcp_vty_go_parent(struct vty *vty)
 		break;
 	case MGCP_NODE:
 	default:
-		if (vty->node != CONFIG_NODE)
+		if (mgcp_vty_is_config_node(vty, vty->node))
 			vty->node = CONFIG_NODE;
 		else
 			vty->node = ENABLE_NODE;
@@ -299,6 +310,7 @@ static struct vty_app_info vty_info = {
 	.name 		= "OsmoMGW",
 	.version	= PACKAGE_VERSION,
 	.go_parent_cb	= mgcp_vty_go_parent,
+	.is_config_node	= mgcp_vty_is_config_node,
 };

 static const struct log_info_cat log_categories[] = {
Author	SHA1	Message	Date
Pau Espin Pedrol	7246206ca9	mgw: MDCX: Simplify early return code paths Change-Id: Icb03a95e34e0c7d9396fefc2e37ee33ab09daa89	2025-01-21 16:43:52 +01:00
Pau Espin Pedrol	70a0c1cd0c	mgw: Remove wrong TODO comment The TODO was written because the author had in mind the ptr where the codec was stored was a MGCP endpoint object, but it is actually an rtp_end which is an object under conn_rtp, so that's fine already with current code. Change-Id: I99d2211e81443883c45cc3fdda10e39a8c152063	2025-01-21 16:43:52 +01:00
Pau Espin Pedrol	6575a5bef9	mgw: Decouple SDP parsing step from conn obj update This allows delaying modification of the conn before full parsing succeeds. Change-Id: I4a2aecb542886672c1f586c6607714e0356abe35	2025-01-21 16:43:52 +01:00
Pau Espin Pedrol	657911ff69	mgw: DLCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. Change-Id: I557a3a257ddefedc479a4aff974a74c4e4e2c85d	2025-01-21 16:43:52 +01:00
Pau Espin Pedrol	79541dba4e	mgw: MDCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. This commit only modifies stuff enough to work for MDCX. Further work (commits) will follow for DLCX. Change-Id: I6ecb41fc2cc737c3a161b6bc98bd08ae01909655	2025-01-21 16:43:52 +01:00
Pau Espin Pedrol	c4b4848bae	mgw: CRCX: Split mgcp header pars parsing into a previous step Do most of the initial parsing and verification in a prior step, filling in a "parsed" struct which simplifies logic coming after for different message types. This commit only modifies stuff enough to work for CRCX. Further work (commits) will follow for MDCX and DLCX. Change-Id: I3ee5158c254213203830fe9c38de11c15b4b19c1	2025-01-21 16:43:52 +01:00