[asterisk-commits] may: branch may/ooh323_ipv6_direct_rtp r321498 - in /team/may/ooh323_ipv6_dir...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat May 28 02:25:32 CDT 2011 

Author: may
Date: Sat May 28 02:24:58 2011
New Revision: 321498

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=321498
Log:
Merged revisions 315002,315054,315214,315260,315350,315395,315447 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r315002 | alecdavis | 2011-04-23 03:01:38 +0400 (Sat, 23 Apr 2011) | 17 lines
  
  Merged revisions 315001 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r315001 | alecdavis | 2011-04-23 10:59:18 +1200 (Sat, 23 Apr 2011) | 12 lines
    
    chan_dahdi: Can't return to normal ring after distinctive ring on FXS 
    
    clear a previous distinctivering pattern before each new call
    
    (closes issue #18985)
    Reported by: bromont
    Patches: 
          bug18985.diff.txt uploaded by alecdavis (license 585)
    Tested by: alecdavis, bromont
  ........
................
  r315054 | alecdavis | 2011-04-25 11:17:27 +0400 (Mon, 25 Apr 2011) | 30 lines
  
  Merged revisions 315053 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r315053 | alecdavis | 2011-04-25 19:14:32 +1200 (Mon, 25 Apr 2011) | 23 lines
    
    Merged revisions 315052 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ................
      r315052 | alecdavis | 2011-04-25 19:11:12 +1200 (Mon, 25 Apr 2011) | 16 lines
      
      Merged revisions 315051 via svnmerge from 
      https://origsvn.digium.com/svn/asterisk/branches/1.4
      
      ........
        r315051 | alecdavis | 2011-04-25 19:06:29 +1200 (Mon, 25 Apr 2011) | 11 lines
        
        chan_local:check_bridge() misplaced misplaced ast_mutex_unlock 
        
        if !p->chan->_bridge->_softhangup path isn't followed, brigde remains locked.
        
        (closes issue #19176)
        Reported by: alecdavis
        Patches: 
              bug19176.diff.txt uploaded by alecdavis (license 585)
      ........
    ................
  ................
................
  r315214 | russell | 2011-04-25 23:06:08 +0400 (Mon, 25 Apr 2011) | 21 lines
  
  Merged revisions 315213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r315213 | russell | 2011-04-25 14:04:28 -0500 (Mon, 25 Apr 2011) | 14 lines
    
    Merged revisions 315212 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ........
      r315212 | russell | 2011-04-25 14:00:24 -0500 (Mon, 25 Apr 2011) | 7 lines
      
      Don't link non-cached realtime peers into the peers_by_ip container.
      
      (closes issue #18924)
      Reported by: wdoekes
      Patches:
            issue18924_uncached_realtime_peers_leak-1.6.2.17.patch uploaded by wdoekes (license 717)
    ........
  ................
................
  r315260 | russell | 2011-04-25 23:40:17 +0400 (Mon, 25 Apr 2011) | 31 lines
  
  Merged revisions 315259 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r315259 | russell | 2011-04-25 14:37:32 -0500 (Mon, 25 Apr 2011) | 24 lines
    
    Merged revisions 315258 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ................
      r315258 | russell | 2011-04-25 14:31:44 -0500 (Mon, 25 Apr 2011) | 17 lines
      
      Merged revisions 315257 via svnmerge from 
      https://origsvn.digium.com/svn/asterisk/branches/1.4
      
      ........
        r315257 | russell | 2011-04-25 14:28:41 -0500 (Mon, 25 Apr 2011) | 10 lines
        
        Be more flexible with unknown chunks in wav files.
        
        This patch makes format_wav ignore unknown chunks instead of erroring
        out on them.
        
        (closes issue #18306)
        Reported by: jhirsch
        Patches:
              wav_skip_unknown_blocks.diff uploaded by jhirsch (license 1156)
      ........
    ................
  ................
................
  r315350 | rmudgett | 2011-04-26 01:55:00 +0400 (Tue, 26 Apr 2011) | 16 lines
  
  Merged revisions 315349 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r315349 | rmudgett | 2011-04-25 16:49:00 -0500 (Mon, 25 Apr 2011) | 9 lines
    
    When using MGCP realtime gateway definitions, random crashes occur.
    
    Fixed incorrect linked list node removal for realtime gateways.
    
    (closes issue #18291)
    Reported by: nahuelgreco
    Patches:
          dangling-pointers-when-pruning.patch uploaded by nahuelgreco (license 162)
  ........
................
  r315395 | pabelanger | 2011-04-26 06:21:38 +0400 (Tue, 26 Apr 2011) | 21 lines
  
  Merged revisions 315394 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ................
    r315394 | pabelanger | 2011-04-25 22:18:50 -0400 (Mon, 25 Apr 2011) | 14 lines
    
    Merged revisions 315393 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.6.2
    
    ........
      r315393 | pabelanger | 2011-04-25 22:17:43 -0400 (Mon, 25 Apr 2011) | 7 lines
      
      Add back CLI command 'dialplan save'
      
      (closes issue #19140)
      Reported by: lmadsen
      Patches:
            __20110419_dialplan_save.patch.txt uploaded by lmadsen (license 10)
    ........
  ................
................
  r315447 | russell | 2011-04-26 21:41:51 +0400 (Tue, 26 Apr 2011) | 21 lines
  
  Merged revisions 315446 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r315446 | russell | 2011-04-26 12:40:23 -0500 (Tue, 26 Apr 2011) | 14 lines
    
    chan_local: resolve a deadlock.
    
    This patch resolves a fairly complex deadlock that can occur with the
    combination of chan_local and a dialplan switch, such as dynamic realtime
    extensions, which pulls autoservice into the picture when doing a dialplan
    lookup.
    
    (closes issue #18818)
    Reported by: nic
    Patches:
          issue18818.patch uploaded by jthurman (license 614)
          18818.v1.txt uploaded by russell (license 2)
    Tested by: nic, jthurman, kterzi, steve-howes, sysreq, IshMalik
  ........
................

Added:
    team/may/ooh323_ipv6_direct_rtp/configure
      - copied, changed from r314116, trunk/configure
    team/may/ooh323_ipv6_direct_rtp/contrib/scripts/import-cdr-csv-mysql.pl
      - copied unchanged from r317996, trunk/contrib/scripts/import-cdr-csv-mysql.pl
Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/CHANGES
    team/may/ooh323_ipv6_direct_rtp/Makefile
    team/may/ooh323_ipv6_direct_rtp/UPGRADE.txt
    team/may/ooh323_ipv6_direct_rtp/addons/app_mysql.c
    team/may/ooh323_ipv6_direct_rtp/addons/cdr_mysql.c
    team/may/ooh323_ipv6_direct_rtp/addons/res_config_mysql.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_amd.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_chanspy.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_confbridge.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_dial.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_festival.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_followme.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_ices.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_meetme.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_minivm.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_originate.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_queue.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_rpt.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_userevent.c
    team/may/ooh323_ipv6_direct_rtp/apps/app_voicemail.c
    team/may/ooh323_ipv6_direct_rtp/autoconf/ast_check_pwlib.m4
    team/may/ooh323_ipv6_direct_rtp/bridges/bridge_softmix.c
    team/may/ooh323_ipv6_direct_rtp/cdr/cdr_radius.c
    team/may/ooh323_ipv6_direct_rtp/cdr/cdr_syslog.c
    team/may/ooh323_ipv6_direct_rtp/cel/cel_pgsql.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_agent.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_alsa.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_console.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_h323.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_iax2.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_jingle.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_local.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_mgcp.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_oss.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_phone.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_sip.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_skinny.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_unistim.c
    team/may/ooh323_ipv6_direct_rtp/channels/chan_usbradio.c
    team/may/ooh323_ipv6_direct_rtp/channels/iax2-provision.c
    team/may/ooh323_ipv6_direct_rtp/channels/misdn_config.c
    team/may/ooh323_ipv6_direct_rtp/channels/sig_analog.c
    team/may/ooh323_ipv6_direct_rtp/channels/sig_pri.c
    team/may/ooh323_ipv6_direct_rtp/channels/sip/reqresp_parser.c
    team/may/ooh323_ipv6_direct_rtp/channels/sip/sdp_crypto.c
    team/may/ooh323_ipv6_direct_rtp/codecs/lpc10/dyptrk.c
    team/may/ooh323_ipv6_direct_rtp/configs/cel.conf.sample
    team/may/ooh323_ipv6_direct_rtp/configs/cel_pgsql.conf.sample
    team/may/ooh323_ipv6_direct_rtp/configs/extensions.lua.sample
    team/may/ooh323_ipv6_direct_rtp/contrib/realtime/mysql/meetme.sql
    team/may/ooh323_ipv6_direct_rtp/contrib/realtime/mysql/queue_log.sql
    team/may/ooh323_ipv6_direct_rtp/contrib/realtime/mysql/sipfriends.sql
    team/may/ooh323_ipv6_direct_rtp/contrib/scripts/safe_asterisk
    team/may/ooh323_ipv6_direct_rtp/formats/format_wav.c
    team/may/ooh323_ipv6_direct_rtp/funcs/func_curl.c
    team/may/ooh323_ipv6_direct_rtp/funcs/func_enum.c
    team/may/ooh323_ipv6_direct_rtp/funcs/func_jitterbuffer.c
    team/may/ooh323_ipv6_direct_rtp/include/asterisk/linkedlists.h
    team/may/ooh323_ipv6_direct_rtp/include/asterisk/select.h
    team/may/ooh323_ipv6_direct_rtp/main/asterisk.c
    team/may/ooh323_ipv6_direct_rtp/main/astobj2.c
    team/may/ooh323_ipv6_direct_rtp/main/audiohook.c
    team/may/ooh323_ipv6_direct_rtp/main/cdr.c
    team/may/ooh323_ipv6_direct_rtp/main/channel.c
    team/may/ooh323_ipv6_direct_rtp/main/config.c
    team/may/ooh323_ipv6_direct_rtp/main/dsp.c
    team/may/ooh323_ipv6_direct_rtp/main/features.c
    team/may/ooh323_ipv6_direct_rtp/main/file.c
    team/may/ooh323_ipv6_direct_rtp/main/fskmodem_float.c
    team/may/ooh323_ipv6_direct_rtp/main/http.c
    team/may/ooh323_ipv6_direct_rtp/main/manager.c
    team/may/ooh323_ipv6_direct_rtp/main/pbx.c
    team/may/ooh323_ipv6_direct_rtp/main/plc.c
    team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c
    team/may/ooh323_ipv6_direct_rtp/main/udptl.c
    team/may/ooh323_ipv6_direct_rtp/main/utils.c
    team/may/ooh323_ipv6_direct_rtp/pbx/pbx_config.c
    team/may/ooh323_ipv6_direct_rtp/pbx/pbx_dundi.c
    team/may/ooh323_ipv6_direct_rtp/pbx/pbx_lua.c
    team/may/ooh323_ipv6_direct_rtp/res/res_agi.c
    team/may/ooh323_ipv6_direct_rtp/res/res_calendar.c
    team/may/ooh323_ipv6_direct_rtp/res/res_config_odbc.c
    team/may/ooh323_ipv6_direct_rtp/res/res_config_sqlite.c
    team/may/ooh323_ipv6_direct_rtp/res/res_crypto.c
    team/may/ooh323_ipv6_direct_rtp/res/res_fax.c
    team/may/ooh323_ipv6_direct_rtp/res/res_jabber.c
    team/may/ooh323_ipv6_direct_rtp/res/res_musiconhold.c
    team/may/ooh323_ipv6_direct_rtp/res/res_odbc.c
    team/may/ooh323_ipv6_direct_rtp/res/res_rtp_asterisk.c
    team/may/ooh323_ipv6_direct_rtp/sounds/Makefile
    team/may/ooh323_ipv6_direct_rtp/sounds/sounds.xml

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
            ('svn:mergeinfo' removed)

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat May 28 02:24:58 2011
@@ -1,1 +1,1 @@
-/trunk:1-313143,313191,313280,313367,313383-313481,313483-313744,313781-313906,313908-313943,313945-315000
+/trunk:1-313143,313191,313280,313367,313383-313481,313483-313744,313781-313906,313908-313943,313945-315447

Modified: team/may/ooh323_ipv6_direct_rtp/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/CHANGES?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/CHANGES (original)
+++ team/may/ooh323_ipv6_direct_rtp/CHANGES Sat May 28 02:24:58 2011
@@ -107,6 +107,11 @@
    channels involved with the FollowMe thread.  Use this option to improve
    compatability for a FollowMe call with certain dialplan apps, options, and
    functions.
+
+SIP Changes
+-----------
+ * Multiple [general] contexts are now permitted within sip.conf.  They will be
+   merged at load time.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------

Modified: team/may/ooh323_ipv6_direct_rtp/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/Makefile?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/Makefile (original)
+++ team/may/ooh323_ipv6_direct_rtp/Makefile Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/UPGRADE.txt?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/UPGRADE.txt (original)
+++ team/may/ooh323_ipv6_direct_rtp/UPGRADE.txt Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/app_mysql.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/app_mysql.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/app_mysql.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/cdr_mysql.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/cdr_mysql.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/cdr_mysql.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/addons/res_config_mysql.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/addons/res_config_mysql.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/addons/res_config_mysql.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_amd.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_amd.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_amd.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_amd.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_chanspy.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_chanspy.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_chanspy.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_confbridge.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_confbridge.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_confbridge.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_dial.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_dial.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_dial.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_festival.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_festival.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_festival.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_festival.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_followme.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_followme.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_followme.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_followme.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_ices.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_ices.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_ices.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_ices.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_meetme.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_meetme.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_meetme.c Sat May 28 02:24:58 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;
@@ -2247,7 +2247,6 @@
 	int talkreq_manager = 0;
 	int using_pseudo = 0;
 	int duration = 20;
-	int hr, min, sec;
 	int sent_event = 0;
 	int checked = 0;
 	int announcement_played = 0;
@@ -2734,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;
@@ -2919,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;
  				}
  				
@@ -3804,9 +3808,6 @@
 	if (user->user_no) {
 		/* Only cleanup users who really joined! */
 		now = ast_tvnow();
-		hr = (now.tv_sec - user->jointime) / 3600;
-		min = ((now.tv_sec - user->jointime) % 3600) / 60;
-		sec = (now.tv_sec - user->jointime) % 60;
 
 		if (sent_event) {
 			ast_manager_event(chan, EVENT_FLAG_CALL, "MeetmeLeave",
@@ -3908,7 +3909,7 @@
 			ast_localtime(&now, &tm, NULL);
 			ast_strftime(currenttime, sizeof(currenttime), DATE_FORMAT, &tm);
 
-			ast_debug(1, "Looking for conference %s that starts after %s\n", confno, eatime);
+			ast_debug(1, "Looking for conference %s that starts after %s\n", confno, currenttime);
 
 			var = ast_load_realtime("meetme", "confno",
 				confno, "starttime <= ", currenttime, "endtime >= ",
@@ -6455,7 +6456,6 @@
 		AST_APP_ARG(options);
 	);
 	char *opts[SLA_TRUNK_OPT_ARG_ARRAY_SIZE] = { NULL, };
-	char *conf_opt_args[OPT_ARG_ARRAY_SIZE] = { NULL, };
 	struct ast_flags opt_flags = { 0 };
 	char *parse;
 
@@ -6518,7 +6518,6 @@
 	if (ast_test_flag(&opt_flags, SLA_TRUNK_OPT_MOH)) {
 		ast_indicate(chan, -1);
 		ast_set_flag64(&conf_flags, CONFFLAG_MOH);
-		conf_opt_args[OPT_ARG_MOH_CLASS] = opts[SLA_TRUNK_OPT_ARG_MOH_CLASS];
 	} else
 		ast_indicate(chan, AST_CONTROL_RINGING);
 

Modified: team/may/ooh323_ipv6_direct_rtp/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_minivm.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_minivm.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_minivm.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_originate.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_originate.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_originate.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_originate.c Sat May 28 02:24:58 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/may/ooh323_ipv6_direct_rtp/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/apps/app_queue.c?view=diff&rev=321498&r1=321497&r2=321498
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/apps/app_queue.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/apps/app_queue.c Sat May 28 02:24:58 2011

[... 5937 lines stripped ...]

More information about the asterisk-commits mailing list