<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24861">View Change</a></p><div style="white-space:pre-wrap">Approvals:
neels: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_send_dummy: Check RTP destination is available before attempt tx<br><br>Several log messages showing "Failed to send dummy RTP packet." were<br>seen in a osmo-mgw on the field. Let's re-use the function to check and<br>provide more information on what's wrong to ease debugging.<br><br>Related: SYS#5498<br>Change-Id: Iee6ac1f4d24c131e3bf40c37e6fdc252e5208ec8<br>---<br>M src/libosmo-mgcp/mgcp_network.c<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>3 files changed, 10 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index dfa952b..5b3ea51 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -1037,6 +1037,12 @@</span><br><span> LOGPCONN(conn->conn, DRTP, LOGL_DEBUG, "sending dummy packet... %s\n",</span><br><span> mgcp_conn_dump(conn->conn));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Before we try to deliver the packet, we check if the destination</span><br><span style="color: hsl(120, 100%, 40%);">+ * port and IP-Address make sense at all. If not, we will be unable</span><br><span style="color: hsl(120, 100%, 40%);">+ * to deliver the packet. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (check_rtp_destin(conn) != 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto failed;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr,</span><br><span> conn->end.rtp_port, rtp_dummy_payload, sizeof(rtp_dummy_payload));</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index e6862e5..5bb7b27 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -634,6 +634,10 @@</span><br><span> dummy_packets += 1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure address+port are valid */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(dest_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(dest_port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return len;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index 9c48147..d3f8a26 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -118,7 +118,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_PT1</span><br><span>@@ -142,7 +141,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_PT2</span><br><span>@@ -166,7 +164,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_PT3</span><br><span>@@ -190,7 +187,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_PT4</span><br><span>@@ -214,7 +210,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing MDCX4_SO</span><br><span>@@ -253,7 +248,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing DLCX</span><br><span>@@ -441,7 +435,6 @@</span><br><span> using message with patched conn_id for comparison</span><br><span> Response matches our expectations.</span><br><span> (response contains a connection id)</span><br><span style="color: hsl(0, 100%, 40%);">-Dummy packets: 2</span><br><span> </span><br><span> ================================================</span><br><span> Testing CRCX</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24861">change 24861</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/+/24861"/><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: Iee6ac1f4d24c131e3bf40c37e6fdc252e5208ec8 </div>
<div style="display:none"> Gerrit-Change-Number: 24861 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </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>