<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">FrameRelay_Emulation: Fix network side emulation<br><br>On the network side, by definition all PVCs are always active. Only the<br>user side detects the active PVCs from the network side. In order to<br>make higher-layer code agnostic, we need to spoof the related status<br>events up the stack.<br><br>Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655<br>---<br>M src/FrameRelay_Emulation.ttcn<br>1 file changed, 31 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/FrameRelay_Emulation.ttcn b/src/FrameRelay_Emulation.ttcn</span><br><span>index fbca3bd..bc581c6 100644</span><br><span>--- a/src/FrameRelay_Emulation.ttcn</span><br><span>+++ b/src/FrameRelay_Emulation.ttcn</span><br><span>@@ -80,7 +80,7 @@</span><br><span> };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* FR Emulation user/client component/dispatcher. Exists once per FR_CODEC_PT */</span><br><span style="color: hsl(120, 100%, 40%);">+/* FR Emulation user/client component/dispatcher. Exists once per DLC */</span><br><span> type component FR_Client_CT {</span><br><span> /* message port towards the Frame Relay Emulation */</span><br><span> port FRemu_PT FR;</span><br><span>@@ -198,6 +198,10 @@</span><br><span> q933em.service_affecting_condition := false;</span><br><span> log("Detecting no more service affecting condition after N392 consecutive good cycles");</span><br><span> notify_all_clients(FRemu_Event:{link_status:=FR_LINK_STS_AVAILABLE});</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not q933em.cfg.ats_is_user) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* on the network side, all DLCs are active immediately */</span><br><span style="color: hsl(120, 100%, 40%);">+ notify_all_clients_pvc_state();</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span>@@ -349,7 +353,17 @@</span><br><span> runs on FR_Emulation_CT {</span><br><span> for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) {</span><br><span> if (ConnectionTable[i].vc_conn != null) {</span><br><span style="color: hsl(0, 100%, 40%);">- CLIENT.send(evt) to ConnectionTable[i].vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ notify_client(ConnectionTable[i].vc_conn, evt);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+private function notify_all_clients_pvc_state()</span><br><span style="color: hsl(120, 100%, 40%);">+runs on FR_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i:= 0; i < sizeof(ConnectionTable); i := i + 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ConnectionTable[i].vc_conn != null) {</span><br><span style="color: hsl(120, 100%, 40%);">+ notify_client(ConnectionTable[i].vc_conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ FRemu_Event:{pvc_status:=ConnectionTable[i].q933_status});</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -437,9 +451,22 @@</span><br><span> " when ", vc_conn, " tries to register for it");</span><br><span> mtc.stop;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- ConnectionTable[dlci].vc_conn := vc_conn;</span><br><span style="color: hsl(0, 100%, 40%);">- /* optionally send async Q.933 STATUS? */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* on the network side, every DLC is immediately active */</span><br><span style="color: hsl(120, 100%, 40%);">+ ConnectionTable[dlci] := {</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := vc_conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ q933_status := {</span><br><span style="color: hsl(120, 100%, 40%);">+ dlci := dlci,</span><br><span style="color: hsl(120, 100%, 40%);">+ new := true,</span><br><span style="color: hsl(120, 100%, 40%);">+ delete := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ active := true</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> PROC.reply(FRemu_register:{dlci}) to vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not q933em.cfg.ats_is_user) {</span><br><span style="color: hsl(120, 100%, 40%);">+ notify_client(vc_conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ FRemu_Event:{pvc_status:=ConnectionTable[dlci].q933_status});</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* optionally send async Q.933 STATUS? */</span><br><span> }</span><br><span> </span><br><span> [] PROC.getcall(FRemu_unregister:{?}) -> param(dlci) sender vc_conn {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/titan.TestPorts.AF_PACKET/+/22934">change 22934</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/titan.TestPorts.AF_PACKET/+/22934"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: titan.TestPorts.AF_PACKET </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I791a7739e5ee6301ee5c24e5824a15a7b380a655 </div>
<div style="display:none"> Gerrit-Change-Number: 22934 </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-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>