<p>dexter <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24315">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_network: refactor MGCP_DUMMY_LOAD<br><br>The constant MGCP_DUMMY_LOAD is used ambigously. Sometimes it is used as<br>initalizer for an array, sometimes it is used as a single byte. Also the<br>name is not very expressive. Lets refactor this.<br><br>Change-Id: I21d96cefeeb647958bfa1e22a0ea030884746fad<br>Related: OS#4005<br>---<br>M include/osmocom/mgcp/mgcp_network.h<br>M src/libosmo-mgcp/mgcp_network.c<br>M src/libosmo-mgcp/mgcp_osmux.c<br>M tests/mgcp/mgcp_test.c<br>4 files changed, 59 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_network.h b/include/osmocom/mgcp/mgcp_network.h</span><br><span>index 6e1e52c..1766f4a 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_network.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_network.h</span><br><span>@@ -7,7 +7,16 @@</span><br><span> </span><br><span> #include <osmocom/mgcp/mgcp.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MGCP_DUMMY_LOAD 0x23</span><br><span style="color: hsl(120, 100%, 40%);">+/* The following constant defines an RTP dummy payload that is used for</span><br><span style="color: hsl(120, 100%, 40%);">+ * "UDP Hole Punching" (NAT) */</span><br><span style="color: hsl(120, 100%, 40%);">+static const char rtp_dummy_payload[] = { 0x23 };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Check if the data in a given message buffer matches the rtp dummy payload</span><br><span style="color: hsl(120, 100%, 40%);">+ * defined above */</span><br><span style="color: hsl(120, 100%, 40%);">+#define mgcp_is_rtp_dummy_payload(msg) \</span><br><span style="color: hsl(120, 100%, 40%);">+ (msgb_length(msg) == sizeof(rtp_dummy_payload) && \</span><br><span style="color: hsl(120, 100%, 40%);">+ memcmp(msgb_data(msg), rtp_dummy_payload, sizeof(rtp_dummy_payload)) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define RTP_BUF_SIZE 4096</span><br><span> </span><br><span> struct mgcp_rtp_stream_state {</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_network.c b/src/libosmo-mgcp/mgcp_network.c</span><br><span>index 79ddf8a..1b7c3bd 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_network.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_network.c</span><br><span>@@ -205,7 +205,6 @@</span><br><span> * \returns bytes sent, -1 on error. */</span><br><span> int mgcp_send_dummy(struct mgcp_endpoint *endp, struct mgcp_conn_rtp *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[] = { MGCP_DUMMY_LOAD };</span><br><span> int rc;</span><br><span> int was_rtcp = 0;</span><br><span> </span><br><span>@@ -216,7 +215,7 @@</span><br><span> mgcp_conn_dump(conn->conn));</span><br><span> </span><br><span> rc = mgcp_udp_send(conn->end.rtp.fd, &conn->end.addr,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.rtp_port, buf, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->end.rtp_port, rtp_dummy_payload, sizeof(rtp_dummy_payload));</span><br><span> </span><br><span> if (rc == -1)</span><br><span> goto failed;</span><br><span>@@ -226,7 +225,7 @@</span><br><span> </span><br><span> was_rtcp = 1;</span><br><span> rc = mgcp_udp_send(conn->end.rtcp.fd, &conn->end.addr,</span><br><span style="color: hsl(0, 100%, 40%);">- conn->end.rtcp_port, buf, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->end.rtcp_port, rtp_dummy_payload, sizeof(rtp_dummy_payload));</span><br><span> </span><br><span> if (rc >= 0)</span><br><span> return rc;</span><br><span>@@ -1398,11 +1397,6 @@</span><br><span> mgcp_cleanup_rtp_bridge_cb(endp, conn);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static bool is_dummy_msg(enum rtp_proto proto, struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- return msgb_length(msg) == 1 && msgb_data(msg)[0] == MGCP_DUMMY_LOAD;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Handle incoming RTP data from NET */</span><br><span> static int rtp_data_net(struct osmo_fd *fd, unsigned int what)</span><br><span> {</span><br><span>@@ -1453,7 +1447,7 @@</span><br><span> goto out;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (is_dummy_msg(proto, msg)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mgcp_is_rtp_dummy_payload(msg)) {</span><br><span> LOG_CONN_RTP(conn_src, LOGL_DEBUG, "rx dummy packet (dropped)\n");</span><br><span> rc = 0;</span><br><span> goto out;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_osmux.c b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>index bb85735..8f0a906 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_osmux.c</span><br><span>@@ -375,7 +375,7 @@</span><br><span> }</span><br><span> </span><br><span> /* not any further processing dummy messages */</span><br><span style="color: hsl(0, 100%, 40%);">- if (msg->data[0] == MGCP_DUMMY_LOAD)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (mgcp_is_rtp_dummy_payload(msg))</span><br><span> return osmux_handle_dummy(cfg, &addr, msg);</span><br><span> </span><br><span> rem = msg->len;</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 74ecfe8..2ca0b4c 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <osmocom/mgcp/mgcp_trunk.h></span><br><span> #include <osmocom/mgcp/mgcp_sdp.h></span><br><span> #include <osmocom/mgcp/mgcp_codec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/mgcp/mgcp_network.h></span><br><span> </span><br><span> #include <osmocom/core/application.h></span><br><span> #include <osmocom/core/talloc.h></span><br><span>@@ -616,7 +617,6 @@</span><br><span> return MGCP_POLICY_CONT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define MGCP_DUMMY_LOAD 0x23</span><br><span> static int dummy_packets = 0;</span><br><span> /* override and forward */</span><br><span> ssize_t sendto(int sockfd, const void *buf, size_t len, int flags,</span><br><span>@@ -626,7 +626,8 @@</span><br><span> htonl(((struct sockaddr_in *)dest_addr)->sin_addr.s_addr);</span><br><span> int dest_port = htons(((struct sockaddr_in *)dest_addr)->sin_port);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (len == 1 && ((const char *)buf)[0] == MGCP_DUMMY_LOAD) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len == sizeof(rtp_dummy_payload)</span><br><span style="color: hsl(120, 100%, 40%);">+ && memcmp(buf, rtp_dummy_payload, sizeof(rtp_dummy_payload)) == 0) {</span><br><span> fprintf(stderr,</span><br><span> "Dummy packet to 0x%08x:%d, msg length %zu\n%s\n\n",</span><br><span> dest_host, dest_port, len, osmo_hexdump(buf, len));</span><br><span>@@ -2161,6 +2162,47 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void test_mgcp_is_rtp_dummy_payload()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* realistic rtp packet */</span><br><span style="color: hsl(120, 100%, 40%);">+ static const char rtp_payload[] =</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x80, 0x03, 0xca, 0xd7, 0x62, 0x12, 0x75, 0xc4, 0x43, 0x4b, 0x3e,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x72, 0xd2, 0x57, 0x7a, 0x1c, 0xda, 0x50, 0x00, 0x49, 0x24, 0x92,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x49, 0x24, 0x50, 0x00, 0x49, 0x24, 0x92, 0x49, 0x24, 0x50, 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x49, 0x24, 0x92, 0x49, 0x24, 0x50, 0x00, 0x49, 0x23, 0x92, 0x49,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x24 };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_dummy = msgb_alloc(RTP_BUF_SIZE, "RTP-msg_dummy");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_rtp = msgb_alloc(RTP_BUF_SIZE, "RTP-msg_rtp");</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg_dummy_rtp =</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_alloc(RTP_BUF_SIZE, "RTP-msg_dummy_rtp");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *buf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Dummy RTP packet */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = msgb_put(msg_dummy, ARRAY_SIZE(rtp_dummy_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf, rtp_dummy_payload, ARRAY_SIZE(rtp_dummy_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Normal RTP packet */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = msgb_put(msg_rtp, ARRAY_SIZE(rtp_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf, rtp_payload, ARRAY_SIZE(rtp_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Dummy RTP packet with normal RTP packet attached, this must not be</span><br><span style="color: hsl(120, 100%, 40%);">+ * recognized as Dummy RTP packet */</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = msgb_put(msg_dummy_rtp, ARRAY_SIZE(rtp_dummy_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf, rtp_dummy_payload, ARRAY_SIZE(rtp_dummy_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ buf = msgb_put(msg_dummy_rtp, ARRAY_SIZE(rtp_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf, rtp_payload, ARRAY_SIZE(rtp_payload));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(mgcp_is_rtp_dummy_payload(msg_dummy) == true);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(mgcp_is_rtp_dummy_payload(msg_rtp) == false);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(mgcp_is_rtp_dummy_payload(msg_dummy_rtp) == false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg_dummy);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg_rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg_dummy_rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> void *ctx = talloc_named_const(NULL, 0, "mgcp_test");</span><br><span>@@ -2187,6 +2229,7 @@</span><br><span> test_mgcp_codec_pt_translate();</span><br><span> test_conn_id_matching();</span><br><span> test_e1_trunk_nr_from_epname();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_mgcp_is_rtp_dummy_payload();</span><br><span> </span><br><span> OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0);</span><br><span> OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/24315">change 24315</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/+/24315"/><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: I21d96cefeeb647958bfa1e22a0ea030884746fad </div>
<div style="display:none"> Gerrit-Change-Number: 24315 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>