<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15840">View Change</a></p><div style="white-space:pre-wrap">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
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">accept MGCP without SDP<br><br>SDP is an optional part of MGCP messages. Do not fail when there is no SDP part.<br><br>Practically this is useful to compose simpler MGCP responses from TTCN3 tests.<br>osmo-mgw itself always includes SDP, so there is no real impact on operating<br>libosmo-mgcp-client with osmo-mgw from osmo-bsc or osmo-msc.<br><br>Change-Id: I608001626459ea72415fb142f857550bbb90c683<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M tests/mgcp_client/mgcp_client_test.c<br>M tests/mgcp_client/mgcp_client_test.err<br>3 files changed, 18 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index 5823e2b..a65cd61 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -466,9 +466,8 @@</span><br><span> /* Find beginning of the parameter (SDP) section */</span><br><span> data_ptr = mgcp_find_section_end(data);</span><br><span> if (!data_ptr) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "MGCP response: cannot find start of SDP parameters\n");</span><br><span style="color: hsl(0, 100%, 40%);">- rc = -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_DEBUG, "MGCP response contains no SDP parameters\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = 0;</span><br><span> goto exit;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/mgcp_client/mgcp_client_test.c b/tests/mgcp_client/mgcp_client_test.c</span><br><span>index 9c4392f..d2e34a6 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.c</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.c</span><br><span>@@ -360,7 +360,7 @@</span><br><span> static struct sdp_section_start_test sdp_section_start_tests[] = {</span><br><span> {</span><br><span> .body = "",</span><br><span style="color: hsl(0, 100%, 40%);">- .expect_rc = -EINVAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect_rc = 0,</span><br><span> },</span><br><span> {</span><br><span> .body = "\n\n",</span><br><span>@@ -399,19 +399,19 @@</span><br><span> .body = "some mgcp header data\r\nand header params"</span><br><span> "\n\r\n"</span><br><span> "m=audio 23\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- .expect_rc = -EINVAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect_rc = 0,</span><br><span> },</span><br><span> {</span><br><span> .body = "some mgcp header data\r\nand header params"</span><br><span> "\r\n\r"</span><br><span> "m=audio 23\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- .expect_rc = -EINVAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect_rc = 0,</span><br><span> },</span><br><span> {</span><br><span> .body = "some mgcp header data\r\nand header params"</span><br><span> "\n\r\r"</span><br><span> "m=audio 23\r\n",</span><br><span style="color: hsl(0, 100%, 40%);">- .expect_rc = -EINVAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ .expect_rc = 0,</span><br><span> },</span><br><span> };</span><br><span> </span><br><span>diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err</span><br><span>index 627b2d9..fbcf8f6 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.err</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.err</span><br><span>@@ -17,8 +17,9 @@</span><br><span> </span><br><span> test_sdp_section_start() test [0]:</span><br><span> body: ""</span><br><span style="color: hsl(0, 100%, 40%);">-DLMGCP MGCP response: cannot find start of SDP parameters</span><br><span style="color: hsl(0, 100%, 40%);">-got rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP MGCP response contains no SDP parameters</span><br><span style="color: hsl(120, 100%, 40%);">+got rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+got audio_port=0</span><br><span> </span><br><span> test_sdp_section_start() test [1]:</span><br><span> body: "\n\n"</span><br><span>@@ -52,18 +53,21 @@</span><br><span> </span><br><span> test_sdp_section_start() test [7]:</span><br><span> body: "some mgcp header data\r\nand header params\n\r\nm=audio 23\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">-DLMGCP MGCP response: cannot find start of SDP parameters</span><br><span style="color: hsl(0, 100%, 40%);">-got rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP MGCP response contains no SDP parameters</span><br><span style="color: hsl(120, 100%, 40%);">+got rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+got audio_port=0</span><br><span> </span><br><span> test_sdp_section_start() test [8]:</span><br><span> body: "some mgcp header data\r\nand header params\r\n\rm=audio 23\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">-DLMGCP MGCP response: cannot find start of SDP parameters</span><br><span style="color: hsl(0, 100%, 40%);">-got rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP MGCP response contains no SDP parameters</span><br><span style="color: hsl(120, 100%, 40%);">+got rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+got audio_port=0</span><br><span> </span><br><span> test_sdp_section_start() test [9]:</span><br><span> body: "some mgcp header data\r\nand header params\n\r\rm=audio 23\r\n"</span><br><span style="color: hsl(0, 100%, 40%);">-DLMGCP MGCP response: cannot find start of SDP parameters</span><br><span style="color: hsl(0, 100%, 40%);">-got rc=-22</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP MGCP response contains no SDP parameters</span><br><span style="color: hsl(120, 100%, 40%);">+got rc=0</span><br><span style="color: hsl(120, 100%, 40%);">+got audio_port=0</span><br><span> DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2</span><br><span> DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100</span><br><span> DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/15840">change 15840</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-mgw/+/15840"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I608001626459ea72415fb142f857550bbb90c683 </div>
<div style="display:none"> Gerrit-Change-Number: 15840 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>