The MeetmeJoin now has caller ID name and Caller ID number fields (like MeetMeLeave)

(Moremanager)

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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 6341c4165f875beccf3e25f882ed3b36006da71a..f97bbc13bc28040b4db781f09abe0beb005d2ee8 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1888,11 +1888,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 
        if (!sent_event) {
                manager_event(EVENT_FLAG_CALL, "MeetmeJoin", 
-                             "Channel: %s\r\n"
-                             "Uniqueid: %s\r\n"
-                             "Meetme: %s\r\n"
-                             "Usernum: %d\r\n",
-                             chan->name, chan->uniqueid, conf->confno, user->user_no);
+                               "Channel: %s\r\n"
+                               "Uniqueid: %s\r\n"
+                               "Meetme: %s\r\n"
+                               "CallerIDnum: %s\r\n"
+                               "CallerIDname: %s\r\n"
+                               "Duration: %ld\r\n",
+                               chan->name, chan->uniqueid, conf->confno, 
+                             user->user_no,
+                             S_OR(user->chan->cid.cid_num, "<unknown>"),
+                             S_OR(user->chan->cid.cid_name, "<unknown>"),
                sent_event = 1;
        }
 
@@ -5191,9 +5196,6 @@ static void sla_destroy(void)
                pthread_join(sla.thread, NULL);
        }
 
-       /* Drop any created contexts from the dialplan */
-       ast_context_destroy(NULL, sla_registrar);
-
        ast_mutex_destroy(&sla.lock);
        ast_cond_destroy(&sla.cond);
 }