diff options
author | Harald Welte <laforge@gnumonks.org> | 2018-01-28 03:04:16 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-03-16 18:49:47 +0000 |
commit | 3561bd48976dbee8dbd4659dad15be85a3e79ace (patch) | |
tree | 58c1f4453b00f66ac6d7f3d5b5082e149a8de766 /src/osmo-bsc/osmo_bsc_sigtran.c | |
parent | 2cf46b97d3e5ec4b65cad7f7a2e18cc781558456 (diff) |
introduce an osmo_fsm for gsm_subscriber_connection
In the current implementation of osmo-bsc, the subscriber connection is
not handled (very) statefully. However, there is some state keeping in the
code that handles the mgcp connection, but there are still to much loose ends
which allow odd situations to happen, which then lead severe error situations
(see also closes tags at the end) This commit adds a number of improvements
to fix those problems.
- Use an osmo-fsm to control the gsm_subscriber_connection state and
make sure that certain operations can only take place at certain states
(e.g let connection oriented SCCP traffic only pass when an SCCP connection
actually exists.
Remove the old osmo_bsc_mgcp.c code. Use the recently developed MGCP client
FSM to handle the MGCP connections.
Also make sure that stuff that already works does not break. This in
particular refers to the internal handover capability and the respective
unit-tests.
See also OS#2823, OS#2768 and OS#2898
- Fix logic to permit assignment to a signalling channel. (OS#2762)
- Introduce T993210 to release lchan + subscr_conn if MSC fails to respond
The GSM specs don't have an explicit timer for this, so let's introdcue
a custom timer (hence starting with 99).
This timeout catches the following situation:
* we send a SCCP CR with COMPL_L3_INFO from the MS to the MSC,
* the MSC doesn't respond (e.g. SCCP routing failure, program down, ...)
The MS is supposed to timeout with T3210, 3220 or 3230. But the BSC
shouldn't trust the MS but have some timer on its own.
SCCP would have a timer T(conn est), but that one is specified to be
1-2min and hence rather long.
See also: OS#2775
- Terminate bsc_subscr_conn_fsm on SCCP N-DISC.ind from MSC
If the MSC is disconnecting the SCCP channel, we must terminate the FSM
which in turn will release all lchan's and other state.
This makes TC_chan_rel_hard_rlsd pass, see also OS#2731
As a side-effect, this fixes TC_chan_act_ack_est_ind_refused(),
where the MSC is answering with CREF to our CR/COMPL_L3.
- Release subscriber connection on RLL RELEASE IND of SAPI0 on main DCCH
The subscriber connection isn't really useful for anything after the
SAPI0 main signalling link has been released. We could try to
re-establish, but our best option is probably simply releasing the
subscriber_conn and anything related to it.
This will make TC_chan_rel_rll_rel_ind pass, see also OS#2730
This commit has been tested using the BSC_Tests TTCN3 testsuit and the
following tests were passed:
TC_chan_act_noreply
TC_chan_act_ack_noest
TC_chan_act_ack_est_ind_noreply
TC_chan_act_ack_est_ind_refused
TC_chan_act_nack
TC_chan_exhaustion
TC_ctrl
TC_chan_rel_conn_fail
TC_chan_rel_hard_clear
TC_chan_rel_hard_rlsd
TC_chan_rel_a_reset
TC_rll_est_ind_inact_lchan
TC_rll_est_ind_inval_sapi1
TC_rll_est_ind_inval_sapi3
TC_rll_est_ind_inval_sacch
TC_assignment_cic_only
TC_assignment_csd
TC_assignment_ctm
TC_assignment_fr_a5_0
TC_assignment_fr_a5_1_codec_missing
TC_assignment_fr_a5_1
TC_assignment_fr_a5_3
TC_assignment_fr_a5_4
TC_paging_imsi_nochan
TC_paging_tmsi_nochan
TC_paging_tmsi_any
TC_paging_tmsi_sdcch
TC_paging_tmsi_tch_f
TC_paging_tmsi_tch_hf
TC_paging_imsi_nochan_cgi
TC_paging_imsi_nochan_lac_ci
TC_paging_imsi_nochan_ci
TC_paging_imsi_nochan_lai
TC_paging_imsi_nochan_lac
TC_paging_imsi_nochan_all
TC_paging_imsi_nochan_plmn_lac_rnc
TC_paging_imsi_nochan_rnc
TC_paging_imsi_nochan_lac_rnc
TC_paging_imsi_nochan_lacs
TC_paging_imsi_nochan_lacs_empty
TC_paging_imsi_a_reset
TC_paging_counter
TC_rsl_drop_counter
TC_classmark
TC_unsol_ass_fail
TC_unsol_ass_compl
TC_unsol_ho_fail
TC_err_82_short_msg
TC_ho_int
Authors:
Harald Welte <laforge@gnumonks.org>
Philipp Maier <pmaier@sysmocom.de>
Neels Hofmeyr <neels@hofmeyr.de>
Closes: OS#2730
Closes: OS#2731
Closes: OS#2762
Closes: OS#2768
Closes: OS#2775
Closes: OS#2823
Closes: OS#2898
Closes: OS#2936
Change-Id: I68286d26e2014048b054f39ef29c35fef420cc97
Diffstat (limited to 'src/osmo-bsc/osmo_bsc_sigtran.c')
-rw-r--r-- | src/osmo-bsc/osmo_bsc_sigtran.c | 107 |
1 files changed, 38 insertions, 69 deletions
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c index ab903b622..1a31a7c52 100644 --- a/src/osmo-bsc/osmo_bsc_sigtran.c +++ b/src/osmo-bsc/osmo_bsc_sigtran.c @@ -1,8 +1,7 @@ -/* (C) 2017 by sysmocom s.f.m.c. GmbH +/* (C) 2017 by sysmocom s.f.m.c. GmbH, Author: Philipp Maier + * (C) 2017 by Harald Welte <laforge@gnumonks.org> * All Rights Reserved * - * Author: Philipp Maier - * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation; either version 3 of the License, or @@ -20,6 +19,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> +#include <osmocom/core/fsm.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/core/linuxlist.h> @@ -32,7 +32,7 @@ #include <osmocom/bsc/osmo_bsc_sigtran.h> #include <osmocom/bsc/a_reset.h> #include <osmocom/bsc/gsm_04_80.h> -#include <osmocom/bsc/osmo_bsc_mgcp.h> +#include <osmocom/bsc/bsc_subscr_conn_fsm.h> /* A pointer to a list with all involved MSCs * (a copy of the pointer location submitted with osmo_bsc_sigtran_init() */ @@ -127,18 +127,10 @@ static struct bsc_msc_data *get_msc_by_addr(const struct osmo_sccp_addr *msc_add } /* Send data to MSC, use the connection id which MSC it is */ -static int handle_data_from_msc(int conn_id, struct msgb *msg) +static int handle_data_from_msc(struct gsm_subscriber_connection *conn, struct msgb *msg) { - struct gsm_subscriber_connection *conn = get_bsc_conn_by_conn_id(conn_id); - int rc = -EINVAL; - - if (conn) { - msg->l3h = msgb_l2(msg); - rc = bsc_handle_dt(conn, msg, msgb_l2len(msg)); - } else - LOGP(DMSC, LOGL_NOTICE, "incoming data from unknown connection id: %i\n", conn_id); - - return rc; + msg->l3h = msgb_l2(msg); + return bsc_handle_dt(conn, msg, msgb_l2len(msg)); } /* Sent unitdata to MSC, use the point code to determine which MSC it is */ @@ -177,23 +169,32 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *_scu) break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION): - /* Handle (Reject) inbound connections */ + /* Handle inbound connections */ DEBUGP(DMSC, "N-CONNECT.ind(X->%u)\n", scu_prim->u.connect.conn_id); - LOGP(DMSC, LOGL_DEBUG, "Rejecting inbound SCCP connection...\n"); - rc = osmo_sccp_tx_disconn(scu, scu_prim->u.connect.conn_id, &scu_prim->u.connect.called_addr, 0); + conn = bsc_subscr_con_allocate(bsc_gsmnet); + if (conn) { + conn->sccp.msc = get_msc_by_addr(&scu_prim->u.connect.calling_addr); + /* MSC may be NULL, let the FSM deal with it */ + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_IND, scu_prim); + } else + LOGP(DMSC, LOGL_ERROR, "Unable to alloc subscr_conn for inbound N-CONNECT.ind\n"); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM): /* Handle outbound connection confirmation */ + DEBUGP(DMSC, "N-CONNECT.cnf(%u, %s)\n", scu_prim->u.connect.conn_id, + osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); conn = get_bsc_conn_by_conn_id(scu_prim->u.connect.conn_id); - if (conn) + if (conn) { + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_CONN_CFM, scu_prim); conn->sccp.state = SUBSCR_SCCP_ST_CONNECTED; - if (msgb_l2len(oph->msg) > 0) { - DEBUGP(DMSC, "N-CONNECT.cnf(%u, %s)\n", scu_prim->u.connect.conn_id, - osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); - rc = handle_data_from_msc(scu_prim->u.connect.conn_id, oph->msg); - } else - DEBUGP(DMSC, "N-CONNECT.cnf(%u)\n", scu_prim->u.connect.conn_id); + if (msgb_l2len(oph->msg) > 0) + handle_data_from_msc(conn, oph->msg); + } else { + LOGP(DMSC, LOGL_ERROR, "N-CONNET.cfm(%u, %s) for unknown conn?!?\n", + scu_prim->u.connect.conn_id, osmo_hexdump(msgb_l2(oph->msg), + msgb_l2len(oph->msg))); + } break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION): @@ -202,28 +203,25 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *_scu) osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg))); /* Incoming data is a sign of a vital connection */ - conn = get_bsc_conn_by_conn_id(scu_prim->u.disconnect.conn_id); - if (conn) + conn = get_bsc_conn_by_conn_id(scu_prim->u.data.conn_id); + if (conn) { a_reset_conn_success(conn->sccp.msc->a.reset); - - rc = handle_data_from_msc(scu_prim->u.data.conn_id, oph->msg); + handle_data_from_msc(conn, oph->msg); + } break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): + DEBUGP(DMSC, "N-DISCONNECT.ind(%u, %s, cause=%i)\n", scu_prim->u.disconnect.conn_id, + osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)), + scu_prim->u.disconnect.cause); /* indication of disconnect */ conn = get_bsc_conn_by_conn_id(scu_prim->u.disconnect.conn_id); - if (conn) + if (conn) { conn->sccp.state = SUBSCR_SCCP_ST_NONE; - if (msgb_l2len(oph->msg) > 0) { - DEBUGP(DMSC, "N-DISCONNECT.ind(%u, %s, cause=%i)\n", scu_prim->u.disconnect.conn_id, - osmo_hexdump(msgb_l2(oph->msg), msgb_l2len(oph->msg)), scu_prim->u.disconnect.cause); - handle_data_from_msc(scu_prim->u.disconnect.conn_id, oph->msg); - } else { - DEBUGP(DMSC, "N-DISCONNECT.ind(%u, cause=%i)\n", scu_prim->u.disconnect.conn_id, - scu_prim->u.disconnect.cause); + if (msgb_l2len(oph->msg) > 0) + handle_data_from_msc(conn, oph->msg); + osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_DISC_IND, scu_prim); } - if (conn) - rc = osmo_bsc_sigtran_del_conn(conn); break; default: @@ -352,31 +350,6 @@ int osmo_bsc_sigtran_send(struct gsm_subscriber_connection *conn, struct msgb *m return rc; } -/* Delete a connection from the list with open connections - * (called by osmo_bsc_api.c on failing open connections and - * locally, when a connection is closed by the MSC */ -int osmo_bsc_sigtran_del_conn(struct gsm_subscriber_connection *conn) -{ - if (!conn) - return 0; - - LOGP(DMSC, LOGL_ERROR, - "sccp connection (id=%i) not cleared (gsm subscriber connection still active) -- forcefully clearing it now!\n", conn->sccp.conn_id); - - /* This bahaviour might be caused by a bad connection. Maybe we - * will have to go through the reset procedure again */ - a_reset_conn_fail(conn->sccp.msc->a.reset); - - /* Remove mgcp context if existant */ - if (conn->user_plane.mgcp_ctx) - mgcp_free_ctx(conn->user_plane.mgcp_ctx); - - /* free the "conn" and make sure any pending lchans are also free'd */ - bsc_subscr_con_free(conn); - - return 0; -} - /* Send an USSD notification in case we loose the connection to the MSC */ static void bsc_notify_msc_lost(struct gsm_subscriber_connection *conn) { @@ -411,13 +384,9 @@ void osmo_bsc_sigtran_reset(const struct bsc_msc_data *msc) bsc_notify_msc_lost(conn); /* Take down all occopied RF channels */ - gsm0808_clear(conn); - /* Disconnect all Sigtran connections */ - osmo_sccp_tx_disconn(msc->a.sccp_user, conn->sccp.conn_id, &msc->a.bsc_addr, 0); - /* Delete subscriber connection */ - osmo_bsc_sigtran_del_conn(conn); + osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_REQUEST, NULL); } } } |