diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-02 20:35:16 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-02 20:35:16 +0000 |
| commit | a781f1ba8780aeac3d80bc3328ba0e54e2bc09fc (patch) | |
| tree | 36ce0a530e136bda39dd9309722c188079822eb3 /res | |
| parent | f0538552eb177e80e8357a7a53c5cee17940c7f0 (diff) | |
Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44217 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/res_features.c b/res/res_features.c index 3947bb360..9b521453e 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -399,7 +399,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou "Channel: %s\r\n" "From: %s\r\n" "Timeout: %ld\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n", pu->parkingexten, pu->chan->name, peer ? peer->name : "", (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL), @@ -1514,7 +1514,7 @@ static void post_manager_event(const char *s, char *parkingexten, struct ast_cha manager_event(EVENT_FLAG_CALL, s, "Exten: %s\r\n" "Channel: %s\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n\r\n", parkingexten, chan->name, @@ -1768,7 +1768,7 @@ static int park_exec(struct ast_channel *chan, void *data) "Exten: %s\r\n" "Channel: %s\r\n" "From: %s\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n", pu->parkingexten, pu->chan->name, chan->name, S_OR(pu->chan->cid.cid_num, "<unknown>"), @@ -1951,7 +1951,7 @@ static int manager_parking_status( struct mansession *s, struct message *m ) "Channel: %s\r\n" "From: %s\r\n" "Timeout: %ld\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" "%s" "\r\n", |