diff options
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/cli.c b/main/cli.c index 0b58c3461..c9dbc6d02 100644 --- a/main/cli.c +++ b/main/cli.c @@ -872,7 +872,7 @@ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_ar ast_cli(a->fd, CONCISE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), c->appl ? c->appl : "(None)", S_OR(c->data, ""), /* XXX different from verbose ? */ - S_OR(c->cid.cid_num, ""), + S_COR(c->caller.id.number.valid, c->caller.id.number.str, ""), S_OR(c->accountcode, ""), S_OR(c->peeraccount, ""), c->amaflags, @@ -883,7 +883,7 @@ static char *handle_chanlist(struct ast_cli_entry *e, int cmd, struct ast_cli_ar ast_cli(a->fd, VERBOSE_FORMAT_STRING, c->name, c->context, c->exten, c->priority, ast_state2str(c->_state), c->appl ? c->appl : "(None)", c->data ? S_OR(c->data, "(Empty)" ): "(None)", - S_OR(c->cid.cid_num, ""), + S_COR(c->caller.id.number.valid, c->caller.id.number.str, ""), durbuf, S_OR(c->accountcode, ""), S_OR(c->peeraccount, ""), @@ -1417,9 +1417,9 @@ static char *handle_showchan(struct ast_cli_entry *e, int cmd, struct ast_cli_ar " Data: %s\n" " Blocking in: %s\n", c->name, c->tech->type, c->uniqueid, c->linkedid, - S_OR(c->cid.cid_num, "(N/A)"), - S_OR(c->cid.cid_name, "(N/A)"), - S_OR(c->cid.cid_dnid, "(N/A)"), + S_COR(c->caller.id.number.valid, c->caller.id.number.str, "(N/A)"), + S_COR(c->caller.id.name.valid, c->caller.id.name.str, "(N/A)"), + S_OR(c->dialed.number.str, "(N/A)"), c->language, ast_state2str(c->_state), c->_state, c->rings, ast_getformatname_multiple(nf, sizeof(nf), c->nativeformats), |