<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13000">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Daniel Willmann: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">RTP_Emulation: check received RTP packets<br><br>The configuration of the RTP Emulation (RtpemConfig) allows to set a<br>fixed RTP payload that is then used when RTP packets are transmitted.<br>However, when packets are received, then the payload is not checked.<br>Lets check the received data against some user configurable rx payload,<br>that is by default set to the tx payload.<br><br>Change-Id: Id0b125aaf915497d0a4f051af890fc34e09da61d<br>Related: OS#3807<br>---<br>M library/RTP_Emulation.ttcn<br>1 file changed, 14 insertions(+), 4 deletions(-)<br><br></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 fcb158b..2494d74 100644</span><br><span>--- a/library/RTP_Emulation.ttcn</span><br><span>+++ b/library/RTP_Emulation.ttcn</span><br><span>@@ -119,7 +119,9 @@</span><br><span> /* number of packets received wrong payload type */</span><br><span> integer num_pkts_rx_err_pt,</span><br><span> /* number of packets received during Rx disable */</span><br><span style="color: hsl(0, 100%, 40%);">- integer num_pkts_rx_err_disabled</span><br><span style="color: hsl(120, 100%, 40%);">+ integer num_pkts_rx_err_disabled,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* number of packets received with mismatching payload */</span><br><span style="color: hsl(120, 100%, 40%);">+ integer num_pkts_rx_err_payload</span><br><span> }</span><br><span> </span><br><span> const RtpemStats c_RtpemStatsReset := {</span><br><span>@@ -130,7 +132,8 @@</span><br><span> num_pkts_rx_err_seq := 0,</span><br><span> num_pkts_rx_err_ts := 0,</span><br><span> num_pkts_rx_err_pt := 0,</span><br><span style="color: hsl(0, 100%, 40%);">- num_pkts_rx_err_disabled := 0</span><br><span style="color: hsl(120, 100%, 40%);">+ num_pkts_rx_err_disabled := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ num_pkts_rx_err_payload := 0</span><br><span> }</span><br><span> </span><br><span> type record RtpemConfig {</span><br><span>@@ -139,6 +142,7 @@</span><br><span> integer tx_duration_ms,</span><br><span> BIT32_BO_LAST tx_ssrc,</span><br><span> octetstring tx_fixed_payload optional,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring rx_fixed_payload optional,</span><br><span> boolean iuup_mode,</span><br><span> boolean iuup_tx_init</span><br><span> };</span><br><span>@@ -149,6 +153,7 @@</span><br><span> tx_duration_ms := 20,</span><br><span> tx_ssrc := '11011110101011011011111011101111'B,</span><br><span> tx_fixed_payload := '01020304'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_fixed_payload := '01020304'O,</span><br><span> iuup_mode := false,</span><br><span> iuup_tx_init := true</span><br><span> }</span><br><span>@@ -276,6 +281,10 @@</span><br><span> setverdict(fail, "RTP packets received while RX was disabled");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (s.num_pkts_rx_err_payload != 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RTP packets with mismatching payload 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> </span><br><span> template PDU_RTP ts_RTP(BIT32_BO_LAST ssrc, INT7b pt, LIN2_BO_LAST seq, uint32_t ts,</span><br><span>@@ -437,8 +446,6 @@</span><br><span> </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 style="color: hsl(0, 100%, 40%);">- //log("RX RTP: ", rx_rtp);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* increment counters */</span><br><span> if (rx_rtp.msg.rtp.payload_type != g_cfg.tx_payload_type) {</span><br><span> g_stats_rtp.num_pkts_rx_err_pt := g_stats_rtp.num_pkts_rx_err_pt+1;</span><br><span>@@ -446,6 +453,9 @@</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 style="color: hsl(120, 100%, 40%);">+ if (ispresent(g_cfg.rx_fixed_payload) and rx_rtp.msg.rtp.data != g_cfg.rx_fixed_payload) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_stats_rtp.num_pkts_rx_err_payload := g_stats_rtp.num_pkts_rx_err_payload + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (g_cfg.iuup_mode) {</span><br><span> rx_rtp.msg.rtp.data := f_IuUP_Em_rx_decaps(g_iuup_ent, rx_rtp.msg.rtp.data);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13000">change 13000</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/13000"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id0b125aaf915497d0a4f051af890fc34e09da61d </div>
<div style="display:none"> Gerrit-Change-Number: 13000 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Daniel Willmann <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>