<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17184">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;">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, 22 insertions(+), 4 deletions(-)<br><br></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..b006809 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>@@ -370,20 +387,20 @@</span><br><span> [SRVC_ST_ESTABLISHED] = {</span><br><span> .name = "ESTABLISHED",</span><br><span> .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) | S(SRVC_E_CLIENT_CONN_RES),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SRVC_ST_CONNECTED) | S(SRVC_ST_REESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SRVC_ST_CONNECTED) | S(SRVC_ST_REESTABLISH) | S(SRVC_ST_INIT),</span><br><span> .action = srvc_st_established,</span><br><span> .onenter = srvc_st_established_onenter,</span><br><span> },</span><br><span> [SRVC_ST_CONNECTED] = {</span><br><span> .name = "CONNECTED",</span><br><span> .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) | S(SRVC_E_RSPRO_TX),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SRVC_ST_REESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SRVC_ST_REESTABLISH) | S(SRVC_ST_INIT),</span><br><span> .action = srvc_st_connected,</span><br><span> },</span><br><span> [SRVC_ST_REESTABLISH] = {</span><br><span> .name = "REESTABLISH",</span><br><span> .in_event_mask = S(SRVC_E_TCP_UP) | S(SRVC_E_TCP_DOWN),</span><br><span style="color: hsl(0, 100%, 40%);">- .out_state_mask = S(SRVC_ST_ESTABLISHED) | S(SRVC_ST_REESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .out_state_mask = S(SRVC_ST_ESTABLISHED) | S(SRVC_ST_REESTABLISH) | S(SRVC_ST_INIT),</span><br><span> .action = srvc_st_reestablish,</span><br><span> .onenter = srvc_st_reestablish_onenter,</span><br><span> },</span><br><span>@@ -393,7 +410,7 @@</span><br><span> .name = "RSPRO_CLIENT",</span><br><span> .states = server_conn_fsm_states,</span><br><span> .num_states = ARRAY_SIZE(server_conn_fsm_states),</span><br><span style="color: hsl(0, 100%, 40%);">- .allstate_event_mask = S(SRVC_E_ESTABLISH),</span><br><span style="color: hsl(120, 100%, 40%);">+ .allstate_event_mask = S(SRVC_E_ESTABLISH) | S(SRVC_E_DISCONNECT),</span><br><span> .allstate_action = srvc_allstate_action,</span><br><span> .timer_cb = server_conn_fsm_timer_cb,</span><br><span> .log_subsys = DMAIN,</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: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>