<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/IPA: fix server mode: properly handle multiple client connections<br><br>Change-Id: I93c58c08cf296e5cea81d811650caa1a09b8a579<br>---<br>M library/IPA_Emulation.ttcnpp<br>1 file changed, 33 insertions(+), 25 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/57/18357/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 0edc0a7..b9c7940 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -84,16 +84,21 @@</span><br><span> </span><br><span> /* an event indicating us whether or not a connection is physically up or down,</span><br><span> * and whether we have received an ID_ACK */</span><br><span style="color: hsl(0, 100%, 40%);">-type union ASP_IPA_Event {</span><br><span style="color: hsl(0, 100%, 40%);">- ASP_IPA_EventType up_down</span><br><span style="color: hsl(120, 100%, 40%);">+type record ASP_IPA_Event {</span><br><span style="color: hsl(120, 100%, 40%);">+ ASP_IPA_EventType ev_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPL4asp_Types.ConnectionId conn_id</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) ASP_IPA_Event ts_ASP_IPA_EV(ASP_IPA_EventType ud) := {</span><br><span style="color: hsl(0, 100%, 40%);">- up_down := ud</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) ASP_IPA_Event ts_ASP_IPA_EV(ASP_IPA_EventType ev_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ IPL4asp_Types.ConnectionId conn_id) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_type := ev_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id := conn_id</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template ASP_IPA_Event tr_ASP_IPA_EV(template ASP_IPA_EventType ud) := {</span><br><span style="color: hsl(0, 100%, 40%);">- up_down := ud</span><br><span style="color: hsl(120, 100%, 40%);">+template ASP_IPA_Event tr_ASP_IPA_EV(template ASP_IPA_EventType ev_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ template IPL4asp_Types.ConnectionId conn_id := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ev_type := ev_type,</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id := conn_id</span><br><span> }</span><br><span> </span><br><span> template ASP_IPA_Unitdata t_ASP_IPA_UD(IpaStreamId sid, octetstring pl,</span><br><span>@@ -382,8 +387,9 @@</span><br><span> }</span><br><span> </span><br><span> /* transmit IPA CCM message */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_ccm_tx(PDU_IPA_CCM ccm) runs on IPA_Emulation_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var IPA_Send ipa_tx := valueof(t_IPA_Send(g_ipa_conn_id, IPAC_PROTO_CCM, enc_PDU_IPA_CCM(ccm)));</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_ccm_tx(PDU_IPA_CCM ccm, IPL4asp_Types.ConnectionId conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on IPA_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var IPA_Send ipa_tx := valueof(t_IPA_Send(conn_id, IPAC_PROTO_CCM, enc_PDU_IPA_CCM(ccm)));</span><br><span> log("CCM Tx:", ccm);</span><br><span> IPA_PORT.send(ipa_tx);</span><br><span> }</span><br><span>@@ -411,13 +417,13 @@</span><br><span> private function f_ccm_rx_client(PDU_IPA_CCM ccm) runs on IPA_Emulation_CT {</span><br><span> select (ccm.msg_type) {</span><br><span> case (IPAC_MSGT_PING) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_PONG));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_PONG), g_ipa_conn_id);</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_ACK) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK, g_ipa_conn_id));</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_GET) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(f_ccm_make_id_resp(ccm));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(f_ccm_make_id_resp(ccm), g_ipa_conn_id);</span><br><span> }</span><br><span> case else {</span><br><span> log("Unknown/unsupported IPA CCM message type", ccm);</span><br><span>@@ -425,10 +431,11 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_ccm_rx_server(PDU_IPA_CCM ccm) runs on IPA_Emulation_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_ccm_rx_server(PDU_IPA_CCM ccm, IPL4asp_Types.ConnectionId conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on IPA_Emulation_CT {</span><br><span> select (ccm.msg_type) {</span><br><span> case (IPAC_MSGT_PING) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_PONG));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_PONG), conn_id);</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_ACK) {</span><br><span> /* the IPA server should at some point receive an ID_ACK from the client,</span><br><span>@@ -436,12 +443,12 @@</span><br><span> * the TCP connection is established. Other implementations may differ.</span><br><span> * We currently ignore it completely - but actually we should make sure that</span><br><span> * one ID_ACK is received by the server at some point */</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK, conn_id));</span><br><span> }</span><br><span> case (IPAC_MSGT_ID_RESP) {</span><br><span> log("IPA ID RESP: ", ccm.u.resp);</span><br><span> /* acknowledge any identity that the client may have sent */</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ACK), conn_id);</span><br><span> }</span><br><span> case else {</span><br><span> log("Unknown/unsupported IPA CCM message type", ccm);</span><br><span>@@ -490,9 +497,9 @@</span><br><span> f_connect(remote_host, remote_port, local_host, local_port, ccm_pars);</span><br><span> if (g_ccm_enabled) {</span><br><span> /* we're a client: Send ID_ACK immediately after connect */</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ACK), g_ipa_conn_id);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP, g_ipa_conn_id));</span><br><span> ScanEvents();</span><br><span> }</span><br><span> </span><br><span>@@ -596,7 +603,7 @@</span><br><span> f_ccm_rx_client(ccm);</span><br><span> }</span><br><span> case (IPA_MODE_SERVER) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_rx_server(ccm);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_rx_server(ccm, ipa_rx.connId);</span><br><span> }</span><br><span> case else {</span><br><span> setverdict(fail, "Unknown mode");</span><br><span>@@ -668,16 +675,17 @@</span><br><span> </span><br><span> /* server only */</span><br><span> [] IPA_PORT.receive(ASP_Event:{connOpened:=?}) -> value asp_evt {</span><br><span style="color: hsl(0, 100%, 40%);">- log("IPA: Connected");</span><br><span style="color: hsl(0, 100%, 40%);">- g_ipa_conn_id := asp_evt.connOpened.connId;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP));</span><br><span style="color: hsl(120, 100%, 40%);">+ var IPL4asp_Types.ConnectionId conn_id := asp_evt.connOpened.connId;</span><br><span style="color: hsl(120, 100%, 40%);">+ log("IPA: accepted a new client connection (conn_id=", conn_id, ")");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_UP, conn_id));</span><br><span> if (g_mode == IPA_MODE_SERVER and g_ccm_enabled) {</span><br><span> select (g_init_behavior) {</span><br><span> case (IPA_INIT_SEND_IPA_ID_GET) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_ID_GET));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ID_GET), conn_id);</span><br><span> }</span><br><span> case (IPA_INIT_SEND_IPA_ID_ACK) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_ccm_tx(valueof(ts_IPA_ACK));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ccm_tx(valueof(ts_IPA_ACK), conn_id);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span>@@ -686,14 +694,14 @@</span><br><span> [] IPA_PORT.receive(ASP_Event:{connClosed:=?}) -> value asp_evt {</span><br><span> log("IPA: Closed");</span><br><span> g_ipa_conn_id := -1;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN, asp_evt.connClosed.connId));</span><br><span> self.stop;</span><br><span> }</span><br><span> </span><br><span> [] IPA_PORT.receive(Socket_API_Definitions.PortEvent:{result:={errorCode:=ERROR_SOCKET, connId:=?, os_error_code:=?, os_error_text:=?}}) -> value port_evt {</span><br><span> log("PortEvent: ERROR_SOCKET: ", port_evt);</span><br><span> g_ipa_conn_id := -1;</span><br><span style="color: hsl(0, 100%, 40%);">- f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_send_IPA_EVT(ts_ASP_IPA_EV(ASP_IPA_EVENT_DOWN, port_evt.result.connId));</span><br><span> self.stop;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18357">change 18357</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/+/18357"/><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: I93c58c08cf296e5cea81d811650caa1a09b8a579 </div>
<div style="display:none"> Gerrit-Change-Number: 18357 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>