Initially implement the new osmo-mgw and libosmo-mgcp
Leave the old osmo-bsc_mgcp and libosmo-legacy-mgcp as it is; on a copy thereof
(added by a previous commit), apply changes to initially implement the new
osmo-mgw.
Adjust build system and debian packaging to accomodate the new libosmo-mgcp and
osmo-mgw.
The main differences:
*) use a list to manage rtp connections.
Aggregate all rtp related information inside a single struct.
Use a linked list to manage the both connections (net and bts).
The idea behind using a list is that we might support conference
calls at some later point.
Store the linked list in struct mgcp_endpoint, have a private linked
list for each endpoint. The list contains connection items which are
implemented in struct mgcp_conn. A connection is allocated and freed
using the functions in mgcp_conn.c. A connection is allocated on the
reception of a CRCX command and freed with the reception of a DLCX
command.
*) remove external transcoder feature
Fortunatelly the external transcoder feature is not needed
anymore. This patch removes the related code.
*) vty: get rid of CONN_BTS and CONN_NET
Since the new connection model does not make a difference
between BTS and NET connections the VTY should not use
the fixed CONN_BTS and CONN_NET constants.
- Handle the conns list inside the endpoint directly
- introduce function to dump basic rtp connection info
- introduce human readable names for connections
Parts of the code adjusted to use generalized connections instead of explicit
BTS/NET ones:
- teach mgcp_send_dummy() to send dummy packets to any RTP connection
- network: generalize mgcp_bind_net/bts_rtp_port()
- network: generalize mgcp_send()
- tap: generalize call tapping feature
- stat: generalize statistics
- Replace rtp_data_net() and rtp_data_bts() with generalized rtp_data_rx()
*) mgcp_protocol.c fixes:
- check ci string before it is converted:
In case of missing ci, a nullpointer is delivered to strtoul().
Add a function that takes ci, checks it and converts it to an
uint32_t. Use the return code to react on missing ci.
- output error message on missing CI.
- when parsing the mode, print log message when mode is missing.
- use mode_orig when mode is missing.
- fix ptime formatstring to use %u rather than %d.
- cosmetic: log when connection is deleted on DLCX.
- change loglevels of CRCX, MDCX, DLCX events from DEBUG to NOTICE.
*) mgcp_test
- apply rename of strline_r() to mgcp_strline().
- MGCP command macros:
- Add 'I: 1' parameters.
- Use proper port numbers:
from m=audio 0 RTP/AVP 126
to m=audio 16002 RTP/AVP 128
- Change ptime to 'a=ptime:40' because this is what the MGW currently
returns. CRCX generally feed a ptime:40 and this is expected to be
returned.
- struct mgcp_test: Use only one ptype, there are no explicit BTS and NET
endpoints anymore.
Hence remove one column from tests[].
- test_messages():
- Enable: remove '#if 0'
- Remove concept of BTS and NET endpoints: test only one conn, as they are
now interchangeable anyway.
- remove endpoint init, now done internally.
- add false asserts in error cases.
- test_retransmission():
- remove endpoint init, now done internally.
- add false asserts in error cases.
- test_packet_error_detection():
- Remove concept of BTS and NET endpoints: test only one conn, as they are
now interchangeable anyway. Use arbitrary conn ids (e.g. 4711).
- remove endpoint init, now done internally.
- add false assert in error case.
- Assert that a conn really vanishes on DLCX, previously the conn would
remain and just be unused, now it is actually discarded.
- test_no_cycle()
- Remove concept of BTS and NET endpoints: test only one conn, as they are
now interchangeable anyway. Use arbitrary conn ids (e.g. 4711).
- test_no_name()
- Enable: remove '#if 0'.
- remove endpoint init, now done internally.
- add false assert in error case.
- mgcp_test.ok: adjust expected results to status quo:
- We now see two dummy packets instead of one, now sent to both sides because
we don't know of BTS or NET side. (maybe drop dummy packets later...)
- packet duration, conn mode: now sane defaults show instead of unset.
- various whitespace and formatting changes from lindent.
Change-Id: Ie008599136c7ed8a0dfbb0cf803188975a499fc5
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ae51f89..2eed271 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,7 @@
SUBDIRS = \
legacy_mgcp \
mgcp_client \
+ mgcp \
$(NULL)
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
diff --git a/tests/legacy_mgcp/mgcp_test.c b/tests/legacy_mgcp/mgcp_test.c
index bbb0db2..904ecce 100644
--- a/tests/legacy_mgcp/mgcp_test.c
+++ b/tests/legacy_mgcp/mgcp_test.c
@@ -489,11 +489,11 @@
static void test_values(void)
{
/* Check that NONE disables all output */
- OSMO_ASSERT((MGCP_CONN_NONE & MGCP_CONN_RECV_SEND) == 0)
+ OSMO_ASSERT((MGCP_CONN_NONE & MGCP_CONN_RECV_SEND) == 0);
/* Check that LOOPBACK enables all output */
OSMO_ASSERT((MGCP_CONN_LOOPBACK & MGCP_CONN_RECV_SEND) ==
- MGCP_CONN_RECV_SEND)
+ MGCP_CONN_RECV_SEND);
}
diff --git a/tests/mgcp/Makefile.am b/tests/mgcp/Makefile.am
index f043124..caccb9f 100644
--- a/tests/mgcp/Makefile.am
+++ b/tests/mgcp/Makefile.am
@@ -9,7 +9,6 @@
-ggdb3 \
$(LIBOSMOCORE_CFLAGS) \
$(LIBOSMONETIF_CFLAGS) \
- $(LIBBCG729_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(NULL)
@@ -19,43 +18,21 @@
EXTRA_DIST = \
mgcp_test.ok \
- mgcp_transcoding_test.ok \
$(NULL)
noinst_PROGRAMS = \
mgcp_test \
$(NULL)
-if BUILD_MGCP_TRANSCODING
-noinst_PROGRAMS += \
- mgcp_transcoding_test \
- $(NULL)
-endif
mgcp_test_SOURCES = \
mgcp_test.c \
$(NULL)
mgcp_test_LDADD = \
- $(top_builddir)/src/libosmo-legacy-mgcp/libosmo-legacy-mgcp.la \
+ $(top_builddir)/src/libosmo-mgcp/libosmo-mgcp.la \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOVTY_LIBS) \
$(LIBRARY_DL) \
$(LIBOSMONETIF_LIBS) \
- $(LIBRARY_GSM) \
-lm \
$(NULL)
-
-mgcp_transcoding_test_SOURCES = \
- mgcp_transcoding_test.c \
- $(NULL)
-
-mgcp_transcoding_test_LDADD = \
- $(top_builddir)/src/libosmo-legacy-mgcp/libosmo-legacy-mgcp.la \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBBCG729_LIBS) \
- $(LIBRARY_DL) \
- $(LIBOSMONETIF_LIBS) \
- $(LIBRARY_GSM) \
- -lm \
- $(NULL)
diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c
index bbb0db2..c91de8f 100644
--- a/tests/mgcp/mgcp_test.c
+++ b/tests/mgcp/mgcp_test.c
@@ -19,9 +19,12 @@
#undef _GNU_SOURCE
#define _GNU_SOURCE
-#include <osmocom/legacy_mgcp/mgcp.h>
-#include <osmocom/legacy_mgcp/vty.h>
-#include <osmocom/legacy_mgcp/mgcp_internal.h>
+#include <osmocom/mgcp/mgcp.h>
+#include <osmocom/mgcp/vty.h>
+#include <osmocom/mgcp/mgcp_internal.h>
+#include <osmocom/mgcp/mgcp_stat.h>
+#include <osmocom/mgcp/mgcp_msg.h>
+#include <osmocom/mgcp/mgcp_ep.h>
#include <osmocom/core/application.h>
#include <osmocom/core/talloc.h>
@@ -40,11 +43,7 @@
"\r"
"one CRLF\r\n"
"two CRLF\r\n"
- "\r\n"
- "one LF\n"
- "two LF\n"
- "\n"
- "mixed (4 lines)\r\r\n\n\r\n";
+ "\r\n" "one LF\n" "two LF\n" "\n" "mixed (4 lines)\r\r\n\n\r\n";
#define EXPECTED_NUMBER_OF_LINES 13
@@ -57,8 +56,8 @@
osmo_strlcpy(buf, strline_test_data, sizeof(buf));
- for (line = strline_r(buf, &save); line;
- line = strline_r(NULL, &save)) {
+ for (line = mgcp_strline(buf, &save); line;
+ line = mgcp_strline(NULL, &save)) {
printf("line: '%s'\n", line);
counter++;
}
@@ -79,116 +78,158 @@
#define MDCX_ERR_RET "510 18983213 FAIL\r\n"
#define MDCX_UNALLOCATED "MDCX 18983214 ds/e1-1/2@172.16.6.66 MGCP 1.0\r\n"
#define MDCX_RET "400 18983214 FAIL\r\n"
-#define MDCX3 "MDCX 18983215 1@mgw MGCP 1.0\r\n"
-#define MDCX3_RET "200 18983215 OK\r\n" \
- "I: 1\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=ptime:20\r\n"
-#define MDCX3_FMTP_RET "200 18983215 OK\r\n" \
- "I: 3\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 3 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=fmtp:126 0/1/2\r\n" \
- "a=ptime:20\r\n"
-#define MDCX4 "MDCX 18983216 1@mgw MGCP 1.0\r\n" \
- "M: sendrecv\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: p:20, a:AMR, nt:IN\r\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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_RET(Ident) "200 " Ident " OK\r\n" \
- "I: 1\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=ptime:20\r\n"
-#define MDCX4_PT1 "MDCX 18983217 1@mgw MGCP 1.0\r\n" \
- "M: sendrecv\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: p:20-40, a:AMR, nt:IN\r\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 MDCX3 \
+ "MDCX 18983215 1@mgw MGCP 1.0\r\n" \
+ "I: 1\n"
-#define MDCX4_PT2 "MDCX 18983218 1@mgw MGCP 1.0\r\n" \
- "M: sendrecv\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: p:20-20, a:AMR, nt:IN\r\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 MDCX3_RET \
+ "200 18983215 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 128\r\n" \
+ "a=rtpmap:128 GSM-EFR/8000\r\n" \
+ "a=ptime:40\r\n"
-#define MDCX4_PT3 "MDCX 18983219 1@mgw MGCP 1.0\r\n" \
- "M: sendrecv\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: a:AMR, nt:IN\r\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 MDCX3A_RET \
+ "200 18983215 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 97\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=ptime:40\r\n"
-#define MDCX4_SO "MDCX 18983220 1@mgw MGCP 1.0\r\n" \
- "M: sendonly\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: p:20, a:AMR, nt:IN\r\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 MDCX3_FMTP_RET \
+ "200 18983215 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16006 RTP/AVP 128\r\n" \
+ "a=rtpmap:128 GSM-EFR/8000\r\n" \
+ "a=fmtp:126 0/1/2\r\n" \
+ "a=ptime:40\r\n"
-#define MDCX4_RO "MDCX 18983221 1@mgw MGCP 1.0\r\n" \
- "M: recvonly\r" \
- "C: 2\r\n" \
- "I: 1\r\n" \
- "L: p:20, a:AMR, nt:IN\r\n"
+#define MDCX4 \
+ "MDCX 18983216 1@mgw MGCP 1.0\r\n" \
+ "M: sendrecv\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: p:20, a:AMR, nt:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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_RET(Ident) \
+ "200 " Ident " OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 99\r\n" \
+ "a=rtpmap:99 AMR/8000\r\n" \
+ "a=ptime:40\r\n"
+
+#define MDCX4_RO_RET(Ident) \
+ "200 " Ident " OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 96\r\n" \
+ "a=rtpmap:96 AMR\r\n" \
+ "a=ptime:40\r\n"
+
+#define MDCX4_PT1 \
+ "MDCX 18983217 1@mgw MGCP 1.0\r\n" \
+ "M: sendrecv\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: p:20-40, a:AMR, nt:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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_PT2 \
+ "MDCX 18983218 1@mgw MGCP 1.0\r\n" \
+ "M: sendrecv\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: p:20-20, a:AMR, nt:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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_PT3 \
+ "MDCX 18983219 1@mgw MGCP 1.0\r\n" \
+ "M: sendrecv\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: a:AMR, nt:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 18983220 1@mgw MGCP 1.0\r\n" \
+ "M: sendonly\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: p:20, a:AMR, nt:IN\r\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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_RO \
+ "MDCX 18983221 1@mgw MGCP 1.0\r\n" \
+ "M: recvonly\r" \
+ "C: 2\r\n" \
+ "I: 1\r\n" \
+ "L: p:20, a:AMR, nt:IN\r\n"
#define SHORT2 "CRCX 1"
#define SHORT2_RET "510 000000 FAIL\r\n"
@@ -196,227 +237,248 @@
#define SHORT4 "CRCX 1 1@mgw MGCP"
#define SHORT5 "CRCX 1 1@mgw MGCP 1.0"
-#define CRCX "CRCX 2 1@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 97\r\n" \
- "a=rtpmap:97 GSM-EFR/8000\r\n" \
- "a=ptime:40\r\n"
+#define CRCX \
+ "CRCX 2 1@mgw MGCP 1.0\r\n" \
+ "M: recvonly\r\n" \
+ "C: 2\r\n" \
+ "I: 1\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 97\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_RET "200 2 OK\r\n" \
- "I: 1\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=ptime:20\r\n"
+#define CRCX_RET \
+ "200 2 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 97\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_RET_NO_RTPMAP "200 2 OK\r\n" \
- "I: 1\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 1 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 0 RTP/AVP 126\r\n" \
- "a=ptime:20\r\n"
+#define CRCX_RET_NO_RTPMAP \
+ "200 2 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16002 RTP/AVP 97\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_FMTP_RET "200 2 OK\r\n" \
- "I: 3\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 3 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=fmtp:126 0/1/2\r\n" \
- "a=ptime:20\r\n"
+#define CRCX_FMTP_RET \
+ "200 2 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16006 RTP/AVP 97\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=fmtp:126 0/1/2\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_ZYN "CRCX 2 1@mgw MGCP 1.0\r" \
- "M: recvonly\r" \
- "C: 2\r\r" \
- "v=0\r" \
- "c=IN IP4 123.12.12.123\r" \
- "m=audio 5904 RTP/AVP 97\r" \
- "a=rtpmap:97 GSM-EFR/8000\r"
+#define CRCX_ZYN \
+ "CRCX 2 1@mgw MGCP 1.0\r" \
+ "M: recvonly\r" \
+ "C: 2\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r" \
+ "c=IN IP4 123.12.12.123\r" \
+ "m=audio 5904 RTP/AVP 97\r" \
+ "a=rtpmap:97 GSM-EFR/8000\r"
-#define CRCX_ZYN_RET "200 2 OK\r\n" \
- "I: 2\n" \
- "\n" \
- "v=0\r\n" \
- "o=- 2 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 0 RTP/AVP 126\r\n" \
- "a=rtpmap:126 AMR/8000\r\n" \
- "a=ptime:20\r\n"
+#define CRCX_ZYN_RET \
+ "200 2 OK\r\n" \
+ "I: 1\n" \
+ "\n" \
+ "v=0\r\n" \
+ "o=- 1 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 16004 RTP/AVP 97\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=ptime:20\r\n"
-#define DLCX "DLCX 7 1@mgw MGCP 1.0\r\n" \
- "C: 2\r\n"
+#define DLCX \
+ "DLCX 7 1@mgw MGCP 1.0\r\n" \
+ "I: 1\r\n" \
+ "C: 2\r\n"
-#define DLCX_RET "250 7 OK\r\n" \
- "P: PS=0, OS=0, PR=0, OR=0, PL=0, JI=0\r\n" \
- "X-Osmo-CP: EC TIS=0, TOS=0, TIR=0, TOR=0\r\n"
+#define DLCX_RET \
+ "250 7 OK\r\n" \
+ "P: PS=0, OS=0, PR=0, OR=0, PL=0, JI=0\r\n" \
+ "X-Osmo-CP: EC TI=0, TO=0\r\n"
-#define RQNT "RQNT 186908780 1@mgw MGCP 1.0\r\n" \
- "X: B244F267488\r\n" \
- "S: D/9\r\n"
+#define RQNT \
+ "RQNT 186908780 1@mgw MGCP 1.0\r\n" \
+ "X: B244F267488\r\n" \
+ "S: D/9\r\n"
-#define RQNT2 "RQNT 186908781 1@mgw MGCP 1.0\r\n" \
- "X: ADD4F26746F\r\n" \
- "R: D/[0-9#*](N), G/ft, fxr/t38\r\n"
+#define RQNT2 \
+ "RQNT 186908781 1@mgw MGCP 1.0\r\n" \
+ "X: ADD4F26746F\r\n" \
+ "R: D/[0-9#*](N), G/ft, fxr/t38\r\n"
#define RQNT1_RET "200 186908780 OK\r\n"
#define RQNT2_RET "200 186908781 OK\r\n"
-#define PTYPE_IGNORE 0 /* == default initializer */
+#define PTYPE_IGNORE 0 /* == default initializer */
#define PTYPE_NONE 128
#define PTYPE_NYI PTYPE_NONE
-#define CRCX_MULT_1 "CRCX 2 1@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 18 97\r\n"\
- "a=rtpmap:18 G729/8000\r\n" \
- "a=rtpmap:97 GSM-EFR/8000\r\n" \
- "a=ptime:40\r\n"
+#define CRCX_MULT_1 \
+ "CRCX 2 1@mgw MGCP 1.0\r\n" \
+ "I: 4711\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 18 97\r\n" \
+ "a=rtpmap:18 G729/8000\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_MULT_2 "CRCX 2 2@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 18 97 101\r\n"\
- "a=rtpmap:18 G729/8000\r\n" \
- "a=rtpmap:97 GSM-EFR/8000\r\n" \
- "a=rtpmap:101 FOO/8000\r\n" \
- "a=ptime:40\r\n"
+#define CRCX_MULT_2 \
+ "CRCX 2 2@mgw MGCP 1.0\r\n" \
+ "I: 90210\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 18 97 101\r\n" \
+ "a=rtpmap:18 G729/8000\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=rtpmap:101 FOO/8000\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_MULT_3 "CRCX 2 3@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\r\n" \
- "a=rtpmap:18 G729/8000\r\n" \
- "a=rtpmap:97 GSM-EFR/8000\r\n" \
- "a=rtpmap:101 FOO/8000\r\n" \
- "a=ptime:40\r\n"
+#define CRCX_MULT_3 \
+ "CRCX 2 3@mgw MGCP 1.0\r\n" \
+ "I: 0815\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\r\n" \
+ "a=rtpmap:18 G729/8000\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=rtpmap:101 FOO/8000\r\n" \
+ "a=ptime:40\r\n"
-#define CRCX_MULT_4 "CRCX 2 4@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 18\r\n" \
- "a=rtpmap:18 G729/8000\r\n" \
- "a=rtpmap:97 GSM-EFR/8000\r\n" \
- "a=rtpmap:101 FOO/8000\r\n" \
- "a=ptime:40\r\n"
+#define CRCX_MULT_4 \
+ "CRCX 2 4@mgw MGCP 1.0\r\n" \
+ "I: 32168\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 18\r\n" \
+ "a=rtpmap:18 G729/8000\r\n" \
+ "a=rtpmap:97 GSM-EFR/8000\r\n" \
+ "a=rtpmap:101 FOO/8000\r\n" \
+ "a=ptime:40\r\n"
#define CRCX_MULT_GSM_EXACT \
- "CRCX 259260421 5@mgw MGCP 1.0\r\n" \
- "C: 1355c6041e\r\n" \
- "I: 3\r\n" \
- "L: p:20, a:GSM, nt:IN\r\n" \
- "M: recvonly\r\n" \
- "\r\n" \
- "v=0\r\n" \
- "o=- 1439038275 1439038275 IN IP4 192.168.181.247\r\n" \
- "s=-\r\nc=IN IP4 192.168.181.247\r\n" \
- "t=0 0\r\nm=audio 29084 RTP/AVP 255 0 8 3 18 4 96 97 101\r\n" \
- "a=rtpmap:0 PCMU/8000\r\n" \
- "a=rtpmap:8 PCMA/8000\r\n" \
- "a=rtpmap:3 gsm/8000\r\n" \
- "a=rtpmap:18 G729/8000\r\n" \
- "a=fmtp:18 annexb=no\r\n" \
- "a=rtpmap:4 G723/8000\r\n" \
- "a=rtpmap:96 iLBC/8000\r\n" \
- "a=fmtp:96 mode=20\r\n" \
- "a=rtpmap:97 iLBC/8000\r\n" \
- "a=fmtp:97 mode=30\r\n" \
- "a=rtpmap:101 telephone-event/8000\r\n" \
- "a=fmtp:101 0-15\r\n" \
- "a=recvonly\r\n"
-#define MDCX_NAT_DUMMY \
- "MDCX 23 5@mgw MGCP 1.0\r\n" \
- "C: 1355c6041e\r\n" \
- "\r\n" \
- "c=IN IP4 8.8.8.8\r\n" \
- "m=audio 16434 RTP/AVP 255\r\n"
+ "CRCX 259260421 5@mgw MGCP 1.0\r\n" \
+ "C: 1355c6041e\r\n" \
+ "I: 3\r\n" \
+ "L: p:20, a:GSM, nt:IN\r\n" \
+ "M: recvonly\r\n" \
+ "\r\n" \
+ "v=0\r\n" \
+ "o=- 1439038275 1439038275 IN IP4 192.168.181.247\r\n" \
+ "s=-\r\nc=IN IP4 192.168.181.247\r\n" \
+ "t=0 0\r\nm=audio 29084 RTP/AVP 255 0 8 3 18 4 96 97 101\r\n" \
+ "a=rtpmap:0 PCMU/8000\r\n" \
+ "a=rtpmap:8 PCMA/8000\r\n" \
+ "a=rtpmap:3 gsm/8000\r\n" \
+ "a=rtpmap:18 G729/8000\r\n" \
+ "a=fmtp:18 annexb=no\r\n" \
+ "a=rtpmap:4 G723/8000\r\n" \
+ "a=rtpmap:96 iLBC/8000\r\n" \
+ "a=fmtp:96 mode=20\r\n" \
+ "a=rtpmap:97 iLBC/8000\r\n" \
+ "a=fmtp:97 mode=30\r\n" \
+ "a=rtpmap:101 telephone-event/8000\r\n" \
+ "a=fmtp:101 0-15\r\n" \
+ "a=recvonly\r\n"
+#define MDCX_NAT_DUMMY \
+ "MDCX 23 5@mgw MGCP 1.0\r\n" \
+ "C: 1355c6041e\r\n" \
+ "I: 3\r\n" \
+ "\r\n" \
+ "c=IN IP4 8.8.8.8\r\n" \
+ "m=audio 16434 RTP/AVP 255\r\n"
struct mgcp_test {
const char *name;
const char *req;
const char *exp_resp;
- int exp_net_ptype;
- int exp_bts_ptype;
-
+ int ptype;
const char *extra_fmtp;
};
static const struct mgcp_test tests[] = {
- { "AUEP1", AUEP1, AUEP1_RET },
- { "AUEP2", AUEP2, AUEP2_RET },
- { "MDCX1", MDCX_WRONG_EP, MDCX_ERR_RET },
- { "MDCX2", MDCX_UNALLOCATED, MDCX_RET },
- { "CRCX", CRCX, CRCX_RET, 97, 126 },
- { "MDCX3", MDCX3, MDCX3_RET, PTYPE_NONE, 126 },
- { "MDCX4", MDCX4, MDCX4_RET("18983216"), 99, 126 },
- { "MDCX4_PT1", MDCX4_PT1, MDCX4_RET("18983217"), 99, 126 },
- { "MDCX4_PT2", MDCX4_PT2, MDCX4_RET("18983218"), 99, 126 },
- { "MDCX4_PT3", MDCX4_PT3, MDCX4_RET("18983219"), 99, 126 },
- { "MDCX4_SO", MDCX4_SO, MDCX4_RET("18983220"), 99, 126 },
- { "MDCX4_RO", MDCX4_RO, MDCX4_RET("18983221"), PTYPE_IGNORE, 126 },
- { "DLCX", DLCX, DLCX_RET, -1, -1 },
- { "CRCX_ZYN", CRCX_ZYN, CRCX_ZYN_RET, 97, 126 },
- { "EMPTY", EMPTY, EMPTY_RET },
- { "SHORT1", SHORT, SHORT_RET },
- { "SHORT2", SHORT2, SHORT2_RET },
- { "SHORT3", SHORT3, SHORT2_RET },
- { "SHORT4", SHORT4, SHORT2_RET },
- { "RQNT1", RQNT, RQNT1_RET },
- { "RQNT2", RQNT2, RQNT2_RET },
- { "DLCX", DLCX, DLCX_RET, -1, -1 },
- { "CRCX", CRCX, CRCX_FMTP_RET, 97, 126, .extra_fmtp = "a=fmtp:126 0/1/2" },
- { "MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE, 126 , .extra_fmtp = "a=fmtp:126 0/1/2" },
- { "DLCX", DLCX, DLCX_RET, -1, -1 , .extra_fmtp = "a=fmtp:126 0/1/2" },
+ {"AUEP1", AUEP1, AUEP1_RET},
+ {"AUEP2", AUEP2, AUEP2_RET},
+ {"MDCX1", MDCX_WRONG_EP, MDCX_ERR_RET},
+ {"MDCX2", MDCX_UNALLOCATED, MDCX_RET},
+ {"CRCX", CRCX, CRCX_RET, 97},
+ {"MDCX3", MDCX3, MDCX3_RET, PTYPE_IGNORE},
+ {"MDCX4", MDCX4, MDCX4_RET("18983216"), 99},
+ {"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_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},
+ {"SHORT1", SHORT, SHORT_RET},
+ {"SHORT2", SHORT2, SHORT2_RET},
+ {"SHORT3", SHORT3, SHORT2_RET},
+ {"SHORT4", SHORT4, SHORT2_RET},
+ {"RQNT1", RQNT, RQNT1_RET},
+ {"RQNT2", RQNT2, RQNT2_RET},
+ {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE},
+ {"CRCX", CRCX, CRCX_FMTP_RET, 97,.extra_fmtp = "a=fmtp:126 0/1/2"},
+ {"MDCX3", MDCX3, MDCX3_FMTP_RET, PTYPE_NONE,.extra_fmtp =
+ "a=fmtp:126 0/1/2"},
+ {"DLCX", DLCX, DLCX_RET, PTYPE_IGNORE,.extra_fmtp = "a=fmtp:126 0/1/2"},
};
static const struct mgcp_test retransmit[] = {
- { "CRCX", CRCX, CRCX_RET },
- { "RQNT1", RQNT, RQNT1_RET },
- { "RQNT2", RQNT2, RQNT2_RET },
- { "MDCX3", MDCX3, MDCX3_RET },
- { "DLCX", DLCX, DLCX_RET },
+ {"CRCX", CRCX, CRCX_RET},
+ {"RQNT1", RQNT, RQNT1_RET},
+ {"RQNT2", RQNT2, RQNT2_RET},
+ {"MDCX3", MDCX3, MDCX3A_RET},
+ {"DLCX", DLCX, DLCX_RET},
};
static struct msgb *create_msg(const char *str)
@@ -444,21 +506,22 @@
static int dummy_packets = 0;
/* override and forward */
ssize_t sendto(int sockfd, const void *buf, size_t len, int flags,
- const struct sockaddr *dest_addr, socklen_t addrlen)
+ const struct sockaddr *dest_addr, socklen_t addrlen)
{
- typedef ssize_t (*sendto_t)(int, const void *, size_t, int,
- const struct sockaddr *, socklen_t);
+ typedef ssize_t(*sendto_t) (int, const void *, size_t, int,
+ const struct sockaddr *, socklen_t);
static sendto_t real_sendto = NULL;
- uint32_t dest_host = htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr);
- int dest_port = htons(((struct sockaddr_in *)dest_addr)->sin_port);
+ uint32_t dest_host =
+ htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr);
+ int dest_port = htons(((struct sockaddr_in *)dest_addr)->sin_port);
if (!real_sendto)
real_sendto = dlsym(RTLD_NEXT, "sendto");
- if (len == 1 && ((const char *)buf)[0] == MGCP_DUMMY_LOAD ) {
- fprintf(stderr, "Dummy packet to 0x%08x:%d, msg length %zu\n%s\n\n",
- dest_host, dest_port,
- len, osmo_hexdump(buf, len));
+ if (len == 1 && ((const char *)buf)[0] == MGCP_DUMMY_LOAD) {
+ fprintf(stderr,
+ "Dummy packet to 0x%08x:%d, msg length %zu\n%s\n\n",
+ dest_host, dest_port, len, osmo_hexdump(buf, len));
dummy_packets += 1;
}
@@ -489,19 +552,19 @@
static void test_values(void)
{
/* Check that NONE disables all output */
- OSMO_ASSERT((MGCP_CONN_NONE & MGCP_CONN_RECV_SEND) == 0)
+ OSMO_ASSERT((MGCP_CONN_NONE & MGCP_CONN_RECV_SEND) == 0);
/* Check that LOOPBACK enables all output */
OSMO_ASSERT((MGCP_CONN_LOOPBACK & MGCP_CONN_RECV_SEND) ==
- MGCP_CONN_RECV_SEND)
+ MGCP_CONN_RECV_SEND);
}
-
static void test_messages(void)
{
struct mgcp_config *cfg;
struct mgcp_endpoint *endp;
int i;
+ struct mgcp_conn_rtp *conn = NULL;
cfg = mgcp_config_alloc();
@@ -512,16 +575,6 @@
mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
- /* reset endpoints */
- for (i = 0; i < cfg->trunk.number_endpoints; i++) {
- endp = &cfg->trunk.endpoints[i];
- endp->net_end.codec.payload_type = PTYPE_NONE;
- endp->net_end.packet_duration_ms = -1;
-
- OSMO_ASSERT(endp->conn_mode == MGCP_CONN_NONE);
- endp->conn_mode |= CONN_UNMODIFIED;
- }
-
for (i = 0; i < ARRAY_SIZE(tests); i++) {
const struct mgcp_test *t = &tests[i];
struct msgb *inp;
@@ -532,16 +585,22 @@
last_endpoint = -1;
dummy_packets = 0;
- osmo_talloc_replace_string(cfg, &cfg->trunk.audio_fmtp_extra, t->extra_fmtp);
+ osmo_talloc_replace_string(cfg, &cfg->trunk.audio_fmtp_extra,
+ t->extra_fmtp);
inp = create_msg(t->req);
msg = mgcp_handle_message(cfg, inp);
msgb_free(inp);
if (!t->exp_resp) {
- if (msg)
- printf("%s failed '%s'\n", t->name, (char *) msg->data);
- } else if (strcmp((char *) msg->data, t->exp_resp) != 0)
- printf("%s failed '%s'\n", t->name, (char *) msg->data);
+ if (msg) {
+ printf("%s failed '%s'\n", t->name,
+ (char *)msg->data);
+ OSMO_ASSERT(false);
+ }
+ } else if (strcmp((char *)msg->data, t->exp_resp) != 0) {
+ printf("%s failed '%s'\n", t->name, (char *)msg->data);
+ OSMO_ASSERT(false);
+ }
msgb_free(msg);
if (dummy_packets)
@@ -550,71 +609,73 @@
if (last_endpoint != -1) {
endp = &cfg->trunk.endpoints[last_endpoint];
- if (endp->net_end.packet_duration_ms != -1)
- printf("Detected packet duration: %d\n",
- endp->net_end.packet_duration_ms);
- else
- printf("Packet duration not set\n");
- if (endp->local_options.pkt_period_min ||
- endp->local_options.pkt_period_max)
- printf("Requested packetetization period: "
- "%d-%d\n",
- endp->local_options.pkt_period_min,
- endp->local_options.pkt_period_max);
- else
- printf("Requested packetization period not set\n");
+ conn = mgcp_conn_get_rtp(endp, 1);
+ if (conn) {
+ OSMO_ASSERT(conn);
- if ((endp->conn_mode & CONN_UNMODIFIED) == 0) {
- printf("Connection mode: %d:%s%s%s%s\n",
- endp->conn_mode,
- !endp->conn_mode ? " NONE" : "",
- endp->conn_mode & MGCP_CONN_SEND_ONLY ?
- " SEND" : "",
- endp->conn_mode & MGCP_CONN_RECV_ONLY ?
- " RECV" : "",
- endp->conn_mode & MGCP_CONN_LOOPBACK &
- ~MGCP_CONN_RECV_SEND ?
- " LOOP" : "");
- fprintf(stderr,
- "BTS output %sabled, NET output %sabled\n",
- endp->bts_end.output_enabled ? "en" : "dis",
- endp->net_end.output_enabled ? "en" : "dis");
- } else
- printf("Connection mode not set\n");
+ if (conn->end.packet_duration_ms != -1)
+ printf("Detected packet duration: %d\n",
+ conn->end.packet_duration_ms);
+ else
+ printf("Packet duration not set\n");
+ if (endp->local_options.pkt_period_min ||
+ endp->local_options.pkt_period_max)
+ printf
+ ("Requested packetetization period: "
+ "%d-%d\n",
+ endp->local_options.pkt_period_min,
+ endp->
+ local_options.pkt_period_max);
+ else
+ printf
+ ("Requested packetization period not set\n");
- OSMO_ASSERT(endp->net_end.output_enabled ==
- (endp->conn_mode & MGCP_CONN_SEND_ONLY ? 1 : 0));
- OSMO_ASSERT(endp->bts_end.output_enabled ==
- (endp->conn_mode & MGCP_CONN_RECV_ONLY ? 1 : 0));
+ if ((conn->conn->mode & CONN_UNMODIFIED) == 0) {
+ printf("Connection mode: %d:%s%s%s%s\n",
+ conn->conn->mode,
+ !conn->conn->mode ? " NONE" : "",
+ conn->conn->mode & MGCP_CONN_SEND_ONLY
+ ? " SEND" : "",
+ conn->conn->mode & MGCP_CONN_RECV_ONLY
+ ? " RECV" : "",
+ conn->conn->mode & MGCP_CONN_LOOPBACK
+ & ~MGCP_CONN_RECV_SEND
+ ? " LOOP" : "");
+ fprintf(stderr,
+ "RTP output %sabled, NET output %sabled\n",
+ conn->end.output_enabled
+ ? "en" : "dis",
+ conn->end.output_enabled
+ ? "en" : "dis");
+ } else
+ printf("Connection mode not set\n");
- endp->net_end.packet_duration_ms = -1;
+ OSMO_ASSERT(conn->end.output_enabled
+ == (conn->conn->mode & MGCP_CONN_SEND_ONLY ? 1 : 0));
+
+ conn->conn->mode |= CONN_UNMODIFIED;
+
+ }
endp->local_options.pkt_period_min = 0;
endp->local_options.pkt_period_max = 0;
- endp->conn_mode |= CONN_UNMODIFIED;
}
-
/* Check detected payload type */
- if (t->exp_net_ptype != PTYPE_IGNORE ||
- t->exp_bts_ptype != PTYPE_IGNORE) {
+ if (t->ptype != PTYPE_IGNORE) {
OSMO_ASSERT(last_endpoint != -1);
endp = &cfg->trunk.endpoints[last_endpoint];
fprintf(stderr, "endpoint %d: "
- "payload type BTS %d (exp %d), NET %d (exp %d)\n",
+ "payload type %d (expected %d)\n",
last_endpoint,
- endp->bts_end.codec.payload_type, t->exp_bts_ptype,
- endp->net_end.codec.payload_type, t->exp_net_ptype);
+ conn->end.codec.payload_type, t->ptype);
- if (t->exp_bts_ptype != PTYPE_IGNORE)
- OSMO_ASSERT(endp->bts_end.codec.payload_type ==
- t->exp_bts_ptype);
- if (t->exp_net_ptype != PTYPE_IGNORE)
- OSMO_ASSERT(endp->net_end.codec.payload_type ==
- t->exp_net_ptype);
+ if (t->ptype != PTYPE_IGNORE)
+ OSMO_ASSERT(conn->end.codec.payload_type ==
+ t->ptype);
/* Reset them again for next test */
- endp->net_end.codec.payload_type = PTYPE_NONE;
+ conn->end.codec.payload_type = PTYPE_NONE;
}
}
@@ -633,13 +694,6 @@
mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
- /* reset endpoints */
- for (i = 0; i < cfg->trunk.number_endpoints; i++) {
- struct mgcp_endpoint *endp;
- endp = &cfg->trunk.endpoints[i];
- endp->bts_end.packet_duration_ms = 20;
- }
-
for (i = 0; i < ARRAY_SIZE(retransmit); i++) {
const struct mgcp_test *t = &retransmit[i];
struct msgb *inp;
@@ -649,9 +703,12 @@
inp = create_msg(t->req);
msg = mgcp_handle_message(cfg, inp);
+
msgb_free(inp);
- if (strcmp((char *) msg->data, t->exp_resp) != 0)
- printf("%s failed '%s'\n", t->name, (char *) msg->data);
+ if (strcmp((char *)msg->data, t->exp_resp) != 0) {
+ printf("%s failed '%s'\n", t->name, (char *)msg->data);
+ OSMO_ASSERT(false);
+ }
msgb_free(msg);
/* Retransmit... */
@@ -659,8 +716,10 @@
inp = create_msg(t->req);
msg = mgcp_handle_message(cfg, inp);
msgb_free(inp);
- if (strcmp((char *) msg->data, t->exp_resp) != 0)
- printf("%s failed '%s'\n", t->name, (char *) msg->data);
+ if (strcmp((char *)msg->data, t->exp_resp) != 0) {
+ printf("%s failed '%s'\n", t->name, (char *)msg->data);
+ OSMO_ASSERT(false);
+ }
msgb_free(msg);
}
@@ -670,7 +729,7 @@
static int rqnt_cb(struct mgcp_endpoint *endp, char _tone)
{
ptrdiff_t tone = _tone;
- endp->cfg->data = (void *) tone;
+ endp->cfg->data = (void *)tone;
return 0;
}
@@ -694,12 +753,12 @@
/* send the RQNT and check for the CB */
inp = create_msg(RQNT);
msg = mgcp_handle_message(cfg, inp);
- if (strncmp((const char *) msg->l2h, "200", 3) != 0) {
+ if (strncmp((const char *)msg->l2h, "200", 3) != 0) {
printf("FAILED: message is not 200. '%s'\n", msg->l2h);
abort();
}
- if (cfg->data != (void *) '9') {
+ if (cfg->data != (void *)'9') {
printf("FAILED: callback not called: %p\n", cfg->data);
abort();
}
@@ -714,26 +773,31 @@
}
struct pl_test {
- int cycles;
- uint16_t base_seq;
- uint16_t max_seq;
- uint32_t packets;
+ int cycles;
+ uint16_t base_seq;
+ uint16_t max_seq;
+ uint32_t packets;
- uint32_t expected;
- int loss;
+ uint32_t expected;
+ int loss;
};
static const struct pl_test pl_test_dat[] = {
/* basic.. just one package */
- { .cycles = 0, .base_seq = 0, .max_seq = 0, .packets = 1, .expected = 1, .loss = 0},
+ {.cycles = 0,.base_seq = 0,.max_seq = 0,.packets = 1,.expected =
+ 1,.loss = 0},
/* some packages and a bit of loss */
- { .cycles = 0, .base_seq = 0, .max_seq = 100, .packets = 100, .expected = 101, .loss = 1},
+ {.cycles = 0,.base_seq = 0,.max_seq = 100,.packets = 100,.expected =
+ 101,.loss = 1},
/* wrap around */
- { .cycles = 1<<16, .base_seq = 0xffff, .max_seq = 2, .packets = 4, .expected = 4, .loss = 0},
+ {.cycles = 1 << 16,.base_seq = 0xffff,.max_seq = 2,.packets =
+ 4,.expected = 4,.loss = 0},
/* min loss */
- { .cycles = 0, .base_seq = 0, .max_seq = 0, .packets = UINT_MAX, .expected = 1, .loss = INT_MIN },
+ {.cycles = 0,.base_seq = 0,.max_seq = 0,.packets = UINT_MAX,.expected =
+ 1,.loss = INT_MIN},
/* max loss, with wrap around on expected max */
- { .cycles = INT_MAX, .base_seq = 0, .max_seq = UINT16_MAX, .packets = 0, .expected = ((uint32_t)(INT_MAX) + UINT16_MAX + 1), .loss = INT_MAX },
+ {.cycles = INT_MAX,.base_seq = 0,.max_seq = UINT16_MAX,.packets =
+ 0,.expected = ((uint32_t) (INT_MAX) + UINT16_MAX + 1),.loss = INT_MAX},
};
static void test_packet_loss_calc(void)
@@ -754,17 +818,48 @@
state.stats_max_seq = pl_test_dat[i].max_seq;
state.stats_cycles = pl_test_dat[i].cycles;
- rtp.packets = pl_test_dat[i].packets;
- mgcp_state_calc_loss(&state, &rtp, &expected, &loss);
+ rtp.packets_rx = pl_test_dat[i].packets;
+ calc_loss(&state, &rtp, &expected, &loss);
- if (loss != pl_test_dat[i].loss || expected != pl_test_dat[i].expected) {
- printf("FAIL: Wrong exp/loss at idx(%d) Loss(%d vs. %d) Exp(%u vs. %u)\n",
- i, loss, pl_test_dat[i].loss,
- expected, pl_test_dat[i].expected);
+ if (loss != pl_test_dat[i].loss
+ || expected != pl_test_dat[i].expected) {
+ printf
+ ("FAIL: Wrong exp/loss at idx(%d) Loss(%d vs. %d) Exp(%u vs. %u)\n",
+ i, loss, pl_test_dat[i].loss, expected,
+ pl_test_dat[i].expected);
}
}
}
+int mgcp_parse_stats(struct msgb *msg, uint32_t *ps, uint32_t *os,
+ uint32_t *pr, uint32_t *_or, int *loss,
+ uint32_t *jitter)
+{
+ char *line, *save;
+ int rc;
+
+ /* initialize with bad values */
+ *ps = *os = *pr = *_or = *jitter = UINT_MAX;
+ *loss = INT_MAX;
+
+ line = strtok_r((char *)msg->l2h, "\r\n", &save);
+ if (!line)
+ return -1;
+
+ /* this can only parse the message that is created above... */
+ for_each_non_empty_line(line, save) {
+ switch (line[0]) {
+ case 'P':
+ rc = sscanf(line,
+ "P: PS=%u, OS=%u, PR=%u, OR=%u, PL=%d, JI=%u",
+ ps, os, pr, _or, loss, jitter);
+ return rc == 6 ? 0 : -1;
+ }
+ }
+
+ return -1;
+}
+
static void test_mgcp_stats(void)
{
printf("Testing stat parsing\n");
@@ -777,14 +872,18 @@
msg = create_msg(DLCX_RET);
rc = mgcp_parse_stats(msg, &bps, &bos, &pr, &_or, &loss, &jitter);
printf("Parsing result: %d\n", rc);
- if (bps != 0 || bos != 0 || pr != 0 || _or != 0 || loss != 0 || jitter != 0)
+ if (bps != 0 || bos != 0 || pr != 0 || _or != 0 || loss != 0
+ || jitter != 0)
printf("FAIL: Parsing failed1.\n");
msgb_free(msg);
- msg = create_msg("250 7 OK\r\nP: PS=10, OS=20, PR=30, OR=40, PL=-3, JI=40\r\n");
+ msg =
+ create_msg
+ ("250 7 OK\r\nP: PS=10, OS=20, PR=30, OR=40, PL=-3, JI=40\r\n");
rc = mgcp_parse_stats(msg, &bps, &bos, &pr, &_or, &loss, &jitter);
printf("Parsing result: %d\n", rc);
- if (bps != 10 || bos != 20 || pr != 30 || _or != 40 || loss != -3 || jitter != 40)
+ if (bps != 10 || bos != 20 || pr != 30 || _or != 40 || loss != -3
+ || jitter != 40)
printf("FAIL: Parsing failed2.\n");
msgb_free(msg);
}
@@ -798,109 +897,110 @@
struct rtp_packet_info test_rtp_packets1[] = {
/* RTP: SeqNo=0, TS=0 */
{0.000000, 20, "\x80\x62\x00\x00\x00\x00\x00\x00\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=1, TS=160 */
{0.020000, 20, "\x80\x62\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=2, TS=320 */
{0.040000, 20, "\x80\x62\x00\x02\x00\x00\x01\x40\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Repeat RTP timestamp: */
/* RTP: SeqNo=3, TS=320 */
{0.060000, 20, "\x80\x62\x00\x03\x00\x00\x01\x40\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=4, TS=480 */
{0.080000, 20, "\x80\x62\x00\x04\x00\x00\x01\xE0\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=5, TS=640 */
{0.100000, 20, "\x80\x62\x00\x05\x00\x00\x02\x80\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Double skip RTP timestamp (delta = 2*160): */
/* RTP: SeqNo=6, TS=960 */
{0.120000, 20, "\x80\x62\x00\x06\x00\x00\x03\xC0\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=7, TS=1120 */
{0.140000, 20, "\x80\x62\x00\x07\x00\x00\x04\x60\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=8, TS=1280 */
{0.160000, 20, "\x80\x62\x00\x08\x00\x00\x05\x00\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Non 20ms RTP timestamp (delta = 120): */
/* RTP: SeqNo=9, TS=1400 */
{0.180000, 20, "\x80\x62\x00\x09\x00\x00\x05\x78\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=10, TS=1560 */
{0.200000, 20, "\x80\x62\x00\x0A\x00\x00\x06\x18\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=11, TS=1720 */
{0.220000, 20, "\x80\x62\x00\x0B\x00\x00\x06\xB8\x11\x22\x33\x44"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* SSRC changed to 0x10203040, RTP timestamp jump */
/* RTP: SeqNo=12, TS=34688 */
{0.240000, 20, "\x80\x62\x00\x0C\x00\x00\x87\x80\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=13, TS=34848 */
{0.260000, 20, "\x80\x62\x00\x0D\x00\x00\x88\x20\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=14, TS=35008 */
{0.280000, 20, "\x80\x62\x00\x0E\x00\x00\x88\xC0\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Non 20ms RTP timestamp (delta = 120): */
/* RTP: SeqNo=15, TS=35128 */
{0.300000, 20, "\x80\x62\x00\x0F\x00\x00\x89\x38\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=16, TS=35288 */
{0.320000, 20, "\x80\x62\x00\x10\x00\x00\x89\xD8\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=17, TS=35448 */
{0.340000, 20, "\x80\x62\x00\x11\x00\x00\x8A\x78\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x8A\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x8A\xAB\xCD\xEF"},
/* SeqNo increment by 2, RTP timestamp delta = 320: */
/* RTP: SeqNo=19, TS=35768 */
{0.360000, 20, "\x80\x62\x00\x13\x00\x00\x8B\xB8\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=20, TS=35928 */
{0.380000, 20, "\x80\x62\x00\x14\x00\x00\x8C\x58\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=21, TS=36088 */
{0.380000, 20, "\x80\x62\x00\x15\x00\x00\x8C\xF8\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Repeat last packet */
/* RTP: SeqNo=21, TS=36088 */
{0.400000, 20, "\x80\x62\x00\x15\x00\x00\x8C\xF8\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=22, TS=36248 */
{0.420000, 20, "\x80\x62\x00\x16\x00\x00\x8D\x98\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=23, TS=36408 */
{0.440000, 20, "\x80\x62\x00\x17\x00\x00\x8E\x38\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* Don't increment SeqNo but increment timestamp by 160 */
/* RTP: SeqNo=23, TS=36568 */
{0.460000, 20, "\x80\x62\x00\x17\x00\x00\x8E\xD8\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=24, TS=36728 */
{0.480000, 20, "\x80\x62\x00\x18\x00\x00\x8F\x78\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=25, TS=36888 */
{0.500000, 20, "\x80\x62\x00\x19\x00\x00\x90\x18\x10\x20\x30\x40"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* SSRC changed to 0x50607080, RTP timestamp jump, Delay of 1.5s,
* SeqNo jump */
/* RTP: SeqNo=1000, TS=160000 */
{2.000000, 20, "\x80\x62\x03\xE8\x00\x02\x71\x00\x50\x60\x70\x80"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=1001, TS=160160 */
{2.020000, 20, "\x80\x62\x03\xE9\x00\x02\x71\xA0\x50\x60\x70\x80"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
/* RTP: SeqNo=1002, TS=160320 */
{2.040000, 20, "\x80\x62\x03\xEA\x00\x02\x72\x40\x50\x60\x70\x80"
- "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
+ "\x01\x23\x45\x67\x89\xAB\xCD\xEF"},
};
-void mgcp_patch_and_count(struct mgcp_endpoint *endp, struct mgcp_rtp_state *state,
- struct mgcp_rtp_end *rtp_end, struct sockaddr_in *addr,
- char *data, int len);
+void mgcp_patch_and_count(struct mgcp_endpoint *endp,
+ struct mgcp_rtp_state *state,
+ struct mgcp_rtp_end *rtp_end,
+ struct sockaddr_in *addr, char *data, int len);
static void test_packet_error_detection(int patch_ssrc, int patch_ts)
{
@@ -909,14 +1009,15 @@
struct mgcp_trunk_config trunk;
struct mgcp_endpoint endp;
struct mgcp_rtp_state state;
- struct mgcp_rtp_end *rtp = &endp.net_end;
- struct sockaddr_in addr = {0};
+ struct mgcp_rtp_end *rtp;
+ struct sockaddr_in addr = { 0 };
char buffer[4096];
uint32_t last_ssrc = 0;
uint32_t last_timestamp = 0;
uint32_t last_seqno = 0;
int last_in_ts_err_cnt = 0;
int last_out_ts_err_cnt = 0;
+ struct mgcp_conn_rtp *conn = NULL;
printf("Testing packet error detection%s%s.\n",
patch_ssrc ? ", patch SSRC" : "",
@@ -926,6 +1027,8 @@
memset(&endp, 0, sizeof(endp));
memset(&state, 0, sizeof(state));
+ endp.type = &ep_typeset.rtp;
+
trunk.number_endpoints = 1;
trunk.endpoints = &endp;
trunk.force_constant_ssrc = patch_ssrc;
@@ -933,7 +1036,13 @@
endp.tcfg = &trunk;
- mgcp_initialize_endp(&endp);
+ INIT_LLIST_HEAD(&endp.conns);
+ mgcp_conn_alloc(NULL, &endp, 4711, MGCP_CONN_TYPE_RTP,
+ "test-connection");
+ conn = mgcp_conn_get_rtp(&endp, 4711);
+ OSMO_ASSERT(conn);
+
+ rtp = &conn->end;
rtp->codec.payload_type = 98;
@@ -945,7 +1054,6 @@
OSMO_ASSERT(info->len <= sizeof(buffer));
OSMO_ASSERT(info->len >= 0);
memmove(buffer, info->data, info->len);
-
mgcp_rtp_end_config(&endp, 1, rtp);
mgcp_patch_and_count(&endp, &state, rtp, &addr,
@@ -959,8 +1067,7 @@
printf("In TS: %d, dTS: %d, Seq: %d\n",
state.in_stream.last_timestamp,
- state.in_stream.last_tsdelta,
- state.in_stream.last_seq);
+ state.in_stream.last_tsdelta, state.in_stream.last_seq);
printf("Out TS change: %d, dTS: %d, Seq change: %d, "
"TS Err change: in %+d, out %+d\n",
@@ -971,7 +1078,7 @@
state.out_stream.err_ts_counter - last_out_ts_err_cnt);
printf("Stats: Jitter = %u, Transit = %d\n",
- mgcp_state_calc_jitter(&state), state.stats_transit);
+ calc_jitter(&state), state.stats_transit);
last_in_ts_err_cnt = state.in_stream.err_ts_counter;
last_out_ts_err_cnt = state.out_stream.err_ts_counter;
@@ -988,6 +1095,7 @@
struct mgcp_endpoint *endp;
struct msgb *inp, *resp;
struct in_addr addr;
+ struct mgcp_conn_rtp *conn = NULL;
printf("Testing multiple payload types\n");
@@ -1006,8 +1114,10 @@
OSMO_ASSERT(last_endpoint == 1);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 18);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 97);
+ conn = mgcp_conn_get_rtp(endp, 4711);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 18);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == 97);
/* Allocate 2@mgw with three codecs, last one ignored */
last_endpoint = -1;
@@ -1018,8 +1128,10 @@
OSMO_ASSERT(last_endpoint == 2);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 18);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 97);
+ conn = mgcp_conn_get_rtp(endp, 90210);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 18);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == 97);
/* Allocate 3@mgw with no codecs, check for PT == -1 */
last_endpoint = -1;
@@ -1030,8 +1142,10 @@
OSMO_ASSERT(last_endpoint == 3);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == -1);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == -1);
+ conn = mgcp_conn_get_rtp(endp, 815);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == -1);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == -1);
/* Allocate 4@mgw with a single codec */
last_endpoint = -1;
@@ -1042,8 +1156,10 @@
OSMO_ASSERT(last_endpoint == 4);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 18);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == -1);
+ conn = mgcp_conn_get_rtp(endp, 32168);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 18);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == -1);
/* Allocate 5@mgw at select GSM.. */
last_endpoint = -1;
@@ -1057,8 +1173,10 @@
OSMO_ASSERT(last_endpoint == 5);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 3);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == -1);
+ conn = mgcp_conn_get_rtp(endp, 3);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 3);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == -1);
inp = create_msg(MDCX_NAT_DUMMY);
last_endpoint = -1;
@@ -1067,20 +1185,25 @@
msgb_free(resp);
OSMO_ASSERT(last_endpoint == 5);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 3);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == -1);
- OSMO_ASSERT(endp->net_end.rtp_port == htons(16434));
+ conn = mgcp_conn_get_rtp(endp, 3);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 3);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == -1);
+ OSMO_ASSERT(conn->end.rtp_port == htons(16434));
memset(&addr, 0, sizeof(addr));
inet_aton("8.8.8.8", &addr);
- OSMO_ASSERT(endp->net_end.addr.s_addr == addr.s_addr);
+ OSMO_ASSERT(conn->end.addr.s_addr == addr.s_addr);
/* Check what happens without that flag */
- /* Free the previous endpoint and the data ... */
+ /* Free the previous endpoint and the data and
+ * check if the connection really vanished... */
mgcp_release_endp(endp);
talloc_free(endp->last_response);
talloc_free(endp->last_trans);
endp->last_response = endp->last_trans = NULL;
+ conn = mgcp_conn_get_rtp(endp, 3);
+ OSMO_ASSERT(!conn);
last_endpoint = -1;
inp = create_msg(CRCX_MULT_GSM_EXACT);
@@ -1091,8 +1214,10 @@
OSMO_ASSERT(last_endpoint == 5);
endp = &cfg->trunk.endpoints[last_endpoint];
- OSMO_ASSERT(endp->net_end.codec.payload_type == 255);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 0);
+ conn = mgcp_conn_get_rtp(endp, 3);
+ OSMO_ASSERT(conn);
+ OSMO_ASSERT(conn->end.codec.payload_type == 255);
+ OSMO_ASSERT(conn->end.alt_codec.payload_type == 0);
talloc_free(cfg);
}
@@ -1101,6 +1226,7 @@
{
struct mgcp_config *cfg;
struct mgcp_endpoint *endp;
+ struct mgcp_conn_rtp *conn = NULL;
printf("Testing no sequence flow on initial packet\n");
@@ -1109,29 +1235,35 @@
mgcp_endpoints_allocate(&cfg->trunk);
endp = &cfg->trunk.endpoints[1];
- OSMO_ASSERT(endp->net_state.stats_initialized == 0);
- mgcp_rtp_annex_count(endp, &endp->net_state, 0, 0, 2342);
- OSMO_ASSERT(endp->net_state.stats_initialized == 1);
- OSMO_ASSERT(endp->net_state.stats_cycles == 0);
- OSMO_ASSERT(endp->net_state.stats_max_seq == 0);
+ mgcp_conn_alloc(NULL, endp, 4711, MGCP_CONN_TYPE_RTP,
+ "test-connection");
+ conn = mgcp_conn_get_rtp(endp, 4711);
+ OSMO_ASSERT(conn);
- mgcp_rtp_annex_count(endp, &endp->net_state, 1, 0, 2342);
- OSMO_ASSERT(endp->net_state.stats_initialized == 1);
- OSMO_ASSERT(endp->net_state.stats_cycles == 0);
- OSMO_ASSERT(endp->net_state.stats_max_seq == 1);
+ OSMO_ASSERT(conn->state.stats_initialized == 0);
+
+ mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342);
+ OSMO_ASSERT(conn->state.stats_initialized == 1);
+ OSMO_ASSERT(conn->state.stats_cycles == 0);
+ OSMO_ASSERT(conn->state.stats_max_seq == 0);
+
+ mgcp_rtp_annex_count(endp, &conn->state, 1, 0, 2342);
+ OSMO_ASSERT(conn->state.stats_initialized == 1);
+ OSMO_ASSERT(conn->state.stats_cycles == 0);
+ OSMO_ASSERT(conn->state.stats_max_seq == 1);
/* now jump.. */
- mgcp_rtp_annex_count(endp, &endp->net_state, UINT16_MAX, 0, 2342);
- OSMO_ASSERT(endp->net_state.stats_initialized == 1);
- OSMO_ASSERT(endp->net_state.stats_cycles == 0);
- OSMO_ASSERT(endp->net_state.stats_max_seq == UINT16_MAX);
+ mgcp_rtp_annex_count(endp, &conn->state, UINT16_MAX, 0, 2342);
+ OSMO_ASSERT(conn->state.stats_initialized == 1);
+ OSMO_ASSERT(conn->state.stats_cycles == 0);
+ OSMO_ASSERT(conn->state.stats_max_seq == UINT16_MAX);
/* and wrap */
- mgcp_rtp_annex_count(endp, &endp->net_state, 0, 0, 2342);
- OSMO_ASSERT(endp->net_state.stats_initialized == 1);
- OSMO_ASSERT(endp->net_state.stats_cycles == UINT16_MAX + 1);
- OSMO_ASSERT(endp->net_state.stats_max_seq == 0);
+ mgcp_rtp_annex_count(endp, &conn->state, 0, 0, 2342);
+ OSMO_ASSERT(conn->state.stats_initialized == 1);
+ OSMO_ASSERT(conn->state.stats_cycles == UINT16_MAX + 1);
+ OSMO_ASSERT(conn->state.stats_max_seq == 0);
talloc_free(cfg);
}
@@ -1139,9 +1271,7 @@
static void test_no_name(void)
{
struct mgcp_config *cfg;
- struct mgcp_endpoint *endp;
struct msgb *inp, *msg;
- int i;
printf("Testing no rtpmap name\n");
cfg = mgcp_config_alloc();
@@ -1154,21 +1284,13 @@
mgcp_endpoints_allocate(mgcp_trunk_alloc(cfg, 1));
- /* reset endpoints */
- for (i = 0; i < cfg->trunk.number_endpoints; i++) {
- endp = &cfg->trunk.endpoints[i];
- endp->net_end.codec.payload_type = PTYPE_NONE;
- endp->net_end.packet_duration_ms = -1;
-
- OSMO_ASSERT(endp->conn_mode == MGCP_CONN_NONE);
- endp->conn_mode |= CONN_UNMODIFIED;
- }
-
inp = create_msg(CRCX);
msg = mgcp_handle_message(cfg, inp);
- if (strcmp((char *) msg->data, CRCX_RET_NO_RTPMAP) != 0)
+ if (strcmp((char *)msg->data, CRCX_RET_NO_RTPMAP) != 0) {
printf("FAILED: there should not be a RTPMAP: %s\n",
- (char *) msg->data);
+ (char *)msg->data);
+ OSMO_ASSERT(false);
+ }
msgb_free(inp);
msgb_free(msg);
@@ -1205,8 +1327,8 @@
};
const struct log_info log_info = {
- .cat = log_categories,
- .num_cat = ARRAY_SIZE(log_categories),
+ .cat = log_categories,
+ .num_cat = ARRAY_SIZE(log_categories),
};
int main(int argc, char **argv)
diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok
index 4e27282..7376930 100644
--- a/tests/mgcp/mgcp_test.ok
+++ b/tests/mgcp/mgcp_test.ok
@@ -16,32 +16,32 @@
Testing MDCX1
Testing MDCX2
Testing CRCX
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 1: RECV
Testing MDCX3
-Dummy packets: 1
-Packet duration not set
+Dummy packets: 2
+Detected packet duration: 40
Requested packetization period not set
-Connection mode not set
+Connection mode: 1: RECV
Testing MDCX4
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 3: SEND RECV
Testing MDCX4_PT1
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetetization period: 20-40
Connection mode: 3: SEND RECV
Testing MDCX4_PT2
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 3: SEND RECV
Testing MDCX4_PT3
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetization period not set
Connection mode: 3: SEND RECV
@@ -50,17 +50,14 @@
Requested packetetization period: 20-20
Connection mode: 2: SEND
Testing MDCX4_RO
-Dummy packets: 1
-Packet duration not set
+Dummy packets: 2
+Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 1: RECV
Testing DLCX
-Detected packet duration: 20
-Requested packetization period not set
-Connection mode: 0: NONE
Testing CRCX_ZYN
-Dummy packets: 1
-Packet duration not set
+Dummy packets: 2
+Detected packet duration: 20
Requested packetization period not set
Connection mode: 1: RECV
Testing EMPTY
@@ -71,23 +68,17 @@
Testing RQNT1
Testing RQNT2
Testing DLCX
-Detected packet duration: 20
-Requested packetization period not set
-Connection mode: 0: NONE
Testing CRCX
-Dummy packets: 1
+Dummy packets: 2
Detected packet duration: 40
Requested packetetization period: 20-20
Connection mode: 1: RECV
Testing MDCX3
-Dummy packets: 1
-Packet duration not set
+Dummy packets: 2
+Detected packet duration: 40
Requested packetization period not set
-Connection mode not set
+Connection mode: 1: RECV
Testing DLCX
-Detected packet duration: 20
-Requested packetization period not set
-Connection mode: 0: NONE
Testing CRCX
Re-transmitting CRCX
Testing RQNT1
diff --git a/tests/mgcp/mgcp_transcoding_test.c b/tests/mgcp/mgcp_transcoding_test.c
deleted file mode 100644
index 61de25f..0000000
--- a/tests/mgcp/mgcp_transcoding_test.c
+++ /dev/null
@@ -1,661 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-#include <stdint.h>
-#include <errno.h>
-
-#include <osmocom/core/talloc.h>
-#include <osmocom/core/application.h>
-
-#include <osmocom/netif/rtp.h>
-
-#include <osmocom/legacy_mgcp/mgcp.h>
-#include <osmocom/legacy_mgcp/mgcp_internal.h>
-
-#include "bscconfig.h"
-#ifndef BUILD_MGCP_TRANSCODING
-#error "Requires MGCP transcoding enabled (see --enable-mgcp-transcoding)"
-#endif
-
-#include <osmocom/legacy_mgcp/mgcp_transcode.h>
-
-uint8_t *audio_frame_l16[] = {
-};
-
-struct rtp_packets {
- float t;
- int len;
- char *data;
-};
-
-struct rtp_packets audio_packets_l16[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 332,
- "\x80\x0B\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- "\x00\x00\x40\x13\x5A\x9E\x40\x13\x00\x00\xBF\xED\xA5\x62\xBF\xED"
- },
-};
-
-struct rtp_packets audio_packets_gsm[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 45,
- "\x80\x03\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xD4\x7C\xE3\xE9\x62\x50\x39\xF0\xF8\xB4\x68\xEA\x6C\x0E\x81\x1B"
- "\x56\x2A\xD5\xBC\x69\x9C\xD1\xF0\x66\x7A\xEC\x49\x7A\x33\x3D\x0A"
- "\xDE"
- },
-};
-
-struct rtp_packets audio_packets_gsm_invalid_size[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 41,
- "\x80\x03\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xD4\x7C\xE3\xE9\x62\x50\x39\xF0\xF8\xB4\x68\xEA\x6C\x0E\x81\x1B"
- "\x56\x2A\xD5\xBC\x69\x9C\xD1\xF0\x66\x7A\xEC\x49\x7A\x33\x3D\x0A"
- "\xDE"
- },
-};
-
-struct rtp_packets audio_packets_gsm_invalid_data[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 45,
- "\x80\x03\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE"
- "\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE\xEE"
- "\xEE"
- },
-};
-
-struct rtp_packets audio_packets_gsm_invalid_ptype[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 45,
- "\x80\x08\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xD4\x7C\xE3\xE9\x62\x50\x39\xF0\xF8\xB4\x68\xEA\x6C\x0E\x81\x1B"
- "\x56\x2A\xD5\xBC\x69\x9C\xD1\xF0\x66\x7A\xEC\x49\x7A\x33\x3D\x0A"
- "\xDE"
- },
-};
-
-struct rtp_packets audio_packets_g729[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 32,
- "\x80\x12\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xAF\xC2\x81\x40\x00\xFA\xCE\xA4\x21\x7C\xC5\xC3\x4F\xA5\x98\xF5"
- "\xB2\x95\xC4\xAD"
- },
-};
-
-struct rtp_packets audio_packets_pcma[] = {
- /* RTP: SeqNo=1, TS=160 */
- {0.020000, 172,
- "\x80\x08\x00\x01\x00\x00\x00\xA0\x11\x22\x33\x44"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- "\xD5\xA5\xA3\xA5\xD5\x25\x23\x25\xD5\xA5\xA3\xA5\xD5\x25\x23\x25"
- },
- /* RTP: SeqNo=26527, TS=232640 */
- {0.020000, 92,
- "\x80\x08\x67\x9f\x00\x03\x8c\xc0\x04\xaa\x67\x9f\xd5\xd5\xd5\xd5"
- "\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5"
- "\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5"
- "\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5\xd5"
- "\xd5\xd5\xd5\xd5\xd5\xd5\x55\x55\xd5\xd5\x55\x55\xd5\xd5\x55\x55"
- "\xd5\xd5\xd5\x55\x55\xd5\xd5\xd5\x55\x55\xd5\xd5"
- },
- /* RTP: SeqNo=26528, TS=232720 */
- {0.020000, 92,
- "\x80\x08\x67\xa0\x00\x03\x8d\x10\x04\xaa\x67\x9f\x55\xd5\xd5\x55"
- "\xd5\x55\xd5\xd5\xd5\x55\xd5\x55\xd5\xd5\x55\xd5\x55\xd5\x55\xd5"
- "\x55\x55\xd5\x55\xd5\xd5\x55\x55\x55\x55\x55\xd5\xd5\x55\xd5\xd5"
- "\xd5\x55\xd5\xd5\xd5\x55\x54\x55\xd5\xd5\x55\xd5\xd5\xd5\xd5\x55"
- "\x54\x55\xd5\x55\xd5\x55\x55\x55\x55\x55\xd5\xd5\xd5\xd5\xd5\xd4"
- "\xd5\x54\x55\xd5\xd4\xd5\x54\xd5\x55\xd5\xd5\xd5"
- },
-};
-
-
-
-static int audio_name_to_type(const char *name)
-{
- if (!strcasecmp(name, "gsm"))
- return 3;
-#ifdef HAVE_BCG729
- else if (!strcasecmp(name, "g729"))
- return 18;
-#endif
- else if (!strcasecmp(name, "pcma"))
- return 8;
- else if (!strcasecmp(name, "l16"))
- return 11;
- return -1;
-}
-
-int mgcp_get_trans_frame_size(void *state_, int nsamples, int dst);
-
-static int given_configured_endpoint(int in_samples, int out_samples,
- const char *srcfmt, const char *dstfmt,
- void **out_ctx, struct mgcp_endpoint **out_endp)
-{
- int rc;
- struct mgcp_rtp_end *dst_end;
- struct mgcp_rtp_end *src_end;
- struct mgcp_config *cfg;
- struct mgcp_trunk_config *tcfg;
- struct mgcp_endpoint *endp;
-
- cfg = mgcp_config_alloc();
- tcfg = talloc_zero(cfg, struct mgcp_trunk_config);
- endp = talloc_zero(tcfg, struct mgcp_endpoint);
-
- cfg->setup_rtp_processing_cb = mgcp_transcoding_setup;
- cfg->rtp_processing_cb = mgcp_transcoding_process_rtp;
- cfg->get_net_downlink_format_cb = mgcp_transcoding_net_downlink_format;
-
- tcfg->endpoints = endp;
- tcfg->number_endpoints = 1;
- tcfg->cfg = cfg;
- endp->tcfg = tcfg;
- endp->cfg = cfg;
- mgcp_initialize_endp(endp);
-
- dst_end = &endp->bts_end;
- dst_end->codec.payload_type = audio_name_to_type(dstfmt);
-
- src_end = &endp->net_end;
- src_end->codec.payload_type = audio_name_to_type(srcfmt);
-
- if (out_samples) {
- dst_end->codec.frame_duration_den = dst_end->codec.rate;
- dst_end->codec.frame_duration_num = out_samples;
- dst_end->frames_per_packet = 1;
- dst_end->force_output_ptime = 1;
- }
-
- rc = mgcp_transcoding_setup(endp, dst_end, src_end);
- if (rc < 0) {
- printf("setup failed: %s", strerror(-rc));
- abort();
- }
-
- *out_ctx = cfg;
- *out_endp = endp;
- return 0;
-}
-
-
-static int transcode_test(const char *srcfmt, const char *dstfmt,
- uint8_t *src_pkts, size_t src_pkt_size)
-{
- char buf[4096] = {0x80, 0};
- void *ctx;
-
- struct mgcp_rtp_end *dst_end;
- struct mgcp_process_rtp_state *state;
- struct mgcp_endpoint *endp;
- int in_size;
- const int in_samples = 160;
- int len, cont;
-
- printf("== Transcoding test ==\n");
- printf("converting %s -> %s\n", srcfmt, dstfmt);
-
- given_configured_endpoint(in_samples, 0, srcfmt, dstfmt, &ctx, &endp);
-
- dst_end = &endp->bts_end;
- state = dst_end->rtp_process_data;
- OSMO_ASSERT(state != NULL);
-
- in_size = mgcp_transcoding_get_frame_size(state, in_samples, 0);
- OSMO_ASSERT(sizeof(buf) >= in_size + 12);
-
- memcpy(buf, src_pkts, src_pkt_size);
-
- len = src_pkt_size;
-
- cont = mgcp_transcoding_process_rtp(endp, dst_end,
- buf, &len, sizeof(buf));
- if (cont < 0) {
- printf("Nothing encoded due: %s\n", strerror(-cont));
- talloc_free(ctx);
- return -1;
- }
-
- if (len < 24) {
- printf("encoded: %s\n", osmo_hexdump((unsigned char *)buf, len));
- } else {
- const char *str = osmo_hexdump((unsigned char *)buf, len);
- int i = 0;
- const int prefix = 4;
- const int cutlen = 48;
- int nchars = 0;
-
- printf("encoded:\n");
- do {
- nchars = printf("%*s%-.*s", prefix, "", cutlen, str + i);
- i += nchars - prefix;
- printf("\n");
- } while (nchars - prefix >= cutlen);
- }
- printf("counted: %d\n", cont);
- talloc_free(ctx);
- return 0;
-}
-
-static void test_rtp_seq_state(void)
-{
- char buf[4096];
- int len;
- int cont;
- void *ctx;
- struct mgcp_endpoint *endp;
- struct mgcp_process_rtp_state *state;
- struct rtp_hdr *hdr;
- uint32_t ts_no;
- uint16_t seq_no;
-
- given_configured_endpoint(160, 0, "pcma", "l16", &ctx, &endp);
- state = endp->bts_end.rtp_process_data;
- OSMO_ASSERT(!state->is_running);
- OSMO_ASSERT(state->next_seq == 0);
- OSMO_ASSERT(state->next_time == 0);
-
- /* initialize packet */
- len = audio_packets_pcma[0].len;
- memcpy(buf, audio_packets_pcma[0].data, len);
- cont = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, len);
- OSMO_ASSERT(cont >= 0);
- OSMO_ASSERT(state->is_running);
- OSMO_ASSERT(state->next_seq == 2);
- OSMO_ASSERT(state->next_time == 240);
-
- /* verify that the right timestamp was written */
- OSMO_ASSERT(len == audio_packets_pcma[0].len);
- hdr = (struct rtp_hdr *) &buf[0];
-
- memcpy(&ts_no, &hdr->timestamp, sizeof(ts_no));
- OSMO_ASSERT(htonl(ts_no) == 160);
- memcpy(&seq_no, &hdr->sequence, sizeof(seq_no));
- OSMO_ASSERT(htons(seq_no) == 1);
- /* Check the right sequence number is written */
- state->next_seq = 1234;
- len = audio_packets_pcma[0].len;
- memcpy(buf, audio_packets_pcma[0].data, len);
- cont = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, len);
- OSMO_ASSERT(cont >= 0);
- OSMO_ASSERT(len == audio_packets_pcma[0].len);
- hdr = (struct rtp_hdr *) &buf[0];
-
- memcpy(&seq_no, &hdr->sequence, sizeof(seq_no));
- OSMO_ASSERT(htons(seq_no) == 1234);
-
- talloc_free(ctx);
-}
-
-static void test_transcode_result(void)
-{
- char buf[4096];
- int len, res;
- void *ctx;
- struct mgcp_endpoint *endp;
- struct mgcp_process_rtp_state *state;
-
- {
- /* from GSM to PCMA and same ptime */
- given_configured_endpoint(160, 0, "gsm", "pcma", &ctx, &endp);
- state = endp->bts_end.rtp_process_data;
-
- /* result */
- len = audio_packets_gsm[0].len;
- memcpy(buf, audio_packets_gsm[0].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == sizeof(struct rtp_hdr));
- OSMO_ASSERT(state->sample_cnt == 0);
-
- len = res;
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == -ENOMSG);
-
- talloc_free(ctx);
- }
-
- {
- /* from GSM to PCMA and same ptime */
- given_configured_endpoint(160, 160, "gsm", "pcma", &ctx, &endp);
- state = endp->bts_end.rtp_process_data;
-
- /* result */
- len = audio_packets_gsm[0].len;
- memcpy(buf, audio_packets_gsm[0].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == sizeof(struct rtp_hdr));
- OSMO_ASSERT(state->sample_cnt == 0);
-
- len = res;
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == -EAGAIN);
-
- talloc_free(ctx);
- }
-
- {
- /* from PCMA to GSM and wrong different ptime */
- given_configured_endpoint(80, 160, "pcma", "gsm", &ctx, &endp);
- state = endp->bts_end.rtp_process_data;
-
- /* Add the first sample */
- len = audio_packets_pcma[1].len;
- memcpy(buf, audio_packets_pcma[1].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(state->sample_cnt == 80);
- OSMO_ASSERT(state->next_time == 232640);
- OSMO_ASSERT(res < 0);
-
- /* Add the second sample and it should be consumable */
- len = audio_packets_pcma[2].len;
- memcpy(buf, audio_packets_pcma[2].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(state->sample_cnt == 0);
- OSMO_ASSERT(state->next_time == 232640 + 80 + 160);
- OSMO_ASSERT(res == sizeof(struct rtp_hdr));
-
- talloc_free(ctx);
- }
-
- {
- /* from PCMA to GSM with a big time jump */
- struct rtp_hdr *hdr;
- uint32_t ts;
-
- given_configured_endpoint(80, 160, "pcma", "gsm", &ctx, &endp);
- state = endp->bts_end.rtp_process_data;
-
- /* Add the first sample */
- len = audio_packets_pcma[1].len;
- memcpy(buf, audio_packets_pcma[1].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(state->sample_cnt == 80);
- OSMO_ASSERT(state->next_time == 232640);
- OSMO_ASSERT(state->next_seq == 26527);
- OSMO_ASSERT(res < 0);
-
- /* Add a skip to the packet to force a 'resync' */
- len = audio_packets_pcma[2].len;
- memcpy(buf, audio_packets_pcma[2].data, len);
- hdr = (struct rtp_hdr *) &buf[0];
- /* jump the time and add alignment error */
- ts = ntohl(hdr->timestamp) + 123 * 80 + 2;
- hdr->timestamp = htonl(ts);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res < 0);
- OSMO_ASSERT(state->sample_cnt == 80);
- OSMO_ASSERT(state->next_time == ts);
- OSMO_ASSERT(state->next_seq == 26527);
- /* TODO: this can create alignment errors */
-
-
- /* Now attempt to consume 160 samples */
- len = audio_packets_pcma[2].len;
- memcpy(buf, audio_packets_pcma[2].data, len);
- hdr = (struct rtp_hdr *) &buf[0];
- ts += 80;
- hdr->timestamp = htonl(ts);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == 12);
- OSMO_ASSERT(state->sample_cnt == 0);
- OSMO_ASSERT(state->next_time == ts + 160);
- OSMO_ASSERT(state->next_seq == 26528);
-
- talloc_free(ctx);
- }
-}
-
-static void test_transcode_change(void)
-{
- char buf[4096] = {0x80, 0};
- void *ctx;
-
- struct mgcp_endpoint *endp;
- struct mgcp_process_rtp_state *state;
- struct rtp_hdr *hdr;
-
- int len, res;
-
- {
- /* from GSM to PCMA and same ptime */
- printf("Testing Initial L16->GSM, PCMA->GSM\n");
- given_configured_endpoint(160, 0, "l16", "gsm", &ctx, &endp);
- endp->net_end.alt_codec = endp->net_end.codec;
- endp->net_end.alt_codec.payload_type = audio_name_to_type("pcma");
- state = endp->bts_end.rtp_process_data;
-
- /* initial transcoding work */
- OSMO_ASSERT(state->src_fmt == AF_L16);
- OSMO_ASSERT(state->dst_fmt == AF_GSM);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 8);
- OSMO_ASSERT(endp->net_end.codec.payload_type == 11);
-
- /* result */
- len = audio_packets_pcma[0].len;
- memcpy(buf, audio_packets_pcma[0].data, len);
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- state = endp->bts_end.rtp_process_data;
- OSMO_ASSERT(res == sizeof(struct rtp_hdr));
- OSMO_ASSERT(state->sample_cnt == 0);
- OSMO_ASSERT(state->src_fmt == AF_PCMA);
- OSMO_ASSERT(state->dst_fmt == AF_GSM);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 11);
- OSMO_ASSERT(endp->net_end.codec.payload_type == 8);
-
- len = res;
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(res == -ENOMSG);
- OSMO_ASSERT(state == endp->bts_end.rtp_process_data);
-
-
- /* now check that comfort noise doesn't change anything */
- len = audio_packets_pcma[1].len;
- memcpy(buf, audio_packets_pcma[1].data, len);
- hdr = (struct rtp_hdr *) buf;
- hdr->payload_type = 12;
- res = mgcp_transcoding_process_rtp(endp, &endp->bts_end, buf, &len, ARRAY_SIZE(buf));
- OSMO_ASSERT(state == endp->bts_end.rtp_process_data);
- OSMO_ASSERT(state->sample_cnt == 80);
- OSMO_ASSERT(state->src_fmt == AF_PCMA);
- OSMO_ASSERT(state->dst_fmt == AF_GSM);
- OSMO_ASSERT(endp->net_end.alt_codec.payload_type == 11);
- OSMO_ASSERT(endp->net_end.codec.payload_type == 8);
-
- talloc_free(ctx);
- }
-}
-
-static int test_repacking(int in_samples, int out_samples, int no_transcode)
-{
- char buf[4096] = {0x80, 0};
- int cc;
- struct mgcp_endpoint *endp;
- void *ctx;
-
- struct mgcp_process_rtp_state *state;
- int in_cnt;
- int out_size;
- int in_size;
- uint32_t ts = 0;
- uint16_t seq = 0;
- const char *srcfmt = "pcma";
- const char *dstfmt = no_transcode ? "pcma" : "l16";
-
- printf("== Transcoding test ==\n");
- printf("converting %s -> %s\n", srcfmt, dstfmt);
-
- given_configured_endpoint(in_samples, out_samples, srcfmt, dstfmt, &ctx, &endp);
-
- state = endp->bts_end.rtp_process_data;
- OSMO_ASSERT(state != NULL);
-
- in_size = mgcp_transcoding_get_frame_size(state, in_samples, 0);
- OSMO_ASSERT(sizeof(buf) >= in_size + 12);
-
- out_size = mgcp_transcoding_get_frame_size(state, -1, 1);
- OSMO_ASSERT(sizeof(buf) >= out_size + 12);
-
- buf[1] = endp->net_end.codec.payload_type;
- *(uint16_t*)(buf+2) = htons(1);
- *(uint32_t*)(buf+4) = htonl(0);
- *(uint32_t*)(buf+8) = htonl(0xaabbccdd);
-
- for (in_cnt = 0; in_cnt < 16; in_cnt++) {
- int cont;
- int len;
-
- /* fake PCMA data */
- printf("generating %d %s input samples\n", in_samples, srcfmt);
- for (cc = 0; cc < in_samples; cc++)
- buf[12+cc] = cc;
-
- *(uint16_t*)(buf+2) = htonl(seq);
- *(uint32_t*)(buf+4) = htonl(ts);
-
- seq += 1;
- ts += in_samples;
-
- cc += 12; /* include RTP header */
-
- len = cc;
-
- do {
- cont = mgcp_transcoding_process_rtp(endp, &endp->bts_end,
- buf, &len, sizeof(buf));
- if (cont == -EAGAIN) {
- fprintf(stderr, "Got EAGAIN\n");
- break;
- }
-
- if (cont < 0) {
- printf("processing failed: %s", strerror(-cont));
- abort();
- }
-
- len -= 12; /* ignore RTP header */
-
- printf("got %d %s output frames (%d octets) count=%d\n",
- len / out_size, dstfmt, len, cont);
-
- len = cont;
- } while (len > 0);
- }
-
- talloc_free(ctx);
- return 0;
-}
-
-static const struct log_info_cat log_categories[] = {
-};
-
-const struct log_info log_info = {
- .cat = log_categories,
- .num_cat = ARRAY_SIZE(log_categories),
-};
-
-int main(int argc, char **argv)
-{
- int rc;
- osmo_init_logging(&log_info);
-
- printf("=== Transcoding Good Cases ===\n");
-
- transcode_test("l16", "l16",
- (uint8_t *)audio_packets_l16[0].data,
- audio_packets_l16[0].len);
- transcode_test("l16", "gsm",
- (uint8_t *)audio_packets_l16[0].data,
- audio_packets_l16[0].len);
- transcode_test("l16", "pcma",
- (uint8_t *)audio_packets_l16[0].data,
- audio_packets_l16[0].len);
- transcode_test("gsm", "l16",
- (uint8_t *)audio_packets_gsm[0].data,
- audio_packets_gsm[0].len);
- transcode_test("gsm", "gsm",
- (uint8_t *)audio_packets_gsm[0].data,
- audio_packets_gsm[0].len);
- transcode_test("gsm", "pcma",
- (uint8_t *)audio_packets_gsm[0].data,
- audio_packets_gsm[0].len);
- transcode_test("pcma", "l16",
- (uint8_t *)audio_packets_pcma[0].data,
- audio_packets_pcma[0].len);
- transcode_test("pcma", "gsm",
- (uint8_t *)audio_packets_pcma[0].data,
- audio_packets_pcma[0].len);
- transcode_test("pcma", "pcma",
- (uint8_t *)audio_packets_pcma[0].data,
- audio_packets_pcma[0].len);
-
- printf("=== Transcoding Bad Cases ===\n");
-
- printf("Invalid size:\n");
- rc = transcode_test("gsm", "pcma",
- (uint8_t *)audio_packets_gsm_invalid_size[0].data,
- audio_packets_gsm_invalid_size[0].len);
- OSMO_ASSERT(rc < 0);
-
- printf("Invalid data:\n");
- rc = transcode_test("gsm", "pcma",
- (uint8_t *)audio_packets_gsm_invalid_data[0].data,
- audio_packets_gsm_invalid_data[0].len);
- OSMO_ASSERT(rc < 0);
-
- printf("Invalid payload type:\n");
- rc = transcode_test("gsm", "pcma",
- (uint8_t *)audio_packets_gsm_invalid_ptype[0].data,
- audio_packets_gsm_invalid_ptype[0].len);
- OSMO_ASSERT(rc == 0);
-
- printf("=== Repacking ===\n");
-
- test_repacking(160, 160, 0);
- test_repacking(160, 160, 1);
- test_repacking(160, 80, 0);
- test_repacking(160, 80, 1);
- test_repacking(160, 320, 0);
- test_repacking(160, 320, 1);
- test_repacking(160, 240, 0);
- test_repacking(160, 240, 1);
- test_repacking(160, 100, 0);
- test_repacking(160, 100, 1);
- test_rtp_seq_state();
- test_transcode_result();
- test_transcode_change();
-
- return 0;
-}
-
diff --git a/tests/mgcp/mgcp_transcoding_test.ok b/tests/mgcp/mgcp_transcoding_test.ok
deleted file mode 100644
index 387cfd2..0000000
--- a/tests/mgcp/mgcp_transcoding_test.ok
+++ /dev/null
@@ -1,539 +0,0 @@
-=== Transcoding Good Cases ===
-== Transcoding test ==
-converting l16 -> l16
-encoded:
- 80 0b 00 01 00 00 00 a0 11 22 33 44 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed 00 00 40 13
- 5a 9e 40 13 00 00 bf ed a5 62 bf ed
-counted: 0
-== Transcoding test ==
-converting l16 -> gsm
-encoded:
- 80 0b 00 01 00 00 00 a0 11 22 33 44 d4 7c e3 e9
- 62 50 39 f0 f8 b4 68 ea 6c 0e 81 1b 56 2a d5 bc
- 69 9c d1 f0 66 7a ec 49 7a 33 3d 0a de
-counted: 12
-== Transcoding test ==
-converting l16 -> pcma
-encoded:
- 80 0b 00 01 00 00 00 a0 11 22 33 44 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25
-counted: 12
-== Transcoding test ==
-converting gsm -> l16
-encoded:
- 80 03 00 01 00 00 00 a0 11 22 33 44 00 00 54 00
- 59 f0 34 20 c4 c8 b9 f8 e2 18 f1 e8 f2 28 f0 e0
- 46 08 4f 80 2c a0 a9 c8 80 00 c0 58 3f 80 63 c0
- 24 b8 fa b8 f6 88 0b a0 c8 70 a8 b0 c8 c0 3b a8
- 66 a0 2e 38 d1 f8 98 98 aa 18 e8 30 26 a0 37 40
- 37 e8 17 00 ee 50 b7 80 b1 88 de 28 18 40 45 b0
- 4f 48 21 d8 df 78 ae 68 ab 98 d6 b8 18 18 48 90
- 4e 70 27 40 e8 10 b5 b0 ac 80 d4 60 14 50 48 48
- 50 10 2a 00 ec 08 ba 00 af 58 d1 c0 10 60 45 c8
- 54 10 30 78 f1 a8 bb 18 ad 48 ce 30 0a e8 3f 30
- 4f 10 32 18 f6 18 bf 20 ac 30 cd 80 0b d0 43 d8
- 55 e0 34 a0 f5 78 bc 98 ad 98 cd c8 0a 80 40 58
- 51 c0 35 40 f9 60 c1 68 ac c8 cb 38 08 00 40 98
- 51 e0 34 d8 fa 28 c2 f0 ae 40 c7 70 02 d0 3c a8
- 54 78 38 a0 fc 68 c2 08 ad 50 c7 78 01 60 39 c0
- 51 38 3a e8 00 e8 c6 38 ab d8 c4 00 fe 08 39 18
- 50 30 39 50 01 d8 ca 70 b1 80 c4 c8 fc 58 36 40
- 51 d8 3b 08 02 80 c8 58 b0 60 c5 a8 fb d0 33 e8
- 4e 80 3c e0 06 10 cb 90 ae 48 c2 60 f9 58 34 08
- 4d a0 3a a8 06 48 cf 80 b4 60 c3 e8 f7 90 30 18
- 4d a0 3b 98 07 90 cf 18 b4 68 c4 88
-counted: 12
-== Transcoding test ==
-converting gsm -> gsm
-encoded:
- 80 03 00 01 00 00 00 a0 11 22 33 44 d4 7c e3 e9
- 62 50 39 f0 f8 b4 68 ea 6c 0e 81 1b 56 2a d5 bc
- 69 9c d1 f0 66 7a ec 49 7a 33 3d 0a de
-counted: 0
-== Transcoding test ==
-converting gsm -> pcma
-encoded:
- 80 03 00 01 00 00 00 a0 11 22 33 44 d5 a0 a3 bf
- 38 24 08 19 1e 1b a4 a6 b3 20 2a 3a ba ad b7 60
- 17 92 3e 20 3e b8 ac b2 32 2c 20 02 b6 be be 82
- 04 27 26 35 8d a4 a6 b5 35 21 20 31 8d a7 a6 b6
- 02 27 21 30 81 a7 a1 b0 06 24 21 32 85 a4 a0 bd
- 19 24 21 3d 90 ba a6 bc 16 25 21 3c 92 a5 a0 bf
- 10 25 21 3c 90 a5 a1 bf 6f 3a 21 3f 95 a5 a1 bf
- 62 3b 21 39 f3 bb a0 b9 79 3b 21 39 c3 b9 a1 b8
- db 39 20 3b 4a b9 a1 b9 c8 3f 26 38 78 be a1 b8
- f1 3e 26 38 65 bc a6 bb ed 3f 21 3b 6f bf a6 b8
- ec 3d 27 3b 15 bd a6 b8 eb 3d 27 38
-counted: 12
-== Transcoding test ==
-converting pcma -> l16
-encoded:
- 80 08 00 01 00 00 00 a0 11 22 33 44 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00 00 08 42 00
- 5a 00 42 00 00 08 be 00 a6 00 be 00
-counted: 12
-== Transcoding test ==
-converting pcma -> gsm
-encoded:
- 80 08 00 01 00 00 00 a0 11 22 33 44 d4 b9 f4 5d
- d9 50 5a e1 a0 cd 76 ea 52 0e 87 53 ad d4 ea a2
- 0a 63 ca e9 60 79 e2 2a 25 d2 c0 f3 39
-counted: 12
-== Transcoding test ==
-converting pcma -> pcma
-encoded:
- 80 08 00 01 00 00 00 a0 11 22 33 44 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25 d5 a5 a3 a5
- d5 25 23 25 d5 a5 a3 a5 d5 25 23 25
-counted: 0
-=== Transcoding Bad Cases ===
-Invalid size:
-== Transcoding test ==
-converting gsm -> pcma
-Nothing encoded due: No message of desired type
-Invalid data:
-== Transcoding test ==
-converting gsm -> pcma
-Nothing encoded due: No message of desired type
-Invalid payload type:
-== Transcoding test ==
-converting gsm -> pcma
-encoded:
- 80 08 00 01 00 00 00 a0 11 22 33 44 d5 a0 a3 bf
- 38 24 08 19 1e 1b a4 a6 b3 20 2a 3a ba ad b7 60
- 17 92 3e 20 3e b8 ac b2 32 2c 20 02 b6 be be 82
- 04 27 26 35 8d a4 a6 b5 35 21 20 31 8d a7 a6 b6
- 02 27 21 30 81 a7 a1 b0 06 24 21 32 85 a4 a0 bd
- 19 24 21 3d 90 ba a6 bc 16 25 21 3c 92 a5 a0 bf
- 10 25 21 3c 90 a5 a1 bf 6f 3a 21 3f 95 a5 a1 bf
- 62 3b 21 39 f3 bb a0 b9 79 3b 21 39 c3 b9 a1 b8
- db 39 20 3b 4a b9 a1 b9 c8 3f 26 38 78 be a1 b8
- f1 3e 26 38 65 bc a6 bb ed 3f 21 3b 6f bf a6 b8
- ec 3d 27 3b 15 bd a6 b8 eb 3d 27 38
-counted: 12
-=== Repacking ===
-== Transcoding test ==
-converting pcma -> l16
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-generating 160 pcma input samples
-got 2 l16 output frames (320 octets) count=12
-== Transcoding test ==
-converting pcma -> pcma
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-generating 160 pcma input samples
-got 2 pcma output frames (160 octets) count=12
-== Transcoding test ==
-converting pcma -> l16
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-== Transcoding test ==
-converting pcma -> pcma
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-== Transcoding test ==
-converting pcma -> l16
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 l16 output frames (640 octets) count=12
-== Transcoding test ==
-converting pcma -> pcma
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 4 pcma output frames (320 octets) count=12
-== Transcoding test ==
-converting pcma -> l16
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 l16 output frames (480 octets) count=12
-== Transcoding test ==
-converting pcma -> pcma
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-generating 160 pcma input samples
-generating 160 pcma input samples
-got 3 pcma output frames (240 octets) count=12
-== Transcoding test ==
-converting pcma -> l16
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-generating 160 pcma input samples
-got 1 l16 output frames (160 octets) count=12
-got 1 l16 output frames (160 octets) count=12
-== Transcoding test ==
-converting pcma -> pcma
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-generating 160 pcma input samples
-got 1 pcma output frames (80 octets) count=12
-got 1 pcma output frames (80 octets) count=12
-Testing Initial L16->GSM, PCMA->GSM
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 4f4a303..03ec4b9 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -20,3 +20,9 @@
cat $abs_srcdir/mgcp_client/mgcp_client_test.err > experr
AT_CHECK([$abs_top_builddir/tests/mgcp_client/mgcp_client_test], [], [expout], [experr])
AT_CLEANUP
+
+AT_SETUP([mgcp])
+AT_KEYWORDS([mgcp])
+cat $abs_srcdir/mgcp/mgcp_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/mgcp/mgcp_test], [], [expout], [ignore])
+AT_CLEANUP