This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
neels gerrit-no-reply at lists.osmocom.orgneels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/20354 ) Change subject: cosmetic: fix naming of GSCON_EV_A_CONN_REQ -> GSCON_EV_MO_COMPL_L3 ...................................................................... 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 --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/gsm_08_08.c M tests/handover/handover_test.c 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/20354/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index 9b6398a..ccac4fa 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -9,7 +9,7 @@ /* 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 8dc414c..ba389d2 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -69,7 +69,7 @@ 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 @@ 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 @@ 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 3c03ee8..b390bcd 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -494,7 +494,7 @@ 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 8fa8fe8..d3f29e1 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -247,7 +247,7 @@ 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); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/20354 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic43aabeb0d3c58ac62249ad9d3718363d32508f9 Gerrit-Change-Number: 20354 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr at sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201001/5d77e301/attachment.htm>