<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23882">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pcap-client: Don't bind to second 'traffic' udp port<br><br>if the tester runs on a different host/IP than the IUT (like in our<br>dockerized jenkins tests), then of course we cannot assume that<br>traffic sent by the tester can be received by the tester again.<br><br>So rather than binding/connecting two sockets, let's only use one<br>and send packets without caring if there is a remote receiver.<br><br>Change-Id: If826705c78c7a0ad0e633b7a320d7dd5e5561c27<br>---<br>M pcap-client/OPCAP_CLIENT_Tests.ttcn<br>1 file changed, 3 insertions(+), 15 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/82/23882/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pcap-client/OPCAP_CLIENT_Tests.ttcn b/pcap-client/OPCAP_CLIENT_Tests.ttcn</span><br><span>index 5f59caf..e9fe406 100644</span><br><span>--- a/pcap-client/OPCAP_CLIENT_Tests.ttcn</span><br><span>+++ b/pcap-client/OPCAP_CLIENT_Tests.ttcn</span><br><span>@@ -34,7 +34,7 @@</span><br><span> </span><br><span>         /* port to generate IP traffic that may or may not be captured */</span><br><span>    port IPL4asp_PT IP;</span><br><span style="color: hsl(0, 100%, 40%);">-     var integer g_traffic_conn_id[2];</span><br><span style="color: hsl(120, 100%, 40%);">+     var integer g_traffic_conn_id;</span><br><span> };</span><br><span> </span><br><span> private altstep as_Tguard() runs on test_CT {</span><br><span>@@ -70,24 +70,12 @@</span><br><span>      /* 0 -> 1 */</span><br><span>      res := f_IPL4_connect(IP, mp_traffic_b.ip, mp_traffic_b.udp_port,</span><br><span>                          mp_traffic_a.ip, mp_traffic_a.udp_port, -1, { udp:={} });</span><br><span style="color: hsl(0, 100%, 40%);">- g_traffic_conn_id[0] := res.connId;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-     /* 1 -> 0 */</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(IP, mp_traffic_a.ip, mp_traffic_a.udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">-                             mp_traffic_b.ip, mp_traffic_b.udp_port, -1, { udp:={} });</span><br><span style="color: hsl(0, 100%, 40%);">- g_traffic_conn_id[1] := res.connId;</span><br><span style="color: hsl(120, 100%, 40%);">+   g_traffic_conn_id := res.connId;</span><br><span> }</span><br><span> </span><br><span> /* generate user traffic from A -> B */</span><br><span> function f_trafic_pkt_ab(octetstring payload) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-      IP.send(ASP_Send:{g_traffic_conn_id[0], omit, payload})</span><br><span style="color: hsl(0, 100%, 40%);">- IP.receive(ASP_RecvFrom:{g_traffic_conn_id[1], ?, ?, ?, ?, { udp:={} }, ?, payload});</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* generate user traffic from B -> A */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_trafic_pkt_ba(octetstring payload) runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- IP.send(ASP_Send:{g_traffic_conn_id[1], omit, payload})</span><br><span style="color: hsl(0, 100%, 40%);">- IP.receive(ASP_RecvFrom:{g_traffic_conn_id[0], ?, ?, ?, ?, { udp:={} }, ?, payload});</span><br><span style="color: hsl(120, 100%, 40%);">+ IP.send(ASP_Send:{g_traffic_conn_id, omit, payload})</span><br><span> }</span><br><span> </span><br><span> /* expect a specified UDP payload on the OPCAP connection 'idx' */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/23882">change 23882</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/+/23882"/><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: If826705c78c7a0ad0e633b7a320d7dd5e5561c27 </div>
<div style="display:none"> Gerrit-Change-Number: 23882 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>