kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

added feature from 5750 with whitespace fixing.

Browse Source 
allows for meetme show list to tell how long user
has been in confrence and reports it to manager
when user leaves confrence.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matt O'Gorman
2006-01-11 06:56:28 +00:00
parent 9de6d70b24
commit 283c0d64ba
1 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apps/app_meetme.c
View File

@@ -662,8 +662,14 @@ static int conf_cmd(int fd, int argc, char **argv) {
}
}
/* Show all the users */
for (user = cnf->firstuser; user; user = user->nextuser)
ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s\n",
for (user = cnf->firstuser; user; user = user->nextuser){
now = time(NULL);
hr = (now - user->jointime) / 3600;
min = ((now - user->jointime) % 3600) / 60;
sec = (now - user->jointime) % 60;
ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %02d:%02d:%02d\n",
user->user_no,
user->chan->cid.cid_num ? user->chan->cid.cid_num : "<unknown>",
user->chan->cid.cid_name ? user->chan->cid.cid_name : "<no name>",
@@ -671,7 +677,8 @@ static int conf_cmd(int fd, int argc, char **argv) {
user->userflags & CONFFLAG_ADMIN ? "(Admin)" : "",
user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
user->adminflags & ADMINFLAG_MUTED ? "(Admn Muted)" : "",
istalking(user->talking));
istalking(user->talking), hr, min, sec);
}
ast_cli(fd,"%d users in that conference.\n",cnf->users);
return RESULT_SUCCESS;
@@ -867,6 +874,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
int menu_active = 0;
int using_pseudo = 0;
int duration=20;
int hr, min, sec;
time_t now;
struct ast_dsp *dsp=NULL;
struct ast_app *app;
const char *agifile;
@@ -1661,12 +1670,26 @@ bailoutandtrynormal:
ast_dsp_free(dsp);
if (user->user_no) { /* Only cleanup users who really joined! */
manager_event(EVENT_FLAG_CALL, "MeetmeLeave",
"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);
now = time(NULL);
hr = (now - user->jointime) / 3600;
min = ((now - user->jointime) % 3600) / 60;
sec = (now - user->jointime) % 60;
manager_event(EVENT_FLAG_CALL, "MeetmeLeave",
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
"Meetme: %s\r\n"
"Usernum: %d\r\n"
"CIDnum: %s\r\n"
"CIDname: %s\r\n"
"Duration: %02d:%02d:%02d\r\n",
chan->name, chan->uniqueid, conf->confno,
user->user_no,
user->chan->cid.cid_num ? user->chan->cid.cid_num :
"<unknown>",
user->chan->cid.cid_name ? user->chan->cid.cid_name :
"<no name>", hr, min, sec);
conf->users--;
if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers--;