This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/15840 ) Change subject: accept MGCP without SDP ...................................................................... accept MGCP without SDP SDP is an optional part of MGCP messages. Do not fail when there is no SDP part. Practically this is useful to compose simpler MGCP responses from TTCN3 tests. osmo-mgw itself always includes SDP, so there is no real impact on operating libosmo-mgcp-client with osmo-mgw from osmo-bsc or osmo-msc. Change-Id: I608001626459ea72415fb142f857550bbb90c683 --- M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.c M tests/mgcp_client/mgcp_client_test.err 3 files changed, 18 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 5823e2b..a65cd61 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -466,9 +466,8 @@ /* Find beginning of the parameter (SDP) section */ data_ptr = mgcp_find_section_end(data); if (!data_ptr) { - LOGP(DLMGCP, LOGL_ERROR, - "MGCP response: cannot find start of SDP parameters\n"); - rc = -EINVAL; + LOGP(DLMGCP, LOGL_DEBUG, "MGCP response contains no SDP parameters\n"); + rc = 0; goto exit; } diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c index 9c4392f..d2e34a6 100644 --- a/tests/mgcp_client/mgcp_client_test.c +++ b/tests/mgcp_client/mgcp_client_test.c @@ -360,7 +360,7 @@ static struct sdp_section_start_test sdp_section_start_tests[] = { { .body = "", - .expect_rc = -EINVAL, + .expect_rc = 0, }, { .body = "\n\n", @@ -399,19 +399,19 @@ .body = "some mgcp header data\r\nand header params" "\n\r\n" "m=audio 23\r\n", - .expect_rc = -EINVAL, + .expect_rc = 0, }, { .body = "some mgcp header data\r\nand header params" "\r\n\r" "m=audio 23\r\n", - .expect_rc = -EINVAL, + .expect_rc = 0, }, { .body = "some mgcp header data\r\nand header params" "\n\r\r" "m=audio 23\r\n", - .expect_rc = -EINVAL, + .expect_rc = 0, }, }; diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err index 627b2d9..fbcf8f6 100644 --- a/tests/mgcp_client/mgcp_client_test.err +++ b/tests/mgcp_client/mgcp_client_test.err @@ -17,8 +17,9 @@ test_sdp_section_start() test [0]: body: "" -DLMGCP MGCP response: cannot find start of SDP parameters -got rc=-22 +DLMGCP MGCP response contains no SDP parameters +got rc=0 +got audio_port=0 test_sdp_section_start() test [1]: body: "\n\n" @@ -52,18 +53,21 @@ test_sdp_section_start() test [7]: body: "some mgcp header data\r\nand header params\n\r\nm=audio 23\r\n" -DLMGCP MGCP response: cannot find start of SDP parameters -got rc=-22 +DLMGCP MGCP response contains no SDP parameters +got rc=0 +got audio_port=0 test_sdp_section_start() test [8]: body: "some mgcp header data\r\nand header params\r\n\rm=audio 23\r\n" -DLMGCP MGCP response: cannot find start of SDP parameters -got rc=-22 +DLMGCP MGCP response contains no SDP parameters +got rc=0 +got audio_port=0 test_sdp_section_start() test [9]: body: "some mgcp header data\r\nand header params\n\r\rm=audio 23\r\n" -DLMGCP MGCP response: cannot find start of SDP parameters -got rc=-22 +DLMGCP MGCP response contains no SDP parameters +got rc=0 +got audio_port=0 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 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/15840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I608001626459ea72415fb142f857550bbb90c683 Gerrit-Change-Number: 15840 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <axilirator at gmail.com> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191101/e7118580/attachment.htm>