kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
(Moremanager)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@91387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2007-12-06 14:36:54 +00:00
parent 39c8fc532d
commit a545aaae53
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/app_meetme.c
View File

@@ -1888,11 +1888,16 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
if (!sent_event) { if (!sent_event) {
manager_event(EVENT_FLAG_CALL, "MeetmeJoin", manager_event(EVENT_FLAG_CALL, "MeetmeJoin",
"Channel: %s\r\n" "Channel: %s\r\n"
"Uniqueid: %s\r\n" "Uniqueid: %s\r\n"
"Meetme: %s\r\n" "Meetme: %s\r\n"
"Usernum: %d\r\n", "CallerIDnum: %s\r\n"
chan->name, chan->uniqueid, conf->confno, user->user_no); "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; sent_event = 1;
} }
@@ -5191,9 +5196,6 @@ static void sla_destroy(void)
pthread_join(sla.thread, NULL); pthread_join(sla.thread, NULL);
} }
/* Drop any created contexts from the dialplan */
ast_context_destroy(NULL, sla_registrar);
ast_mutex_destroy(&sla.lock); ast_mutex_destroy(&sla.lock);
ast_cond_destroy(&sla.cond); ast_cond_destroy(&sla.cond);
} }