<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10150">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MGCP_Test: check payload type of received RTP packets<br><br>When an RTP packet is received, the payload type is not checked,<br>so we will not detect if the MGW emits packets with a wrong payload<br>type for some reason.<br><br>- Introduce a statistics counter that counts packets with wrong PT<br>- Update testcases so that they check for the statistics for wrong<br> PT count.<br><br>Change-Id: I83d4b04656a16ced624024245a2fcb7a0ad48a8a<br>Related: OS#3384<br>---<br>M library/RTP_Emulation.ttcn<br>M mgw/MGCP_Test.ttcn<br>2 files changed, 36 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/50/10150/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn</span><br><span>index 71cd8db..2a358a9 100644</span><br><span>--- a/library/RTP_Emulation.ttcn</span><br><span>+++ b/library/RTP_Emulation.ttcn</span><br><span>@@ -116,6 +116,8 @@</span><br><span> integer num_pkts_rx_err_seq,</span><br><span> /* number of packets received wrong timestamp */</span><br><span> integer num_pkts_rx_err_ts,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* number of packets received wrong payload type */</span><br><span style="color: hsl(120, 100%, 40%);">+ integer num_pkts_rx_err_pt,</span><br><span> /* number of packets received during Rx disable */</span><br><span> integer num_pkts_rx_err_disabled</span><br><span> }</span><br><span>@@ -127,6 +129,7 @@</span><br><span> bytes_payload_rx := 0,</span><br><span> num_pkts_rx_err_seq := 0,</span><br><span> num_pkts_rx_err_ts := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_pkts_rx_err_pt := 0,</span><br><span> num_pkts_rx_err_disabled := 0</span><br><span> }</span><br><span> </span><br><span>@@ -399,7 +402,11 @@</span><br><span> /* process received RTCP/RTP if receiver enabled */</span><br><span> [g_rx_enabled] RTP.receive(tr_rtp) -> value rx_rtp {</span><br><span> //log("RX RTP: ", rx_rtp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* increment counters */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rx_rtp.msg.rtp.payload_type != g_cfg.tx_payload_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_stats_rtp.num_pkts_rx_err_pt := g_stats_rtp.num_pkts_rx_err_pt+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> g_stats_rtp.num_pkts_rx := g_stats_rtp.num_pkts_rx+1;</span><br><span> g_stats_rtp.bytes_payload_rx := g_stats_rtp.bytes_payload_rx +</span><br><span> lengthof(rx_rtp.msg.rtp.data);</span><br><span>diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn</span><br><span>index 82ed608..264ac28 100644</span><br><span>--- a/mgw/MGCP_Test.ttcn</span><br><span>+++ b/mgw/MGCP_Test.ttcn</span><br><span>@@ -970,6 +970,9 @@</span><br><span> if (stats.num_pkts_rx_err_ts != 0) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats.num_pkts_rx_err_pt != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (stats.num_pkts_rx_err_disabled != 0) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span>@@ -1008,6 +1011,9 @@</span><br><span> if (stats.num_pkts_rx_err_ts != 0) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats.num_pkts_rx_err_pt != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (stats.num_pkts_rx_err_disabled != 0) {</span><br><span> setverdict(fail);</span><br><span> }</span><br><span>@@ -1062,6 +1068,11 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -1163,12 +1174,20 @@</span><br><span> setverdict(fail, "number of packets not within normal parameters");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats[0].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> temp := stats[1].num_pkts_tx - num_pkts_tx[1] - stats[0].num_pkts_rx;</span><br><span> if (temp > 3 or temp < -3) {</span><br><span> setverdict(fail, "number of packets not within normal parameters");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats[0].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Tear down */</span><br><span> f_flow_delete(RTPEM[0]);</span><br><span>@@ -1221,6 +1240,11 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span>@@ -1284,6 +1308,11 @@</span><br><span> mtc.stop;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (stats[0].num_pkts_rx_err_pt > 0 or stats[1].num_pkts_rx_err_pt > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with wrong payload type received");</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> setverdict(pass);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10150">change 10150</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/10150"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I83d4b04656a16ced624024245a2fcb7a0ad48a8a </div>
<div style="display:none"> Gerrit-Change-Number: 10150 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>