diff options
| author | Harald Welte <laforge@gnumonks.org> | 2010-12-24 12:05:03 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2010-12-24 12:05:03 +0100 |
| commit | 274d015cbb1b93144e46b4fef65e8253db83f7cb (patch) | |
| tree | 26dfd44c7a31ec65ddd1f95b6ff299fed13ae963 /openbsc/src/bsc_vty.c | |
| parent | f6bd340df6bcac716da78da8e35f379a7b853027 (diff) | |
BSC VTY: Fix 'show timeslot' command if BTS and/or TRX are specified
Diffstat (limited to 'openbsc/src/bsc_vty.c')
| -rw-r--r-- | openbsc/src/bsc_vty.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/openbsc/src/bsc_vty.c b/openbsc/src/bsc_vty.c index 5a8e88231..6a170b255 100644 --- a/openbsc/src/bsc_vty.c +++ b/openbsc/src/bsc_vty.c @@ -651,9 +651,9 @@ DEFUN(show_ts, "BTS Number\n" "TRX Number\n" "Timeslot Number\n") { struct gsm_network *net = gsmnet_from_vty(vty); - struct gsm_bts *bts; - struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; + struct gsm_bts *bts = NULL; + struct gsm_bts_trx *trx = NULL; + struct gsm_bts_trx_ts *ts = NULL; int bts_nr, trx_nr, ts_nr; if (argc >= 1) { @@ -682,12 +682,20 @@ DEFUN(show_ts, VTY_NEWLINE); return CMD_WARNING; } + /* Fully Specified: print and exit */ ts = &trx->ts[ts_nr]; ts_dump_vty(vty, ts); return CMD_SUCCESS; } - for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { - bts = gsm_bts_num(net, bts_nr); + + if (bts && trx) { + /* Iterate over all TS in this TRX */ + for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { + ts = &trx->ts[ts_nr]; + ts_dump_vty(vty, ts); + } + } else if (bts) { + /* Iterate over all TRX in this BTS, TS in each TRX */ for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { trx = gsm_bts_trx_num(bts, trx_nr); for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { @@ -695,6 +703,18 @@ DEFUN(show_ts, ts_dump_vty(vty, ts); } } + } else { + /* Iterate over all BTS, TRX in each BTS, TS in each TRX */ + for (bts_nr = 0; bts_nr < net->num_bts; bts_nr++) { + bts = gsm_bts_num(net, bts_nr); + for (trx_nr = 0; trx_nr < bts->num_trx; trx_nr++) { + trx = gsm_bts_trx_num(bts, trx_nr); + for (ts_nr = 0; ts_nr < TRX_NR_TS; ts_nr++) { + ts = &trx->ts[ts_nr]; + ts_dump_vty(vty, ts); + } + } + } } return CMD_SUCCESS; |