From d1e7d3908b66e922d04ac9bd21960d5638d0ccd6 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sun, 27 Sep 2020 23:34:57 +0200 Subject: cosmetic: fix naming of GSCON_EV_A_CONN_REQ -> GSCON_EV_MO_COMPL_L3 The N-CONNECT.req on the A interface is a possible *consequence* of the event being handled, namely the incoming RSL ESTablish INDication containing the Complete Layer 3 message: dispatched by bsc_compl_l3(). If an (LCS related) connection is already present on the A-interface when the lchan is established, there will be no N-CONNECT but an N-DATA sending the Complete Layer 3. See BSC_Tests.TC_cm_service_during_lcs_loc_req(). Change-Id: Ic43aabeb0d3c58ac62249ad9d3718363d32508f9 --- src/osmo-bsc/bsc_subscr_conn_fsm.c | 6 +++--- src/osmo-bsc/gsm_08_08.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/osmo-bsc') diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index de73a2a8b..b127e7f08 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -69,7 +69,7 @@ enum gscon_fsm_states { static const struct value_string gscon_fsm_event_names[] = { {GSCON_EV_A_CONN_IND, "MT-CONNECT.ind"}, - {GSCON_EV_A_CONN_REQ, "MO-CONNECT.req"}, + {GSCON_EV_MO_COMPL_L3, "MO_COMPL_L3"}, {GSCON_EV_A_CONN_CFM, "MO-CONNECT.cfm"}, {GSCON_EV_A_CLEAR_CMD, "CLEAR_CMD"}, {GSCON_EV_A_DISC_IND, "DISCONNET.ind"}, @@ -280,7 +280,7 @@ static void gscon_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) enum handover_result ho_result; switch (event) { - case GSCON_EV_A_CONN_REQ: + case GSCON_EV_MO_COMPL_L3: /* RLL ESTABLISH IND with initial L3 Message */ msg = data; rc = osmo_bsc_sigtran_open_conn(conn, msg); @@ -614,7 +614,7 @@ bool gscon_connect_mgw_to_msc(struct gsm_subscriber_connection *conn, static const struct osmo_fsm_state gscon_fsm_states[] = { [ST_INIT] = { .name = "INIT", - .in_event_mask = S(GSCON_EV_A_CONN_REQ) | S(GSCON_EV_A_CONN_IND) + .in_event_mask = S(GSCON_EV_MO_COMPL_L3) | S(GSCON_EV_A_CONN_IND) | S(GSCON_EV_HANDOVER_END), .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_CLEARING), .action = gscon_fsm_init, diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 01d9d0ee3..41fc230f4 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -494,7 +494,7 @@ int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_chan osmo_mobile_identity_to_str_c(OTC_SELECT, &mi)); goto early_fail; } - rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, create_l3); + rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_COMPL_L3, create_l3); if (!rc) release_lchan = false; -- cgit v1.2.3