diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2020-09-27 23:34:57 +0200 |
---|---|---|
committer | Neels Hofmeyr <neels@hofmeyr.de> | 2020-10-07 11:40:12 +0000 |
commit | d1e7d3908b66e922d04ac9bd21960d5638d0ccd6 (patch) | |
tree | 04c969de464db349c001cffb4bf2007ff52c8dfe | |
parent | 7d9b9437f86e755f5b0f1c4ab40f9d4e2241c432 (diff) |
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
-rw-r--r-- | include/osmocom/bsc/bsc_subscr_conn_fsm.h | 2 | ||||
-rw-r--r-- | src/osmo-bsc/bsc_subscr_conn_fsm.c | 6 | ||||
-rw-r--r-- | src/osmo-bsc/gsm_08_08.c | 2 | ||||
-rw-r--r-- | tests/handover/handover_test.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 9b6398a3f..ccac4fa10 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -9,7 +9,7 @@ enum gscon_fsm_event { /* local SCCP stack tells us incoming conn from MSC */ GSCON_EV_A_CONN_IND, /* RSL side requests CONNECT to MSC */ - GSCON_EV_A_CONN_REQ, + GSCON_EV_MO_COMPL_L3, /* MSC confirms the SCCP connection */ GSCON_EV_A_CONN_CFM, /* MSC has sent BSSMAP CLEAR CMD */ 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; diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index 8fa8fe84a..d3f29e163 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -247,7 +247,7 @@ void create_conn(struct gsm_lchan *lchan) lchan->conn->bsub = bsc_subscr_find_or_create_by_imsi(net->bsc_subscribers, imsi, BSUB_USE_CONN); /* kick the FSM from INIT through to the ACTIVE state */ - osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_REQ, NULL); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_MO_COMPL_L3, NULL); osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_CFM, NULL); } |