diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 8 | ||||
| -rw-r--r-- | main/features.c | 20 | ||||
| -rw-r--r-- | main/manager.c | 6 |
3 files changed, 32 insertions, 2 deletions
diff --git a/main/channel.c b/main/channel.c index 103627bc3..0dc9c0ba3 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2860,12 +2860,16 @@ int ast_hangup(struct ast_channel *chan) "Uniqueid: %s\r\n" "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "Cause: %d\r\n" "Cause-txt: %s\r\n", chan->name, chan->uniqueid, S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, "<unknown>"), S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>"), + S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, "<unknown>"), + S_COR(chan->connected.id.name.valid, chan->connected.id.name.str, "<unknown>"), chan->hangupcause, ast_cause2str(chan->hangupcause) ); @@ -6952,10 +6956,14 @@ int ast_setstate(struct ast_channel *chan, enum ast_channel_state state) "ChannelStateDesc: %s\r\n" "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "Uniqueid: %s\r\n", chan->name, chan->_state, ast_state2str(chan->_state), S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, ""), S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, ""), + S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, ""), + S_COR(chan->connected.id.name.valid, chan->connected.id.name.str, ""), chan->uniqueid); return 0; diff --git a/main/features.c b/main/features.c index e8e9164d3..452c88318 100644 --- a/main/features.c +++ b/main/features.c @@ -1177,11 +1177,15 @@ static int park_call_full(struct ast_channel *chan, struct ast_channel *peer, st "Timeout: %ld\r\n" "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "Uniqueid: %s\r\n", pu->parkingexten, pu->chan->name, pu->parkinglot->name, event_from ? event_from : "", (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL), S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"), S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"), + S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"), + S_COR(pu->chan->connected.id.name.valid, pu->chan->connected.id.name.str, "<unknown>"), pu->chan->uniqueid ); @@ -4056,12 +4060,16 @@ static void post_manager_event(const char *s, struct parkeduser *pu) "Parkinglot: %s\r\n" "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "UniqueID: %s\r\n", pu->parkingexten, pu->chan->name, pu->parkinglot->name, S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"), S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"), + S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"), + S_COR(pu->chan->connected.id.name.valid, pu->chan->connected.id.name.str, "<unknown>"), pu->chan->uniqueid ); } @@ -4554,10 +4562,14 @@ static int park_exec_full(struct ast_channel *chan, const char *data) "Channel: %s\r\n" "From: %s\r\n" "CallerIDNum: %s\r\n" - "CallerIDName: %s\r\n", + "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n", pu->parkingexten, pu->chan->name, chan->name, S_COR(pu->chan->caller.id.number.valid, pu->chan->caller.id.number.str, "<unknown>"), - S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>") + S_COR(pu->chan->caller.id.name.valid, pu->chan->caller.id.name.str, "<unknown>"), + S_COR(pu->chan->connected.id.number.valid, pu->chan->connected.id.number.str, "<unknown>"), + S_COR(pu->chan->connected.id.name.valid, pu->chan->connected.id.name.str, "<unknown>") ); ast_free(pu); @@ -5635,12 +5647,16 @@ static int manager_parking_status(struct mansession *s, const struct message *m) "Timeout: %ld\r\n" "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "%s" "\r\n", cur->parkingnum, cur->chan->name, cur->peername, (long) cur->start.tv_sec + (long) (cur->parkingtime / 1000) - (long) time(NULL), S_COR(cur->chan->caller.id.number.valid, cur->chan->caller.id.number.str, ""), /* XXX in other places it is <unknown> */ S_COR(cur->chan->caller.id.name.valid, cur->chan->caller.id.name.str, ""), + S_COR(cur->chan->connected.id.number.valid, cur->chan->connected.id.number.str, ""), /* XXX in other places it is <unknown> */ + S_COR(cur->chan->connected.id.name.valid, cur->chan->connected.id.name.str, ""), idText); } AST_LIST_UNLOCK(&curlot->parkings); diff --git a/main/manager.c b/main/manager.c index 4f4984b53..ea2e2a975 100644 --- a/main/manager.c +++ b/main/manager.c @@ -4337,6 +4337,9 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m "Application: %s\r\n" "ApplicationData: %s\r\n" "CallerIDnum: %s\r\n" + "CallerIDname: %s\r\n" + "ConnectedLineNum: %s\r\n" + "ConnectedLineName: %s\r\n" "Duration: %s\r\n" "AccountCode: %s\r\n" "BridgedChannel: %s\r\n" @@ -4344,6 +4347,9 @@ static int action_coreshowchannels(struct mansession *s, const struct message *m "\r\n", idText, c->name, c->uniqueid, c->context, c->exten, c->priority, c->_state, ast_state2str(c->_state), c->appl ? c->appl : "", c->data ? S_OR(c->data, "") : "", S_COR(c->caller.id.number.valid, c->caller.id.number.str, ""), + S_COR(c->caller.id.name.valid, c->caller.id.name.str, ""), + S_COR(c->connected.id.number.valid, c->connected.id.number.str, ""), + S_COR(c->connected.id.name.valid, c->connected.id.name.str, ""), durbuf, S_OR(c->accountcode, ""), bc ? bc->name : "", bc ? bc->uniqueid : ""); ast_channel_unlock(c); |