Make callerid fields in Manager events more consistent. CallerIDNum for number and...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44217 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index 2a9a0ca1a2841494c5ed67e2a7a623f179cc2dfb..c32fdefb911033b3ad2c932a5b4a5ae8404a93aa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,3 +21,5 @@ Changes since Asterisk 1.4-beta was branched:
      statistics during a reload.
   * Added rotatetimestamp option to logger.conf which will use
      the time to name the logger files instead of sequence number.
+  * The output of CallerID in Manager events is now more consistent.
+     CallerIDNum is used for number and CallerIDName for name.

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 8f9a050712af7eb89a71e12e566c395ae547ed60..da68e83fe50183e5e57043a53cae92c4bd8bafcb 100644 (file)
--- 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 426ba4eab28d70ae13b0e16e54d1c7b5336e428b..8e42e9d393182d62dff3e9878bccddc707024016 100644 (file)
--- 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 9659f3ad46b208f99d6c4dfc8d400fd9484753a9..aa52c3b40ee4c4042f16efca8fcc0f787da1204f 100644 (file)
--- 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 6ec3c4ef3e4e75f0314f727fd5094e53357a4baa..7e37b19236720ed38c1efe3bf8a61cd1076adf4d 100644 (file)
--- 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"

diff --git a/main/channel.c b/main/channel.c
index 4425be921e45a84399fd49a9344e4974f8e27738..6a5ecaef1ff4933b2a6f9a49c8b19fbee8aec19d 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -2846,7 +2846,7 @@ struct ast_channel *ast_request(const char *type, int format, void *data, int *c
                        manager_event(EVENT_FLAG_CALL, "Newchannel",
                                      "Channel: %s\r\n"
                                      "State: %s\r\n"
-                                     "CallerID: %s\r\n"
+                                     "CallerIDNum: %s\r\n"
                                      "CallerIDName: %s\r\n"
                                      "Uniqueid: %s\r\n",
                                      c->name, ast_state2str(c->_state),
@@ -3473,7 +3473,7 @@ void ast_set_callerid(struct ast_channel *chan, const char *callerid, const char
                ast_cdr_setcid(chan->cdr, chan);
        manager_event(EVENT_FLAG_CALL, "Newcallerid",
                                "Channel: %s\r\n"
-                               "CallerID: %s\r\n"
+                               "CallerIDNum: %s\r\n"
                                "CallerIDName: %s\r\n"
                                "Uniqueid: %s\r\n"
                                "CID-CallingPres: %d (%s)\r\n",
@@ -3499,7 +3499,7 @@ int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
                      (oldstate == AST_STATE_DOWN) ? "Newchannel" : "Newstate",
                      "Channel: %s\r\n"
                      "State: %s\r\n"
-                     "CallerID: %s\r\n"
+                     "CallerIDNum: %s\r\n"
                      "CallerIDName: %s\r\n"
                      "Uniqueid: %s\r\n",
                      chan->name, ast_state2str(chan->_state),

diff --git a/res/res_features.c b/res/res_features.c
index 3947bb360f3ba9b073cbcc795bfd69a132f2cbdc..9b521453e075fac4e865e0a9eec98daa8b728a81 100644 (file)
--- 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",