<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20354">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: fix naming of GSCON_EV_A_CONN_REQ -> GSCON_EV_MO_COMPL_L3<br><br>The N-CONNECT.req on the A interface is a possible *consequence* of the event<br>being handled, namely the incoming RSL ESTablish INDication containing the<br>Complete Layer 3 message: dispatched by bsc_compl_l3().<br><br>If an (LCS related) connection is already present on the A-interface when the<br>lchan is established, there will be no N-CONNECT but an N-DATA sending the<br>Complete Layer 3. See BSC_Tests.TC_cm_service_during_lcs_loc_req().<br><br>Change-Id: Ic43aabeb0d3c58ac62249ad9d3718363d32508f9<br>---<br>M include/osmocom/bsc/bsc_subscr_conn_fsm.h<br>M src/osmo-bsc/bsc_subscr_conn_fsm.c<br>M src/osmo-bsc/gsm_08_08.c<br>M tests/handover/handover_test.c<br>4 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>index 9b6398a..ccac4fa 100644</span><br><span>--- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>+++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h</span><br><span>@@ -9,7 +9,7 @@</span><br><span> /* local SCCP stack tells us incoming conn from MSC */</span><br><span> GSCON_EV_A_CONN_IND,</span><br><span> /* RSL side requests CONNECT to MSC */</span><br><span style="color: hsl(0, 100%, 40%);">- GSCON_EV_A_CONN_REQ,</span><br><span style="color: hsl(120, 100%, 40%);">+ GSCON_EV_MO_COMPL_L3,</span><br><span> /* MSC confirms the SCCP connection */</span><br><span> GSCON_EV_A_CONN_CFM,</span><br><span> /* MSC has sent BSSMAP CLEAR CMD */</span><br><span>diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>index de73a2a..b127e7f 100644</span><br><span>--- a/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>+++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c</span><br><span>@@ -69,7 +69,7 @@</span><br><span> </span><br><span> static const struct value_string gscon_fsm_event_names[] = {</span><br><span> {GSCON_EV_A_CONN_IND, "MT-CONNECT.ind"},</span><br><span style="color: hsl(0, 100%, 40%);">- {GSCON_EV_A_CONN_REQ, "MO-CONNECT.req"},</span><br><span style="color: hsl(120, 100%, 40%);">+ {GSCON_EV_MO_COMPL_L3, "MO_COMPL_L3"},</span><br><span> {GSCON_EV_A_CONN_CFM, "MO-CONNECT.cfm"},</span><br><span> {GSCON_EV_A_CLEAR_CMD, "CLEAR_CMD"},</span><br><span> {GSCON_EV_A_DISC_IND, "DISCONNET.ind"},</span><br><span>@@ -280,7 +280,7 @@</span><br><span> enum handover_result ho_result;</span><br><span> </span><br><span> switch (event) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSCON_EV_A_CONN_REQ:</span><br><span style="color: hsl(120, 100%, 40%);">+ case GSCON_EV_MO_COMPL_L3:</span><br><span> /* RLL ESTABLISH IND with initial L3 Message */</span><br><span> msg = data;</span><br><span> rc = osmo_bsc_sigtran_open_conn(conn, msg);</span><br><span>@@ -614,7 +614,7 @@</span><br><span> static const struct osmo_fsm_state gscon_fsm_states[] = {</span><br><span> [ST_INIT] = {</span><br><span> .name = "INIT",</span><br><span style="color: hsl(0, 100%, 40%);">- .in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND)</span><br><span style="color: hsl(120, 100%, 40%);">+ .in_event_mask = S(GSCON_EV_MO_COMPL_L3) | S(GSCON_EV_A_CONN_IND)</span><br><span> | S(GSCON_EV_HANDOVER_END),</span><br><span> .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_CLEARING),</span><br><span> .action = gscon_fsm_init,</span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 01d9d0e..41fc230 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -494,7 +494,7 @@</span><br><span> osmo_mobile_identity_to_str_c(OTC_SELECT, &mi));</span><br><span> goto early_fail;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, create_l3);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_COMPL_L3, create_l3);</span><br><span> if (!rc)</span><br><span> release_lchan = false;</span><br><span> </span><br><span>diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c</span><br><span>index 8fa8fe8..d3f29e1 100644</span><br><span>--- a/tests/handover/handover_test.c</span><br><span>+++ b/tests/handover/handover_test.c</span><br><span>@@ -247,7 +247,7 @@</span><br><span> lchan->conn->bsub = bsc_subscr_find_or_create_by_imsi(net->bsc_subscribers, imsi, BSUB_USE_CONN);</span><br><span> </span><br><span> /* kick the FSM from INIT through to the ACTIVE state */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_COMPL_L3, NULL);</span><br><span> osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_CFM, NULL);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20354">change 20354</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/+/20354"/><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: Ic43aabeb0d3c58ac62249ad9d3718363d32508f9 </div>
<div style="display:none"> Gerrit-Change-Number: 20354 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>