kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting issues

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-05-30 20:38:05 +00:00
parent 0f5ed60d51
commit 5ee4f3048c
1 changed files with 223 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

430
apps/app_meetme.c
View File

@@ -65,8 +65,8 @@ static char *descrip =
" 'M' -- enable music on hold when the conference has a single caller\n" " 'M' -- enable music on hold when the conference has a single caller\n"
" 'x' -- exit the conference if the last marked user left\n" " 'x' -- exit the conference if the last marked user left\n"
" 'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n" " 'b' -- run AGI script specified in ${MEETME_AGI_BACKGROUND}\n"
" Default: conf-background.agi\n" " Default: conf-background.agi\n"
" (Note: This does not work with non-Zap channels in the same conference)\n" " (Note: This does not work with non-Zap channels in the same conference)\n"
" 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n" " 's' -- Present menu (user or admin) when '*' is received ('send' to menu)\n"
" 'a' -- set admin mode\n"; " 'a' -- set admin mode\n";
@@ -95,18 +95,18 @@ static struct ast_conference {
int fd; /* Announcements fd */ int fd; /* Announcements fd */
int zapconf; /* Zaptel Conf # */ int zapconf; /* Zaptel Conf # */
int users; /* Number of active users */ int users; /* Number of active users */
int markedusers; /* Number of marked users */ int markedusers; /* Number of marked users */
struct ast_conf_user *firstuser; /* Pointer to the first user struct */ struct ast_conf_user *firstuser; /* Pointer to the first user struct */
struct ast_conf_user *lastuser; /* Pointer to the last user struct */ struct ast_conf_user *lastuser; /* Pointer to the last user struct */
time_t start; /* Start time (s) */ time_t start; /* Start time (s) */
int isdynamic; /* Created on the fly? */ int isdynamic; /* Created on the fly? */
int locked; /* Is the conference locked? */ int locked; /* Is the conference locked? */
char pin[AST_MAX_EXTENSION]; /* If protected by a PIN */ char pin[AST_MAX_EXTENSION]; /* If protected by a PIN */
struct ast_conference *next; struct ast_conference *next;
} *confs; } *confs;
struct ast_conf_user { struct ast_conf_user {
int user_no; /* User Number */ int user_no; /* User Number */
struct ast_conf_user *prevuser; /* Pointer to the previous user */ struct ast_conf_user *prevuser; /* Pointer to the previous user */
struct ast_conf_user *nextuser; /* Pointer to the next user */ struct ast_conf_user *nextuser; /* Pointer to the next user */
int userflags; /* Flags as set in the conference */ int userflags; /* Flags as set in the conference */
@@ -222,13 +222,13 @@ static struct ast_conference *build_conf(char *confno, char *pin, int make, int
cnf = NULL; cnf = NULL;
goto cnfout; goto cnfout;
} }
/* Fill the conference struct */ /* Fill the conference struct */
cnf->start = time(NULL); cnf->start = time(NULL);
cnf->zapconf = ztc.confno; cnf->zapconf = ztc.confno;
cnf->isdynamic = dynamic; cnf->isdynamic = dynamic;
cnf->firstuser = NULL; cnf->firstuser = NULL;
cnf->lastuser = NULL; cnf->lastuser = NULL;
cnf->locked = 0; cnf->locked = 0;
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno); ast_verbose(VERBOSE_PREFIX_3 "Created MeetMe conference %d for conference '%s'\n", cnf->zapconf, cnf->confno);
cnf->next = confs; cnf->next = confs;
@@ -244,15 +244,15 @@ cnfout:
static int confs_show(int fd, int argc, char **argv) static int confs_show(int fd, int argc, char **argv)
{ {
ast_cli(fd, "Deprecated! Please use 'meetme' instead.\n"); ast_cli(fd, "Deprecated! Please use 'meetme' instead.\n");
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
static char show_confs_usage[] = static char show_confs_usage[] =
"Deprecated! Please use 'meetme' instead.\n"; "Deprecated! Please use 'meetme' instead.\n";
static struct ast_cli_entry cli_show_confs = { static struct ast_cli_entry cli_show_confs = {
{ "show", "conferences", NULL }, confs_show, { "show", "conferences", NULL }, confs_show,
"Show status of conferences", show_confs_usage, NULL }; "Show status of conferences", show_confs_usage, NULL };
static int conf_cmd(int fd, int argc, char **argv) { static int conf_cmd(int fd, int argc, char **argv) {
/* Process the command */ /* Process the command */
@@ -262,7 +262,7 @@ static int conf_cmd(int fd, int argc, char **argv) {
int i = 0, total = 0; int i = 0, total = 0;
time_t now; time_t now;
char *header_format = "%-14s %-14s %-8s %-8s\n"; char *header_format = "%-14s %-14s %-8s %-8s\n";
char *data_format = "%-12.12s %4.4d %02d:%02d:%02d %-8s\n"; char *data_format = "%-12.12s %4.4d %02d:%02d:%02d %-8s\n";
char cmdline[1024] = ""; char cmdline[1024] = "";
if (argc > 8) if (argc > 8)
@@ -275,21 +275,21 @@ static int conf_cmd(int fd, int argc, char **argv) {
if (argc == 1) { if (argc == 1) {
/* 'MeetMe': List all the conferences */ /* 'MeetMe': List all the conferences */
now = time(NULL); now = time(NULL);
cnf = confs; cnf = confs;
if (!cnf) { if (!cnf) {
ast_cli(fd, "No active MeetMe conferences.\n"); ast_cli(fd, "No active MeetMe conferences.\n");
return RESULT_SUCCESS; return RESULT_SUCCESS;
} }
ast_cli(fd, header_format, "Conf Num", "Parties", "Activity", "Creation"); ast_cli(fd, header_format, "Conf Num", "Parties", "Activity", "Creation");
while(cnf) { while(cnf) {
hr = (now - cnf->start) / 3600; hr = (now - cnf->start) / 3600;
min = ((now - cnf->start) % 3600) / 60; min = ((now - cnf->start) % 3600) / 60;
sec = (now - cnf->start) % 60; sec = (now - cnf->start) % 60;
if (cnf->isdynamic) if (cnf->isdynamic)
ast_cli(fd, data_format, cnf->confno, cnf->users, hr, min, sec, "Dynamic"); ast_cli(fd, data_format, cnf->confno, cnf->users, hr, min, sec, "Dynamic");
else else
ast_cli(fd, data_format, cnf->confno, cnf->users, hr, min, sec, "Static"); ast_cli(fd, data_format, cnf->confno, cnf->users, hr, min, sec, "Static");
total += cnf->users; total += cnf->users;
cnf = cnf->next; cnf = cnf->next;
@@ -442,13 +442,13 @@ static char conf_usage[] =
" Executes a command for the conference or on a conferee\n"; " Executes a command for the conference or on a conferee\n";
static struct ast_cli_entry cli_conf = { static struct ast_cli_entry cli_conf = {
{ "meetme", NULL, NULL }, conf_cmd, { "meetme", NULL, NULL }, conf_cmd,
"Execute a command on a conference or conferee", conf_usage, complete_confcmd }; "Execute a command on a conference or conferee", conf_usage, complete_confcmd };
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags) static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags)
{ {
struct ast_conference *prev=NULL, *cur; struct ast_conference *prev=NULL, *cur;
struct ast_conf_user *user = malloc(sizeof(struct ast_conf_user)); struct ast_conf_user *user = malloc(sizeof(struct ast_conf_user));
int fd; int fd;
struct zt_confinfo ztc; struct zt_confinfo ztc;
struct ast_frame *f; struct ast_frame *f;
@@ -471,13 +471,13 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
struct ast_app *app; struct ast_app *app;
char *agifile; char *agifile;
char *agifiledefault = "conf-background.agi"; char *agifiledefault = "conf-background.agi";
char meetmesecs[30]; char meetmesecs[30];
ZT_BUFFERINFO bi; ZT_BUFFERINFO bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET]; char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET; char *buf = __buf + AST_FRIENDLY_OFFSET;
user->user_no = 0; /* User number 0 means starting up user! (dead - not in the list!) */ user->user_no = 0; /* User number 0 means starting up user! (dead - not in the list!) */
if (conf->locked) { if (conf->locked) {
/* Sorry, but this confernce is locked! */ /* Sorry, but this confernce is locked! */
@@ -487,36 +487,36 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
} }
conf->users++; conf->users++;
if (confflags & CONFFLAG_ADMINEXIT) { if (confflags & CONFFLAG_ADMINEXIT) {
if (conf->markedusers == -1) { if (conf->markedusers == -1) {
conf->markedusers = 1; conf->markedusers = 1;
} else { } else {
conf->markedusers++; conf->markedusers++;
} }
} }
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
if (conf->firstuser == NULL) { if (conf->firstuser == NULL) {
/* Fill the first new User struct */ /* Fill the first new User struct */
user->user_no = 1; user->user_no = 1;
user->nextuser = NULL; user->nextuser = NULL;
user->prevuser = NULL; user->prevuser = NULL;
conf->firstuser = user; conf->firstuser = user;
conf->lastuser = user; conf->lastuser = user;
} else { } else {
/* Fill the new user struct */ /* Fill the new user struct */
user->user_no = conf->lastuser->user_no + 1; user->user_no = conf->lastuser->user_no + 1;
user->prevuser = conf->lastuser; user->prevuser = conf->lastuser;
user->nextuser = NULL; user->nextuser = NULL;
if (conf->lastuser->nextuser != NULL) { if (conf->lastuser->nextuser != NULL) {
ast_log(LOG_WARNING, "Error in User Management!\n"); ast_log(LOG_WARNING, "Error in User Management!\n");
goto outrun; goto outrun;
} else { } else {
conf->lastuser->nextuser = user; conf->lastuser->nextuser = user;
conf->lastuser = user; conf->lastuser = user;
} }
} }
strncpy(user->usrvalue, "test", sizeof(user->usrvalue)); strncpy(user->usrvalue, "test", sizeof(user->usrvalue));
user->chan = chan; user->chan = chan;
user->userflags = confflags; user->userflags = confflags;
user->adminflags = 0; user->adminflags = 0;
@@ -668,24 +668,24 @@ zapretry:
ast_log(LOG_WARNING, "Could not find application (agi)\n"); ast_log(LOG_WARNING, "Could not find application (agi)\n");
ret = -2; ret = -2;
} }
if (!strcasecmp(chan->type,"Zap")) { if (!strcasecmp(chan->type,"Zap")) {
/* Remove CONFMUTE mode on Zap channel */ /* Remove CONFMUTE mode on Zap channel */
x = 0; x = 0;
ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0); ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0);
} }
} else { } else {
if (!strcasecmp(chan->type,"Zap") && (confflags & CONFFLAG_STARMENU)) { if (!strcasecmp(chan->type,"Zap") && (confflags & CONFFLAG_STARMENU)) {
/* Set CONFMUTE mode on Zap channel to mute DTMF tones when the menu is enabled */ /* Set CONFMUTE mode on Zap channel to mute DTMF tones when the menu is enabled */
x = 1; x = 1;
ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0); ast_channel_setoption(chan,AST_OPTION_TONE_VERIFY,&x,sizeof(char),0);
} }
for(;;) { for(;;) {
outfd = -1; outfd = -1;
ms = -1; ms = -1;
c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms); c = ast_waitfor_nandfds(&chan, 1, &fd, nfds, NULL, &outfd, &ms);
/* Update the struct with the actual confflags */ /* Update the struct with the actual confflags */
user->userflags = confflags; user->userflags = confflags;
/* trying to add moh for single person conf */ /* trying to add moh for single person conf */
if (confflags & CONFFLAG_MOH) { if (confflags & CONFFLAG_MOH) {
@@ -702,11 +702,11 @@ zapretry:
} }
} }
/* Leave if the last marked user left */ /* Leave if the last marked user left */
if ((confflags & CONFFLAG_ADMINEXIT) && (conf->markedusers == 0)) { if ((confflags & CONFFLAG_ADMINEXIT) && (conf->markedusers == 0)) {
ret = 0; ret = 0;
break; break;
} }
/* Check if the admin changed my modes */ /* Check if the admin changed my modes */
if (user->adminflags) { if (user->adminflags) {
@@ -714,33 +714,33 @@ zapretry:
if ((user->adminflags & ADMINFLAG_MUTED) && (ztc.confmode & ZT_CONF_TALKER)) { if ((user->adminflags & ADMINFLAG_MUTED) && (ztc.confmode & ZT_CONF_TALKER)) {
ztc.confmode ^= ZT_CONF_TALKER; ztc.confmode ^= ZT_CONF_TALKER;
if (ioctl(fd, ZT_SETCONF, &ztc)) { if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n");
ret = -1; ret = -1;
break; break;
} }
} }
if (!(user->adminflags & ADMINFLAG_MUTED) && !(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & ZT_CONF_TALKER)) { if (!(user->adminflags & ADMINFLAG_MUTED) && !(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & ZT_CONF_TALKER)) {
ztc.confmode |= ZT_CONF_TALKER; ztc.confmode |= ZT_CONF_TALKER;
if (ioctl(fd, ZT_SETCONF, &ztc)) { if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n");
ret = -1; ret = -1;
break; break;
} }
} }
if (user->adminflags & ADMINFLAG_KICKME) { if (user->adminflags & ADMINFLAG_KICKME) {
//You have been kicked. //You have been kicked.
if (!ast_streamfile(chan, "conf-kicked", chan->language)) if (!ast_streamfile(chan, "conf-kicked", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
ret = 0; ret = 0;
break; break;
} }
} else if (!(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & ZT_CONF_TALKER)) { } else if (!(confflags & CONFFLAG_MONITOR) && !(ztc.confmode & ZT_CONF_TALKER)) {
ztc.confmode |= ZT_CONF_TALKER; ztc.confmode |= ZT_CONF_TALKER;
if (ioctl(fd, ZT_SETCONF, &ztc)) { if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n");
ret = -1; ret = -1;
break; break;
} }
} }
if (c) { if (c) {
@@ -759,105 +759,105 @@ zapretry:
if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#') && (confflags & CONFFLAG_POUNDEXIT)) { if ((f->frametype == AST_FRAME_DTMF) && (f->subclass == '#') && (confflags & CONFFLAG_POUNDEXIT)) {
ret = 0; ret = 0;
break; break;
} else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) { } else if (((f->frametype == AST_FRAME_DTMF) && (f->subclass == '*') && (confflags & CONFFLAG_STARMENU)) || ((f->frametype == AST_FRAME_DTMF) && menu_active)) {
if (musiconhold) { if (musiconhold) {
ast_moh_stop(chan); ast_moh_stop(chan);
} }
if ((confflags & CONFFLAG_ADMIN)) { if ((confflags & CONFFLAG_ADMIN)) {
/* Admin menu */ /* Admin menu */
if (!menu_active) { if (!menu_active) {
menu_active = 1; menu_active = 1;
/* Record this sound! */ /* Record this sound! */
if (!ast_streamfile(chan, "conf-adminmenu", chan->language)) if (!ast_streamfile(chan, "conf-adminmenu", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} else { } else {
switch(f->subclass - 48) { switch(f->subclass - 48) {
case 1: /* Un/Mute */ case 1: /* Un/Mute */
menu_active = 0; menu_active = 0;
if (ztc.confmode & ZT_CONF_TALKER) { if (ztc.confmode & ZT_CONF_TALKER) {
ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER; ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER;
confflags |= CONFFLAG_MONITOR ^ CONFFLAG_TALKER; confflags |= CONFFLAG_MONITOR ^ CONFFLAG_TALKER;
} else { } else {
ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER; ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER;
confflags ^= CONFFLAG_MONITOR | CONFFLAG_TALKER; confflags ^= CONFFLAG_MONITOR | CONFFLAG_TALKER;
} }
if (ioctl(fd, ZT_SETCONF, &ztc)) { if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n");
ret = -1; ret = -1;
break; break;
} }
if (ztc.confmode & ZT_CONF_TALKER) { if (ztc.confmode & ZT_CONF_TALKER) {
if (!ast_streamfile(chan, "conf-unmuted", chan->language)) if (!ast_streamfile(chan, "conf-unmuted", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} else { } else {
if (!ast_streamfile(chan, "conf-muted", chan->language)) if (!ast_streamfile(chan, "conf-muted", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} }
break; break;
case 2: /* Un/Lock the Conference */ case 2: /* Un/Lock the Conference */
menu_active = 0; menu_active = 0;
if (conf->locked) { if (conf->locked) {
conf->locked = 0; conf->locked = 0;
if (!ast_streamfile(chan, "conf-unlockednow", chan->language)) if (!ast_streamfile(chan, "conf-unlockednow", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} else { } else {
conf->locked = 1; conf->locked = 1;
if (!ast_streamfile(chan, "conf-lockednow", chan->language)) if (!ast_streamfile(chan, "conf-lockednow", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} }
break; break;
default: default:
menu_active = 0; menu_active = 0;
/* Play an error message! */ /* Play an error message! */
if (!ast_streamfile(chan, "conf-errormenu", chan->language)) if (!ast_streamfile(chan, "conf-errormenu", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
break; break;
} }
} }
} else { } else {
/* User menu */ /* User menu */
if (!menu_active) { if (!menu_active) {
menu_active = 1; menu_active = 1;
/* Record this sound! */ /* Record this sound! */
if (!ast_streamfile(chan, "conf-usermenu", chan->language)) if (!ast_streamfile(chan, "conf-usermenu", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} else { } else {
switch(f->subclass - 48) { switch(f->subclass - 48) {
case 1: /* Un/Mute */ case 1: /* Un/Mute */
menu_active = 0; menu_active = 0;
if (ztc.confmode & ZT_CONF_TALKER) { if (ztc.confmode & ZT_CONF_TALKER) {
ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER; ztc.confmode = ZT_CONF_CONF | ZT_CONF_LISTENER;
confflags |= CONFFLAG_MONITOR ^ CONFFLAG_TALKER; confflags |= CONFFLAG_MONITOR ^ CONFFLAG_TALKER;
} else if (!(user->adminflags & ADMINFLAG_MUTED)) { } else if (!(user->adminflags & ADMINFLAG_MUTED)) {
ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER; ztc.confmode = ZT_CONF_CONF | ZT_CONF_TALKER | ZT_CONF_LISTENER;
confflags ^= CONFFLAG_MONITOR | CONFFLAG_TALKER; confflags ^= CONFFLAG_MONITOR | CONFFLAG_TALKER;
} }
if (ioctl(fd, ZT_SETCONF, &ztc)) { if (ioctl(fd, ZT_SETCONF, &ztc)) {
ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n"); ast_log(LOG_WARNING, "Error setting conference - Un/Mute \n");
ret = -1; ret = -1;
break; break;
} }
if (ztc.confmode & ZT_CONF_TALKER) { if (ztc.confmode & ZT_CONF_TALKER) {
if (!ast_streamfile(chan, "conf-unmuted", chan->language)) if (!ast_streamfile(chan, "conf-unmuted", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} else { } else {
if (!ast_streamfile(chan, "conf-muted", chan->language)) if (!ast_streamfile(chan, "conf-muted", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
} }
break; break;
default: default:
menu_active = 0; menu_active = 0;
/* Play an error message! */ /* Play an error message! */
if (!ast_streamfile(chan, "errormenu", chan->language)) if (!ast_streamfile(chan, "errormenu", chan->language))
ast_waitstream(chan, ""); ast_waitstream(chan, "");
break; break;
} }
} }
} }
if (musiconhold) { if (musiconhold) {
ast_moh_start(chan, NULL); ast_moh_start(chan, NULL);
} }
} else if (fd != chan->fds[0]) { } else if (fd != chan->fds[0]) {
if (f->frametype == AST_FRAME_VOICE) { if (f->frametype == AST_FRAME_VOICE) {
if (f->subclass == AST_FORMAT_ULAW) { if (f->subclass == AST_FORMAT_ULAW) {
@@ -903,15 +903,15 @@ zapretry:
conf_play(conf, LEAVE); conf_play(conf, LEAVE);
outrun: outrun:
if (user->user_no) { /* Only cleanup users who really joined! */ if (user->user_no) { /* Only cleanup users who really joined! */
manager_event(EVENT_FLAG_CALL, "MeetmeLeave", manager_event(EVENT_FLAG_CALL, "MeetmeLeave",
"Channel: %s\r\n" "Channel: %s\r\n"
"Uniqueid: %s\r\n" "Uniqueid: %s\r\n"
"Meetme: %s\r\n", "Meetme: %s\r\n",
chan->name, chan->uniqueid, conf->confno); chan->name, chan->uniqueid, conf->confno);
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
conf->users--; conf->users--;
cur = confs; cur = confs;
if (!conf->users) { if (!conf->users) {
/* No more users -- close this one out */ /* No more users -- close this one out */
while(cur) { while(cur) {
@@ -929,22 +929,22 @@ outrun:
ast_log(LOG_WARNING, "Conference not found\n"); ast_log(LOG_WARNING, "Conference not found\n");
close(conf->fd); close(conf->fd);
free(conf); free(conf);
} else { } else {
/* Remove the user struct */ /* Remove the user struct */
if (user == cur->firstuser) { if (user == cur->firstuser) {
cur->firstuser->nextuser->prevuser = NULL; cur->firstuser->nextuser->prevuser = NULL;
cur->firstuser = cur->firstuser->nextuser; cur->firstuser = cur->firstuser->nextuser;
} else if (user == cur->lastuser){ } else if (user == cur->lastuser){
cur->lastuser->prevuser->nextuser = NULL; cur->lastuser->prevuser->nextuser = NULL;
cur->lastuser = cur->lastuser->prevuser; cur->lastuser = cur->lastuser->prevuser;
} else { } else {
user->nextuser->prevuser = user->prevuser; user->nextuser->prevuser = user->prevuser;
user->prevuser->nextuser = user->nextuser; user->prevuser->nextuser = user->nextuser;
} }
/* Return the number of seconds the user was in the conf */ /* Return the number of seconds the user was in the conf */
sprintf(meetmesecs, "%i", (int) (user->jointime - time(NULL))); sprintf(meetmesecs, "%i", (int) (user->jointime - time(NULL)));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs); pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
} }
} }
free(user); free(user);
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
@@ -1106,8 +1106,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
confflags |= CONFFLAG_QUIET; confflags |= CONFFLAG_QUIET;
if (strchr(inflags, 'M')) if (strchr(inflags, 'M'))
confflags |= CONFFLAG_MOH; confflags |= CONFFLAG_MOH;
if (strchr(inflags, 'x')) if (strchr(inflags, 'x'))
confflags |= CONFFLAG_ADMINEXIT; confflags |= CONFFLAG_ADMINEXIT;
if (strchr(inflags, 'b')) if (strchr(inflags, 'b'))
confflags |= CONFFLAG_AGI; confflags |= CONFFLAG_AGI;
if (strchr(inflags, 'd')) if (strchr(inflags, 'd'))
@@ -1312,16 +1312,16 @@ static int admin_exec(struct ast_channel *chan, void *data) {
caller = strsep(&params, "|"); caller = strsep(&params, "|");
ast_mutex_lock(&conflock); ast_mutex_lock(&conflock);
cnf = confs; cnf = confs;
while (cnf) { while (cnf) {
if (strcmp(cnf->confno, conf) == 0) if (strcmp(cnf->confno, conf) == 0)
break; break;
cnf = cnf->next; cnf = cnf->next;
} }
ast_mutex_unlock(&conflock); ast_mutex_unlock(&conflock);
if (caller) if (caller)
user = find_user(cnf, caller); user = find_user(cnf, caller);
if (cnf) { if (cnf) {
switch((int) (*command)) { switch((int) (*command)) {
@@ -1376,8 +1376,8 @@ int unload_module(void)
{ {
STANDARD_HANGUP_LOCALUSERS; STANDARD_HANGUP_LOCALUSERS;
ast_cli_unregister(&cli_show_confs); ast_cli_unregister(&cli_show_confs);
ast_cli_unregister(&cli_conf); ast_cli_unregister(&cli_conf);
ast_unregister_application(app3); ast_unregister_application(app3);
ast_unregister_application(app2); ast_unregister_application(app2);
return ast_unregister_application(app); return ast_unregister_application(app);
} }
@@ -1385,8 +1385,8 @@ int unload_module(void)
int load_module(void) int load_module(void)
{ {
ast_cli_register(&cli_show_confs); ast_cli_register(&cli_show_confs);
ast_cli_register(&cli_conf); ast_cli_register(&cli_conf);
ast_register_application(app3, admin_exec, synopsis3, descrip3); ast_register_application(app3, admin_exec, synopsis3, descrip3);
ast_register_application(app2, count_exec, synopsis2, descrip2); ast_register_application(app2, count_exec, synopsis2, descrip2);
return ast_register_application(app, conf_exec, synopsis, descrip); return ast_register_application(app, conf_exec, synopsis, descrip);
} }