cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

LCLS: expand logging to print the name of the mode in use 

Change-Id: I56b57936ae82984e84896228da5a83115a78bbd7
Related: OS#3659
This commit is contained in:
Max 2018-11-07 12:34:07 +01:00
parent 1bcdd730b6
commit 6fb500f789
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/osmocom/bsc/bsc_msc_data.h
View File

@ -59,6 +59,13 @@ enum bsc_lcls_mode {
/* we may later introduce BTS_LOOP here: direct RTP between BTSs */
};
extern const struct value_string bsc_lcls_mode_names[];
static inline const char *bsc_lcls_mode_name(enum bsc_lcls_mode m)
{
return get_value_string(bsc_lcls_mode_names, m);
}
/*! /brief Information on a remote MSC for libbsc.
*/
struct bsc_msc_data {

6
src/osmo-bsc/gsm_data.c
View File

@ -47,6 +47,12 @@
void *tall_bsc_ctx = NULL;
const struct value_string bsc_lcls_mode_names[] = {
{ BSC_LCLS_MODE_DISABLED, "disabled" },
{ BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },
{ 0, NULL }
};
static LLIST_HEAD(bts_models);
void set_ts_e1link(struct gsm_bts_trx_ts *ts, uint8_t e1_nr,

7
src/osmo-bsc/osmo_bsc_lcls.c
View File

@ -240,7 +240,9 @@ static void lcls_break_local_switching(struct gsm_subscriber_connection *conn)
{
struct mgcp_conn_peer mdcx_info;
LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS\n");
LOGPFSM(conn->lcls.fi, "=== HERE IS WHERE WE DISABLE LCLS(%s)\n",
bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));
if (!conn->user_plane.mgw_endpoint_ci_msc) {
/* the MGCP FSM has died, e.g. due to some MGCP/SDP parsing error */
LOGPFSML(conn->lcls.fi, LOGL_NOTICE, "Cannot disable LCLS without MSC-side MGCP FSM\n");
@ -581,7 +583,8 @@ static void lcls_locally_switched_onenter(struct osmo_fsm_inst *fi, uint32_t pre
OSMO_ASSERT(conn_other);
LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS\n");
LOGPFSM(fi, "=== HERE IS WHERE WE ENABLE LCLS(%s)\n",
bsc_lcls_mode_name(conn->sccp.msc->lcls_mode));
if (!conn->user_plane.mgw_endpoint_ci_msc) {
LOGPFSML(fi, LOGL_ERROR, "Cannot enable LCLS without MSC-side MGCP FSM. FIXME\n");
return;

6
src/osmo-bsc/osmo_bsc_vty.c
View File

@ -38,12 +38,6 @@
#define IPA_STR "IP.ACCESS specific\n"
static const struct value_string bsc_lcls_mode_names[] = {
{ BSC_LCLS_MODE_DISABLED, "disabled" },
{ BSC_LCLS_MODE_MGW_LOOP, "mgw-loop" },
{ 0, NULL }
};
static struct osmo_bsc_data *osmo_bsc_data(struct vty *vty)
{
return bsc_gsmnet->bsc_data;