<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RTP_Emulation: Close previous socket after rebind<br><br>If test calls RTPEM_bind twice, the previous socket is kept open<br>(ConnId 1) while the new one is assigned to the the expected ConnId for<br>RTP/RTCP packets received (ConnId), however, if remote was already<br>sending packets, it may happen that the port still receives those with<br>ConnId=1, which may make test fail with message:<br>"Received unexpected type from RTP"<br><br>Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d<br>---<br>M library/OSMUX_Emulation.ttcn<br>M library/RTP_Emulation.ttcn<br>2 files changed, 16 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/OSMUX_Emulation.ttcn b/library/OSMUX_Emulation.ttcn</span><br><span>index e1275b9..d31a562 100644</span><br><span>--- a/library/OSMUX_Emulation.ttcn</span><br><span>+++ b/library/OSMUX_Emulation.ttcn</span><br><span>@@ -451,6 +451,11 @@</span><br><span> [] CTRL.getcall(OsmuxEM_bind:{?,?}) -> param(g_local_host, g_local_port) {</span><br><span> </span><br><span> g_tx_connected := false; /* will set it back to true upon next connect() call */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_osmux_conn_id != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ res := OSMUX_CodecPort_CtrlFunct.f_IPL4_close(OSMUX, g_osmux_conn_id, {udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ g_osmux_conn_id := -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> res := OSMUX_CodecPort_CtrlFunct.f_IPL4_listen(OSMUX, g_local_host,</span><br><span> g_local_port, {udp:={}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span>diff --git a/library/RTP_Emulation.ttcn b/library/RTP_Emulation.ttcn</span><br><span>index 70604dc..900a196 100644</span><br><span>--- a/library/RTP_Emulation.ttcn</span><br><span>+++ b/library/RTP_Emulation.ttcn</span><br><span>@@ -4,7 +4,7 @@</span><br><span> * * act as a RTP source that generates a RTP Stream</span><br><span> * * act asaa RTP sink that consumes a RTP Stream</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * for all of the above, we want to be able to </span><br><span style="color: hsl(120, 100%, 40%);">+ * for all of the above, we want to be able to</span><br><span> * * specify the payload type</span><br><span> * * specify the interval / sample rate</span><br><span> * * create drop-outs in the stream</span><br><span>@@ -387,6 +387,11 @@</span><br><span> }</span><br><span> </span><br><span> g_tx_connected := false; /* will set it back to true upon next connect() call */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_rtp_conn_id != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTP, g_rtp_conn_id, {udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ g_rtp_conn_id := -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTP, g_local_host,</span><br><span> g_local_port, {udp:={}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span>@@ -395,6 +400,11 @@</span><br><span> }</span><br><span> g_rtp_conn_id := res.connId;</span><br><span> tr_rtp.connId := g_rtp_conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_rtcp_conn_id != -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ res := RTP_CodecPort_CtrlFunct.f_IPL4_close(RTCP, g_rtcp_conn_id, {udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ g_rtcp_conn_id := -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> res := RTP_CodecPort_CtrlFunct.f_IPL4_listen(RTCP, g_local_host,</span><br><span> g_local_port+1, {udp:={}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20032">change 20032</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-ttcn3-hacks/+/20032"/><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-Change-Id: I73f4af4e590dd3958e3f4d1dba0496c0750d642d </div>
<div style="display:none"> Gerrit-Change-Number: 20032 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>