aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-12-19 00:44:37 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2018-12-19 22:22:34 +0000
commit72bc8da53760646871e85d94423b42c3459650ea (patch)
tree2fa5b5af0aea052a642017d834ee8cc25183a152 /tests
parentc3132fd5083904295ad2d9cf8738b8d3662555b4 (diff)
mgcp_client: drop a bunch of dead code
Remove public API that makes no sense anymore and is dead code. I see the dropped API as a dead-end initial misconception of the early mgcp client, and it doesn't really make sense to drag this stuff along. It has not been used by osmo-msc,-bsc for a long time now, and just confuses the reader. It is public API, yes, and older versions of osmo-msc / osmo-bsc will not be able to compile against this, but even if it did, the resulting MGCP client would not work with the current osmo-mgw: this API is still based on the premise that the MGCP client dictates the MGW endpoint numbers, a concept that cannot be used with the current osmo-mgw. Instead, osmo-mgw expects a wildcarded endpoint upon CRCX and assigns its own endpoint names. Also, the bts-base configuration is unused and a legacy of when osmo-bsc_mgcp had explicit BTS and CN sides. Change-Id: I98a9f1f17a1c4ab20cea3b08c7d21663592134d6
Diffstat (limited to 'tests')
-rw-r--r--tests/mgcp_client/mgcp_client_test.c84
-rw-r--r--tests/mgcp_client/mgcp_client_test.err2
-rw-r--r--tests/mgcp_client/mgcp_client_test.ok110
3 files changed, 0 insertions, 196 deletions
diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c
index e6982e44b..1db70cfe2 100644
--- a/tests/mgcp_client/mgcp_client_test.c
+++ b/tests/mgcp_client/mgcp_client_test.c
@@ -135,87 +135,6 @@ mgcp_trans_id_t dummy_mgcp_send(struct msgb *msg)
return trans_id;
}
-void test_crcx(void)
-{
- struct msgb *msg;
- mgcp_trans_id_t trans_id;
-
- printf("\n===== %s =====\n", __func__);
-
- if (mgcp)
- talloc_free(mgcp);
- mgcp = mgcp_client_init(ctx, &conf);
-
- msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK);
- trans_id = dummy_mgcp_send(msg);
-
- reply_to(trans_id, 200, "OK",
- "I: 1\r\n\r\n"
- "v=0\r\n"
- "o=- 1 23 IN IP4 10.9.1.120\r\n"
- "s=-\r\n"
- "c=IN IP4 10.9.1.120\r\n"
- "t=0 0\r\n"
- "m=audio 16002 RTP/AVP 110 96\r\n"
- "a=rtpmap:110 AMR/8000\r\n"
- "a=rtpmap:96 GSM-EFR/8000\r\n"
- "a=ptime:20\r\n");
-}
-
-void test_crcx_long_conn_id(void)
-{
- struct msgb *msg;
- mgcp_trans_id_t trans_id;
-
- printf("\n===== %s =====\n", __func__);
-
- if (mgcp)
- talloc_free(mgcp);
- mgcp = mgcp_client_init(ctx, &conf);
-
- msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK);
- trans_id = dummy_mgcp_send(msg);
-
- reply_to(trans_id, 200, "OK",
- "I: 123456789abcdef0123456789ABCDEF0\r\n\r\n"
- "v=0\r\n"
- "o=- 1 23 IN IP4 10.9.1.120\r\n"
- "s=-\r\n"
- "c=IN IP4 10.9.1.120\r\n"
- "t=0 0\r\n"
- "m=audio 16002 RTP/AVP 110 96\r\n"
- "a=rtpmap:110 AMR/8000\r\n"
- "a=rtpmap:96 GSM-EFR/8000\r\n"
- "a=ptime:20\r\n");
-}
-
-void test_crcx_too_long_conn_id(void)
-{
- struct msgb *msg;
- mgcp_trans_id_t trans_id;
-
- printf("\n===== %s =====\n", __func__);
-
- if (mgcp)
- talloc_free(mgcp);
- mgcp = mgcp_client_init(ctx, &conf);
-
- msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK);
- trans_id = dummy_mgcp_send(msg);
-
- reply_to(trans_id, 200, "OK",
- "I: 123456789abcdef0123456789ABCDEF01001029\r\n\r\n"
- "v=0\r\n"
- "o=- 1 23 IN IP4 10.9.1.120\r\n"
- "s=-\r\n"
- "c=IN IP4 10.9.1.120\r\n"
- "t=0 0\r\n"
- "m=audio 16002 RTP/AVP 110 96\r\n"
- "a=rtpmap:110 AMR/8000\r\n"
- "a=rtpmap:96 GSM-EFR/8000\r\n"
- "a=ptime:20\r\n");
-}
-
void test_mgcp_msg(void)
{
struct msgb *msg;
@@ -618,14 +537,11 @@ int main(int argc, char **argv)
mgcp_client_conf_init(&conf);
- test_crcx();
test_mgcp_msg();
test_mgcp_client_cancel();
test_sdp_section_start();
test_map_codec_to_pt_and_map_pt_to_codec();
test_map_pt_to_codec();
- test_crcx_long_conn_id();
- test_crcx_too_long_conn_id();
printf("Done\n");
fprintf(stderr, "Done\n");
diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err
index b20f93fd4..1d5a1a0db 100644
--- a/tests/mgcp_client/mgcp_client_test.err
+++ b/tests/mgcp_client/mgcp_client_test.err
@@ -66,6 +66,4 @@ DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2
DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100
DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2
DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100
-DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters
-DLMGCP Cannot parse MGCP response (head parameters)
Done
diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok
index 40e32ba89..65b529851 100644
--- a/tests/mgcp_client/mgcp_client_test.ok
+++ b/tests/mgcp_client/mgcp_client_test.ok
@@ -1,46 +1,4 @@
-===== test_crcx =====
-composed:
------
-CRCX 1 17@mgw MGCP 1.0
-C: 2a
-L: p:20, a:AMR, nt:IN
-M: loopback
-
------
-composed response:
------
-200 1 OK
-I: 1
-
-v=0
-o=- 1 23 IN IP4 10.9.1.120
-s=-
-c=IN IP4 10.9.1.120
-t=0 0
-m=audio 16002 RTP/AVP 110 96
-a=rtpmap:110 AMR/8000
-a=rtpmap:96 GSM-EFR/8000
-a=ptime:20
-
------
-response cb received:
- head.response_code = 200
- head.trans_id = 1
- head.conn_id = 1
- head.comment = OK
- audio_port = 16002
- audio_ip = 10.9.1.120
- ptime = 20
- codecs_len = 2
- codecs[0] = 112
- codecs[1] = 110
- ptmap_len = 2
- ptmap[0].codec = 112
- ptmap[0].pt = 110
- ptmap[1].codec = 110
- ptmap[1].pt = 96
-
Generated CRCX message:
CRCX 1 23@mgw MGCP 1.0
C: 2f
@@ -196,72 +154,4 @@ test_sdp_section_start() test [9]:
2 <= 2
100 <= 100
-
-===== test_crcx_long_conn_id =====
-composed:
------
-CRCX 1 17@mgw MGCP 1.0
-C: 2a
-L: p:20, a:AMR, nt:IN
-M: loopback
-
------
-composed response:
------
-200 1 OK
-I: 123456789abcdef0123456789ABCDEF0
-
-v=0
-o=- 1 23 IN IP4 10.9.1.120
-s=-
-c=IN IP4 10.9.1.120
-t=0 0
-m=audio 16002 RTP/AVP 110 96
-a=rtpmap:110 AMR/8000
-a=rtpmap:96 GSM-EFR/8000
-a=ptime:20
-
------
-response cb received:
- head.response_code = 200
- head.trans_id = 1
- head.conn_id = 123456789abcdef0123456789ABCDEF0
- head.comment = OK
- audio_port = 16002
- audio_ip = 10.9.1.120
- ptime = 20
- codecs_len = 2
- codecs[0] = 112
- codecs[1] = 110
- ptmap_len = 2
- ptmap[0].codec = 112
- ptmap[0].pt = 110
- ptmap[1].codec = 110
- ptmap[1].pt = 96
-
-===== test_crcx_too_long_conn_id =====
-composed:
------
-CRCX 1 17@mgw MGCP 1.0
-C: 2a
-L: p:20, a:AMR, nt:IN
-M: loopback
-
------
-composed response:
------
-200 1 OK
-I: 123456789abcdef0123456789ABCDEF01001029
-
-v=0
-o=- 1 23 IN IP4 10.9.1.120
-s=-
-c=IN IP4 10.9.1.120
-t=0 0
-m=audio 16002 RTP/AVP 110 96
-a=rtpmap:110 AMR/8000
-a=rtpmap:96 GSM-EFR/8000
-a=ptime:20
-
------
Done