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

Merged revisions 55758 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55758 | russell | 2007-02-20 19:03:25 -0600 (Tue, 20 Feb 2007) | 4 lines

Improve the reference counting to fix bugs where people report seeing
conferences listed that have no members.
(issue #9073)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-02-21 01:05:00 +00:00
parent ee980f4350
commit e57e5aca4a
1 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
apps/app_meetme.c
View File

@@ -634,7 +634,7 @@ static void conf_play(struct ast_channel *chan, struct ast_conference *conf, enu
static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount) static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin, int make, int dynamic, int refcount)
{ {
struct ast_conference *cnf; struct ast_conference *cnf;
struct zt_confinfo ztc; struct zt_confinfo ztc = { 0, };
AST_LIST_LOCK(&confs); AST_LIST_LOCK(&confs);
@@ -655,8 +655,6 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
ast_copy_string(cnf->confno, confno, sizeof(cnf->confno)); ast_copy_string(cnf->confno, confno, sizeof(cnf->confno));
ast_copy_string(cnf->pin, pin, sizeof(cnf->pin)); ast_copy_string(cnf->pin, pin, sizeof(cnf->pin));
ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin)); ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin));
cnf->refcount = 0;
cnf->markedusers = 0;
cnf->chan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL); cnf->chan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL);
if (cnf->chan) { if (cnf->chan) {
ast_set_read_format(cnf->chan, AST_FORMAT_SLINEAR); ast_set_read_format(cnf->chan, AST_FORMAT_SLINEAR);
@@ -672,9 +670,8 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
goto cnfout; goto cnfout;
} }
} }
memset(&ztc, 0, sizeof(ztc));
/* Setup a new zap conference */ /* Setup a new zap conference */
ztc.chan = 0;
ztc.confno = -1; ztc.confno = -1;
ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON; ztc.confmode = ZT_CONF_CONFANN | ZT_CONF_CONFANNMON;
if (ioctl(cnf->fd, ZT_SETCONF, &ztc)) { if (ioctl(cnf->fd, ZT_SETCONF, &ztc)) {
@@ -709,7 +706,7 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
cnfout: cnfout:
if (cnf) if (cnf)
cnf->refcount += refcount; ast_atomic_fetchadd_int(&cnf->refcount, refcount);
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);
@@ -1060,6 +1057,7 @@ static int conf_free(struct ast_conference *conf)
conf->recording = MEETME_RECORD_TERMINATE; conf->recording = MEETME_RECORD_TERMINATE;
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);
while (1) { while (1) {
usleep(1);
AST_LIST_LOCK(&confs); AST_LIST_LOCK(&confs);
if (conf->recording == MEETME_RECORD_OFF) if (conf->recording == MEETME_RECORD_OFF)
break; break;
@@ -1146,6 +1144,22 @@ static void sla_queue_event(enum sla_event_type type, const struct ast_channel *
ast_mutex_unlock(&sla.lock); ast_mutex_unlock(&sla.lock);
} }
/* Decrement reference counts, as incremented by find_conf() */
static int dispose_conf(struct ast_conference *conf)
{
int res = 0;
AST_LIST_LOCK(&confs);
if (ast_atomic_dec_and_test(&conf->refcount)) {
conf_free(conf);
res = 1;
}
AST_LIST_UNLOCK(&confs);
return res;
}
static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags, char *optargs[]) static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int confflags, char *optargs[])
{ {
struct ast_conf_user *user = NULL; struct ast_conf_user *user = NULL;
@@ -1188,15 +1202,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
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;
if (!(user = ast_calloc(1, sizeof(*user)))) { if (!(user = ast_calloc(1, sizeof(*user))))
AST_LIST_LOCK(&confs);
conf->refcount--;
if (!conf->refcount){
conf_free(conf);
}
AST_LIST_UNLOCK(&confs);
return ret; return ret;
}
/* Possible timeout waiting for marked user */ /* Possible timeout waiting for marked user */
if ((confflags & CONFFLAG_WAITMARKED) && if ((confflags & CONFFLAG_WAITMARKED) &&
@@ -2065,7 +2072,6 @@ bailoutandtrynormal:
} }
conf->users--; conf->users--;
conf->refcount--;
/* Update table */ /* Update table */
snprintf(members, sizeof(members), "%d", conf->users); snprintf(members, sizeof(members), "%d", conf->users);
ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL); ast_update_realtime("meetme", "confno", conf->confno, "members", members, NULL);
@@ -2078,11 +2084,6 @@ bailoutandtrynormal:
if (!conf->users) if (!conf->users)
ast_device_state_changed("meetme:%s", conf->confno); ast_device_state_changed("meetme:%s", conf->confno);
if (AST_LIST_EMPTY(&conf->userlist)) {
/* close this one when no more users and no references*/
if (!conf->refcount)
conf_free(conf);
}
/* Return the number of seconds the user was in the conf */ /* Return the number of seconds the user was in the conf */
snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime)); snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs); pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
@@ -2272,11 +2273,13 @@ static int count_exec(struct ast_channel *chan, void *data)
AST_STANDARD_APP_ARGS(args, localdata); AST_STANDARD_APP_ARGS(args, localdata);
conf = find_conf(chan, args.confno, 0, 0, NULL, 0, 0, NULL); conf = find_conf(chan, args.confno, 0, 0, NULL, 0, 1, NULL);
if (conf) if (conf) {
count = conf->users; count = conf->users;
else dispose_conf(conf);
conf = NULL;
} else
count = 0; count = 0;
if (!ast_strlen_zero(args.varname)){ if (!ast_strlen_zero(args.varname)){
@@ -2301,7 +2304,7 @@ static int conf_exec(struct ast_channel *chan, void *data)
char confno[MAX_CONFNUM] = ""; char confno[MAX_CONFNUM] = "";
int allowretry = 0; int allowretry = 0;
int retrycnt = 0; int retrycnt = 0;
struct ast_conference *cnf; struct ast_conference *cnf = NULL;
struct ast_flags confflags = {0}; struct ast_flags confflags = {0};
int dynamic = 0; int dynamic = 0;
int empty = 0, empty_no_pin = 0; int empty = 0, empty_no_pin = 0;
@@ -2514,15 +2517,8 @@ static int conf_exec(struct ast_channel *chan, void *data)
ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n"); ast_log(LOG_WARNING, "Couldn't play invalid pin msg!\n");
break; break;
} }
if (res < 0) { if (res < 0)
AST_LIST_LOCK(&confs);
cnf->refcount--;
if (!cnf->refcount){
conf_free(cnf);
}
AST_LIST_UNLOCK(&confs);
break; break;
}
pin[0] = res; pin[0] = res;
pin[1] = '\0'; pin[1] = '\0';
res = -1; res = -1;
@@ -2534,12 +2530,6 @@ static int conf_exec(struct ast_channel *chan, void *data)
res = -1; res = -1;
allowretry = 0; allowretry = 0;
/* see if we need to get rid of the conference */ /* see if we need to get rid of the conference */
AST_LIST_LOCK(&confs);
cnf->refcount--;
if (!cnf->refcount) {
conf_free(cnf);
}
AST_LIST_UNLOCK(&confs);
break; break;
} }
@@ -2556,9 +2546,14 @@ static int conf_exec(struct ast_channel *chan, void *data)
res = conf_run(chan, cnf, confflags.flags, optargs); res = conf_run(chan, cnf, confflags.flags, optargs);
} }
} }
dispose_conf(cnf);
cnf = NULL;
} }
} while (allowretry); } while (allowretry);
if (cnf)
dispose_conf(cnf);
ast_module_user_remove(u); ast_module_user_remove(u);
return res; return res;
@@ -2622,6 +2617,8 @@ static int admin_exec(struct ast_channel *chan, void *data) {
return 0; return 0;
} }
ast_atomic_fetchadd_int(&cnf->refcount, 1);
if (args.user) if (args.user)
user = find_user(cnf, args.user); user = find_user(cnf, args.user);
@@ -2725,6 +2722,8 @@ static int admin_exec(struct ast_channel *chan, void *data) {
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);
dispose_conf(cnf);
ast_module_user_remove(u); ast_module_user_remove(u);
return 0; return 0;
@@ -3018,8 +3017,11 @@ static void *run_station(void *data)
CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_PASS_DTMF | CONFFLAG_SLA_STATION); CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_PASS_DTMF | CONFFLAG_SLA_STATION);
ast_answer(trunk_ref->chan); ast_answer(trunk_ref->chan);
conf = build_conf(conf_name, "", "", 0, 0, 1); conf = build_conf(conf_name, "", "", 0, 0, 1);
if (conf) if (conf) {
conf_run(trunk_ref->chan, conf, conf_flags.flags, NULL); conf_run(trunk_ref->chan, conf, conf_flags.flags, NULL);
dispose_conf(conf);
conf = NULL;
}
trunk_ref->chan = NULL; trunk_ref->chan = NULL;
if (ast_atomic_dec_and_test((int *) &trunk_ref->trunk->active_stations)) { if (ast_atomic_dec_and_test((int *) &trunk_ref->trunk->active_stations)) {
strncat(conf_name, "|K", sizeof(conf_name) - strlen(conf_name) - 1); strncat(conf_name, "|K", sizeof(conf_name) - strlen(conf_name) - 1);
@@ -3334,8 +3336,11 @@ static void *dial_trunk(void *data)
ast_cond_signal(args->cond); ast_cond_signal(args->cond);
ast_mutex_unlock(args->cond_lock); ast_mutex_unlock(args->cond_lock);
if (conf) if (conf) {
conf_run(trunk->chan, conf, conf_flags.flags, NULL); conf_run(trunk->chan, conf, conf_flags.flags, NULL);
dispose_conf(conf);
conf = NULL;
}
trunk->chan = NULL; trunk->chan = NULL;
@@ -3440,8 +3445,11 @@ static int slastation_exec(struct ast_channel *chan, void *data)
trunk_ref->chan = chan; trunk_ref->chan = chan;
ast_answer(chan); ast_answer(chan);
conf = build_conf(conf_name, "", "", 0, 0, 1); conf = build_conf(conf_name, "", "", 0, 0, 1);
if (conf) if (conf) {
conf_run(chan, conf, conf_flags.flags, NULL); conf_run(chan, conf, conf_flags.flags, NULL);
dispose_conf(conf);
conf = NULL;
}
trunk_ref->chan = NULL; trunk_ref->chan = NULL;
res = ast_atomic_fetchadd_int((int *) &trunk_ref->trunk->active_stations, -1); res = ast_atomic_fetchadd_int((int *) &trunk_ref->trunk->active_stations, -1);
if (res == 1) { if (res == 1) {
@@ -3517,6 +3525,8 @@ static int slatrunk_exec(struct ast_channel *chan, void *data)
CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_MARKEDUSER | CONFFLAG_PASS_DTMF); CONFFLAG_QUIET | CONFFLAG_MARKEDEXIT | CONFFLAG_MARKEDUSER | CONFFLAG_PASS_DTMF);
ast_indicate(chan, AST_CONTROL_RINGING); ast_indicate(chan, AST_CONTROL_RINGING);
conf_run(chan, conf, conf_flags.flags, NULL); conf_run(chan, conf, conf_flags.flags, NULL);
dispose_conf(conf);
conf = NULL;
trunk->chan = NULL; trunk->chan = NULL;
pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS"); pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "SUCCESS");