<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17336">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rspro_client_fsm: Add optional notifiation of parent on connect/disconnect<br><br>This will be useful once we introduce a 'main' client FSM that is a<br>parent to the rspro_client_fsms.<br><br>Change-Id: Ifddb8e0b5c991e5348392c9e44612669ce207bc4<br>---<br>M src/rspro_client_fsm.c<br>M src/rspro_client_fsm.h<br>2 files changed, 22 insertions(+), 0 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 2c1c029..e55892c 100644</span><br><span>--- a/src/rspro_client_fsm.c</span><br><span>+++ b/src/rspro_client_fsm.c</span><br><span>@@ -244,6 +244,14 @@</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void srvc_st_connected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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 style="color: hsl(120, 100%, 40%);">+  if (fi->proc.parent)</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_fsm_inst_dispatch(fi->proc.parent, srvc->parent_conn_evt, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void srvc_st_connected(struct osmo_fsm_inst *fi, uint32_t event, void *data)</span><br><span> {</span><br><span>         struct rspro_server_conn *srvc = (struct rspro_server_conn *) fi->priv;</span><br><span>@@ -263,6 +271,14 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void srvc_st_connected_onleave(struct osmo_fsm_inst *fi, uint32_t next_state)</span><br><span style="color: hsl(120, 100%, 40%);">+{</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 style="color: hsl(120, 100%, 40%);">+  if (fi->proc.parent)</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_fsm_inst_dispatch(fi->proc.parent, srvc->parent_disc_evt, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int ipa_kaepalive_timeout_cb(struct osmo_fsm_inst *ka_fi, void *conn)</span><br><span> {</span><br><span>        struct osmo_fsm_inst *fi = ka_fi->proc.parent;</span><br><span>@@ -396,6 +412,8 @@</span><br><span>              .in_event_mask = S(SRVC_E_TCP_DOWN) | S(SRVC_E_KA_TIMEOUT) | S(SRVC_E_RSPRO_TX),</span><br><span>             .out_state_mask = S(SRVC_ST_REESTABLISH) | S(SRVC_ST_INIT),</span><br><span>          .action = srvc_st_connected,</span><br><span style="color: hsl(120, 100%, 40%);">+          .onenter = srvc_st_connected_onenter,</span><br><span style="color: hsl(120, 100%, 40%);">+         .onleave = srvc_st_connected_onleave,</span><br><span>        },</span><br><span>   [SRVC_ST_REESTABLISH] = {</span><br><span>            .name = "REESTABLISH",</span><br><span>diff --git a/src/rspro_client_fsm.h b/src/rspro_client_fsm.h</span><br><span>index c1ae764..029fcd9 100644</span><br><span>--- a/src/rspro_client_fsm.h</span><br><span>+++ b/src/rspro_client_fsm.h</span><br><span>@@ -41,6 +41,10 @@</span><br><span>   char *server_host;</span><br><span>   uint16_t server_port;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     /* FSM events we are to sent to the parent FSM on connect / disconnect */</span><br><span style="color: hsl(120, 100%, 40%);">+     uint32_t parent_conn_evt;</span><br><span style="color: hsl(120, 100%, 40%);">+     uint32_t parent_disc_evt;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  /* only in case we are representing a bankd client */</span><br><span>        struct {</span><br><span>             uint16_t bank_id;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-remsim/+/17336">change 17336</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/+/17336"/><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: Ifddb8e0b5c991e5348392c9e44612669ce207bc4 </div>
<div style="display:none"> Gerrit-Change-Number: 17336 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>