[asterisk-commits] tilghman: branch tilghman/realtime_failover r157286 - in /team/tilghman/realt...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Nov 17 17:56:43 CST 2008 

Author: tilghman
Date: Mon Nov 17 17:56:41 2008
New Revision: 157286

URL: http://svn.digium.com/view/asterisk?view=rev&rev=157286
Log:
Merged revisions 157253 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r157253 | tilghman | 2008-11-17 16:25:06 -0600 (Mon, 17 Nov 2008) | 8 lines
  
  Can't use items duplicated off the stack frame in an element returned from
  a function: in these cases, we have to use the heap, or garbage will result.
  (closes issue #13898)
   Reported by: alecdavis
   Patches: 
         20081114__bug13898__2.diff.txt uploaded by Corydon76 (license 14)
   Tested by: alecdavis
........

Added:
    team/tilghman/realtime_failover/autoconf/
      - copied from r157167, trunk/autoconf/
    team/tilghman/realtime_failover/build_tools/get_documentation
      - copied unchanged from r157167, trunk/build_tools/get_documentation
    team/tilghman/realtime_failover/configs/cli_aliases.conf.sample
      - copied unchanged from r157167, trunk/configs/cli_aliases.conf.sample
    team/tilghman/realtime_failover/contrib/scripts/live_ast
      - copied unchanged from r157167, trunk/contrib/scripts/live_ast
    team/tilghman/realtime_failover/doc/appdocsxml.dtd
      - copied unchanged from r157167, trunk/doc/appdocsxml.dtd
    team/tilghman/realtime_failover/include/asterisk/buildinfo.h
      - copied unchanged from r157167, trunk/include/asterisk/buildinfo.h
    team/tilghman/realtime_failover/include/asterisk/xml.h
      - copied unchanged from r157167, trunk/include/asterisk/xml.h
    team/tilghman/realtime_failover/include/asterisk/xmldoc.h
      - copied unchanged from r157167, trunk/include/asterisk/xmldoc.h
    team/tilghman/realtime_failover/main/xml.c
      - copied unchanged from r157167, trunk/main/xml.c
    team/tilghman/realtime_failover/main/xmldoc.c
      - copied unchanged from r157167, trunk/main/xmldoc.c
    team/tilghman/realtime_failover/res/res_clialiases.c
      - copied unchanged from r157167, trunk/res/res_clialiases.c
Removed:
    team/tilghman/realtime_failover/acinclude.m4
Modified:
    team/tilghman/realtime_failover/   (props changed)
    team/tilghman/realtime_failover/CHANGES
    team/tilghman/realtime_failover/Makefile
    team/tilghman/realtime_failover/Makefile.moddir_rules
    team/tilghman/realtime_failover/Makefile.rules
    team/tilghman/realtime_failover/UPGRADE.txt
    team/tilghman/realtime_failover/agi/eagi-sphinx-test.c
    team/tilghman/realtime_failover/agi/eagi-test.c
    team/tilghman/realtime_failover/apps/app_adsiprog.c
    team/tilghman/realtime_failover/apps/app_alarmreceiver.c
    team/tilghman/realtime_failover/apps/app_amd.c
    team/tilghman/realtime_failover/apps/app_authenticate.c
    team/tilghman/realtime_failover/apps/app_cdr.c
    team/tilghman/realtime_failover/apps/app_chanisavail.c
    team/tilghman/realtime_failover/apps/app_channelredirect.c
    team/tilghman/realtime_failover/apps/app_chanspy.c
    team/tilghman/realtime_failover/apps/app_controlplayback.c
    team/tilghman/realtime_failover/apps/app_dahdibarge.c
    team/tilghman/realtime_failover/apps/app_dahdiras.c
    team/tilghman/realtime_failover/apps/app_dahdiscan.c
    team/tilghman/realtime_failover/apps/app_db.c
    team/tilghman/realtime_failover/apps/app_dial.c
    team/tilghman/realtime_failover/apps/app_dictate.c
    team/tilghman/realtime_failover/apps/app_directed_pickup.c
    team/tilghman/realtime_failover/apps/app_directory.c
    team/tilghman/realtime_failover/apps/app_disa.c
    team/tilghman/realtime_failover/apps/app_dumpchan.c
    team/tilghman/realtime_failover/apps/app_echo.c
    team/tilghman/realtime_failover/apps/app_exec.c
    team/tilghman/realtime_failover/apps/app_fax.c
    team/tilghman/realtime_failover/apps/app_festival.c
    team/tilghman/realtime_failover/apps/app_flash.c
    team/tilghman/realtime_failover/apps/app_followme.c
    team/tilghman/realtime_failover/apps/app_forkcdr.c
    team/tilghman/realtime_failover/apps/app_getcpeid.c
    team/tilghman/realtime_failover/apps/app_ices.c
    team/tilghman/realtime_failover/apps/app_image.c
    team/tilghman/realtime_failover/apps/app_ivrdemo.c
    team/tilghman/realtime_failover/apps/app_jack.c
    team/tilghman/realtime_failover/apps/app_macro.c
    team/tilghman/realtime_failover/apps/app_meetme.c
    team/tilghman/realtime_failover/apps/app_milliwatt.c
    team/tilghman/realtime_failover/apps/app_mixmonitor.c
    team/tilghman/realtime_failover/apps/app_morsecode.c
    team/tilghman/realtime_failover/apps/app_mp3.c
    team/tilghman/realtime_failover/apps/app_nbscat.c
    team/tilghman/realtime_failover/apps/app_osplookup.c
    team/tilghman/realtime_failover/apps/app_page.c
    team/tilghman/realtime_failover/apps/app_parkandannounce.c
    team/tilghman/realtime_failover/apps/app_playback.c
    team/tilghman/realtime_failover/apps/app_privacy.c
    team/tilghman/realtime_failover/apps/app_queue.c
    team/tilghman/realtime_failover/apps/app_read.c
    team/tilghman/realtime_failover/apps/app_readexten.c
    team/tilghman/realtime_failover/apps/app_readfile.c
    team/tilghman/realtime_failover/apps/app_record.c
    team/tilghman/realtime_failover/apps/app_sayunixtime.c
    team/tilghman/realtime_failover/apps/app_senddtmf.c
    team/tilghman/realtime_failover/apps/app_sendtext.c
    team/tilghman/realtime_failover/apps/app_setcallerid.c
    team/tilghman/realtime_failover/apps/app_skel.c
    team/tilghman/realtime_failover/apps/app_sms.c
    team/tilghman/realtime_failover/apps/app_softhangup.c
    team/tilghman/realtime_failover/apps/app_stack.c
    team/tilghman/realtime_failover/apps/app_system.c
    team/tilghman/realtime_failover/apps/app_talkdetect.c
    team/tilghman/realtime_failover/apps/app_test.c
    team/tilghman/realtime_failover/apps/app_transfer.c
    team/tilghman/realtime_failover/apps/app_url.c
    team/tilghman/realtime_failover/apps/app_userevent.c
    team/tilghman/realtime_failover/apps/app_verbose.c
    team/tilghman/realtime_failover/apps/app_voicemail.c
    team/tilghman/realtime_failover/apps/app_waitforring.c
    team/tilghman/realtime_failover/apps/app_waitforsilence.c
    team/tilghman/realtime_failover/apps/app_waituntil.c
    team/tilghman/realtime_failover/apps/app_while.c
    team/tilghman/realtime_failover/apps/app_zapateller.c
    team/tilghman/realtime_failover/bootstrap.sh
    team/tilghman/realtime_failover/build_tools/menuselect-deps.in
    team/tilghman/realtime_failover/cdr/cdr_adaptive_odbc.c
    team/tilghman/realtime_failover/cdr/cdr_odbc.c
    team/tilghman/realtime_failover/channels/Makefile
    team/tilghman/realtime_failover/channels/chan_agent.c
    team/tilghman/realtime_failover/channels/chan_alsa.c
    team/tilghman/realtime_failover/channels/chan_console.c
    team/tilghman/realtime_failover/channels/chan_dahdi.c
    team/tilghman/realtime_failover/channels/chan_h323.c
    team/tilghman/realtime_failover/channels/chan_iax2.c
    team/tilghman/realtime_failover/channels/chan_local.c
    team/tilghman/realtime_failover/channels/chan_mgcp.c
    team/tilghman/realtime_failover/channels/chan_misdn.c
    team/tilghman/realtime_failover/channels/chan_oss.c
    team/tilghman/realtime_failover/channels/chan_sip.c
    team/tilghman/realtime_failover/channels/chan_skinny.c
    team/tilghman/realtime_failover/channels/chan_usbradio.c
    team/tilghman/realtime_failover/channels/chan_vpb.cc
    team/tilghman/realtime_failover/channels/misdn/isdn_lib.c
    team/tilghman/realtime_failover/channels/misdn/isdn_lib.h
    team/tilghman/realtime_failover/channels/misdn/isdn_lib_intern.h
    team/tilghman/realtime_failover/codecs/lpc10/chanwr.c
    team/tilghman/realtime_failover/configs/cdr_adaptive_odbc.conf.sample
    team/tilghman/realtime_failover/configs/chan_dahdi.conf.sample
    team/tilghman/realtime_failover/configs/extensions.conf.sample
    team/tilghman/realtime_failover/configs/features.conf.sample
    team/tilghman/realtime_failover/configs/func_odbc.conf.sample
    team/tilghman/realtime_failover/configs/phoneprov.conf.sample
    team/tilghman/realtime_failover/configs/sip.conf.sample
    team/tilghman/realtime_failover/configs/voicemail.conf.sample
    team/tilghman/realtime_failover/configure
    team/tilghman/realtime_failover/configure.ac
    team/tilghman/realtime_failover/contrib/asterisk-ng-doxygen
    team/tilghman/realtime_failover/contrib/scripts/vmdb.sql
    team/tilghman/realtime_failover/doc/   (props changed)
    team/tilghman/realtime_failover/doc/tex/asterisk-conf.tex
    team/tilghman/realtime_failover/doc/tex/channelvariables.tex
    team/tilghman/realtime_failover/doc/valgrind.txt
    team/tilghman/realtime_failover/formats/format_gsm.c
    team/tilghman/realtime_failover/formats/format_ogg_vorbis.c
    team/tilghman/realtime_failover/formats/format_wav.c
    team/tilghman/realtime_failover/formats/format_wav_gsm.c
    team/tilghman/realtime_failover/funcs/func_base64.c
    team/tilghman/realtime_failover/funcs/func_blacklist.c
    team/tilghman/realtime_failover/funcs/func_callerid.c
    team/tilghman/realtime_failover/funcs/func_cdr.c
    team/tilghman/realtime_failover/funcs/func_channel.c
    team/tilghman/realtime_failover/funcs/func_config.c
    team/tilghman/realtime_failover/funcs/func_cut.c
    team/tilghman/realtime_failover/funcs/func_db.c
    team/tilghman/realtime_failover/funcs/func_devstate.c
    team/tilghman/realtime_failover/funcs/func_dialgroup.c
    team/tilghman/realtime_failover/funcs/func_dialplan.c
    team/tilghman/realtime_failover/funcs/func_enum.c
    team/tilghman/realtime_failover/funcs/func_env.c
    team/tilghman/realtime_failover/funcs/func_extstate.c
    team/tilghman/realtime_failover/funcs/func_global.c
    team/tilghman/realtime_failover/funcs/func_groupcount.c
    team/tilghman/realtime_failover/funcs/func_iconv.c
    team/tilghman/realtime_failover/funcs/func_lock.c
    team/tilghman/realtime_failover/funcs/func_logic.c
    team/tilghman/realtime_failover/funcs/func_math.c
    team/tilghman/realtime_failover/funcs/func_md5.c
    team/tilghman/realtime_failover/funcs/func_module.c
    team/tilghman/realtime_failover/funcs/func_odbc.c
    team/tilghman/realtime_failover/funcs/func_rand.c
    team/tilghman/realtime_failover/funcs/func_realtime.c
    team/tilghman/realtime_failover/funcs/func_sha1.c
    team/tilghman/realtime_failover/funcs/func_shell.c
    team/tilghman/realtime_failover/funcs/func_speex.c
    team/tilghman/realtime_failover/funcs/func_strings.c
    team/tilghman/realtime_failover/funcs/func_timeout.c
    team/tilghman/realtime_failover/funcs/func_uri.c
    team/tilghman/realtime_failover/funcs/func_version.c
    team/tilghman/realtime_failover/funcs/func_vmcount.c
    team/tilghman/realtime_failover/funcs/func_volume.c
    team/tilghman/realtime_failover/include/asterisk.h
    team/tilghman/realtime_failover/include/asterisk/_private.h
    team/tilghman/realtime_failover/include/asterisk/agi.h
    team/tilghman/realtime_failover/include/asterisk/app.h
    team/tilghman/realtime_failover/include/asterisk/astobj2.h
    team/tilghman/realtime_failover/include/asterisk/autoconfig.h.in
    team/tilghman/realtime_failover/include/asterisk/channel.h
    team/tilghman/realtime_failover/include/asterisk/cli.h
    team/tilghman/realtime_failover/include/asterisk/compat.h
    team/tilghman/realtime_failover/include/asterisk/compiler.h
    team/tilghman/realtime_failover/include/asterisk/config.h
    team/tilghman/realtime_failover/include/asterisk/devicestate.h
    team/tilghman/realtime_failover/include/asterisk/dial.h
    team/tilghman/realtime_failover/include/asterisk/extconf.h
    team/tilghman/realtime_failover/include/asterisk/features.h
    team/tilghman/realtime_failover/include/asterisk/indications.h
    team/tilghman/realtime_failover/include/asterisk/module.h
    team/tilghman/realtime_failover/include/asterisk/pbx.h
    team/tilghman/realtime_failover/include/asterisk/sched.h
    team/tilghman/realtime_failover/include/asterisk/strings.h
    team/tilghman/realtime_failover/include/asterisk/term.h
    team/tilghman/realtime_failover/include/asterisk/timing.h
    team/tilghman/realtime_failover/main/Makefile
    team/tilghman/realtime_failover/main/app.c
    team/tilghman/realtime_failover/main/ast_expr2f.c
    team/tilghman/realtime_failover/main/asterisk.c
    team/tilghman/realtime_failover/main/astobj2.c
    team/tilghman/realtime_failover/main/buildinfo.c
    team/tilghman/realtime_failover/main/cdr.c
    team/tilghman/realtime_failover/main/channel.c
    team/tilghman/realtime_failover/main/cli.c
    team/tilghman/realtime_failover/main/config.c
    team/tilghman/realtime_failover/main/db1-ast/hash/hash_page.c
    team/tilghman/realtime_failover/main/devicestate.c
    team/tilghman/realtime_failover/main/dial.c
    team/tilghman/realtime_failover/main/dnsmgr.c
    team/tilghman/realtime_failover/main/editline/readline.c
    team/tilghman/realtime_failover/main/features.c
    team/tilghman/realtime_failover/main/file.c
    team/tilghman/realtime_failover/main/http.c
    team/tilghman/realtime_failover/main/indications.c
    team/tilghman/realtime_failover/main/logger.c
    team/tilghman/realtime_failover/main/manager.c
    team/tilghman/realtime_failover/main/pbx.c
    team/tilghman/realtime_failover/main/rtp.c
    team/tilghman/realtime_failover/main/taskprocessor.c
    team/tilghman/realtime_failover/main/term.c
    team/tilghman/realtime_failover/main/udptl.c
    team/tilghman/realtime_failover/main/utils.c
    team/tilghman/realtime_failover/makeopts.in
    team/tilghman/realtime_failover/pbx/pbx_ael.c
    team/tilghman/realtime_failover/pbx/pbx_config.c
    team/tilghman/realtime_failover/pbx/pbx_dundi.c
    team/tilghman/realtime_failover/pbx/pbx_lua.c
    team/tilghman/realtime_failover/phoneprov/polycom_line.xml
    team/tilghman/realtime_failover/res/ael/ael.flex
    team/tilghman/realtime_failover/res/ael/ael.tab.c
    team/tilghman/realtime_failover/res/ael/ael.y
    team/tilghman/realtime_failover/res/ael/ael_lex.c
    team/tilghman/realtime_failover/res/res_agi.c
    team/tilghman/realtime_failover/res/res_config_odbc.c
    team/tilghman/realtime_failover/res/res_config_sqlite.c
    team/tilghman/realtime_failover/res/res_crypto.c
    team/tilghman/realtime_failover/res/res_http_post.c
    team/tilghman/realtime_failover/res/res_indications.c
    team/tilghman/realtime_failover/res/res_jabber.c
    team/tilghman/realtime_failover/res/res_musiconhold.c
    team/tilghman/realtime_failover/res/res_odbc.c
    team/tilghman/realtime_failover/res/res_phoneprov.c
    team/tilghman/realtime_failover/res/res_realtime.c
    team/tilghman/realtime_failover/res/res_timing_pthread.c
    team/tilghman/realtime_failover/utils/astcanary.c
    team/tilghman/realtime_failover/utils/astman.c
    team/tilghman/realtime_failover/utils/extconf.c
    team/tilghman/realtime_failover/utils/frame.c
    team/tilghman/realtime_failover/utils/hashtest2.c
    team/tilghman/realtime_failover/utils/muted.c
    team/tilghman/realtime_failover/utils/stereorize.c
    team/tilghman/realtime_failover/utils/streamplayer.c

Propchange: team/tilghman/realtime_failover/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/tilghman/realtime_failover/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/tilghman/realtime_failover/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/tilghman/realtime_failover/
------------------------------------------------------------------------------
    reviewboard:url = http://reviewboard.digium.com

Propchange: team/tilghman/realtime_failover/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 17 17:56:41 2008
@@ -1,1 +1,1 @@
-/trunk:1-151202
+/trunk:1-157250

Modified: team/tilghman/realtime_failover/CHANGES
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/CHANGES?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/CHANGES (original)
+++ team/tilghman/realtime_failover/CHANGES Mon Nov 17 17:56:41 2008
@@ -9,6 +9,12 @@
    subscribed to.
  * Added support for subscribing to a voice mailbox on a remote server and
    making the new/old message count available to local devices.
+ * Added support for setting the domain in the URI for caller of an
+   outbound call by using the SIPFROMDOMAIN channel variable.
+ * Added a new configuration option "remotesecret" for authentication to
+   remote services. For backwards compatibility, "secret" still has the
+   same function as before, but now you can configure both a remote secret and a
+   local secret for mutual authentication.
 
 Skinny Changes
 --------------
@@ -23,6 +29,12 @@
    cookies, proxies, connection timeouts, passwords, etc.
  * Permit the syntax and synopsis fields of the corresponding dialplan
    functions to be individually set from func_odbc.conf.
+ * Added debugging CLI functions to func_odbc, 'odbc read' and 'odbc write'.
+ * func_odbc now may specify an insert query to execute, when the write query
+   affects 0 rows (usually indicating that no such row exists).
+ * Added a new dialplan function, LISTFILTER, which permits removing elements
+   from a set list, by name.  Uses the same general syntax as the existing CUT
+   and FIELDQTY dialplan functions, which also manage lists.
 
 Applications
 ------------
@@ -30,6 +42,9 @@
    using MeetMeAdmin.
  * app_authenticate now gives the ability to select a prompt other than
    the default.
+ * app_directory now pays attention to the searchcontexts setting in
+   voicemail.conf and will look through all contexts, if no context is
+   specified in the initial argument.
 
 Miscellaneous
 -------------
@@ -43,6 +58,8 @@
      same  =>     n,SomethingElse()
  * musiconhold.conf classes of type 'files' can now use relative directory paths,
    which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
+ * All deprecated CLI commands are removed from the sourcecode. They are now handled
+   by the new clialiases module. See cli_aliases.conf.sample file.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1  -------------
@@ -677,6 +694,7 @@
      WaitForRing() now takes floating pt timeout arg.
      SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
   * Added 's' option to Page application.
+  * Added an optional timeout argument to the Page application.
   * Added 'E', 'V', and 'P' commands to ExternalIVR.
   * Added 'o' and 'X' options to Chanspy.
   * Added a new dialplan application, Bridge, which allows you to bridge the
@@ -763,6 +781,7 @@
      the first one available.
   * Added cli command 'features reload' to reload call features from features.conf
   * Moved into core asterisk binary.
+  * Changed the default setting for featuredigittimeout to 2000 ms from 500 ms.
 
 Language Support Changes
 ------------------------

Modified: team/tilghman/realtime_failover/Makefile
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/Makefile?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/Makefile (original)
+++ team/tilghman/realtime_failover/Makefile Mon Nov 17 17:56:41 2008
@@ -104,6 +104,9 @@
 # CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
 ASTCFLAGS+=$(COPTS)
 ASTLDFLAGS+=$(LDOPTS)
+
+# libxml2 cflags
+ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes
@@ -348,7 +351,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest makeopts $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS) doc/core-en_US.xml
 
 makeopts: configure
 	@echo "****"
@@ -437,7 +440,9 @@
 $(SUBDIRS_DIST_CLEAN):
 	@$(SUBMAKE) -C $(@:-dist-clean=) dist-clean
 
-clean: $(SUBDIRS_CLEAN)
+clean: $(SUBDIRS_CLEAN) _clean
+
+_clean:
 	rm -f defaults.h
 	rm -f include/asterisk/build.h
 	rm -f main/version.c
@@ -447,7 +452,7 @@
 
 dist-clean: distclean
 
-distclean: $(SUBDIRS_DIST_CLEAN) clean
+distclean: $(SUBDIRS_DIST_CLEAN) _clean
 	@$(MAKE) -C menuselect dist-clean
 	@$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
@@ -480,6 +485,29 @@
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
+
+doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) 
+	@echo -n "Building Documentation For: "
+	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+	@echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+	@echo "<docs>" >> $@
+	@for x in $(MOD_SUBDIRS); do \
+		echo -n "$$x " ; \
+		for i in $$x/*.c; do \
+			$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
+		done ; \
+	done
+	@echo
+	@echo "</docs>" >> $@
+
+validate-docs: doc/core-en_US.xml
+ifeq ($(XMLSTARLET),:)
+	@echo "---------------------------------------------------------------"
+	@echo "--- Please install xmlstarlet to validate the documentation ---"
+	@echo "---------------------------------------------------------------"
+else
+	$(XMLSTARLET) val -d doc/appdocsxml.dtd $<
+endif
 
 update: 
 	@if [ -d .svn ]; then \
@@ -529,12 +557,16 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+	$(INSTALL) -m 644 doc/core-*.xml $(ASTDATADIR)/documentation
+	$(INSTALL) -m 644 doc/appdocsxml.dtd $(ASTVARLIBDIR)/documentation
 	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -656,7 +688,7 @@
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
 		echo "astlogdir => $(ASTLOGDIR)" ; \
 		echo "" ; \
-		echo ";[options]" ; \
+		echo "[options]" ; \
 		echo ";verbose = 3" ; \
 		echo ";debug = 3" ; \
 		echo ";alwaysfork = yes ; same as -F at startup" ; \
@@ -686,6 +718,7 @@
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \
 		echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \
+		echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \
@@ -902,7 +935,7 @@
 asterisk.pdf:
 	$(MAKE) -C doc/tex asterisk.pdf
 
-.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs validate-docs _clean
 
 FORCE:
 

Modified: team/tilghman/realtime_failover/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/Makefile.moddir_rules?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/Makefile.moddir_rules (original)
+++ team/tilghman/realtime_failover/Makefile.moddir_rules Mon Nov 17 17:56:41 2008
@@ -124,6 +124,7 @@
 dist-clean::
 	rm -f .*.moduleinfo .moduleinfo
 	rm -f .*.makeopts .makeopts
+	rm -f .*.d
 
 .%.moduleinfo: %.c
 	@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@

Modified: team/tilghman/realtime_failover/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/Makefile.rules?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/Makefile.rules (original)
+++ team/tilghman/realtime_failover/Makefile.rules Mon Nov 17 17:56:41 2008
@@ -43,12 +43,12 @@
 endif
 
 # build rules for various targets
+%.o: %.i
+	$(ECHO_PREFIX) echo "   [CCi] $< -> $@"
+	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+
 %.o: %.c
 	$(ECHO_PREFIX) echo "   [CC] $< -> $@"
-	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
-
-%.o: %.i
-	$(ECHO_PREFIX) echo "   [CCi] $< -> $@"
 	$(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
 
 %.i: %.c
@@ -95,4 +95,4 @@
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
 
-dist-clean::
+dist-clean:: clean

Modified: team/tilghman/realtime_failover/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/UPGRADE.txt?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/UPGRADE.txt (original)
+++ team/tilghman/realtime_failover/UPGRADE.txt Mon Nov 17 17:56:41 2008
@@ -291,6 +291,13 @@
   new value has been added to the TRANSFER event that indicates the caller's
   original position in the queue they are being transfered from.
 
+* Prior to Asterisk 1.6.2, queue names were treated in a case-sensitive
+  manner, meaning that queues with names like "sales" and "sALeS" would
+  be seen as unique queues. The parsing logic has changed to use case-
+  insensitive comparisons now when originally hashing based on queue
+  names, meaning that now the two queues mentioned as examples earlier
+  will be seen as having the same name.
+
 iLBC Codec:
 
 * Previously, the Asterisk source code distribution included the iLBC

Modified: team/tilghman/realtime_failover/agi/eagi-sphinx-test.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/agi/eagi-sphinx-test.c?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/agi/eagi-sphinx-test.c (original)
+++ team/tilghman/realtime_failover/agi/eagi-sphinx-test.c Mon Nov 17 17:56:41 2008
@@ -79,7 +79,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -130,7 +132,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;
@@ -141,9 +145,10 @@
 		}
 		if (FD_ISSET(AUDIO_FILENO, &fds)) {
 			res = read(AUDIO_FILENO, audiobuf, sizeof(audiobuf));
-			if (res > 0) {
-				if (sphinx_sock > -1) 
-					write(sphinx_sock, audiobuf, res);
+			if ((res > 0) && (sphinx_sock > -1)) {
+				if (write(sphinx_sock, audiobuf, res) < 0) {
+					fprintf(stderr, "write() failed: %s\n", strerror(errno));
+				}
 			}
 		}
 		if ((sphinx_sock > -1) && FD_ISSET(sphinx_sock, &fds)) {

Modified: team/tilghman/realtime_failover/agi/eagi-test.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/agi/eagi-test.c?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/agi/eagi-test.c (original)
+++ team/tilghman/realtime_failover/agi/eagi-test.c Mon Nov 17 17:56:41 2008
@@ -24,7 +24,9 @@
 	char *val;
 	/* Read environment */
 	for(;;) {
-		fgets(buf, sizeof(buf), stdin);
+		if (!fgets(buf, sizeof(buf), stdin)) {
+			return -1;
+		}
 		if (feof(stdin))
 			return -1;
 		buf[strlen(buf) - 1] = '\0';
@@ -68,7 +70,9 @@
 			return NULL;
 		}
 		if (FD_ISSET(STDIN_FILENO, &fds)) {
-			fgets(astresp, sizeof(astresp), stdin);
+			if (!fgets(astresp, sizeof(astresp), stdin)) {
+				return NULL;
+			}
 			if (feof(stdin)) {
 				fprintf(stderr, "Got hungup on apparently\n");
 				return NULL;

Modified: team/tilghman/realtime_failover/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/apps/app_adsiprog.c?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/apps/app_adsiprog.c (original)
+++ team/tilghman/realtime_failover/apps/app_adsiprog.c Mon Nov 17 17:56:41 2008
@@ -47,13 +47,27 @@
 
 static char *app = "ADSIProg";
 
-static char *synopsis = "Load Asterisk ADSI Scripts into phone";
+/*** DOCUMENTATION
+	<application name="ADSIProg" language="en_US">
+		<synopsis>
+			Load Asterisk ADSI Scripts into phone
+		</synopsis>
+		<syntax>
+			<parameter name="script" required="false">
+				<para>adsi script to use. If not given uses the default script <filename>asterisk.adsi</filename></para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>This application programs an ADSI Phone with the given script</para>
+		</description>
+		<see-also>
+			<ref type="application">GetCPEID</ref>
+			<ref type="filename">adsi.conf</ref>
+		</see-also>
+	</application>
+ ***/
 
 /* #define DUMP_MESSAGES */
-
-static char *descrip =
-"  ADSIProg(script): This application programs an ADSI Phone with the given\n"
-"script. If nothing is specified, the default script (asterisk.adsi) is used.\n";
 
 struct adsi_event {
 	int id;
@@ -828,7 +842,7 @@
 			ast_log(LOG_WARNING, "'%s' is not a valid state name at line %d of %s\n", tok, lineno, script);
 			return 0;
 		}
-		if ((snums[scnt] = getstatebyname(state, sname, script, lineno, 0) < 0)) {
+		if ((snums[scnt] = getstatebyname(state, sname, script, lineno, 0) == NULL)) {
 			ast_log(LOG_WARNING, "State '%s' not declared at line %d of %s\n", sname, lineno, script);
 			return 0;
 		}
@@ -1369,7 +1383,9 @@
 	/* Create "main" as first subroutine */
 	getsubbyname(scr, "main", NULL, 0);
 	while (!feof(f)) {
-		fgets(buf, sizeof(buf), f);
+		if (!fgets(buf, sizeof(buf), f)) {
+			continue;
+		}
 		if (!feof(f)) {
 			lineno++;
 			/* Trim off trailing return */
@@ -1570,7 +1586,7 @@
 
 static int load_module(void)
 {
-	if (ast_register_application(app, adsi_exec, synopsis, descrip))
+	if (ast_register_application_xml(app, adsi_exec))
 		return AST_MODULE_LOAD_FAILURE;
 	return AST_MODULE_LOAD_SUCCESS;
 }

Modified: team/tilghman/realtime_failover/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/apps/app_alarmreceiver.c?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/apps/app_alarmreceiver.c (original)
+++ team/tilghman/realtime_failover/apps/app_alarmreceiver.c Mon Nov 17 17:56:41 2008
@@ -63,18 +63,27 @@
 typedef struct event_node event_node_t;
 
 static char *app = "AlarmReceiver";
-
-static char *synopsis = "Provide support for receiving alarm reports from a burglar or fire alarm panel";
-static char *descrip =
-"  AlarmReceiver(): Only 1 signalling format is supported at this time: Ademco\n"
-"Contact ID. This application should be called whenever there is an alarm\n"
-"panel calling in to dump its events. The application will handshake with the\n"
-"alarm panel, and receive events, validate them, handshake them, and store them\n"
-"until the panel hangs up. Once the panel hangs up, the application will run the\n"
-"system command specified by the eventcmd setting in alarmreceiver.conf and pipe\n"
-"the events to the standard input of the application. The configuration file also\n"
-"contains settings for DTMF timing, and for the loudness of the acknowledgement\n"
-"tones.\n";
+/*** DOCUMENTATION
+	<application name="AlarmReceiver" language="en_US">
+		<synopsis>
+			Provide support for receiving alarm reports from a burglar or fire alarm panel.
+		</synopsis>
+		<syntax />
+		<description>
+			<para>This application should be called whenever there is an alarm panel calling in to dump its events.
+			The application will handshake with the alarm panel, and receive events, validate them, handshake them,
+			and store them until the panel hangs up. Once the panel hangs up, the application will run the system
+			command specified by the eventcmd setting in <filename>alarmreceiver.conf</filename> and pipe the
+			events to the standard input of the application.
+			The configuration file also contains settings for DTMF timing, and for the loudness of the
+			acknowledgement tones.</para>
+			<note><para>Only 1 signalling format is supported at this time: Ademco Contact ID.</para></note>
+		</description>
+		<see-also>
+			<ref type="filename">alarmreceiver.conf</ref>
+		</see-also>
+	</application>
+ ***/
 
 /* Config Variables */
 static int fdtimeout = 2000;
@@ -711,7 +720,7 @@
 static int load_module(void)
 {
 	if (load_config()) {
-		if (ast_register_application(app, alarmreceiver_exec, synopsis, descrip))
+		if (ast_register_application_xml(app, alarmreceiver_exec))
 			return AST_MODULE_LOAD_FAILURE;
 		return AST_MODULE_LOAD_SUCCESS;
 	} else

Modified: team/tilghman/realtime_failover/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/tilghman/realtime_failover/apps/app_amd.c?view=diff&rev=157286&r1=157285&r2=157286
==============================================================================
--- team/tilghman/realtime_failover/apps/app_amd.c (original)
+++ team/tilghman/realtime_failover/apps/app_amd.c Mon Nov 17 17:56:41 2008
@@ -39,45 +39,92 @@
 #include "asterisk/config.h"
 #include "asterisk/app.h"
 
+/*** DOCUMENTATION
+	<application name="AMD" language="en_US">
+		<synopsis>
+			Attempt to detect answering machines.
+		</synopsis>
+		<syntax>
+			<parameter name="initialSilence" required="false">
+				<para>Is maximum initial silence duration before greeting.</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="greeting" required="false">
+				<para>is the maximum length of a greeting.</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="afterGreetingSilence" required="false">
+				<para>Is the silence after detecting a greeting.</para>
+				<para>If this is exceeded set as HUMAN</para>
+			</parameter>
+			<parameter name="totalAnalysis Time" required="false">
+				<para>Is the maximum time allowed for the algorithm</para>
+				<para>to decide HUMAN or MACHINE</para>
+			</parameter>
+			<parameter name="miniumWordLength" required="false">
+				<para>Is the minimum duration of Voice considered to be a word</para>
+			</parameter>
+			<parameter name="betweenWordSilence" required="false">
+				<para>Is the minimum duration of silence after a word to
+				consider the audio that follows to be a new word</para>
+			</parameter>
+			<parameter name="maximumNumberOfWords" required="false">
+				<para>Is the maximum number of words in a greeting</para>
+				<para>If this is exceeded set as MACHINE</para>
+			</parameter>
+			<parameter name="silenceThreshold" required="false">
+				<para>How long do we consider silence</para>
+			</parameter>
+			<parameter name="maximumWordLength" required="false">
+				<para>Is the maximum duration of a word to accept.</para>
+				<para>If exceeded set as MACHINE</para>
+			</parameter>
+		</syntax>
+		<description>
+			<para>This application attempts to detect answering machines at the beginning
+			of outbound calls. Simply call this application after the call
+			has been answered (outbound only, of course).</para>
+			<para>When loaded, AMD reads amd.conf and uses the parameters specified as
+			default values. Those default values get overwritten when the calling AMD
+			with parameters.</para>
+			<para>This application sets the following channel variables:</para>
+			<variablelist>
+				<variable name="AMDSTATUS">
+					<para>This is the status of the answering machine detection</para>
+					<value name="MACHINE" />
+					<value name="HUMAN" />
+					<value name="NOTSURE" />
+					<value name="HANGUP" />
+				</variable>
+				<variable name="AMDCAUSE">
+					<para>Indicates the cause that led to the conclusion</para>
+					<value name="TOOLONG">
+						Total Time.
+					</value>
+					<value name="INITIALSILENCE">
+						Silence Duration - Initial Silence.
+					</value>
+					<value name="HUMAN">
+						Silence Duration - afterGreetingSilence.
+					</value>
+					<value name="LONGGREETING">
+						Voice Duration - Greeting.
+					</value>
+					<value name="MAXWORDLENGTH">
+						Word Count - maximum number of words.
+					</value>	
+				</variable>
+			</variablelist>
+		</description>
+		<see-also>
+			<ref type="application">WaitForSilence</ref>
+			<ref type="application">WaitForNoise</ref>
+		</see-also>
+	</application>
+
+ ***/
 
 static char *app = "AMD";
-static char *synopsis = "Attempts to detect answering machines";
-static char *descrip =
-"  AMD([initialSilence],[greeting],[afterGreetingSilence],[totalAnalysisTime]\n"
-"      ,[minimumWordLength],[betweenWordsSilence],[maximumNumberOfWords]\n"
-"      ,[silenceThreshold],[|maximumWordLength])\n"
-"  This application attempts to detect answering machines at the beginning\n"
-"  of outbound calls.  Simply call this application after the call\n"
-"  has been answered (outbound only, of course).\n"
-"  When loaded, AMD reads amd.conf and uses the parameters specified as\n"
-"  default values. Those default values get overwritten when calling AMD\n"
-"  with parameters.\n"
-"- 'initialSilence' is the maximum silence duration before the greeting. If\n"
-"   exceeded then MACHINE.\n"
-"- 'greeting' is the maximum length of a greeting. If exceeded then MACHINE.\n"
-"- 'afterGreetingSilence' is the silence after detecting a greeting.\n"
-"   If exceeded then HUMAN.\n"
-"- 'totalAnalysisTime' is the maximum time allowed for the algorithm to decide\n"
-"   on a HUMAN or MACHINE.\n"
-"- 'minimumWordLength'is the minimum duration of Voice to considered as a word.\n"
-"- 'betweenWordsSilence' is the minimum duration of silence after a word to \n"
-"   consider the audio that follows as a new word.\n"
-"- 'maximumNumberOfWords'is the maximum number of words in the greeting. \n"
-"   If exceeded then MACHINE.\n"
-"- 'silenceThreshold' is the silence threshold.\n"
-"- 'maximumWordLength' is the maximum duration of a word to accept. If exceeded then MACHINE\n"
-"This application sets the following channel variables upon completion:\n"
-"    AMDSTATUS - This is the status of the answering machine detection.\n"
-"                Possible values are:\n"

[... 29528 lines stripped ...]

More information about the asterisk-commits mailing list