<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17184">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rspro_client_fsm: Add SRVC_E_DISCONNECT to disconnect from RSPRO server<br><br>This is in preparation of other patches which will actually issue the<br>SRVC_E_DISCONNET event towards this FSM.<br><br>Related: OS#4399<br>Change-Id: I080f9e85987bbbe7aef84c32ce84b69d949ff561<br>---<br>M src/rspro_client_fsm.c<br>M src/rspro_client_fsm.h<br>2 files changed, 18 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/84/17184/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/rspro_client_fsm.c b/src/rspro_client_fsm.c</span><br><span>index d5cf04b..7df1d17 100644</span><br><span>--- a/src/rspro_client_fsm.c</span><br><span>+++ b/src/rspro_client_fsm.c</span><br><span>@@ -110,6 +110,7 @@</span><br><span> </span><br><span> static const struct value_string server_conn_fsm_event_names[] = {</span><br><span>       OSMO_VALUE_STRING(SRVC_E_ESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+  OSMO_VALUE_STRING(SRVC_E_DISCONNECT),</span><br><span>        OSMO_VALUE_STRING(SRVC_E_TCP_UP),</span><br><span>    OSMO_VALUE_STRING(SRVC_E_TCP_DOWN),</span><br><span>  OSMO_VALUE_STRING(SRVC_E_KA_TIMEOUT),</span><br><span>@@ -330,10 +331,26 @@</span><br><span> </span><br><span> static void srvc_allstate_action(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+      struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>         switch (event) {</span><br><span>     case SRVC_E_ESTABLISH:</span><br><span>               osmo_fsm_inst_state_chg(fi, SRVC_ST_REESTABLISH, T2_RECONNECT, 2);</span><br><span>           break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case SRVC_E_DISCONNECT:</span><br><span style="color: hsl(120, 100%, 40%);">+               if (srvc->keepalive_fi) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  ipa_keepalive_fsm_stop(srvc->keepalive_fi);</span><br><span style="color: hsl(120, 100%, 40%);">+                        osmo_fsm_inst_term(srvc->keepalive_fi, OSMO_FSM_TERM_REGULAR, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+                       srvc->keepalive_fi = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+             if (srvc->conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  LOGPFSML(fi, LOGL_INFO, "Destroying existing connection to server\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                      ipa_client_conn_close(srvc->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+                 ipa_client_conn_destroy(srvc->conn);</span><br><span style="color: hsl(120, 100%, 40%);">+                       srvc->conn = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+         }</span><br><span style="color: hsl(120, 100%, 40%);">+             osmo_fsm_inst_state_chg(fi, SRVC_ST_INIT, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span>       default:</span><br><span>             OSMO_ASSERT(0);</span><br><span>      }</span><br><span>diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h</span><br><span>index 2f3f7fc..c1ae764 100644</span><br><span>--- a/src/rspro_client_fsm.h</span><br><span>+++ b/src/rspro_client_fsm.h</span><br><span>@@ -8,6 +8,7 @@</span><br><span> </span><br><span> enum server_conn_fsm_event {</span><br><span>         SRVC_E_ESTABLISH,       /* instruct SRVC to (re)etablish TCP connection to bankd */</span><br><span style="color: hsl(120, 100%, 40%);">+   SRVC_E_DISCONNECT,      /* instruct SRVC to disconnect TCP connection to bankd */</span><br><span>    SRVC_E_TCP_UP,</span><br><span>       SRVC_E_TCP_DOWN,</span><br><span>     SRVC_E_KA_TIMEOUT,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17184">change 17184</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-remsim/+/17184"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I080f9e85987bbbe7aef84c32ce84b69d949ff561 </div>
<div style="display:none"> Gerrit-Change-Number: 17184 </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>