diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-09 22:09:18 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2017-08-30 14:11:25 +0200 |
| commit | 7b656884cfadfd8c56355e8a6c690721827b5b30 (patch) | |
| tree | 7f3357a94992d953021a28ec20336c4578f23052 /src/libbsc/bsc_vty.c | |
| parent | 31a11aa75b5aad8887213bcd88cddc1b79b5954f (diff) | |
split off osmo-bsc: remove files, apply build
Change-Id: I64d84c52f6e38e98144eb9be8f0ab82e0e1f6cca
Diffstat (limited to 'src/libbsc/bsc_vty.c')
| -rw-r--r-- | src/libbsc/bsc_vty.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/libbsc/bsc_vty.c b/src/libbsc/bsc_vty.c index d55c6eb30..abfff0cd5 100644 --- a/src/libbsc/bsc_vty.c +++ b/src/libbsc/bsc_vty.c @@ -31,6 +31,7 @@ #include <osmocom/gsm/protocol/gsm_04_08.h> #include <osmocom/gsm/gsm0502.h> #include <osmocom/ctrl/control_if.h> +#include <osmocom/gsm/gsm48.h> #include <arpa/inet.h> @@ -44,7 +45,6 @@ #include <osmocom/gsm/abis_nm.h> #include <openbsc/chan_alloc.h> #include <openbsc/meas_rep.h> -#include <openbsc/db.h> #include <openbsc/vty.h> #include <osmocom/gprs/gprs_ns.h> #include <openbsc/system_information.h> @@ -56,8 +56,8 @@ #include <openbsc/osmo_bsc_rf.h> #include <openbsc/pcu_if.h> #include <openbsc/common_cs.h> -#include <openbsc/vlr.h> #include <openbsc/handover.h> +#include <openbsc/gsm_04_08_utils.h> #include <inttypes.h> @@ -1021,26 +1021,6 @@ DEFUN(show_ts, return CMD_SUCCESS; } -static void subscr_dump_vty(struct vty *vty, struct vlr_subscr *vsub) -{ - OSMO_ASSERT(vsub); - if (strlen(vsub->name)) - vty_out(vty, " Name: '%s'%s", vsub->name, VTY_NEWLINE); - if (strlen(vsub->msisdn)) - vty_out(vty, " Extension: %s%s", vsub->msisdn, - VTY_NEWLINE); - if (strlen(vsub->imsi)) - vty_out(vty, " IMSI: %s%s", vsub->imsi, VTY_NEWLINE); - if (vsub->tmsi != GSM_RESERVED_TMSI) - vty_out(vty, " TMSI: %08X%s", vsub->tmsi, - VTY_NEWLINE); - if (vsub->tmsi_new != GSM_RESERVED_TMSI) - vty_out(vty, " new TMSI: %08X%s", vsub->tmsi_new, - VTY_NEWLINE); - - vty_out(vty, " Use count: %u%s", vsub->use_count, VTY_NEWLINE); -} - static void bsc_subscr_dump_vty(struct vty *vty, struct bsc_subscr *bsub) { if (strlen(bsub->imsi)) @@ -1166,9 +1146,9 @@ static void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan) vty_out(vty, " Channel Mode / Codec: %s%s", get_value_string(gsm48_cmode_names, lchan->tch_mode), VTY_NEWLINE); - if (lchan->conn && lchan->conn->vsub) { + if (lchan->conn && lchan->conn->bsub) { vty_out(vty, " Subscriber:%s", VTY_NEWLINE); - subscr_dump_vty(vty, lchan->conn->vsub); + bsc_subscr_dump_vty(vty, lchan->conn->bsub); } else vty_out(vty, " No Subscriber%s", VTY_NEWLINE); if (is_ipaccess_bts(lchan->ts->trx->bts)) { |