[asterisk-commits] oej: branch group/bufo-manager-setvar-trunk r317902 - in /team/group/bufo-man...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri May 6 15:26:38 CDT 2011
Author: oej
Date: Fri May 6 15:26:12 2011
New Revision: 317902
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317902
Log:
Reset, resolve, merge. Go to bed. No more snow, please.
Modified:
team/group/bufo-manager-setvar-trunk/ (props changed)
team/group/bufo-manager-setvar-trunk/CHANGES
team/group/bufo-manager-setvar-trunk/Makefile
team/group/bufo-manager-setvar-trunk/UPGRADE.txt
team/group/bufo-manager-setvar-trunk/addons/app_mysql.c
team/group/bufo-manager-setvar-trunk/addons/cdr_mysql.c
team/group/bufo-manager-setvar-trunk/addons/res_config_mysql.c
team/group/bufo-manager-setvar-trunk/apps/app_amd.c
team/group/bufo-manager-setvar-trunk/apps/app_chanspy.c
team/group/bufo-manager-setvar-trunk/apps/app_confbridge.c
team/group/bufo-manager-setvar-trunk/apps/app_dial.c
team/group/bufo-manager-setvar-trunk/apps/app_festival.c
team/group/bufo-manager-setvar-trunk/apps/app_followme.c
team/group/bufo-manager-setvar-trunk/apps/app_ices.c
team/group/bufo-manager-setvar-trunk/apps/app_meetme.c
team/group/bufo-manager-setvar-trunk/apps/app_minivm.c
team/group/bufo-manager-setvar-trunk/apps/app_originate.c
team/group/bufo-manager-setvar-trunk/apps/app_queue.c
team/group/bufo-manager-setvar-trunk/apps/app_rpt.c
team/group/bufo-manager-setvar-trunk/apps/app_voicemail.c
team/group/bufo-manager-setvar-trunk/autoconf/ast_check_pwlib.m4
team/group/bufo-manager-setvar-trunk/bridges/bridge_softmix.c
team/group/bufo-manager-setvar-trunk/cdr/cdr_radius.c
team/group/bufo-manager-setvar-trunk/cdr/cdr_syslog.c
team/group/bufo-manager-setvar-trunk/cel/cel_pgsql.c
team/group/bufo-manager-setvar-trunk/channels/chan_agent.c
team/group/bufo-manager-setvar-trunk/channels/chan_alsa.c
team/group/bufo-manager-setvar-trunk/channels/chan_console.c
team/group/bufo-manager-setvar-trunk/channels/chan_dahdi.c
team/group/bufo-manager-setvar-trunk/channels/chan_h323.c
team/group/bufo-manager-setvar-trunk/channels/chan_iax2.c
team/group/bufo-manager-setvar-trunk/channels/chan_jingle.c
team/group/bufo-manager-setvar-trunk/channels/chan_local.c
team/group/bufo-manager-setvar-trunk/channels/chan_mgcp.c
team/group/bufo-manager-setvar-trunk/channels/chan_oss.c
team/group/bufo-manager-setvar-trunk/channels/chan_phone.c
team/group/bufo-manager-setvar-trunk/channels/chan_sip.c
team/group/bufo-manager-setvar-trunk/channels/chan_skinny.c
team/group/bufo-manager-setvar-trunk/channels/chan_unistim.c
team/group/bufo-manager-setvar-trunk/channels/chan_usbradio.c
team/group/bufo-manager-setvar-trunk/channels/iax2-provision.c
team/group/bufo-manager-setvar-trunk/channels/misdn_config.c
team/group/bufo-manager-setvar-trunk/channels/sig_analog.c
team/group/bufo-manager-setvar-trunk/channels/sig_pri.c
team/group/bufo-manager-setvar-trunk/channels/sig_pri.h
team/group/bufo-manager-setvar-trunk/channels/sip/include/sip.h
team/group/bufo-manager-setvar-trunk/channels/sip/reqresp_parser.c
team/group/bufo-manager-setvar-trunk/channels/sip/sdp_crypto.c
team/group/bufo-manager-setvar-trunk/codecs/lpc10/dyptrk.c
team/group/bufo-manager-setvar-trunk/configs/cel.conf.sample
team/group/bufo-manager-setvar-trunk/configs/cel_pgsql.conf.sample
team/group/bufo-manager-setvar-trunk/configs/extensions.lua.sample
team/group/bufo-manager-setvar-trunk/configs/http.conf.sample
team/group/bufo-manager-setvar-trunk/configs/sip.conf.sample
team/group/bufo-manager-setvar-trunk/configs/skinny.conf.sample
team/group/bufo-manager-setvar-trunk/configure
team/group/bufo-manager-setvar-trunk/contrib/realtime/mysql/meetme.sql
team/group/bufo-manager-setvar-trunk/contrib/realtime/mysql/queue_log.sql
team/group/bufo-manager-setvar-trunk/contrib/realtime/mysql/sipfriends.sql
team/group/bufo-manager-setvar-trunk/contrib/scripts/safe_asterisk
team/group/bufo-manager-setvar-trunk/formats/format_wav.c
team/group/bufo-manager-setvar-trunk/funcs/func_curl.c
team/group/bufo-manager-setvar-trunk/funcs/func_enum.c
team/group/bufo-manager-setvar-trunk/funcs/func_jitterbuffer.c
team/group/bufo-manager-setvar-trunk/include/asterisk/linkedlists.h
team/group/bufo-manager-setvar-trunk/include/asterisk/select.h
team/group/bufo-manager-setvar-trunk/main/asterisk.c
team/group/bufo-manager-setvar-trunk/main/astobj2.c
team/group/bufo-manager-setvar-trunk/main/audiohook.c
team/group/bufo-manager-setvar-trunk/main/cdr.c
team/group/bufo-manager-setvar-trunk/main/channel.c
team/group/bufo-manager-setvar-trunk/main/config.c
team/group/bufo-manager-setvar-trunk/main/dsp.c
team/group/bufo-manager-setvar-trunk/main/features.c
team/group/bufo-manager-setvar-trunk/main/file.c
team/group/bufo-manager-setvar-trunk/main/fskmodem_float.c
team/group/bufo-manager-setvar-trunk/main/http.c
team/group/bufo-manager-setvar-trunk/main/manager.c
team/group/bufo-manager-setvar-trunk/main/pbx.c
team/group/bufo-manager-setvar-trunk/main/plc.c
team/group/bufo-manager-setvar-trunk/main/rtp_engine.c
team/group/bufo-manager-setvar-trunk/main/udptl.c
team/group/bufo-manager-setvar-trunk/main/utils.c
team/group/bufo-manager-setvar-trunk/pbx/pbx_config.c
team/group/bufo-manager-setvar-trunk/pbx/pbx_dundi.c
team/group/bufo-manager-setvar-trunk/pbx/pbx_lua.c
team/group/bufo-manager-setvar-trunk/res/res_agi.c
team/group/bufo-manager-setvar-trunk/res/res_calendar.c
team/group/bufo-manager-setvar-trunk/res/res_config_odbc.c
team/group/bufo-manager-setvar-trunk/res/res_config_sqlite.c
team/group/bufo-manager-setvar-trunk/res/res_crypto.c
team/group/bufo-manager-setvar-trunk/res/res_fax.c
team/group/bufo-manager-setvar-trunk/res/res_fax_spandsp.c
team/group/bufo-manager-setvar-trunk/res/res_jabber.c
team/group/bufo-manager-setvar-trunk/res/res_musiconhold.c
team/group/bufo-manager-setvar-trunk/res/res_odbc.c
team/group/bufo-manager-setvar-trunk/sounds/Makefile
team/group/bufo-manager-setvar-trunk/sounds/sounds.xml
Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Fri May 6 15:26:12 2011
@@ -1,1 +1,1 @@
-/branches/1.8:299531,313436
+/branches/1.8:299531,313436,317858,317861
Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/group/bufo-manager-setvar-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 6 15:26:12 2011
@@ -1,1 +1,1 @@
-/trunk:1-314599
+/trunk:1-317868
Modified: team/group/bufo-manager-setvar-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/CHANGES?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/CHANGES (original)
+++ team/group/bufo-manager-setvar-trunk/CHANGES Fri May 6 15:26:12 2011
@@ -93,6 +93,8 @@
--------------------------
* Added setvar option to calendar.conf to allow setting channel variables on
notification channels.
+ * Added "calendar show types" CLI command to list registered calendar
+ connectors.
MixMonitor
--------------------------
@@ -106,6 +108,24 @@
* Added a new option, l, which will disable local call optimization for
channels involved with the FollowMe thread. Use this option to improve
compatability for a FollowMe call with certain dialplan apps, options, and
+ functions.
+
+CEL
+--------------------------
+ * cel_pgsql now supports the 'extra' column for data added using the
+ CELGenUserEvent() application.
+
+pbx_lua
+--------------------------
+ * Support for defining hints has been added to pbx_lua. See the 'hints' table
+ in the sample extensions.lua file for syntax details.
+ * Applications that perform jumps in the dialplan such as Goto will now
+ execute properly. When pbx_lua detects that the context, extension, or
+ priority we are executing on has changed it will immediatly return control
+ to the asterisk PBX engine. Currently the engine cannot detect a Goto to
+ the priority after the currently executing priority.
+ * An autoservice is now started by default for pbx_lua channels. It can be
+ stopped and restarted using the autoservice_stop() and autoservice_start()
functions.
------------------------------------------------------------------------------
Modified: team/group/bufo-manager-setvar-trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/Makefile?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/Makefile (original)
+++ team/group/bufo-manager-setvar-trunk/Makefile Fri May 6 15:26:12 2011
@@ -545,7 +545,6 @@
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-csv"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation"
@@ -925,7 +924,7 @@
menuselect/makeopts: makeopts
+$(MAKE_MENUSELECT) makeopts
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
@echo "Generating input for menuselect ..."
@echo "<?xml version=\"1.0\"?>" > $@
@echo >> $@
Modified: team/group/bufo-manager-setvar-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/UPGRADE.txt?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/UPGRADE.txt (original)
+++ team/group/bufo-manager-setvar-trunk/UPGRADE.txt Fri May 6 15:26:12 2011
@@ -21,6 +21,10 @@
From 1.8 to 1.10:
+cel_pgsql:
+ - This module now expects an 'extra' column in the database for data added
+ using the CELGenUserEvent() application.
+
ConfBridge
- ConfBridge's dialplan arguments have changed and are not
backwards compatible.
@@ -38,5 +42,13 @@
- The mohinterpret=passthrough setting is deprecated in favor of
moh_signaling=notify.
+pbx_lua:
+ - Execution no longer continues after applications that do dialplan jumps
+ (such as app.goto). Now when an application such as app.goto() is called,
+ control is returned back to the pbx engine and the current extension
+ function stops executing.
+ - the autoservice now defaults to being on by default
+ - autoservice_start() and autoservice_start() no longer return a value.
+
===========================================================
===========================================================
Modified: team/group/bufo-manager-setvar-trunk/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/addons/app_mysql.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/addons/app_mysql.c (original)
+++ team/group/bufo-manager-setvar-trunk/addons/app_mysql.c Fri May 6 15:26:12 2011
@@ -546,7 +546,10 @@
result = 0;
if (autoclear) {
- struct ast_datastore *mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
+ struct ast_datastore *mysql_store = NULL;
+
+ ast_channel_lock(chan);
+ mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
if (!mysql_store) {
if (!(mysql_store = ast_datastore_alloc(&mysql_ds_info, NULL))) {
ast_log(LOG_WARNING, "Unable to allocate new datastore.\n");
@@ -555,6 +558,7 @@
ast_channel_datastore_add(chan, mysql_store);
}
}
+ ast_channel_unlock(chan);
}
ast_mutex_lock(&_mysql_mutex);
Modified: team/group/bufo-manager-setvar-trunk/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/addons/cdr_mysql.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/addons/cdr_mysql.c (original)
+++ team/group/bufo-manager-setvar-trunk/addons/cdr_mysql.c Fri May 6 15:26:12 2011
@@ -325,7 +325,7 @@
ast_str_make_space(&escape, (valsz = strlen(value)) * 2 + 1);
mysql_real_escape_string(&mysql, ast_str_buffer(escape), value, valsz);
- ast_str_append(&sql1, 0, "%s", entry->name);
+ ast_str_append(&sql1, 0, "`%s`", entry->name);
ast_str_append(&sql2, 0, "'%s'", ast_str_buffer(escape));
}
}
Modified: team/group/bufo-manager-setvar-trunk/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/addons/res_config_mysql.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/addons/res_config_mysql.c (original)
+++ team/group/bufo-manager-setvar-trunk/addons/res_config_mysql.c Fri May 6 15:26:12 2011
@@ -398,7 +398,7 @@
} else if (ast_strlen_zero(row[i])) {
row[i] = " ";
}
- for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+ for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
if (prev) {
if ((prev->next = ast_variable_new(fields[i].name, decode_chunk(chunk), ""))) {
prev = prev->next;
@@ -524,7 +524,7 @@
for (i = 0; i < numFields; i++) {
if (ast_strlen_zero(row[i]))
continue;
- for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+ for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
if (chunk && !ast_strlen_zero(decode_chunk(ast_strip(chunk)))) {
if (initfield && !strcmp(initfield, fields[i].name)) {
ast_category_rename(cat, chunk);
@@ -608,7 +608,7 @@
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "UPDATE %s SET %s = '%s'", tablename, newparam, ast_str_buffer(buf));
+ ast_str_set(&sql, 0, "UPDATE %s SET `%s` = '%s'", tablename, newparam, ast_str_buffer(buf));
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -625,7 +625,7 @@
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, ", %s = '%s'", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, ", `%s` = '%s'", newparam, ast_str_buffer(buf));
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -635,7 +635,7 @@
va_end(ap);
ESCAPE_STRING(buf, lookup);
- ast_str_append(&sql, 0, " WHERE %s = '%s'", keyfield, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, " WHERE `%s` = '%s'", keyfield, ast_str_buffer(buf));
ast_debug(1, "MySQL RealTime: Update SQL: %s\n", ast_str_buffer(sql));
@@ -719,7 +719,7 @@
return -1;
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&where, 0, "%s %s='%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
+ ast_str_append(&where, 0, "%s `%s` = '%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
first = 0;
/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -744,7 +744,7 @@
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, "%s %s = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, "%s `%s` = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
first = 0;
/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -816,7 +816,7 @@
/* Create the first part of the query using the first parameter/value pairs we just extracted
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "INSERT INTO %s (%s", table, newparam);
+ ast_str_set(&sql, 0, "INSERT INTO %s (`%s`", table, newparam);
ast_str_set(&sql2, 0, ") VALUES ('%s'", ast_str_buffer(buf));
internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
@@ -828,7 +828,7 @@
ast_str_reset(buf);
}
if (internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL) == 0) {
- ast_str_append(&sql, 0, ", %s", newparam);
+ ast_str_append(&sql, 0, ", `%s`", newparam);
ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf));
}
}
@@ -894,11 +894,11 @@
/* Create the first part of the query using the first parameter/value pairs we just extracted
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, lookup);
- ast_str_set(&sql, 0, "DELETE FROM %s WHERE %s = '%s'", table, keyfield, ast_str_buffer(buf));
+ ast_str_set(&sql, 0, "DELETE FROM %s WHERE `%s` = '%s'", table, keyfield, ast_str_buffer(buf));
while ((newparam = va_arg(ap, const char *))) {
newval = va_arg(ap, const char *);
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, " AND %s = '%s'", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, " AND `%s` = '%s'", newparam, ast_str_buffer(buf));
}
va_end(ap);
@@ -1074,7 +1074,7 @@
res = -1;
break;
}
- ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY %s %s", tablename, column->name, ast_str_buffer(typestr));
+ ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY `%s` %s", tablename, column->name, ast_str_buffer(typestr));
if (!column->null) {
ast_str_append(&sql, 0, " NOT NULL");
}
Modified: team/group/bufo-manager-setvar-trunk/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_amd.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_amd.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_amd.c Fri May 6 15:26:12 2011
@@ -157,7 +157,6 @@
int iTotalTime = 0;
int iWordsCount = 0;
int currentState = STATE_IN_WORD;
- int previousState = STATE_IN_SILENCE;
int consecutiveVoiceDuration = 0;
char amdCause[256] = "", amdStatus[256] = "";
char *parse = ast_strdupa(data);
@@ -303,7 +302,6 @@
if (silenceDuration >= betweenWordsSilence) {
if (currentState != STATE_IN_SILENCE ) {
- previousState = currentState;
ast_verb(3, "AMD: Channel [%s]. Changed state to STATE_IN_SILENCE\n", chan->name);
}
/* Find words less than word duration */
@@ -343,7 +341,6 @@
if (consecutiveVoiceDuration >= minimumWordLength && currentState == STATE_IN_SILENCE) {
iWordsCount++;
ast_verb(3, "AMD: Channel [%s]. Word detected. iWordsCount:%d\n", chan->name, iWordsCount);
- previousState = currentState;
currentState = STATE_IN_WORD;
}
if (consecutiveVoiceDuration >= maximumWordLength){
Modified: team/group/bufo-manager-setvar-trunk/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_chanspy.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_chanspy.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_chanspy.c Fri May 6 15:26:12 2011
@@ -404,6 +404,7 @@
struct ast_audiohook bridge_whisper_audiohook;
int fd;
int volfactor;
+ struct ast_flags flags;
};
struct spy_dtmf_options {
@@ -438,7 +439,7 @@
return -1;
}
- if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) {
+ if (ast_test_flag(&csth->flags, OPTION_READONLY)) {
/* Option 'o' was set, so don't mix channel audio */
f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, &format_slin);
} else {
@@ -539,7 +540,7 @@
spyer_name, name);
memset(&csth, 0, sizeof(csth));
- ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL);
+ ast_copy_flags(&csth.flags, flags, AST_FLAGS_ALL);
ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy", 0);
Modified: team/group/bufo-manager-setvar-trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_confbridge.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_confbridge.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_confbridge.c Fri May 6 15:26:12 2011
@@ -299,9 +299,9 @@
case CONF_SOUND_ERROR_MENU:
return S_OR(custom_sounds->errormenu, "conf-errormenu");
case CONF_SOUND_JOIN:
- return S_OR(custom_sounds->join, "beep");
+ return S_OR(custom_sounds->join, "confbridge-join");
case CONF_SOUND_LEAVE:
- return S_OR(custom_sounds->leave, "beeperr");
+ return S_OR(custom_sounds->leave, "confbridge-leave");
}
return "";
Modified: team/group/bufo-manager-setvar-trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_dial.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_dial.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_dial.c Fri May 6 15:26:12 2011
@@ -2243,6 +2243,7 @@
* No hint name available. We have a connected name supplied by
* the dialplan we can use instead.
*/
+ caller.id.name.valid = 1;
caller.id.name = chan->connected.id.name;
}
ast_channel_set_caller_event(tc, &caller, NULL);
@@ -2256,6 +2257,7 @@
* We have a connected name supplied by the dialplan we can
* use instead.
*/
+ caller.id.name.valid = 1;
caller.id.name = chan->connected.id.name;
ast_channel_set_caller_event(tc, &caller, NULL);
}
@@ -2393,14 +2395,6 @@
peer = wait_for_answer(chan, outgoing, &to, peerflags, opt_args, &pa, &num, &result,
dtmf_progress, ignore_cc, &forced_clid, &stored_clid);
- /* The ast_channel_datastore_remove() function could fail here if the
- * datastore was moved to another channel during a masquerade. If this is
- * the case, don't free the datastore here because later, when the channel
- * to which the datastore was moved hangs up, it will attempt to free this
- * datastore again, causing a crash
- */
- if (!ast_channel_datastore_remove(chan, datastore))
- ast_datastore_free(datastore);
if (!peer) {
if (result) {
res = result;
Modified: team/group/bufo-manager-setvar-trunk/apps/app_festival.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_festival.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_festival.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_festival.c Fri May 6 15:26:12 2011
@@ -163,7 +163,6 @@
{
int res = 0;
int fds[2];
- int pid = -1;
int needed = 0;
struct ast_format owriteformat;
struct ast_frame *f;
@@ -196,7 +195,6 @@
res = send_waveform_to_fd(waveform, length, fds[1]);
if (res >= 0) {
- pid = res;
/* Order is important -- there's almost always going to be mp3... we want to prioritize the
user */
for (;;) {
@@ -258,10 +256,6 @@
close(fds[0]);
close(fds[1]);
-#if 0
- if (pid > -1)
- kill(pid, SIGKILL);
-#endif
if (!res && owriteformat.id)
ast_set_write_format(chan, &owriteformat);
return res;
@@ -285,7 +279,6 @@
char ack[4];
char *waveform;
int filesize;
- int wave;
char bigstring[MAXFESTLEN];
int i;
struct MD5Context md5ctx;
@@ -494,7 +487,6 @@
/* Read back info from server */
/* This assumes only one waveform will come back, also LP is unlikely */
- wave = 0;
do {
int read_data;
for (n = 0; n < 3; ) {
Modified: team/group/bufo-manager-setvar-trunk/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_followme.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_followme.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_followme.c Fri May 6 15:26:12 2011
@@ -804,7 +804,6 @@
char *rest, *number;
struct findme_user *tmpuser;
struct findme_user *fmuser;
- struct findme_user *headuser;
struct findme_user_listptr *findme_user_list;
int status;
@@ -915,7 +914,6 @@
fmuser = NULL;
tmpuser = NULL;
- headuser = NULL;
if (winner)
break;
Modified: team/group/bufo-manager-setvar-trunk/apps/app_ices.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_ices.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_ices.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_ices.c Fri May 6 15:26:12 2011
@@ -112,7 +112,6 @@
int pid = -1;
int flags;
struct ast_format oreadformat;
- struct timeval last;
struct ast_frame *f;
char filename[256]="";
char *c;
@@ -122,8 +121,6 @@
ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
return -1;
}
-
- last = ast_tv(0, 0);
if (pipe(fds)) {
ast_log(LOG_WARNING, "Unable to create pipe\n");
Modified: team/group/bufo-manager-setvar-trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_meetme.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_meetme.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_meetme.c Fri May 6 15:26:12 2011
@@ -780,13 +780,13 @@
char usrvalue[50]; /*!< Custom User Value */
char namerecloc[PATH_MAX]; /*!< Name Recorded file Location */
time_t jointime; /*!< Time the user joined the conference */
- time_t kicktime; /*!< Time the user will be kicked from the conference */
- struct timeval start_time; /*!< Time the user entered into the conference */
- long timelimit; /*!< Time limit for the user to be in the conference L(x:y:z) */
- long play_warning; /*!< Play a warning when 'y' ms are left */
- long warning_freq; /*!< Repeat the warning every 'z' ms */
- const char *warning_sound; /*!< File to play as warning if 'y' is defined */
- const char *end_sound; /*!< File to play when time is up. */
+ time_t kicktime; /*!< Time the user will be kicked from the conference */
+ struct timeval start_time; /*!< Time the user entered into the conference */
+ long timelimit; /*!< Time limit for the user to be in the conference L(x:y:z) */
+ long play_warning; /*!< Play a warning when 'y' ms are left */
+ long warning_freq; /*!< Repeat the warning every 'z' ms */
+ const char *warning_sound; /*!< File to play as warning if 'y' is defined */
+ const char *end_sound; /*!< File to play when time is up. */
struct volume talk;
struct volume listen;
AST_LIST_ENTRY(ast_conf_user) list;
@@ -2733,7 +2733,7 @@
ao2_ref(item, -1);
}
- if (ast_test_flag64(confflags, CONFFLAG_WAITMARKED && !conf->markedusers))
+ if (ast_test_flag64(confflags, CONFFLAG_WAITMARKED) && !conf->markedusers)
dahdic.confmode = DAHDI_CONF_CONF;
else if (ast_test_flag64(confflags, CONFFLAG_MONITOR))
dahdic.confmode = DAHDI_CONF_CONFMON | DAHDI_CONF_LISTENER;
@@ -2918,6 +2918,11 @@
res = ast_streamfile(chan, user->end_sound, chan->language);
res = ast_waitstream(chan, "");
}
+ if (ast_test_flag64(confflags, CONFFLAG_KICK_CONTINUE)) {
+ ret = 0;
+ } else {
+ ret = -1;
+ }
break;
}
Modified: team/group/bufo-manager-setvar-trunk/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_minivm.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_minivm.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_minivm.c Fri May 6 15:26:12 2011
@@ -1229,7 +1229,7 @@
struct ast_tm tm;
struct minivm_zone *the_zone = NULL;
struct ast_channel *ast;
- char *finalfilename;
+ char *finalfilename = "";
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *fromaddress;
char *fromemail;
@@ -1266,13 +1266,22 @@
char tmpcmd[PATH_MAX];
int tmpfd;
+ /**
+ * XXX
+ * /bug tmpfd is a leaked fd. The file is also never unlinked.
+ * See app_voicemail.c for how the code works there that
+ * doesn't have this bug.
+ */
+
ast_copy_string(newtmp, "/tmp/XXXXXX", sizeof(newtmp));
ast_debug(3, "newtmp: %s\n", newtmp);
tmpfd = mkstemp(newtmp);
- snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, filename, format, newtmp, format);
- ast_safe_system(tmpcmd);
- finalfilename = newtmp;
- ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username);
+ if (tmpfd > -1) {
+ snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, filename, format, newtmp, format);
+ ast_safe_system(tmpcmd);
+ finalfilename = newtmp;
+ ast_debug(3, "VOLGAIN: Stored at: %s.%s - Level: %.4f - Mailbox: %s\n", filename, format, vmu->volgain, vmu->username);
+ }
} else {
finalfilename = ast_strdupa(filename);
}
@@ -1828,7 +1837,6 @@
char callerid[256];
FILE *txt;
int res = 0, txtdes;
- int msgnum;
int duration = 0;
char date[256];
char tmpdir[PATH_MAX];
@@ -1871,7 +1879,6 @@
pbx_builtin_setvar_helper(chan, "MVM_RECORD_STATUS", "FAILED");
return res;
}
- msgnum = 0;
userdir = check_dirpath(tmpdir, sizeof(tmpdir), vmu->domain, username, "tmp");
@@ -2452,7 +2459,6 @@
char *message = NULL;
char *prompt = NULL;
int duration;
- int cmd;
if (ast_strlen_zero(data)) {
ast_log(LOG_ERROR, "MinivmAccmess needs at least two arguments: account and option\n");
@@ -2526,7 +2532,7 @@
}
snprintf(filename,sizeof(filename), "%s%s/%s/%s", MVM_SPOOL_DIR, vmu->domain, vmu->username, message);
/* Maybe we should check the result of play_record_review ? */
- cmd = play_record_review(chan, prompt, filename, global_maxgreet, default_vmformat, 0, vmu, &duration, NULL, FALSE);
+ play_record_review(chan, prompt, filename, global_maxgreet, default_vmformat, 0, vmu, &duration, NULL, FALSE);
ast_debug(1, "Recorded new %s message in %s (duration %d)\n", message, filename, duration);
@@ -3238,12 +3244,10 @@
check_dirpath(buf, len, vmu->domain, vmu->username, NULL);
} else { /* Look in channel variables */
struct ast_variable *var;
- int found = 0;
for (var = vmu->chanvars ; var ; var = var->next)
if (!strcmp(var->name, colname)) {
ast_copy_string(buf, var->value, len);
- found = 1;
break;
}
}
Modified: team/group/bufo-manager-setvar-trunk/apps/app_originate.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_originate.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_originate.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_originate.c Fri May 6 15:26:12 2011
@@ -101,7 +101,6 @@
char *parse;
char *chantech, *chandata;
int res = -1;
- int outgoing_res = 0;
int outgoing_status = 0;
static const unsigned int timeout = 30;
static const char default_exten[] = "s";
@@ -154,14 +153,14 @@
ast_debug(1, "Originating call to '%s/%s' and connecting them to extension %s,%s,%d\n",
chantech, chandata, args.arg1, exten, priority);
- outgoing_res = ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
+ ast_pbx_outgoing_exten(chantech, cap_slin, chandata,
timeout * 1000, args.arg1, exten, priority, &outgoing_status, 0, NULL,
NULL, NULL, NULL, NULL);
} else if (!strcasecmp(args.type, "app")) {
ast_debug(1, "Originating call to '%s/%s' and connecting them to %s(%s)\n",
chantech, chandata, args.arg1, S_OR(args.arg2, ""));
- outgoing_res = ast_pbx_outgoing_app(chantech, cap_slin, chandata,
+ ast_pbx_outgoing_app(chantech, cap_slin, chandata,
timeout * 1000, args.arg1, args.arg2, &outgoing_status, 0, NULL,
NULL, NULL, NULL, NULL);
} else {
Modified: team/group/bufo-manager-setvar-trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_queue.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_queue.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_queue.c Fri May 6 15:26:12 2011
@@ -999,7 +999,7 @@
struct queue_ent {
struct call_queue *parent; /*!< What queue is our parent */
char moh[80]; /*!< Name of musiconhold to be used */
- char announce[80]; /*!< Announcement to play for member when call is answered */
+ char announce[PATH_MAX]; /*!< Announcement to play for member when call is answered */
char context[AST_MAX_CONTEXT]; /*!< Context when user exits queue */
char digits[AST_MAX_EXTENSION]; /*!< Digits entered while in queue */
int valid_digits; /*!< Digits entered correspond to valid extension. Exited */
@@ -4323,7 +4323,6 @@
char *agiexec = NULL;
char *macroexec = NULL;
char *gosubexec = NULL;
- int ret = 0;
const char *monitorfilename;
const char *monitor_exec;
const char *monitor_options;
@@ -4849,7 +4848,7 @@
/* We purposely lock the CDR so that pbx_exec does not update the application data */
if (qe->chan->cdr)
ast_set_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED);
- ret = pbx_exec(qe->chan, mixmonapp, mixmonargs);
+ pbx_exec(qe->chan, mixmonapp, mixmonargs);
if (qe->chan->cdr)
ast_clear_flag(qe->chan->cdr, AST_CDR_FLAG_LOCKED);
@@ -4981,7 +4980,7 @@
application = pbx_findapp("agi");
if (application) {
agiexec = ast_strdupa(agi);
- ret = pbx_exec(qe->chan, application, agiexec);
+ pbx_exec(qe->chan, application, agiexec);
} else
ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
}
Modified: team/group/bufo-manager-setvar-trunk/apps/app_rpt.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_rpt.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_rpt.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_rpt.c Fri May 6 15:26:12 2011
@@ -1975,7 +1975,11 @@
return;
}
n = finddelim(astr,astrs,100);
- if (n < 1) return;
+ if (n < 1) {
+ ast_free(str);
+ ast_free(astr);
+ return;
+ }
ast_mutex_lock(&myrpt->statpost_lock);
seq = ++myrpt->statpost_seqno;
ast_mutex_unlock(&myrpt->statpost_lock);
@@ -12218,7 +12222,7 @@
// ctcss code autopatch initiate
if (strstr((char *)f->data.ptr,"/M/")&& !myrpt->macropatch)
{
- char value[16];
+ char value[16] = "";
strcat(value,"*6");
myrpt->macropatch=1;
rpt_mutex_lock(&myrpt->lock);
Modified: team/group/bufo-manager-setvar-trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/apps/app_voicemail.c?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/apps/app_voicemail.c (original)
+++ team/group/bufo-manager-setvar-trunk/apps/app_voicemail.c Fri May 6 15:26:12 2011
@@ -4734,6 +4734,7 @@
char fname[256];
char tmpcmd[256];
int tmpfd = -1;
+ int soxstatus = 0;
/* Eww. We want formats to tell us their own MIME type */
char *ctype = (!strcasecmp(format, "ogg")) ? "application/" : "audio/x-";
@@ -4745,7 +4746,6 @@
chmod(newtmp, VOICEMAIL_FILE_MODE & ~my_umask);
ast_debug(3, "newtmp: %s\n", newtmp);
if (tmpfd > -1) {
- int soxstatus;
snprintf(tmpcmd, sizeof(tmpcmd), "sox -v %.4f %s.%s %s.%s", vmu->volgain, attach, format, newtmp, format);
if ((soxstatus = ast_safe_system(tmpcmd)) == 0) {
attach = newtmp;
@@ -4773,7 +4773,9 @@
if (last)
fprintf(p, ENDL ENDL "--%s--" ENDL "." ENDL, bound);
if (tmpfd > -1) {
- unlink(fname);
+ if (soxstatus == 0) {
+ unlink(fname);
+ }
close(tmpfd);
unlink(newtmp);
}
@@ -7061,7 +7063,6 @@
char *dir;
int curmsg;
char urgent_str[7] = "";
- char tmptxtfile[PATH_MAX];
int prompt_played = 0;
#ifndef IMAP_STORAGE
char msgfile[PATH_MAX], textfile[PATH_MAX], backup[PATH_MAX], backup_textfile[PATH_MAX];
@@ -7074,7 +7075,6 @@
dir = vms->curdir;
curmsg = vms->curmsg;
- tmptxtfile[0] = '\0';
while (!res && !valid_extensions) {
int use_directory = 0;
if (ast_test_flag((&globalflags), VM_DIRECFORWARD)) {
Modified: team/group/bufo-manager-setvar-trunk/autoconf/ast_check_pwlib.m4
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/autoconf/ast_check_pwlib.m4?view=diff&rev=317902&r1=317901&r2=317902
==============================================================================
--- team/group/bufo-manager-setvar-trunk/autoconf/ast_check_pwlib.m4 (original)
+++ team/group/bufo-manager-setvar-trunk/autoconf/ast_check_pwlib.m4 Fri May 6 15:26:12 2011
@@ -205,9 +205,9 @@
$2_VER=$((${$2_MAJOR_VERSION}*10000+${$2_MINOR_VERSION}*100+${$2_BUILD_NUMBER}))
$2_REQ=$(($4*10000+$5*100+$6))
if test "x$10" = "x"; then
- let $2_MAX=9999999
+ $2_MAX=9999999
else
- let $2_MAX=$8*10000+$9*100+$10
+ $2_MAX=$(($8*10000+$9*100+$10))
fi
AC_MSG_CHECKING(if $1 version ${$2_VERSION} is compatible with chan_h323)
Modified: team/group/bufo-manager-setvar-trunk/bridges/bridge_softmix.c
URL: http://svnview.digium.com/svn/asterisk/team/group/bufo-manager-setvar-trunk/bridges/bridge_softmix.c?view=diff&rev=317902&r1=317901&r2=317902
[... 6432 lines stripped ...]
More information about the asterisk-commits
mailing list