[svn-commits] branch group/testframework r19766 - in /team/group/testframework: ./ apps/ cd...

Thu Apr 13 06:23:50 MST 2006

Author: oej
Date: Thu Apr 13 08:21:30 2006
New Revision: 19766

URL: http://svn.digium.com/view/asterisk?rev=19766&view=rev
Log:
Update to trunk and reset automerge

Added:
    team/group/testframework/apps/app_speech_utils.c
      - copied unchanged from r19736, trunk/apps/app_speech_utils.c
    team/group/testframework/doc/ajam.txt
      - copied unchanged from r19736, trunk/doc/ajam.txt
    team/group/testframework/doc/datastores.txt
      - copied unchanged from r19736, trunk/doc/datastores.txt
    team/group/testframework/doc/speechrec.txt
      - copied unchanged from r19736, trunk/doc/speechrec.txt
    team/group/testframework/include/asterisk/speech.h
      - copied unchanged from r19736, trunk/include/asterisk/speech.h
    team/group/testframework/res/res_config_pgsql.c
      - copied unchanged from r19736, trunk/res/res_config_pgsql.c
    team/group/testframework/res/res_speech.c
      - copied unchanged from r19736, trunk/res/res_speech.c
    team/group/testframework/static-http/
      - copied from r19736, trunk/static-http/
    team/group/testframework/static-http/ajamdemo.html
      - copied unchanged from r19736, trunk/static-http/ajamdemo.html
    team/group/testframework/static-http/astman.css
      - copied unchanged from r19736, trunk/static-http/astman.css
    team/group/testframework/static-http/astman.js
      - copied unchanged from r19736, trunk/static-http/astman.js
    team/group/testframework/static-http/prototype.js
      - copied unchanged from r19736, trunk/static-http/prototype.js
Removed:
    team/group/testframework/formats/format_au.c
    team/group/testframework/formats/format_pcm_alaw.c
Modified:
    team/group/testframework/   (props changed)
    team/group/testframework/.cleancount
    team/group/testframework/CREDITS
    team/group/testframework/Makefile
    team/group/testframework/README
    team/group/testframework/UPGRADE.txt
    team/group/testframework/acl.c
    team/group/testframework/app.c
    team/group/testframework/apps/Makefile
    team/group/testframework/apps/app_adsiprog.c
    team/group/testframework/apps/app_alarmreceiver.c
    team/group/testframework/apps/app_amd.c
    team/group/testframework/apps/app_authenticate.c
    team/group/testframework/apps/app_cdr.c
    team/group/testframework/apps/app_chanisavail.c
    team/group/testframework/apps/app_channelredirect.c
    team/group/testframework/apps/app_chanspy.c
    team/group/testframework/apps/app_controlplayback.c
    team/group/testframework/apps/app_db.c
    team/group/testframework/apps/app_dial.c
    team/group/testframework/apps/app_dictate.c
    team/group/testframework/apps/app_directed_pickup.c
    team/group/testframework/apps/app_directory.c
    team/group/testframework/apps/app_disa.c
    team/group/testframework/apps/app_dumpchan.c
    team/group/testframework/apps/app_echo.c
    team/group/testframework/apps/app_exec.c
    team/group/testframework/apps/app_externalivr.c
    team/group/testframework/apps/app_festival.c
    team/group/testframework/apps/app_flash.c
    team/group/testframework/apps/app_forkcdr.c
    team/group/testframework/apps/app_getcpeid.c
    team/group/testframework/apps/app_hasnewvoicemail.c
    team/group/testframework/apps/app_ices.c
    team/group/testframework/apps/app_image.c
    team/group/testframework/apps/app_ivrdemo.c
    team/group/testframework/apps/app_lookupblacklist.c
    team/group/testframework/apps/app_lookupcidname.c
    team/group/testframework/apps/app_macro.c
    team/group/testframework/apps/app_meetme.c
    team/group/testframework/apps/app_milliwatt.c
    team/group/testframework/apps/app_mixmonitor.c
    team/group/testframework/apps/app_morsecode.c
    team/group/testframework/apps/app_mp3.c
    team/group/testframework/apps/app_nbscat.c
    team/group/testframework/apps/app_osplookup.c
    team/group/testframework/apps/app_page.c
    team/group/testframework/apps/app_parkandannounce.c
    team/group/testframework/apps/app_playback.c
    team/group/testframework/apps/app_privacy.c
    team/group/testframework/apps/app_queue.c
    team/group/testframework/apps/app_random.c
    team/group/testframework/apps/app_read.c
    team/group/testframework/apps/app_readfile.c
    team/group/testframework/apps/app_realtime.c
    team/group/testframework/apps/app_record.c
    team/group/testframework/apps/app_rpt.c
    team/group/testframework/apps/app_sayunixtime.c
    team/group/testframework/apps/app_senddtmf.c
    team/group/testframework/apps/app_sendtext.c
    team/group/testframework/apps/app_setcallerid.c
    team/group/testframework/apps/app_setcdruserfield.c
    team/group/testframework/apps/app_settransfercapability.c
    team/group/testframework/apps/app_skel.c
    team/group/testframework/apps/app_sms.c
    team/group/testframework/apps/app_softhangup.c
    team/group/testframework/apps/app_stack.c
    team/group/testframework/apps/app_system.c
    team/group/testframework/apps/app_talkdetect.c
    team/group/testframework/apps/app_test.c
    team/group/testframework/apps/app_transfer.c
    team/group/testframework/apps/app_url.c
    team/group/testframework/apps/app_userevent.c
    team/group/testframework/apps/app_verbose.c
    team/group/testframework/apps/app_voicemail.c
    team/group/testframework/apps/app_waitforring.c
    team/group/testframework/apps/app_waitforsilence.c
    team/group/testframework/apps/app_while.c
    team/group/testframework/apps/app_zapateller.c
    team/group/testframework/apps/app_zapbarge.c
    team/group/testframework/apps/app_zapras.c
    team/group/testframework/apps/app_zapscan.c
    team/group/testframework/asterisk.c
    team/group/testframework/cdr.c
    team/group/testframework/cdr/cdr_csv.c
    team/group/testframework/cdr/cdr_custom.c
    team/group/testframework/cdr/cdr_manager.c
    team/group/testframework/cdr/cdr_odbc.c
    team/group/testframework/cdr/cdr_pgsql.c
    team/group/testframework/cdr/cdr_sqlite.c
    team/group/testframework/cdr/cdr_tds.c
    team/group/testframework/channel.c
    team/group/testframework/channels/chan_agent.c
    team/group/testframework/channels/chan_alsa.c
    team/group/testframework/channels/chan_features.c
    team/group/testframework/channels/chan_h323.c
    team/group/testframework/channels/chan_iax2.c
    team/group/testframework/channels/chan_local.c
    team/group/testframework/channels/chan_mgcp.c
    team/group/testframework/channels/chan_misdn.c
    team/group/testframework/channels/chan_nbs.c
    team/group/testframework/channels/chan_oss.c
    team/group/testframework/channels/chan_phone.c
    team/group/testframework/channels/chan_sip.c
    team/group/testframework/channels/chan_skinny.c
    team/group/testframework/channels/chan_vpb.c
    team/group/testframework/channels/chan_zap.c
    team/group/testframework/channels/h323/ast_h323.cpp
    team/group/testframework/channels/iax2-provision.h
    team/group/testframework/channels/misdn/Makefile
    team/group/testframework/channels/misdn/isdn_lib.c
    team/group/testframework/channels/misdn/isdn_lib.h
    team/group/testframework/channels/misdn/isdn_msg_parser.c
    team/group/testframework/channels/misdn/portinfo.c
    team/group/testframework/cli.c
    team/group/testframework/codecs/codec_a_mu.c
    team/group/testframework/codecs/codec_adpcm.c
    team/group/testframework/codecs/codec_alaw.c
    team/group/testframework/codecs/codec_g723_1.c
    team/group/testframework/codecs/codec_g726.c
    team/group/testframework/codecs/codec_gsm.c
    team/group/testframework/codecs/codec_ilbc.c
    team/group/testframework/codecs/codec_lpc10.c
    team/group/testframework/codecs/codec_speex.c
    team/group/testframework/codecs/codec_ulaw.c
    team/group/testframework/config.c
    team/group/testframework/configs/extensions.conf.sample
    team/group/testframework/configs/features.conf.sample
    team/group/testframework/configs/http.conf.sample
    team/group/testframework/configs/iax.conf.sample
    team/group/testframework/configs/manager.conf.sample
    team/group/testframework/configs/meetme.conf.sample
    team/group/testframework/configs/mgcp.conf.sample
    team/group/testframework/configs/modules.conf.sample
    team/group/testframework/configs/osp.conf.sample
    team/group/testframework/configs/queues.conf.sample
    team/group/testframework/configs/sip.conf.sample
    team/group/testframework/configs/skinny.conf.sample
    team/group/testframework/configs/voicemail.conf.sample
    team/group/testframework/devicestate.c
    team/group/testframework/dns.c
    team/group/testframework/doc/00README.1st
    team/group/testframework/doc/CODING-GUIDELINES
    team/group/testframework/doc/channelvariables.txt
    team/group/testframework/doc/manager.txt
    team/group/testframework/enum.c
    team/group/testframework/file.c
    team/group/testframework/formats/Makefile
    team/group/testframework/formats/format_g723.c
    team/group/testframework/formats/format_g726.c
    team/group/testframework/formats/format_g729.c
    team/group/testframework/formats/format_gsm.c
    team/group/testframework/formats/format_h263.c
    team/group/testframework/formats/format_h264.c
    team/group/testframework/formats/format_ilbc.c
    team/group/testframework/formats/format_jpeg.c
    team/group/testframework/formats/format_ogg_vorbis.c
    team/group/testframework/formats/format_pcm.c
    team/group/testframework/formats/format_sln.c
    team/group/testframework/formats/format_vox.c
    team/group/testframework/formats/format_wav.c
    team/group/testframework/formats/format_wav_gsm.c
    team/group/testframework/funcs/func_base64.c
    team/group/testframework/funcs/func_callerid.c
    team/group/testframework/funcs/func_cdr.c
    team/group/testframework/funcs/func_channel.c
    team/group/testframework/funcs/func_curl.c
    team/group/testframework/funcs/func_cut.c
    team/group/testframework/funcs/func_db.c
    team/group/testframework/funcs/func_enum.c
    team/group/testframework/funcs/func_env.c
    team/group/testframework/funcs/func_groupcount.c
    team/group/testframework/funcs/func_language.c
    team/group/testframework/funcs/func_logic.c
    team/group/testframework/funcs/func_math.c
    team/group/testframework/funcs/func_md5.c
    team/group/testframework/funcs/func_moh.c
    team/group/testframework/funcs/func_odbc.c
    team/group/testframework/funcs/func_rand.c
    team/group/testframework/funcs/func_sha1.c
    team/group/testframework/funcs/func_strings.c
    team/group/testframework/funcs/func_timeout.c
    team/group/testframework/funcs/func_uri.c
    team/group/testframework/http.c
    team/group/testframework/include/asterisk.h
    team/group/testframework/include/asterisk/adsi.h
    team/group/testframework/include/asterisk/app.h
    team/group/testframework/include/asterisk/astosp.h
    team/group/testframework/include/asterisk/callerid.h
    team/group/testframework/include/asterisk/channel.h
    team/group/testframework/include/asterisk/cli.h
    team/group/testframework/include/asterisk/compat.h
    team/group/testframework/include/asterisk/crypto.h
    team/group/testframework/include/asterisk/dns.h
    team/group/testframework/include/asterisk/doxyref.h
    team/group/testframework/include/asterisk/enum.h
    team/group/testframework/include/asterisk/features.h
    team/group/testframework/include/asterisk/file.h
    team/group/testframework/include/asterisk/frame.h
    team/group/testframework/include/asterisk/fskmodem.h
    team/group/testframework/include/asterisk/http.h
    team/group/testframework/include/asterisk/image.h
    team/group/testframework/include/asterisk/io.h
    team/group/testframework/include/asterisk/linkedlists.h
    team/group/testframework/include/asterisk/localtime.h
    team/group/testframework/include/asterisk/lock.h
    team/group/testframework/include/asterisk/logger.h
    team/group/testframework/include/asterisk/manager.h
    team/group/testframework/include/asterisk/module.h
    team/group/testframework/include/asterisk/musiconhold.h
    team/group/testframework/include/asterisk/pbx.h
    team/group/testframework/include/asterisk/rtp.h
    team/group/testframework/include/asterisk/sched.h
    team/group/testframework/include/asterisk/tdd.h
    team/group/testframework/include/asterisk/term.h
    team/group/testframework/include/asterisk/translate.h
    team/group/testframework/include/asterisk/utils.h
    team/group/testframework/loader.c
    team/group/testframework/manager.c
    team/group/testframework/pbx.c
    team/group/testframework/pbx/pbx_ael.c
    team/group/testframework/pbx/pbx_config.c
    team/group/testframework/pbx/pbx_dundi.c
    team/group/testframework/pbx/pbx_gtkconsole.c
    team/group/testframework/pbx/pbx_loopback.c
    team/group/testframework/pbx/pbx_realtime.c
    team/group/testframework/pbx/pbx_spool.c
    team/group/testframework/res/Makefile
    team/group/testframework/res/res_adsi.c
    team/group/testframework/res/res_agi.c
    team/group/testframework/res/res_clioriginate.c
    team/group/testframework/res/res_config_odbc.c
    team/group/testframework/res/res_convert.c
    team/group/testframework/res/res_crypto.c
    team/group/testframework/res/res_features.c
    team/group/testframework/res/res_indications.c
    team/group/testframework/res/res_monitor.c
    team/group/testframework/res/res_musiconhold.c
    team/group/testframework/res/res_odbc.c
    team/group/testframework/res/res_osp.c
    team/group/testframework/res/res_smdi.c
    team/group/testframework/res/res_snmp.c
    team/group/testframework/rtp.c
    team/group/testframework/sched.c
    team/group/testframework/translate.c
    team/group/testframework/udptl.c
    team/group/testframework/utils.c
    team/group/testframework/utils/astman.c

Propchange: team/group/testframework/
------------------------------------------------------------------------------
    automerge = http://www.meetasterisk.com/

Propchange: team/group/testframework/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/group/testframework/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/testframework/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Apr 13 08:21:30 2006
@@ -1,1 +1,1 @@
-/trunk:1-16580
+/trunk:1-19757

Modified: team/group/testframework/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/testframework/.cleancount?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/.cleancount (original)
+++ team/group/testframework/.cleancount Thu Apr 13 08:21:30 2006
@@ -1,1 +1,1 @@
-12
+15

Modified: team/group/testframework/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/testframework/CREDITS?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/CREDITS (original)
+++ team/group/testframework/CREDITS Thu Apr 13 08:21:30 2006
@@ -12,6 +12,8 @@
 Telesthetic - for supporting SIP development
 
 Christos Ricudis - for substantial code contributions
+
+nic.at - ENUM support in Asterisk
 
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
 
@@ -90,6 +92,11 @@
 Music provided by www.freeplaymusic.com
 
 === OTHER SOURCE CODE IN ASTERISK ===
+Asterisk uses libedit, the lightweight readline replacement from
+NetBSD. It is BSD-licensed and requires the following statement:
+
+      This product includes software developed by the NetBSD
+      Foundation, Inc. and its contributors.
 
 Digium did not implement the codecs in Asterisk.  Here is the copyright on the
 GSM source:

Modified: team/group/testframework/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/testframework/Makefile?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/Makefile (original)
+++ team/group/testframework/Makefile Thu Apr 13 08:21:30 2006
@@ -15,22 +15,33 @@
 
 # Create OPTIONS variable
 OPTIONS=
+
 # If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
 CC=$(CROSS_COMPILE)gcc
 HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
 
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
-  OSREV=$(shell uname -r)
+  PROC?=$(shell uname -m)
 else
   OSARCH=$(CROSS_ARCH)
-  OSREV=$(CROSS_REV)
+  PROC=$(CROSS_PROC)
 endif
 
 PWD=$(shell pwd)
@@ -39,13 +50,13 @@
 MAKETOPLEVEL?=$(MAKELEVEL)
 
 ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions.  This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.  
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions.  This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.  
 #K6OPT  = -DK6OPT
 
-#Tell gcc to optimize the code
+# Tell gcc to optimize the code
 OPTIMIZE+=-O6
 else
   # Stack backtraces, while useful for debugging, are incompatible with optimizations
@@ -54,14 +65,13 @@
   endif
 endif
 
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
 OVERWRITE=y
 
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g3 #-pg
 
-#Set NOCRYPTO to yes if you do not want to have crypto support or 
-#dependencies
+# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
 #NOCRYPTO=yes
 
 # If you are running a radio application, define RADIO_RELAX so that the DTMF
@@ -70,14 +80,11 @@
 
 # If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
 # to reduce the size of certain static buffers
-
 #ifneq ($(CROSS_COMPILE),)
 #OPTIONS += -DLOW_MEMORY
 #endif
 
-#
 # Asterisk SMDI integration
-#
 WITH_SMDI = 1
 
 # Optional debugging parameters
@@ -101,7 +108,7 @@
 # Files are copied here temporarily during the install process
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
 DESTDIR?=
 #DESTDIR?=/tmp/asterisk
 
@@ -117,57 +124,64 @@
 # Don't use together with -DBUSYDETECT_TONEONLY
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
-ifneq ($(OSARCH),SunOS)
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf 
+ifeq ($(OSARCH),SunOS)
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
+  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
+  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
+  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+else
+ifeq ($(OSARCH),FreeBSD)
+  PREFIX?=/usr/local
+  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
   ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
   ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
   ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
   ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
   ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
   ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
   ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else
-  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
-  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
-  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
-  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-endif
+endif
+endif
+
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
 
 ASTCFLAGS=
 
 # Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
 ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
 
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
-
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
 
 # Uncomment the following to enable code testing code to be enabled :)
 ASTCFLAGS+=-DENABLE_CODE_TEST
@@ -187,12 +201,6 @@
 endif
 
 ifeq ($(OSARCH),Linux)
-  ifeq ($(CROSS_COMPILE),)
-    PROC?=$(shell uname -m)
-  else
-    PROC=$(CROSS_PROC)
-  endif
-
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
@@ -246,7 +254,6 @@
 ASTOBJ=-o asterisk
 
 ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  PROC=$(shell uname -m)
   ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
 endif
 
@@ -274,22 +281,6 @@
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
   MPG123TARG=freebsd
-
-  # XXX FreeBSD paths
-  PREFIX?=/usr/local
-  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
-  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-  # XXX end FreeBSD paths
-
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
@@ -314,7 +305,6 @@
   ASTLINK=
   LIBS+=-lpthread -lncurses -lm -lresolv
   ASTSBINDIR=$(MODULES_DIR)
-  PROC=$(shell uname -m)
 endif
 
 ifndef WITHOUT_ZAPTEL
@@ -404,10 +394,13 @@
   AUDIO_LIBS=-framework CoreAudio
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  OBJS+=poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
+  # Mac on Intel CoreDuo does not need poll compatibility layer
+  ifneq ($(PROC),i386)
+    OBJS+=poll.o
+    ASTCFLAGS+=-DPOLLCOMPAT
+  endif
 else
-#These are used for all but Darwin
+# These are used for all but Darwin
   ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
   ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -573,6 +566,13 @@
 
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+	# Should static HTTP be installed during make samples or even with its own target ala
+	# webvoicemail?  There are portions here that *could* be customized but might also be
+	# improved a lot.  I'll put it here for now.
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/static-http
+	for x in static-http/*; do \
+		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/static-http ; \
+	done
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
@@ -681,7 +681,6 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
@@ -700,7 +699,6 @@
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
 	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 	@echo " +---- Asterisk Installation Complete -------+"  
 	@echo " +                                           +"
@@ -963,11 +961,9 @@
 	@echo " +            $(MAKE) uninstall-all             +"  
 	@echo " +-------------------------------------------+"  
 
-
 uninstall-all: _uninstall
 	rm -rf $(DESTDIR)$(ASTLIBDIR)
 	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
 	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
 	rm -rf $(DESTDIR)$(ASTETCDIR)
 	rm -rf $(DESTDIR)$(ASTLOGDIR)
-

Modified: team/group/testframework/README
URL: http://svn.digium.com/view/asterisk/team/group/testframework/README?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/README (original)
+++ team/group/testframework/README Thu Apr 13 08:21:30 2006
@@ -2,14 +2,14 @@
 by Mark Spencer <markster at digium.com>
 and the Asterisk.org developer community
 
-Copyright (C) 2001-2005 Digium, Inc.
+Copyright (C) 2001-2006 Digium, Inc.
 and other copyright holders.
 ================================================================
 
 * SECURITY
   It is imperative that you read and fully understand the contents of
-the SECURITY file before you attempt to configure and run an Asterisk
-server.
+the security information file (doc/security.txt) before you attempt 
+to configure and run an Asterisk server.
 
 * WHAT IS ASTERISK ?
   Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
@@ -84,11 +84,18 @@
 
   So let's proceed:
 
-1) Run "make"
+1) Read the README files.
+   There are more README files than this one in the doc/ directory.
+   Start with doc/00README.1st
+   You may also want to check the configuration files that contain
+   examples and reference guides. They are all in the configs/
+   directory.
+
+2) Run "make"
 
   Assuming the build completes successfully:
 
-2) Run "make install"
+3) Run "make install"
 
   Each time you update or checkout from the repository, you are strongly
 encouraged to ensure all previous object files are removed to avoid internal 
@@ -99,7 +106,7 @@
   If this is your first time working with Asterisk, you may wish to install
 the sample PBX, with demonstration extensions, etc.  If so, run:
 
-3) "make samples"
+4) "make samples"
 
   Doing so will overwrite any existing config files you have.
 

Modified: team/group/testframework/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/group/testframework/UPGRADE.txt?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/UPGRADE.txt (original)
+++ team/group/testframework/UPGRADE.txt Thu Apr 13 08:21:30 2006
@@ -1,5 +1,10 @@
 Information for Upgrading From Previous Asterisk Releases
 =========================================================
+
+PBX Core:
+
+* The (very old and undocumented) ability to use BYEXTENSION for dialing
+  instead of ${EXTEN} has been removed.
 
 Command Line Interface:
 
@@ -29,6 +34,17 @@
   "noanswer" will not work.  Use s or n.  Also there is a new feature i, for
   using indication tones, so typing in skip would give you unexpected results.
 
+* OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
+
+Manager:
+
+* After executing the 'status' manager action, the "Status" manager events
+  included the header "CallerID:" which was actually only the CallerID number,
+  and not the full CallerID string.  This header has been renamed to
+  "CallerIDNum".  For compatibility purposes, the CallerID parameter will remain
+  until after the release of 1.4, when it will be removed.  Please use the time
+  during the 1.4 release to make this transition.
+
 Variables:
 
 * The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
@@ -39,6 +55,10 @@
 
 * The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now 
   adjustable from cdr.conf, instead of recompiling.
+
+* OSP applications exports several new variables, ${OSPINHANDLE},
+  ${OSPOUTHANDLE}, ${OSPINTOKEN}, ${OSPOUTTOKEN}, ${OSPCALLING},
+  ${OSPINTIMELIMIT}, and ${OSPOUTTIMELIMIT}
 
 Functions:
 
@@ -66,6 +86,10 @@
 
 * The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
 
+* OSP support code is removed from SIP channel to OSP applications. ospauth 
+  option in sip.conf is removed to osp.conf as authpolicy. allowguest option
+  in sip.conf cannot be set as osp anymore. 
+
 Installation:
 
 * On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf

Modified: team/group/testframework/acl.c
URL: http://svn.digium.com/view/asterisk/team/group/testframework/acl.c?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/acl.c (original)
+++ team/group/testframework/acl.c Thu Apr 13 08:21:30 2006
@@ -70,10 +70,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
 #include "asterisk/compat.h"
-
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-AST_MUTEX_DEFINE_STATIC(routeseq_lock);
-#endif
 
 struct ast_ha {
 	/* Host access rule */

Modified: team/group/testframework/app.c
URL: http://svn.digium.com/view/asterisk/team/group/testframework/app.c?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/app.c (original)
+++ team/group/testframework/app.c Thu Apr 13 08:21:30 2006
@@ -552,7 +552,6 @@
 	struct ast_dsp *sildet=NULL;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;
 	struct ast_silence_generator *silgen = NULL;
 
@@ -675,7 +674,7 @@
 						if (option_verbose > 2)
 							ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 						ast_frfree(f);
-						gotsilence = 1;
+						res = 'S';
 						outmsg=2;
 						break;
 					}
@@ -779,7 +778,6 @@
 	struct ast_dsp *sildet;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;	
 	char prependfile[80];
 	
@@ -898,7 +896,7 @@
 					if (option_verbose > 2) 
 						ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 					ast_frfree(f);
-					gotsilence = 1;
+					res = 'S';
 					outmsg=2;
 					break;
 					}
@@ -1157,7 +1155,7 @@
 		return AST_LOCK_FAILURE;
 	}
 
-	snprintf(fs, strlen(path) + 19, "%s/.lock-%08x", path, rand());
+	snprintf(fs, strlen(path) + 19, "%s/.lock-%08lx", path, ast_random());
 	fd = open(fs, O_WRONLY | O_CREAT | O_EXCL, 0600);
 	if (fd < 0) {
 		fprintf(stderr, "Unable to create lock file '%s': %s\n", path, strerror(errno));

Modified: team/group/testframework/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/testframework/apps/Makefile?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/apps/Makefile (original)
+++ team/group/testframework/apps/Makefile Thu Apr 13 08:21:30 2006
@@ -59,7 +59,7 @@
 	rm -f .depend
 
 clean: clean-depend
-	rm -f *.so *.o look
+	rm -f *.so *.o
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -75,14 +75,10 @@
 
 uninstall:
 
-look:	look.c
-	$(CC) -pipe -O6 -g look.c -o look -lncurses
-
 ifeq (SunOS,$(shell uname))
 app_chanspy.so: app_chanspy.o
 	$(CC) $(SOLINK) -o $@ $< -lrt
 endif
-
 
 ifneq ($(wildcard .depend),)
  include .depend

Modified: team/group/testframework/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/testframework/apps/app_adsiprog.c?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/apps/app_adsiprog.c (original)
+++ team/group/testframework/apps/app_adsiprog.c Thu Apr 13 08:21:30 2006
@@ -48,8 +48,6 @@
 #include "asterisk/options.h"
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
-
-static char *tdesc = "Asterisk ADSI Programming Application";
 
 static char *app = "ADSIProg";
 
@@ -1586,9 +1584,9 @@
 	return ast_register_application(app, adsi_exec, synopsis, descrip);
 }
 
-char *description(void)
-{
-	return tdesc;
+const char *description(void)
+{
+	return "Asterisk ADSI Programming Application";
 }
 
 int usecount(void)
@@ -1598,7 +1596,7 @@
 	return res;
 }
 
-char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/group/testframework/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/testframework/apps/app_alarmreceiver.c?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/apps/app_alarmreceiver.c (original)
+++ team/group/testframework/apps/app_alarmreceiver.c Thu Apr 13 08:21:30 2006
@@ -67,8 +67,6 @@
 };
 
 typedef struct event_node event_node_t;
-
-static char *tdesc = "Alarm Receiver for Asterisk";
 
 static char *app = "AlarmReceiver";
 
@@ -551,13 +549,12 @@
 
 		checksum = checksum % 15;
 
-		if(checksum){
+		if (checksum) {
 			database_increment("checksum-errors");
-			if(option_verbose >= 2){
+			if (option_verbose >= 2)
 				ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
 			ast_log(LOG_DEBUG, "AlarmReceiver: Nonzero checksum\n");
 			continue;
-			}
 		}
 
 		/* Check the message type for correctness */
@@ -838,9 +835,9 @@
 	return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
 }
 
-char *description(void)
-{
-	return tdesc;
+const char *description(void)
+{
+	return "Alarm Receiver for Asterisk";
 }
 
 int usecount(void)
@@ -850,7 +847,7 @@
 	return res;
 }
 
-char *key()
+const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/group/testframework/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/group/testframework/apps/app_amd.c?rev=19766&r1=19765&r2=19766&view=diff
==============================================================================
--- team/group/testframework/apps/app_amd.c (original)
+++ team/group/testframework/apps/app_amd.c Thu Apr 13 08:21:30 2006
@@ -35,7 +35,6 @@
 #include "asterisk/app.h"
 
 
-static char *tdesc = "Answering Machine Detection Application";
 static char *app = "AMD";
 static char *synopsis = "Attempts to detect answering machines";
 static char *descrip =
@@ -91,7 +90,7 @@
 
 static void isAnsweringMachine(struct ast_channel *chan, void *data)
 {
-	int res = 0;
+	int res = 0, ret = 0;
 
 	struct ast_frame *f = NULL;
 
@@ -136,8 +135,8 @@
 			     AST_APP_ARG(argMaximumNumberOfWords);
 			     AST_APP_ARG(argSilenceThreshold);
 	);
-
-	ast_verbose(VERBOSE_PREFIX_3 "AMD: %s %s %s (Fmt: %d)\n", chan->name ,chan->cid.cid_ani, chan->cid.cid_rdnis, chan->readformat);
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "AMD: %s %s %s (Fmt: %d)\n", chan->name ,chan->cid.cid_ani, chan->cid.cid_rdnis, chan->readformat);
 
 	/* Lets parse the arguments. */
 	if (ast_strlen_zero(data)) {
@@ -180,8 +179,9 @@
 	}
 
 	/* Now we're ready to roll! */
-
-	ast_verbose(VERBOSE_PREFIX_3 "AMD: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
+	
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "AMD: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
 		"totalAnalysisTime [%d] minimumWordLength [%d] betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] \n",
 				initialSilence, greeting, afterGreetingSilence, totalAnalysisTime,
 				minimumWordLength, betweenWordsSilence, maximumNumberOfWords, silenceThreshold );
@@ -204,42 +204,45 @@
 	}
 	ast_dsp_set_threshold(silenceDetector, silenceThreshold );
 
-	while (ast_waitfor(chan, -1) > -1)
+	while ((ret = ast_waitfor(chan, totalAnalysisTime)))
 	{
-		f = ast_read(chan);
-		if (!f ) {
-			/* No Frame: Called Party Must Have Dropped */
-			ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
-			ast_log(LOG_DEBUG, "Got hangup\n");
+		if (ret < 0 || !(f = ast_read(chan))) {
+			/* No Frame OR Error on ast_waitfor : Called Party Must Have Dropped */
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Got hangup\n");
 			strcpy(amdStatus , "HANGUP" );
 			strcpy(amdCause , "" );
 			break;
 		}
-		framelength = (ast_codec_get_samples(f) / 8);
-		iTotalTime += framelength;
-		if (iTotalTime >= totalAnalysisTime ) {
-			ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
-			ast_frfree(f);
-			strcpy(amdStatus , "NOTSURE" );
-			sprintf(amdCause , "TOOLONG-%d", iTotalTime );
-			break;
-		}
 		if (f->frametype == AST_FRAME_VOICE ) {
+			framelength = (ast_codec_get_samples(f) / DEFAULT_SAMPLES_PER_MS);
+			iTotalTime += framelength;
+			if (iTotalTime >= totalAnalysisTime ) {
+				if (option_verbose > 2)	
+					ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
+				ast_frfree(f);
+				strcpy(amdStatus , "NOTSURE" );
+				sprintf(amdCause , "TOOLONG-%d", iTotalTime );
+				break;
+			}
 			dspsilence = 0;
 			ast_dsp_silence(silenceDetector, f, &dspsilence);
 			if (dspsilence ) {
 				silenceDuration = dspsilence;
-				/* ast_verbose(VERBOSE_PREFIX_3 "AMD: %d SILENCE: silenceDuration:%d afterGreetingSilence:%d inGreeting:%d\n", currentState, silenceDuration, afterGreetingSilence, inGreeting ); */
 				if (silenceDuration >= betweenWordsSilence ) {
 					if (currentState != STATE_IN_SILENCE ) {

[... 36963 lines stripped ...]
