[svn-commits] oej: branch oej/cancel_elsewhere_1.4 r286377 - in /team/oej/cancel_elsewhere_...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Sep 13 09:02:33 CDT 2010
Author: oej
Date: Mon Sep 13 09:02:20 2010
New Revision: 286377
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286377
Log:
Updating branch
Added:
team/oej/cancel_elsewhere_1.4/BSDmakefile
- copied unchanged from r286267, branches/1.4/BSDmakefile
team/oej/cancel_elsewhere_1.4/contrib/realtime/
- copied from r286267, branches/1.4/contrib/realtime/
team/oej/cancel_elsewhere_1.4/contrib/realtime/mysql/
- copied from r286267, branches/1.4/contrib/realtime/mysql/
team/oej/cancel_elsewhere_1.4/contrib/realtime/mysql/iaxfriends.sql
- copied unchanged from r286267, branches/1.4/contrib/realtime/mysql/iaxfriends.sql
team/oej/cancel_elsewhere_1.4/contrib/realtime/mysql/meetme.sql
- copied unchanged from r286267, branches/1.4/contrib/realtime/mysql/meetme.sql
team/oej/cancel_elsewhere_1.4/contrib/realtime/mysql/sipfriends.sql
- copied unchanged from r286267, branches/1.4/contrib/realtime/mysql/sipfriends.sql
team/oej/cancel_elsewhere_1.4/contrib/realtime/mysql/voicemail.sql
- copied unchanged from r286267, branches/1.4/contrib/realtime/mysql/voicemail.sql
team/oej/cancel_elsewhere_1.4/contrib/realtime/oracle/
- copied from r286267, branches/1.4/contrib/realtime/oracle/
team/oej/cancel_elsewhere_1.4/contrib/realtime/postgresql/
- copied from r286267, branches/1.4/contrib/realtime/postgresql/
team/oej/cancel_elsewhere_1.4/contrib/realtime/postgresql/realtime.sql
- copied unchanged from r286267, branches/1.4/contrib/realtime/postgresql/realtime.sql
team/oej/cancel_elsewhere_1.4/contrib/realtime/sqlserver/
- copied from r286267, branches/1.4/contrib/realtime/sqlserver/
team/oej/cancel_elsewhere_1.4/contrib/scripts/astcli
- copied unchanged from r286267, branches/1.4/contrib/scripts/astcli
team/oej/cancel_elsewhere_1.4/include/asterisk/select.h
- copied unchanged from r286267, branches/1.4/include/asterisk/select.h
team/oej/cancel_elsewhere_1.4/include/asterisk/test.h
- copied unchanged from r286267, branches/1.4/include/asterisk/test.h
team/oej/cancel_elsewhere_1.4/main/test.c
- copied unchanged from r286267, branches/1.4/main/test.c
team/oej/cancel_elsewhere_1.4/tests/
- copied from r286267, branches/1.4/tests/
team/oej/cancel_elsewhere_1.4/tests/Makefile
- copied unchanged from r286267, branches/1.4/tests/Makefile
team/oej/cancel_elsewhere_1.4/tests/test_astobj2.c
- copied unchanged from r286267, branches/1.4/tests/test_astobj2.c
team/oej/cancel_elsewhere_1.4/tests/test_poll.c
- copied unchanged from r286267, branches/1.4/tests/test_poll.c
team/oej/cancel_elsewhere_1.4/tests/test_skel.c
- copied unchanged from r286267, branches/1.4/tests/test_skel.c
Removed:
team/oej/cancel_elsewhere_1.4/contrib/scripts/iax-friends.sql
team/oej/cancel_elsewhere_1.4/contrib/scripts/meetme.sql
team/oej/cancel_elsewhere_1.4/contrib/scripts/realtime_pgsql.sql
team/oej/cancel_elsewhere_1.4/contrib/scripts/sip-friends.sql
team/oej/cancel_elsewhere_1.4/contrib/scripts/vmdb.sql
Modified:
team/oej/cancel_elsewhere_1.4/ (props changed)
team/oej/cancel_elsewhere_1.4/Makefile
team/oej/cancel_elsewhere_1.4/apps/app_amd.c
team/oej/cancel_elsewhere_1.4/apps/app_chanspy.c
team/oej/cancel_elsewhere_1.4/apps/app_dial.c
team/oej/cancel_elsewhere_1.4/apps/app_meetme.c
team/oej/cancel_elsewhere_1.4/apps/app_queue.c
team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c
team/oej/cancel_elsewhere_1.4/autoconf/ast_check_pwlib.m4
team/oej/cancel_elsewhere_1.4/autoconf/ast_func_fork.m4
team/oej/cancel_elsewhere_1.4/build_tools/cflags-devmode.xml
team/oej/cancel_elsewhere_1.4/channels/chan_agent.c
team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c
team/oej/cancel_elsewhere_1.4/channels/chan_dahdi.c
team/oej/cancel_elsewhere_1.4/channels/chan_h323.c
team/oej/cancel_elsewhere_1.4/channels/chan_iax2.c
team/oej/cancel_elsewhere_1.4/channels/chan_local.c
team/oej/cancel_elsewhere_1.4/channels/chan_misdn.c
team/oej/cancel_elsewhere_1.4/channels/chan_oss.c
team/oej/cancel_elsewhere_1.4/channels/chan_phone.c
team/oej/cancel_elsewhere_1.4/channels/chan_sip.c
team/oej/cancel_elsewhere_1.4/codecs/gsm/Makefile
team/oej/cancel_elsewhere_1.4/configs/say.conf.sample
team/oej/cancel_elsewhere_1.4/configs/sip.conf.sample
team/oej/cancel_elsewhere_1.4/configs/voicemail.conf.sample
team/oej/cancel_elsewhere_1.4/configure
team/oej/cancel_elsewhere_1.4/configure.ac
team/oej/cancel_elsewhere_1.4/contrib/scripts/live_ast
team/oej/cancel_elsewhere_1.4/doc/asterisk.8
team/oej/cancel_elsewhere_1.4/funcs/func_callerid.c
team/oej/cancel_elsewhere_1.4/funcs/func_channel.c
team/oej/cancel_elsewhere_1.4/include/asterisk.h
team/oej/cancel_elsewhere_1.4/include/asterisk/audiohook.h
team/oej/cancel_elsewhere_1.4/include/asterisk/autoconfig.h.in
team/oej/cancel_elsewhere_1.4/include/asterisk/channel.h
team/oej/cancel_elsewhere_1.4/include/asterisk/compiler.h
team/oej/cancel_elsewhere_1.4/include/asterisk/frame.h
team/oej/cancel_elsewhere_1.4/include/asterisk/linkedlists.h
team/oej/cancel_elsewhere_1.4/include/asterisk/lock.h
team/oej/cancel_elsewhere_1.4/include/asterisk/pbx.h
team/oej/cancel_elsewhere_1.4/include/asterisk/poll-compat.h
team/oej/cancel_elsewhere_1.4/main/Makefile
team/oej/cancel_elsewhere_1.4/main/asterisk.c
team/oej/cancel_elsewhere_1.4/main/audiohook.c
team/oej/cancel_elsewhere_1.4/main/autoservice.c
team/oej/cancel_elsewhere_1.4/main/channel.c
team/oej/cancel_elsewhere_1.4/main/cli.c
team/oej/cancel_elsewhere_1.4/main/config.c
team/oej/cancel_elsewhere_1.4/main/file.c
team/oej/cancel_elsewhere_1.4/main/loader.c
team/oej/cancel_elsewhere_1.4/main/manager.c
team/oej/cancel_elsewhere_1.4/main/pbx.c
team/oej/cancel_elsewhere_1.4/main/poll.c
team/oej/cancel_elsewhere_1.4/main/rtp.c
team/oej/cancel_elsewhere_1.4/makeopts.in
team/oej/cancel_elsewhere_1.4/pbx/pbx_config.c
team/oej/cancel_elsewhere_1.4/res/res_agi.c
team/oej/cancel_elsewhere_1.4/res/res_config_odbc.c
team/oej/cancel_elsewhere_1.4/res/res_config_pgsql.c
team/oej/cancel_elsewhere_1.4/res/res_features.c
team/oej/cancel_elsewhere_1.4/res/res_jabber.c
team/oej/cancel_elsewhere_1.4/res/res_musiconhold.c
Propchange: team/oej/cancel_elsewhere_1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 13 09:02:20 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-272640
+/branches/1.4:1-286376
Modified: team/oej/cancel_elsewhere_1.4/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/Makefile?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/Makefile (original)
+++ team/oej/cancel_elsewhere_1.4/Makefile Mon Sep 13 09:02:20 2010
@@ -265,7 +265,7 @@
_ASTCFLAGS+=$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs tests main
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -293,7 +293,12 @@
SOLINK=-shared -fpic -L/usr/local/ssl/lib -lrt
endif
-SUBMAKE=$(MAKE) --quiet --no-print-directory
+SILENTMAKE:=$(MAKE) --quiet --no-print-directory
+ifneq ($(PRINT_DIR)$(NOISY_BUILD),)
+SUBMAKE:=$(MAKE)
+else
+SUBMAKE:=$(MAKE) --quiet --no-print-directory
+endif
# This is used when generating the doxygen documentation
ifneq ($(DOT),:)
@@ -330,13 +335,13 @@
endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
- + at echo "EMBED_LDSCRIPTS+="`$(SUBMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+ + at echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LDFLAGS):
- + at echo "EMBED_LDFLAGS+="`$(SUBMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+ + at echo "EMBED_LDFLAGS+="`$(SILENTMAKE) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
$(MOD_SUBDIRS_EMBED_LIBS):
- + at echo "EMBED_LIBS+="`$(SUBMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+ + at echo "EMBED_LIBS+="`$(SILENTMAKE) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
$(MOD_SUBDIRS_MENUSELECT_TREE):
+@$(SUBMAKE) -C $(@:-menuselect-tree=) SUBDIR=$(@:-menuselect-tree=) moduleinfo
@@ -806,8 +811,8 @@
@echo "<?xml version=\"1.0\"?>" > $@
@echo >> $@
@echo "<menu name=\"Asterisk Module and Build Option Selection\">" >> $@
- + at for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
- + at for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SUBMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
+ + at for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} moduleinfo >> $@; done
+ + at for dir in $(sort $(filter-out main,$(MOD_SUBDIRS))); do $(SILENTMAKE) -C $${dir} SUBDIR=$${dir} makeopts >> $@; done
@cat build_tools/cflags.xml >> $@
@if [ "${AST_DEVMODE}" = "yes" ]; then \
cat build_tools/cflags-devmode.xml >> $@; \
Modified: team/oej/cancel_elsewhere_1.4/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_amd.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_amd.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_amd.c Mon Sep 13 09:02:20 2010
@@ -215,10 +215,11 @@
if (f->frametype == AST_FRAME_VOICE || f->frametype == AST_FRAME_NULL || f->frametype == AST_FRAME_CNG) {
/* If the total time exceeds the analysis time then give up as we are not too sure */
- if (f->frametype == AST_FRAME_VOICE)
+ if (f->frametype == AST_FRAME_VOICE) {
framelength = (ast_codec_get_samples(f) / DEFAULT_SAMPLES_PER_MS);
- else
- framelength += 2 * maxWaitTimeForFrame;
+ } else {
+ framelength = 2 * maxWaitTimeForFrame;
+ }
iTotalTime += framelength;
if (iTotalTime >= totalAnalysisTime) {
Modified: team/oej/cancel_elsewhere_1.4/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_chanspy.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_chanspy.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_chanspy.c Mon Sep 13 09:02:20 2010
@@ -633,7 +633,7 @@
ast_channel_unlock(peer);
if (!ast_test_flag(flags, OPTION_QUIET)) {
- if (ast_fileexists(peer_name, NULL, NULL) != -1) {
+ if (ast_fileexists(peer_name, NULL, NULL) > 0) {
res = ast_streamfile(chan, peer_name, chan->language);
if (!res)
res = ast_waitstream(chan, "");
Modified: team/oej/cancel_elsewhere_1.4/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_dial.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_dial.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_dial.c Mon Sep 13 09:02:20 2010
@@ -541,7 +541,9 @@
ast_channel_inherit_variables(in, o->chan);
ast_channel_datastore_inherit(in, o->chan);
} else
- ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
+ ast_log(LOG_NOTICE,
+ "Forwarding failed to create channel to dial '%s/%s' (cause = %d)\n",
+ tech, stuff, cause);
}
if (!c) {
ast_clear_flag(o, DIAL_STILLGOING);
@@ -576,8 +578,9 @@
if (c->cid.cid_rdnis)
free(c->cid.cid_rdnis);
c->cid.cid_rdnis = ast_strdup(S_OR(in->macroexten, in->exten));
- if (ast_call(c, tmpchan, 0)) {
- ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
+ if (ast_call(c, stuff, 0)) {
+ ast_log(LOG_NOTICE, "Forwarding failed to dial '%s/%s'\n",
+ tech, stuff);
ast_clear_flag(o, DIAL_STILLGOING);
ast_hangup(c);
c = o->chan = NULL;
@@ -1720,6 +1723,11 @@
}
if (chan && peer && ast_test_flag(&opts, OPT_GOTO) && !ast_strlen_zero(opt_args[OPT_ARG_GOTO])) {
+ /* chan and peer are going into the PBX, they both
+ * should probably get CDR records. */
+ ast_clear_flag(chan->cdr, AST_CDR_FLAG_DIALED);
+ ast_clear_flag(peer->cdr, AST_CDR_FLAG_DIALED);
+
replace_macro_delimiter(opt_args[OPT_ARG_GOTO]);
ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]);
/* peer goes to the same context and extension as chan, so just copy info from chan*/
@@ -1861,8 +1869,9 @@
sentringing = 0;
ast_indicate(chan, -1);
}
- /* Be sure no generators are left on it */
+ /* Be sure no generators are left on it and reset the visible indication */
ast_deactivate_generator(chan);
+ chan->visible_indication = 0;
/* Make sure channels are compatible */
res = ast_channel_make_compatible(chan, peer);
if (res < 0) {
Modified: team/oej/cancel_elsewhere_1.4/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_meetme.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_meetme.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_meetme.c Mon Sep 13 09:02:20 2010
@@ -362,7 +362,7 @@
struct ast_frame *transframe[32];
struct ast_frame *origframe;
struct ast_trans_pvt *transpath[32];
- AST_LIST_HEAD_NOLOCK(, ast_conf_user) userlist;
+ struct ao2_container *usercontainer;
AST_LIST_ENTRY(ast_conference) list;
/* announce_thread related data */
pthread_t announcethread;
@@ -752,6 +752,30 @@
ast_autoservice_stop(chan);
}
+static int user_no_cmp(void *obj, void *arg, int flags)
+{
+ struct ast_conf_user *user = obj;
+ int *user_no = arg;
+
+ if (user->user_no == *user_no) {
+ return (CMP_MATCH | CMP_STOP);
+ }
+
+ return 0;
+}
+
+static int user_max_cmp(void *obj, void *arg, int flags)
+{
+ struct ast_conf_user *user = obj;
+ int *max_no = arg;
+
+ if (user->user_no > *max_no) {
+ *max_no = user->user_no;
+ }
+
+ return 0;
+}
+
/*!
* \brief Find or create a conference
*
@@ -782,8 +806,10 @@
goto cnfout;
/* Make a new one */
- if (!(cnf = ast_calloc(1, sizeof(*cnf))))
+ if (!(cnf = ast_calloc(1, sizeof(*cnf))) ||
+ !(cnf->usercontainer = ao2_container_alloc(1, NULL, user_no_cmp))) {
goto cnfout;
+ }
ast_mutex_init(&cnf->playlock);
ast_mutex_init(&cnf->listenlock);
@@ -939,6 +965,7 @@
strncat(cmdline, argv[3], sizeof(cmdline) - strlen(cmdline) - 1);
}
} else if(strcmp(argv[1], "list") == 0) {
+ struct ao2_iterator user_iter;
int concise = ( 4 == argc && ( !strcasecmp(argv[3], "concise") ) );
/* List all the users in a conference */
if (AST_LIST_EMPTY(&confs)) {
@@ -960,11 +987,12 @@
}
/* Show all the users */
time(&now);
- AST_LIST_TRAVERSE(&cnf->userlist, user, list) {
+ user_iter = ao2_iterator_init(cnf->usercontainer, 0);
+ while((user = ao2_iterator_next(&user_iter))) {
hr = (now - user->jointime) / 3600;
min = ((now - user->jointime) % 3600) / 60;
sec = (now - user->jointime) % 60;
- if ( !concise )
+ if (!concise) {
ast_cli(fd, "User #: %-2.2d %12.12s %-20.20s Channel: %s %s %s %s %s %02d:%02d:%02d\n",
user->user_no,
S_OR(user->chan->cid.cid_num, "<unknown>"),
@@ -974,7 +1002,7 @@
user->userflags & CONFFLAG_MONITOR ? "(Listen only)" : "",
user->adminflags & ADMINFLAG_MUTED ? "(Admin Muted)" : user->adminflags & ADMINFLAG_SELFMUTED ? "(Muted)" : "",
istalking(user->talking), hr, min, sec);
- else
+ } else {
ast_cli(fd, "%d!%s!%s!%s!%s!%s!%s!%d!%02d:%02d:%02d\n",
user->user_no,
S_OR(user->chan->cid.cid_num, ""),
@@ -984,8 +1012,10 @@
user->userflags & CONFFLAG_MONITOR ? "1" : "",
user->adminflags & (ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED) ? "1" : "",
user->talking, hr, min, sec);
-
- }
+ }
+ ao2_ref(user, -1);
+ }
+ ao2_iterator_destroy(&user_iter);
if ( !concise )
ast_cli(fd,"%d users in that conference.\n",cnf->users);
AST_LIST_UNLOCK(&confs);
@@ -1044,15 +1074,21 @@
}
if (cnf) {
+ struct ao2_iterator user_iter;
+ user_iter = ao2_iterator_init(cnf->usercontainer, 0);
/* Search for the user */
- AST_LIST_TRAVERSE(&cnf->userlist, usr, list) {
+ while((usr = ao2_iterator_next(&user_iter))) {
snprintf(usrno, sizeof(usrno), "%d", usr->user_no);
- if (!strncasecmp(word, usrno, len) && ++which > state)
+ if (!strncasecmp(word, usrno, len) && ++which > state) {
+ ao2_ref(usr, -1);
break;
+ }
+ ao2_ref(usr, -1);
}
+ ao2_iterator_destroy(&user_iter);
+ AST_LIST_UNLOCK(&confs);
+ return usr ? strdup(usrno) : NULL;
}
- AST_LIST_UNLOCK(&confs);
- return usr ? strdup(usrno) : NULL;
} else if ( strstr(line, "list") && ( 0 == state ) )
return strdup("concise");
}
@@ -1302,6 +1338,9 @@
ast_hangup(conf->chan);
if (conf->fd >= 0)
close(conf->fd);
+ if (conf->usercontainer) {
+ ao2_ref(conf->usercontainer, -1);
+ }
ast_mutex_destroy(&conf->playlock);
ast_mutex_destroy(&conf->listenlock);
@@ -1317,13 +1356,19 @@
const struct ast_conf_user *sender, struct ast_frame *f)
{
struct ast_conf_user *user;
-
- AST_LIST_TRAVERSE(&conf->userlist, user, list) {
- if (user == sender)
+ struct ao2_iterator user_iter;
+
+ user_iter = ao2_iterator_init(conf->usercontainer, 0);
+ while ((user = ao2_iterator_next(&user_iter))) {
+ if (user == sender) {
+ ao2_ref(user, -1);
continue;
+ }
if (ast_write(user->chan, f) < 0)
ast_log(LOG_WARNING, "Error writing frame to channel %s\n", user->chan->name);
- }
+ ao2_ref(user, -1);
+ }
+ ao2_iterator_destroy(&user_iter);
}
static void sla_queue_event_full(enum sla_event_type type,
@@ -1564,8 +1609,9 @@
int setusercount = 0;
int confsilence = 0, totalsilence = 0;
- if (!(user = ast_calloc(1, sizeof(*user))))
+ if (!(user = ao2_alloc(sizeof(*user), NULL))) {
return ret;
+ }
/* Possible timeout waiting for marked user */
if ((confflags & CONFFLAG_WAITMARKED) &&
@@ -1630,13 +1676,11 @@
}
ast_mutex_lock(&conf->playlock);
-
- if (AST_LIST_EMPTY(&conf->userlist))
- user->user_no = 1;
- else
- user->user_no = AST_LIST_LAST(&conf->userlist)->user_no + 1;
-
- AST_LIST_INSERT_TAIL(&conf->userlist, user, list);
+ ao2_lock(conf->usercontainer);
+ ao2_callback(conf->usercontainer, OBJ_NODATA, user_max_cmp, &user->user_no);
+ user->user_no++;
+ ao2_link(conf->usercontainer, user);
+ ao2_unlock(conf->usercontainer);
user->chan = chan;
user->userflags = confflags;
@@ -1869,6 +1913,9 @@
}
conf_flush(fd, chan);
+
+ if (dsp)
+ ast_dsp_free(dsp);
if (!(dsp = ast_dsp_new())) {
ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
@@ -2202,15 +2249,21 @@
}
break;
case '3': /* Eject last user */
+ {
+ int max_no = 0;
+ ao2_callback(conf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no);
menu_active = 0;
- usr = AST_LIST_LAST(&conf->userlist);
+ usr = ao2_find(conf->usercontainer, &max_no, 0);
if ((usr->chan->name == chan->name)||(usr->userflags & CONFFLAG_ADMIN)) {
if(!ast_streamfile(chan, "conf-errormenu", chan->language))
ast_waitstream(chan, "");
- } else
+ } else {
usr->adminflags |= ADMINFLAG_KICKME;
+ }
+ ao2_ref(user, -1);
ast_stopstream(chan);
break;
+ }
case '4':
tweak_listen_volume(user, VOL_DOWN);
break;
@@ -2322,6 +2375,20 @@
}
} else if (f->frametype == AST_FRAME_NULL) {
/* Ignore NULL frames. It is perfectly normal to get these if the person is muted. */
+ } else if (f->frametype == AST_FRAME_CONTROL) {
+ switch (f->subclass) {
+ case AST_CONTROL_BUSY:
+ case AST_CONTROL_CONGESTION:
+ ast_frfree(f);
+ goto outrun;
+ break;
+ default:
+ if (option_debug) {
+ ast_log(LOG_DEBUG,
+ "Got ignored control frame on channel %s, f->frametype=%d,f->subclass=%d\n",
+ chan->name, f->frametype, f->subclass);
+ }
+ }
} else if (option_debug) {
ast_log(LOG_DEBUG,
"Got unrecognized frame on channel %s, f->frametype=%d,f->subclass=%d\n",
@@ -2456,7 +2523,9 @@
if (dsp)
ast_dsp_free(dsp);
- if (user->user_no) { /* Only cleanup users who really joined! */
+ if (!user->user_no) {
+ ao2_ref(user, -1);
+ } else { /* Only cleanup users who really joined! */
now = time(NULL);
hr = (now - user->jointime) / 3600;
min = ((now - user->jointime) % 3600) / 60;
@@ -2486,8 +2555,8 @@
if (confflags & CONFFLAG_MARKEDUSER)
conf->markedusers--;
}
- /* Remove ourselves from the list */
- AST_LIST_REMOVE(&conf->userlist, user, list);
+ /* Remove ourselves from the container */
+ ao2_unlink(conf->usercontainer, user);
/* Change any states */
if (!conf->users)
@@ -2497,7 +2566,6 @@
snprintf(meetmesecs, sizeof(meetmesecs), "%d", (int) (time(NULL) - user->jointime));
pbx_builtin_setvar_helper(chan, "MEETMESECS", meetmesecs);
}
- free(user);
AST_LIST_UNLOCK(&confs);
return ret;
@@ -2875,8 +2943,7 @@
} else {
if (((!ast_strlen_zero(cnf->pin) &&
!ast_test_flag(&confflags, CONFFLAG_ADMIN)) ||
- (!ast_strlen_zero(cnf->pinadmin) &&
- ast_test_flag(&confflags, CONFFLAG_ADMIN))) &&
+ !ast_strlen_zero(cnf->pinadmin)) &&
(!(cnf->users == 0 && cnf->isdynamic))) {
char pin[MAX_PIN] = "";
int j;
@@ -2960,12 +3027,69 @@
sscanf(callerident, "%30i", &cid);
if (conf && callerident) {
- AST_LIST_TRAVERSE(&conf->userlist, user, list) {
- if (cid == user->user_no)
- return user;
- }
+ user = ao2_find(conf->usercontainer, &cid, 0);
+ /* reference decremented later in admin_exec */
+ return user;
}
return NULL;
+}
+
+static int user_set_kickme_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ user->adminflags |= ADMINFLAG_KICKME;
+ return 0;
+}
+
+static int user_set_muted_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ if (!(user->userflags & CONFFLAG_ADMIN)) {
+ user->adminflags |= ADMINFLAG_MUTED;
+ }
+ return 0;
+}
+
+static int user_set_unmuted_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
+ return 0;
+}
+
+static int user_listen_volup_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ tweak_listen_volume(user, VOL_UP);
+ return 0;
+}
+
+static int user_listen_voldown_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ tweak_listen_volume(user, VOL_DOWN);
+ return 0;
+}
+
+static int user_talk_volup_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ tweak_talk_volume(user, VOL_UP);
+ return 0;
+}
+
+static int user_talk_voldown_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ tweak_talk_volume(user, VOL_DOWN);
+ return 0;
+}
+
+static int user_reset_vol_cb(void *obj, void *unused, int flags)
+{
+ struct ast_conf_user *user = obj;
+ reset_volumes(user);
+ return 0;
}
/*! \brief The MeetMeadmin application */
@@ -3013,8 +3137,13 @@
ast_atomic_fetchadd_int(&cnf->refcount, 1);
- if (args.user)
+ if (args.user) {
user = find_user(cnf, args.user);
+ if (!user) {
+ ast_log(LOG_NOTICE, "Specified User not found!\n");
+ goto usernotfound;
+ }
+ }
switch (*args.command) {
case 76: /* L: Lock */
@@ -3024,96 +3153,72 @@
cnf->locked = 0;
break;
case 75: /* K: kick all users */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- user->adminflags |= ADMINFLAG_KICKME;
+ ao2_callback(cnf->usercontainer, 0, user_set_kickme_cb, NULL);
break;
case 101: /* e: Eject last user*/
- user = AST_LIST_LAST(&cnf->userlist);
+ {
+ int max_no = 0;
+ ao2_callback(cnf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no);
+ user = ao2_find(cnf->usercontainer, &max_no, 0);
if (!(user->userflags & CONFFLAG_ADMIN))
user->adminflags |= ADMINFLAG_KICKME;
else
ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n");
+ ao2_ref(user, -1);
break;
+ }
case 77: /* M: Mute */
- if (user) {
- user->adminflags |= ADMINFLAG_MUTED;
- } else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ user->adminflags |= ADMINFLAG_MUTED;
break;
case 78: /* N: Mute all (non-admin) users */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list) {
- if (!(user->userflags & CONFFLAG_ADMIN))
- user->adminflags |= ADMINFLAG_MUTED;
- }
+ ao2_callback(cnf->usercontainer, 0, user_set_muted_cb, NULL);
break;
case 109: /* m: Unmute */
- if (user) {
- user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
- } else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
break;
case 110: /* n: Unmute all users */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
+ ao2_callback(cnf->usercontainer, 0, user_set_unmuted_cb, NULL);
break;
case 107: /* k: Kick user */
- if (user)
- user->adminflags |= ADMINFLAG_KICKME;
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ user->adminflags |= ADMINFLAG_KICKME;
break;
case 118: /* v: Lower all users listen volume */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- tweak_listen_volume(user, VOL_DOWN);
+ ao2_callback(cnf->usercontainer, 0, user_listen_voldown_cb, NULL);
break;
case 86: /* V: Raise all users listen volume */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- tweak_listen_volume(user, VOL_UP);
+ ao2_callback(cnf->usercontainer, 0, user_listen_volup_cb, NULL);
break;
case 115: /* s: Lower all users speaking volume */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- tweak_talk_volume(user, VOL_DOWN);
+ ao2_callback(cnf->usercontainer, 0, user_talk_voldown_cb, NULL);
break;
case 83: /* S: Raise all users speaking volume */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- tweak_talk_volume(user, VOL_UP);
+ ao2_callback(cnf->usercontainer, 0, user_talk_volup_cb, NULL);
break;
case 82: /* R: Reset all volume levels */
- AST_LIST_TRAVERSE(&cnf->userlist, user, list)
- reset_volumes(user);
+ ao2_callback(cnf->usercontainer, 0, user_reset_vol_cb, NULL);
break;
case 114: /* r: Reset user's volume level */
- if (user)
- reset_volumes(user);
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ reset_volumes(user);
break;
case 85: /* U: Raise user's listen volume */
- if (user)
- tweak_listen_volume(user, VOL_UP);
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ tweak_listen_volume(user, VOL_UP);
break;
case 117: /* u: Lower user's listen volume */
- if (user)
- tweak_listen_volume(user, VOL_DOWN);
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ tweak_listen_volume(user, VOL_DOWN);
break;
case 84: /* T: Raise user's talk volume */
- if (user)
- tweak_talk_volume(user, VOL_UP);
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ tweak_talk_volume(user, VOL_UP);
break;
case 116: /* t: Lower user's talk volume */
- if (user)
- tweak_talk_volume(user, VOL_DOWN);
- else
- ast_log(LOG_NOTICE, "Specified User not found!\n");
+ tweak_talk_volume(user, VOL_DOWN);
break;
}
+ if (args.user) {
+ /* decrement reference from find_user */
+ ao2_ref(user, -1);
+ }
+usernotfound:
AST_LIST_UNLOCK(&confs);
dispose_conf(cnf);
@@ -3161,9 +3266,7 @@
return 0;
}
- AST_LIST_TRAVERSE(&conf->userlist, user, list)
- if (user->user_no == userno)
- break;
+ user = ao2_find(conf->usercontainer, &userno, 0);
if (!user) {
AST_LIST_UNLOCK(&confs);
@@ -3180,6 +3283,7 @@
ast_log(LOG_NOTICE, "Requested to %smute conf %s user %d userchan %s uniqueid %s\n", mute ? "" : "un", conf->confno, user->user_no, user->chan->name, user->chan->uniqueid);
+ ao2_ref(user, -1);
astman_send_ack(s, m, mute ? "User muted" : "User unmuted");
return 0;
}
Modified: team/oej/cancel_elsewhere_1.4/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_queue.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_queue.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_queue.c Mon Sep 13 09:02:20 2010
@@ -577,10 +577,13 @@
struct member *member;
struct ao2_iterator mem_iter;
enum queue_member_status result = QUEUE_NO_MEMBERS;
+ int allpaused = 1, empty = 1;
ao2_lock(q);
mem_iter = ao2_iterator_init(q->members, 0);
while ((member = ao2_iterator_next(&mem_iter))) {
+ empty = 0;
+
if (max_penalty && (member->penalty > max_penalty)) {
ao2_ref(member, -1);
continue;
@@ -589,6 +592,8 @@
if (member->paused) {
ao2_ref(member, -1);
continue;
+ } else {
+ allpaused = 0;
}
switch (member->status) {
@@ -608,6 +613,10 @@
}
ao2_iterator_destroy(&mem_iter);
ao2_unlock(q);
+
+ if (!empty && allpaused) {
+ result = QUEUE_NO_REACHABLE_MEMBERS;
+ }
return result;
}
@@ -2325,7 +2334,9 @@
/* Setup parameters */
o->chan = ast_request(tech, in->nativeformats, stuff, &status);
if (!o->chan) {
- ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s'\n", tech, stuff);
+ ast_log(LOG_NOTICE,
+ "Forwarding failed to create channel to dial '%s/%s'\n",
+ tech, stuff);
o->stillgoing = 0;
numnochan++;
} else {
@@ -2350,8 +2361,9 @@
if (o->chan->cid.cid_rdnis)
free(o->chan->cid.cid_rdnis);
o->chan->cid.cid_rdnis = ast_strdup(S_OR(in->macroexten, in->exten));
- if (ast_call(o->chan, tmpchan, 0)) {
- ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
+ if (ast_call(o->chan, stuff, 0)) {
+ ast_log(LOG_NOTICE, "Forwarding failed to dial '%s/%s'\n",
+ tech, stuff);
do_hang(o);
numnochan++;
}
Modified: team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c (original)
+++ team/oej/cancel_elsewhere_1.4/apps/app_voicemail.c Mon Sep 13 09:02:20 2010
@@ -915,11 +915,12 @@
}
value = strstr(tmp,",");
if (!value) {
- ast_log(LOG_WARNING, "variable has bad format.\n");
- break;
+ new = alloca(strlen(newpassword)+1);
+ sprintf(new, "%s", newpassword);
+ } else {
+ new = alloca((strlen(value)+strlen(newpassword)+1));
+ sprintf(new,"%s%s", newpassword, value);
}
- new = alloca((strlen(value)+strlen(newpassword)+1));
- sprintf(new,"%s%s", newpassword, value);
if (!(cat = ast_category_get(cfg, category))) {
ast_log(LOG_WARNING, "Failed to get category structure.\n");
break;
@@ -3544,7 +3545,7 @@
ast_log(LOG_DEBUG, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", attach, format, vmu->volgain, mailbox);
}
} else {
- ast_log(LOG_WARNING, "Sox failed to reencode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format,
+ ast_log(LOG_WARNING, "Sox failed to re-encode %s.%s: %s (have you installed support for all sox file formats?)\n", attach, format,
soxstatus == 1 ? "Problem with command line options" : "An error occurred during file processing");
ast_log(LOG_WARNING, "Voicemail attachment will have no volume gain.\n");
}
@@ -5955,12 +5956,15 @@
DELETE(vms->curdir, x, vms->fn, vmu);
}
ast_unlock_path(vms->curdir);
-#else
+#else /* defined(IMAP_STORAGE) */
if (vms->deleted) {
- for (x=0;x < vmu->maxmsg;x++) {
- if (vms->deleted[x]) {
- if (option_debug > 2)
- ast_log(LOG_DEBUG,"IMAP delete of %d\n",x);
+ /* Since we now expunge after each delete, deleting in reverse order
+ * ensures that no reordering occurs between each step. */
+ for (x = vmu->maxmsg - 1; x >= 0; x--) {
+ if (vms->deleted[x]) {
+ if (option_debug > 2) {
+ ast_log(LOG_DEBUG, "IMAP delete of %d\n", x);
+ }
DELETE(vms->curdir, x, vms->fn, vmu);
}
}
Modified: team/oej/cancel_elsewhere_1.4/autoconf/ast_check_pwlib.m4
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/autoconf/ast_check_pwlib.m4?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/autoconf/ast_check_pwlib.m4 (original)
+++ team/oej/cancel_elsewhere_1.4/autoconf/ast_check_pwlib.m4 Mon Sep 13 09:02:20 2010
@@ -204,13 +204,23 @@
$2_BUILD_NUMBER=`echo ${$2_VERSION} | cut -f3 -d.`
let $2_VER=${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}
let $2_REQ=$4*10000+$5*100+$6
+ if test "x$10" = "x"; then
+ let $2_MAX=9999999
+ else
+ let $2_MAX=$8*10000+$9*100+$10
+ fi
AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
if test ${$2_VER} -lt ${$2_REQ}; then
AC_MSG_RESULT(no)
unset HAS_$2
else
- AC_MSG_RESULT(yes)
+ if test ${$2_VER} -gt ${$2_MAX}; then
+ AC_MSG_RESULT(no)
+ unset HAS_$2
+ else
+ AC_MSG_RESULT(yes)
+ fi
fi
fi
])
Modified: team/oej/cancel_elsewhere_1.4/autoconf/ast_func_fork.m4
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/autoconf/ast_func_fork.m4?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/autoconf/ast_func_fork.m4 (original)
+++ team/oej/cancel_elsewhere_1.4/autoconf/ast_func_fork.m4 Mon Sep 13 09:02:20 2010
@@ -13,7 +13,7 @@
fi
if test "x$ac_cv_func_fork_works" = xcross; then
case $host in
- *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* | *-*-linux-uclibc* )
+ *-*-amigaos* | *-*-msdosdjgpp* | *-*-uclinux* )
# Override, as these systems have only a dummy fork() stub
ac_cv_func_fork_works=no
;;
Modified: team/oej/cancel_elsewhere_1.4/build_tools/cflags-devmode.xml
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/build_tools/cflags-devmode.xml?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/build_tools/cflags-devmode.xml (original)
+++ team/oej/cancel_elsewhere_1.4/build_tools/cflags-devmode.xml Mon Sep 13 09:02:20 2010
@@ -12,4 +12,6 @@
</member>
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
</member>
+ <member name="TEST_FRAMEWORK" displayname="Enable Test Framework API">
+ </member>
</category>
Modified: team/oej/cancel_elsewhere_1.4/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/channels/chan_agent.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/channels/chan_agent.c (original)
+++ team/oej/cancel_elsewhere_1.4/channels/chan_agent.c Mon Sep 13 09:02:20 2010
@@ -707,7 +707,12 @@
ast_mutex_lock(&p->lock);
if (p->chan && !ast_check_hangup(p->chan)) {
while (ast_channel_trylock(p->chan)) {
- ast_channel_unlock(ast);
+ int res;
+ if ((res = ast_channel_unlock(ast))) {
+ ast_log(LOG_ERROR, "chan_agent bug! Channel was not locked upon entry to agent_indicate: %s\n", strerror(res));
+ ast_mutex_unlock(&p->lock);
+ return -1;
+ }
usleep(1);
ast_channel_lock(ast);
}
Modified: team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c (original)
+++ team/oej/cancel_elsewhere_1.4/channels/chan_alsa.c Mon Sep 13 09:02:20 2010
@@ -277,34 +277,25 @@
static void *sound_thread(void *unused)
{
- fd_set rfds;
- fd_set wfds;
- int max, res;
+ struct pollfd pfd[3] = { { .fd = sndcmd[0], .events = POLLIN }, { .fd = writedev }, { .fd = readdev } };
+ int res, x;
for (;;) {
- FD_ZERO(&rfds);
- FD_ZERO(&wfds);
- max = sndcmd[0];
- FD_SET(sndcmd[0], &rfds);
- if (cursound > -1) {
- FD_SET(writedev, &wfds);
- if (writedev > max)
- max = writedev;
- }
+ for (x = 0; x < 3; x++) {
+ pfd[x].revents = 0;
+ }
+
+ pfd[1].events = cursound > -1 ? POLLOUT : 0;
#ifdef ALSA_MONITOR
- if (!alsa.owner) {
- FD_SET(readdev, &rfds);
- if (readdev > max)
- max = readdev;
- }
-#endif
- res = ast_select(max + 1, &rfds, &wfds, NULL, NULL);
+ pfd[2].events = !alsa.owner ? POLLIN : 0;
+#endif
+ res = ast_poll(pfd, 3, -1);
if (res < 1) {
- ast_log(LOG_WARNING, "select failed: %s\n", strerror(errno));
+ ast_log(LOG_WARNING, "poll() failed: %s\n", strerror(errno));
continue;
}
#ifdef ALSA_MONITOR
- if (FD_ISSET(readdev, &rfds)) {
+ if (pfd[2].revents & POLLIN) {
/* Keep the pipe going with read audio */
snd_pcm_state_t state;
short buf[FRAME_SIZE];
@@ -329,7 +320,7 @@
alsa_monitor_read((char *) buf, r * 2);
}
#endif
- if (FD_ISSET(sndcmd[0], &rfds)) {
+ if (pfd[0].revents & POLLIN) {
if (read(sndcmd[0], &cursound, sizeof(cursound)) < 0) {
ast_log(LOG_WARNING, "read() failed: %s\n", strerror(errno));
}
@@ -337,9 +328,11 @@
offset = 0;
sampsent = 0;
}
- if (FD_ISSET(writedev, &wfds))
- if (send_sound())
+ if (pfd[1].revents & POLLOUT) {
+ if (send_sound()) {
ast_log(LOG_WARNING, "Failed to write sound\n");
+ }
+ }
}
/* Never reached */
return NULL;
Modified: team/oej/cancel_elsewhere_1.4/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/cancel_elsewhere_1.4/channels/chan_dahdi.c?view=diff&rev=286377&r1=286376&r2=286377
==============================================================================
--- team/oej/cancel_elsewhere_1.4/channels/chan_dahdi.c (original)
+++ team/oej/cancel_elsewhere_1.4/channels/chan_dahdi.c Mon Sep 13 09:02:20 2010
@@ -3416,10 +3416,10 @@
case AST_OPTION_ECHOCAN:
cp = (char *) data;
if (*cp) {
- ast_log(LOG_DEBUG, "Enabling echo cancelation on %s\n", chan->name);
+ ast_log(LOG_DEBUG, "Enabling echo cancellation on %s\n", chan->name);
dahdi_enable_ec(p);
} else {
- ast_log(LOG_DEBUG, "Disabling echo cancelation on %s\n", chan->name);
+ ast_log(LOG_DEBUG, "Disabling echo cancellation on %s\n", chan->name);
dahdi_disable_ec(p);
}
break;
@@ -4399,8 +4399,12 @@
/* Here we have to retain the lock on both the main channel, the 3-way channel, and
the private structure -- not especially easy or clean */
[... 5514 lines stripped ...]
More information about the svn-commits
mailing list