diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-10-02 20:35:16 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-10-02 20:35:16 +0000 |
| commit | 3e4a081e1cdae046b37c16177f6ea5d57ae8c7fb (patch) | |
| tree | 36ce0a530e136bda39dd9309722c188079822eb3 /apps | |
| parent | fadd9e783170e6719ca08e160c3a83874cefaaee (diff) | |
Make callerid fields in Manager events more consistent. CallerIDNum for number and CallerIDName for name. (issue #7976 reported by suhler)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 3 | ||||
| -rw-r--r-- | apps/app_dumpchan.c | 2 | ||||
| -rw-r--r-- | apps/app_meetme.c | 4 | ||||
| -rw-r--r-- | apps/app_queue.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 8f9a05071..da68e83fe 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -373,11 +373,10 @@ static const char *get_cid_name(char *name, int namelen, struct ast_channel *cha static void senddialevent(struct ast_channel *src, struct ast_channel *dst) { - /* XXX do we need also CallerIDnum ? */ manager_event(EVENT_FLAG_CALL, "Dial", "Source: %s\r\n" "Destination: %s\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" "SrcUniqueID: %s\r\n" "DestUniqueID: %s\r\n", diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c index 426ba4eab..8e42e9d39 100644 --- a/apps/app_dumpchan.c +++ b/apps/app_dumpchan.c @@ -82,7 +82,7 @@ static int serialize_showchan(struct ast_channel *c, char *buf, size_t size) "Name= %s\n" "Type= %s\n" "UniqueID= %s\n" - "CallerID= %s\n" + "CallerIDNum= %s\n" "CallerIDName= %s\n" "DNIDDigits= %s\n" "RDNIS= %s\n" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 9659f3ad4..aa52c3b40 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1910,8 +1910,8 @@ bailoutandtrynormal: "Uniqueid: %s\r\n" "Meetme: %s\r\n" "Usernum: %d\r\n" - "CallerIDnum: %s\r\n" - "CallerIDname: %s\r\n" + "CallerIDNum: %s\r\n" + "CallerIDName: %s\r\n" "Duration: %ld\r\n", chan->name, chan->uniqueid, conf->confno, user->user_no, diff --git a/apps/app_queue.c b/apps/app_queue.c index 6ec3c4ef3..7e37b1923 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -1659,7 +1659,7 @@ static int ring_entry(struct queue_ent *qe, struct callattempt *tmp, int *busies manager_event(EVENT_FLAG_AGENT, "AgentCalled", "AgentCalled: %s\r\n" "ChannelCalling: %s\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" "Context: %s\r\n" "Extension: %s\r\n" @@ -4131,7 +4131,7 @@ static int manager_queues_status(struct mansession *s, struct message *m) "Queue: %s\r\n" "Position: %d\r\n" "Channel: %s\r\n" - "CallerID: %s\r\n" + "CallerIDNum: %s\r\n" "CallerIDName: %s\r\n" "Wait: %ld\r\n" "%s" |