<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20629">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSSMAP RESET: also accept conn cfm events during ST_DISC<br><br>We don't really expect connection attempts during ST_DISC, but if the user<br>happens to dispatch those events for whatever obscure reasons, treat them<br>instead of erroring about an unallowed event.<br><br>Change-Id: Ic7c60a40ff25ae647ee659259dfea769bc4592e4<br>---<br>M src/osmo-bsc/reset.c<br>1 file changed, 13 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/29/20629/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/reset.c b/src/osmo-bsc/reset.c</span><br><span>index b3f0f69..99a3821 100644</span><br><span>--- a/src/osmo-bsc/reset.c</span><br><span>+++ b/src/osmo-bsc/reset.c</span><br><span>@@ -118,6 +118,17 @@</span><br><span>             reset_fsm_state_chg(fi, RESET_ST_CONN);</span><br><span>              break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+    case RESET_EV_CONN_CFM_FAILURE:</span><br><span style="color: hsl(120, 100%, 40%);">+               /* ignore */</span><br><span style="color: hsl(120, 100%, 40%);">+          break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      case RESET_EV_CONN_CFM_SUCCESS:</span><br><span style="color: hsl(120, 100%, 40%);">+               /* A connection succeeded before we managed to do a RESET handshake?</span><br><span style="color: hsl(120, 100%, 40%);">+           * Then the calling code is not taking care to check reset_is_conn_ready().</span><br><span style="color: hsl(120, 100%, 40%);">+            */</span><br><span style="color: hsl(120, 100%, 40%);">+           LOGPFSML(fi, LOGL_ERROR, "Connection success confirmed, but we have not seen a RESET-ACK; bug?\n");</span><br><span style="color: hsl(120, 100%, 40%);">+         break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     default:</span><br><span>             OSMO_ASSERT(false);</span><br><span>  }</span><br><span>@@ -183,6 +194,8 @@</span><br><span>                   .in_event_mask = 0</span><br><span>                           | S(RESET_EV_RX_RESET)</span><br><span>                       | S(RESET_EV_RX_RESET_ACK)</span><br><span style="color: hsl(120, 100%, 40%);">+                            | S(RESET_EV_CONN_CFM_FAILURE)</span><br><span style="color: hsl(120, 100%, 40%);">+                        | S(RESET_EV_CONN_CFM_SUCCESS)</span><br><span>                       ,</span><br><span>                    .out_state_mask = 0</span><br><span>                          | S(RESET_ST_DISC)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20629">change 20629</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-bsc/+/20629"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic7c60a40ff25ae647ee659259dfea769bc4592e4 </div>
<div style="display:none"> Gerrit-Change-Number: 20629 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>