Convert all release tags to Opsound music-on-hold.

For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/



git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.2.0-beta1@212958 65c4cc65-6c06-0410-ace0-fbb531ad65f3

.cleancount

@@ -0,0 +1 @@
+6

.cvsignore

@@ -1,5 +0,0 @@
-asterisk
-build.h
-ast_expr.c
-.version
-.depend

BUGS

@@ -1,3 +1,8 @@
+Asterisk 1.0-RC-1 Known Major Bugs
+==================================
+* Some people still have issues with H.323
+* QuickNet driver still not entirely stable
+
 Asterisk Bug Tracking Information
 =================================
 

CHANGES

@@ -1,3 +1,62 @@
+ -- Pass redirecting number on PRI calls 
+ -- Add RTP debug support 
+ -- Misc Debugging improvements 
+ -- Add TALK_DETECTED variable 
+ -- Adding Q.SIG switchtype option to chan_zap
+ -- Added pbx_builtin_serialize_variables
+ -- Update to new iLBC codec
+ -- Add CLI for realtime stuff 
+ -- Add DUNDi.... (http://www.dundi.com)
+ -- Misc Memory fixes 
+ -- Voicemail improvements from the bug tracker
+ -- Major revamp of PBX core including 'n' and 's' priorities and labels
+ -- Deprecate pbx_wilcalu and app_qcall in favor of pbx_spool
+ -- Remove old chan_iax and chan_vofr
+ -- Major Caller*ID Restructuring
+ -- Realtime API (IAX, SIP and Voicemail)
+ -- codecs.conf to tune various codec options (ie Speex)
+Asterisk 1.0.1
+ -- Added AGI over TCP support
+ -- Add ability to purge callers from queue if no agents are logged in
+ -- Fix inband PRI indication detection
+ -- Fix for MGCP - always request digits if no RTP stream
+ -- Fixed seg fault for ast_control_streamfile
+ -- Make pick-up extension configurable via features.conf 
+ -- Numerous other bug fixes
+Asterisk 1.0.0
+ -- Use Q.931 standard cause codes for asterisk cause codes
+ -- Bug fixes from the bug tracker
+Asterisk 1.0-RC2 
+ -- Additional CDR backends
+ -- Allow muted to reconnect
+ -- Call parking improvements (including SIP parking support)
+ -- Added licensed hold music from FreePlayMusic
+ -- GR-303 and Zap improvements
+ -- More bug fixes from the bug tracker
+ -- Improved FreeBSD/OpenBSD/MacOS X support
+Asterisk 1.0-RC1
+ -- Innumerable bug fixes and features from the bug tracker
+ -- Added Open Settlement Protocol (OSP) support
+ -- Added Non-facility Associated Signalling (NFAS) Support
+ -- Added alarm Monitoring support
+ -- Added new MeetMe options
+ -- Added GR-303 Support
+ -- Added trunk groups
+ -- ADPCM Standardization
+ -- Numerous bug fixes
+ -- Add IAX2 Firmware Support
+ -- Add G.726 support
+ -- Add ices/icecast support
+ -- Numerous bug fixes
+Asterisk 0.7.2
+ -- Countless small bug fixes from bug tracker
+ -- DSP Fixes
+ -- Fix unloading of Zaptel
+ -- Pass Caller*ID/ANI properly on call forwarding
+ -- Add indication for Italy
+Asterisk 0.7.1
+ -- Fixed timed include context's and GotoIfTime
+ -- Fixed chan_h323 it now gets remote ip properly instead of 127.0.0.1
 Asterisk 0.7.0
  -- Removed MP3 format and codec
  -- Can now load and unload SIP,IAX,IAX2,H323 channels without core

CREDITS

@@ -5,6 +5,8 @@ Asterisk:
 
 Pilosoft, Inc. - for supporting ADSI development in Asterisk
 
+Asterlink, Inc. - for supporting broad Asterisk development
+
 GFS - for supporting ALSA development
 
 Telesthetic - for supporting SIP development
@@ -12,6 +14,7 @@ Telesthetic - for supporting SIP development
 Christos Ricudis - for substantial code contributions
 
 Paul Bagyenda, Digital Solutions - for initial Voicetronix driver development
+
 === WISHLIST CONTRIBUTERS ===
 Jeremy McNamara - SpeeX support
 Nick Seraphin - RDNIS support
@@ -23,6 +26,10 @@ Wasim - Hangup detect
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
 
 === MISCELLANEOUS PATCHES ===
+Russell Bryant - Asterisk 1.0 maintainer and misc. enhancements
+       russelb@clemson.edu
+Anthony Minessale - Countless big and small fixes, and relentless forward push
+       anthmct@yahoo.com              http://www.asterlink.com
 James Golovich - Innumerable contributions
        You can find him and asterisk-perl at http://asterisk.gnuinter.net
 Andre Bierwirth - Extension hints and status
@@ -52,10 +59,22 @@ Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
 	dialplan include verification, route lookup on OpenBSD, various other
 	bugs. tholo@sigmasoft.com
 Brian West - ODBC support and Bug Marshaling  
+Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
+		and Bug Marshalling. - josh@asteriasgi.com, http://www.asteriasgi.com
+William Waites - syslog support, SIP NAT traversal for SIP-UA. ww@styx.org
+Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
+	rich@whiteoaklabs.com  http://whiteoaklabs.com
+Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
+	simon@slimey.org
+Olle Johansson - SIP RFC compliance and testing, testing, testing
+	oej@edvina.net
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 
+=== HOLD MUSIC ===
+Music provided by www.opsound.org
+
 === OTHER SOURCE CODE IN ASTERISK ===
 
 I did not implement the codecs in asterisk.  Here is the copyright on the

HARDWARE

@@ -16,11 +16,11 @@ Zaptel compatible hardware
    * Wildcard X100P - Single FXO interface connects to Loopstart phone 
      line
 
-   * Wildcard T400P - Quad T1 interface connects to four T1/PRI 
+   * Wildcard T400P (obsolete) - Quad T1 interface connects to four T1/PRI 
      interfaces.  Supports RBS and PRI voice and PPP, FR, and HDLC data.
 
-   * Wildcard E400P - Quad E1 interface connects to four E1/PRI (or PRA)
-     interfaces.  Supports PRA/PRI, EuroISDN voice and PPP, FR, HDLC data.
+   * Wildcard E400P (obsolete)- Quad E1 interface connects to four E1/PRI 
+     (or PRA) interfaces.  Supports PRA/PRI, EuroISDN voice and data.
 
    * Wildcard T100P - Single T1 interface connects to a single T1/PRI
      interface.  Supports RBS and PRI voice and PPP, FR, and HDLC data.

Makefile

@@ -3,9 +3,9 @@
 # 
 # Top level Makefile
 #
-# Copyright (C) 1999, Mark Spencer
+# Copyright (C) 1999-2005, Mark Spencer
 #
-# Mark Spencer <markster@linux-support.net>
+# Mark Spencer <markster@digium.com>
 #
 # This program is free software, distributed under the terms of
 # the GNU General Public License
@@ -15,26 +15,21 @@
 
 # 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
+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)
-
-ifeq (${OSARCH},Linux)
-PROC=$(shell uname -m)
 else
-ifeq (${OSARCH},FreeBSD)
-PROC=$(shell uname -m)
+OSARCH=$(CROSS_ARCH)
 endif
-endif
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-PWD=$(shell pwd)
 
 ######### More GSM codec optimization
 ######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
@@ -42,19 +37,28 @@ PWD=$(shell pwd)
 ######### ppro's, etc, as well as the AMD K6 and K7.  
 #K6OPT  = -DK6OPT
 
+#Overwite config files on "make samples"
+OVERWRITE=y
+
 #Tell gcc to optimize the asterisk's code
-OPTIMIZE=-O6
+OPTIMIZE+=-O6
 
 #Include debug symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g #-pg
 
-# New hangup routines for chan_zap.c
-# If this flag is uncommented then you need to have new libpri code in your system
-# You can still use the old libpri if you do "cvs update -D "08/03/03" in libpri source code
-OPTIONS += -DNEW_PRI_HANGUP
+# If you are running a radio application, define RADIO_RELAX so that the DTMF
+# will be received more reliably
+#OPTIONS += -DRADIO_RELAX
+
+# 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
 
 # Optional debugging parameters
-DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH 
+DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES
@@ -80,7 +84,7 @@ DESTDIR=
 BUSYDETECT = #-DBUSYDETECT
 
 # Improved busydetect routine, comment the previous one if you use this one
-BUSYDETECT+= -DBUSYDETECT_MARTIN 
+BUSYDETECT+= #-DBUSYDETECT_MARTIN 
 # Detect the busy signal looking only at tone lengths
 # For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
 BUSYDETECT+= #-DBUSYDETECT_TONEONLY
@@ -88,6 +92,7 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
 # Don't use together with -DBUSYDETECT_TONEONLY
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
+ifneq (${OSARCH},SunOS)
 ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
 ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
 ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
@@ -98,78 +103,195 @@ 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
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
+#Uncomment this to use the older DSP routines
+#CFLAGS+=-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
+
+# If the file .asterisk.makeopts is present in your home directory, you can
+# include all of your favorite Makefile options so that every time you download
+# a new version of Asterisk, you don't have to edit the makefile to set them. 
+# The file, /etc/asterisk.makeopts will also be included, but can be overridden
+# by the file in your home directory.
+
+ifneq ($(wildcard /etc/asterisk.makeopts),)
+include /etc/asterisk.makeopts
+endif
+
+ifneq ($(wildcard ~/.asterisk.makeopts),)
+include ~/.asterisk.makeopts
+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
+#PROC=athlon
+OPTIONS+=-m64
+endif
+ifeq ($(PROC),sparc64)
+#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
+#This works for even old (2.96) versions of gcc and provides a small boost either way.
+#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
+#So we go lowest common available by gcc and go a step down, still a step up from
+#the default as we now have a better instruction set to work with. - Belgarath
+PROC=ultrasparc
+OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi)
+OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi)
+OPTIONS+=-fomit-frame-pointer
+endif
+
+ifeq ($(PROC),arm)
+# The Cirrus logic is the only heavily shipping arm processor with a real floating point unit
+ifeq ($(SUB_PROC),maverick)
+OPTIONS+=-fsigned-char -mcpu=ep9312
+else
+ifeq ($(SUB_PROC),xscale)
+OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+else
+OPTIONS+=-fsigned-char -msoft-float 
+endif
+endif
+endif
+MPG123TARG=linux
+endif
+
+ifeq ($(findstring BSD,${OSARCH}),BSD)
+PROC=$(shell uname -m)
+endif
+
+PWD=$(shell pwd)
+
+GREP=grep
+ifeq (${OSARCH},SunOS)
+GREP=/usr/xpg4/bin/grep
+M4=/usr/local/bin/m4
+endif
 
 INCLUDE=-Iinclude -I../include
-CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+CFLAGS+=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
 CFLAGS+=$(OPTIMIZE)
+
+ifneq ($(PROC),ultrasparc)
 CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
-ifeq (${OSARCH},FreeBSD)
-CFLAGS+=-pthread
-INCLUDE+=-I/usr/local/include
 endif
+ifeq ($(PROC),ppc)
+CFLAGS+=-fsigned-char
+endif
+
+CFLAGS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp" ; fi)
+
+ifeq (${OSARCH},FreeBSD)
+OSVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
+CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+LIBS+=$(shell if test  ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+INCLUDE+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
+CFLAGS+=$(shell if [ -d $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp ]; then echo "-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp"; fi)
+MPG123TARG=freebsd
+endif # FreeBSD
+
+ifeq (${OSARCH},NetBSD)
+CFLAGS+=-pthread
+INCLUDE+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
+MPG123TARG=netbsd
+endif
+
 ifeq (${OSARCH},OpenBSD)
 CFLAGS+=-pthread
 endif
+ifeq (${OSARCH},SunOS)
+CFLAGS+=-Wcast-align -DSOLARIS
+INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
+endif
 
-# Comment this out if you have trouble with Feature B signalling (rare)
-CFLAGS+=-DOLD_DSP_ROUTINES
-
-CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+CFLAGS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
+CFLAGS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
 
 LIBEDIT=editline/libedit.a
 
-ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then echo "CVS-`date +"%D-%T"`"; fi; fi)
-HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi)
+ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD"; fi; fi; fi)
+ASTERISKVERSIONNUM=$(shell if [ -d CVS ]; then echo 999999 ; else if [ -f .version ] ; then awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version ; else echo 000000 ; fi ; fi)
+# Set the following two variables to match your httpd installation.
+
 RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi)
-CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\"
-CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\"
-CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\"
-CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\"
-CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\"
-CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\"
-CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\"
-CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\"
-CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\"
-CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\"
-CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\"
 
 CFLAGS+= $(DEBUG_THREADS)
 CFLAGS+= $(TRACE_FRAMES)
 CFLAGS+= $(MALLOC_DEBUG)
 CFLAGS+= $(BUSYDETECT)
 CFLAGS+= $(OPTIONS)
-CFLAGS+=# -fomit-frame-pointer 
-SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime
+CFLAGS+= -fomit-frame-pointer 
+SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
 ifeq (${OSARCH},Linux)
 LIBS=-ldl -lpthread
 endif
-ifeq (${OSARCH},OpenBSD)
-LIBS=-pthread
-else
-ifeq (${OSARCH},FreeBSD)
-LIBS=-pthread
-else
-endif
-endif
 LIBS+=-lncurses -lm
 ifeq (${OSARCH},Linux)
 LIBS+=-lresolv  #-lnjamd
 endif
 ifeq (${OSARCH},Darwin)
-ifeq ($(shell uname -r),7.0.0)
 LIBS+=-lresolv
+CFLAGS+=-D__Darwin__
+AUDIO_LIBS=-framework CoreAudio
 endif
+ifeq (${OSARCH},FreeBSD)
+LIBS+=-lcrypto
 endif
+ifeq (${OSARCH},NetBSD)
+LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/local/lib -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib -lncurses
+endif
+ifeq (${OSARCH},OpenBSD)
+LIBS=-lcrypto -lpthread -lm -lncurses
+endif
+ifeq (${OSARCH},SunOS)
+LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
+endif
+LIBS+=-lssl
+
 OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
 	translate.o file.o say.o pbx.o cli.o md5.o term.o \
 	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
-	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o ast_expr.o \
+	cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
-	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o
+	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
+	utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
+	netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
 ifeq (${OSARCH},Darwin)
 OBJS+=poll.o dlfcn.o
 ASTLINK=-Wl,-dynamic
@@ -178,8 +300,12 @@ else
 ASTLINK=-Wl,-E 
 SOLINK=-shared -Xlinker -x
 endif
+ifeq (${OSARCH},SunOS)
+OBJS+=strcompat.o
+ASTLINK=
+SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
+endif
 
-CC=gcc
 INSTALL=install
 
 _all: all
@@ -191,7 +317,17 @@ _all: all
 	@echo " +               $(MAKE) install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: depend asterisk subdirs
+all: cleantest depend asterisk subdirs 
+
+#ifneq ($(wildcard tags),)
+ctags: tags
+#endif
+
+ifneq ($(wildcard TAGS),)
+all: TAGS
+endif
+
+noclean: depend asterisk subdirs
 
 editline/config.h:
 	cd editline && unset CFLAGS LIBS && ./configure ; \
@@ -212,30 +348,69 @@ ifneq ($(wildcard .depend),)
 include .depend
 endif
 
-.PHONY: _version
-
-_version: 
-	if [ -d CVS ] && ! [ -f .version ]; then echo $(ASTERISKVERSION) > .version; fi 
-
-.version: _version
-
-.y.c:
-	bison $< --name-prefix=ast_yy -o $@
-
-ast_expr.o: ast_expr.c
-
-cli.o: cli.c build.h
-
-asterisk.o: asterisk.c build.h
-
-ifneq ($(strip $(ASTERISKVERSION)),)
-build.h: .version
-	./make_build_h
-else
-build.h:
-	./make_build_h
+ifneq ($(wildcard .tags-depend),)
+include .tags-depend
 endif
 
+ast_expr2.c:
+	bison -d --name-prefix=ast_yy ast_expr2.y -o ast_expr2.c
+
+ast_expr2f.c:
+	flex ast_expr2.fl
+
+testexpr2: ast_expr2f.c ast_expr2.c ast_expr2.h
+	gcc -g -c -DSTANDALONE ast_expr2f.c
+	gcc -g -c -DSTANDALONE ast_expr2.c
+	gcc -g -o testexpr2 ast_expr2f.o ast_expr2.o
+	rm ast_expr2.c ast_expr2.o ast_expr2f.o ast_expr2f.c
+
+manpage: asterisk.8.gz
+
+asterisk.8.gz: asterisk.sgml
+	rm -f asterisk.8
+	docbook2man asterisk.sgml
+	mv ./*.8 asterisk.8
+	gzip asterisk.8
+
+asterisk.pdf: asterisk.sgml
+	docbook2pdf asterisk.sgml
+
+asterisk.ps: asterisk.sgml
+	docbook2ps asterisk.sgml
+
+asterisk.html: asterisk.sgml
+	docbook2html asterisk.sgml
+	mv r1.html asterisk.html
+
+asterisk.txt: asterisk.sgml
+	docbook2txt asterisk.sgml
+
+defaults.h: FORCE
+	build_tools/make_defaults_h > $@.tmp
+	if cmp -s $@.tmp $@ ; then echo ; else \
+		mv $@.tmp $@ ; \
+	fi
+	rm -f $@.tmp
+
+include/asterisk/build.h:
+	build_tools/make_build_h > $@.tmp
+	if cmp -s $@.tmp $@ ; then echo ; else \
+		mv $@.tmp $@ ; \
+	fi
+	rm -f $@.tmp
+
+# only force 'build.h' to be made for a non-'install' run
+ifeq ($(findstring install,$(MAKECMDGOALS)),)
+include/asterisk/build.h: FORCE
+endif
+
+include/asterisk/version.h: FORCE
+	build_tools/make_version_h > $@.tmp
+	if cmp -s $@.tmp $@ ; then echo; else \
+		mv $@.tmp $@ ; \
+	fi
+	rm -f $@.tmp
+
 stdtime/libtime.a: FORCE
 	@if [ -d stdtime ]; then \
 		$(MAKE) -C stdtime libtime.a ; \
@@ -245,7 +420,10 @@ stdtime/libtime.a: FORCE
 	fi
 
 asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
-	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a
+	$(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
+
+muted: muted.o
+	$(CC) $(AUDIO_LIBS) -o muted muted.o
 
 subdirs: 
 	for x in $(SUBDIRS); do $(MAKE) -C $$x || exit 1 ; done
@@ -253,25 +431,58 @@ subdirs:
 clean:
 	for x in $(SUBDIRS); do $(MAKE) -C $$x clean || exit 1 ; done
 	rm -f *.o *.so asterisk .depend
-	rm -f build.h 
-	rm -f ast_expr.c
-	@if [ -e editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
+	rm -f defaults.h
+	rm -f include/asterisk/build.h
+	rm -f include/asterisk/version.h
+	rm -f .version
+	rm -f .tags-depend .tags-sources tags TAGS
+	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
+	@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
 datafiles: all
+	sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
-		if grep -q "^%`basename $$x`%" sounds.txt; then \
-			install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \
-		if grep -q "^%`basename $$x`%" sounds.txt; then \
-			install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+	for x in sounds/dictate/*.gsm; do \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+		else \
+			echo "No description for $$x"; \
+			exit 1; \
+		fi; \
+	done
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+	for x in sounds/letters/*.gsm; do \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+		else \
+			echo "No description for $$x"; \
+			exit 1; \
+		fi; \
+	done
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+	for x in sounds/phonetic/*.gsm; do \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+		else \
+			echo "No description for $$x"; \
+			exit 1; \
+		fi; \
+	done
+	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-*; do \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
@@ -280,57 +491,92 @@ datafiles: all
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
 	for x in images/*.jpg; do \
-		install $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 
 update: 
 	@if [ -d CVS ]; then \
+		if [ -f patches/.applied ]; then \
+			patches=`cat patches/.applied`; \
+		fi; \
+		if [ ! -z "$$patches" ]; then \
+			for x in $$patches; do \
+				echo "Unapplying $$x..."; \
+				patch -R -p0 < patches/$$x; \
+			done; \
+			rm -f patches/.applied; \
+		fi ; \
 		echo "Updating from CVS..." ; \
-		cvs -q update -Pd; \
+		cvs -q -z3 update -Pd | tee update.out; \
 		rm -f .version; \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
+			echo ; echo "The following files have conflicts:" ; \
+			grep ^C update.out | cut -d' ' -f2- ; \
+		fi ; \
+		rm -f update.out; \
+		if [ ! -z "$$patches" ]; then \
+			for x in $$patches; do \
+				if [ -f patches/$$x ]; then \
+					echo "Applying patch $$x..."; \
+					patch -p0 < patches/$$x; \
+					echo $$x >> patches/.applied; \
+				else \
+					echo "Patch $$x no longer relevant"; \
+				fi; \
+			done; \
+		fi; \
 	else \
 		echo "Not CVS";  \
 	fi
 
+NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
+OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+
 bininstall: all
 	mkdir -p $(DESTDIR)$(MODULES_DIR)
 	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	mkdir -p $(DESTDIR)$(ASTBINDIR)
-	mkdir -p $(DESTDIR)$(ASTSBINDIR)
 	mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
+	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
+	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
 	install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/
 	install -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+	install -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/	
 	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
-		install -m 755 contrib/scripts/safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ ;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
 	fi
 	for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
 	install -d $(DESTDIR)$(ASTHEADERDIR)
-	install include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
-	if [ ! -h $(DESTDIR)$(ASTSPOOLDIR)/vm ] && [ -d $(DESTDIR)$(ASTSPOOLDIR)/vm ]; then \
-		mv $(DESTDIR)$(ASTSPOOLDIR)/vm $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
-	else \
-		mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default; \
-		rm -f $(DESTDIR)$(ASTSPOOLDIR)/vm; \
+	install -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+	if [ -n "$(OLDHEADERS)" ]; then \
+		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	ln -s $(ASTSPOOLDIR)/voicemail/default $(DESTDIR)$(ASTSPOOLDIR)/vm
-	rm -f $(DESTDIR)$(MODULES_DIR)/chan_ixj.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/chan_tor.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_mysql.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/cdr_unixodbc.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/codec_mp3_d.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/format_mp3.so
-	rm -f $(DESTDIR)$(MODULES_DIR)/app_voicemail2.so
+	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
 	install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/vm . )
+	install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+	install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8
+	install -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+	install -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+	install -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	if [ -d contrib/firmware/iax ]; then \
+		install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+	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 " +                                           +"
 	@echo " +    YOU MUST READ THE SECURITY DOCUMENT    +"
@@ -352,93 +598,150 @@ bininstall: all
 	@echo " + **Note** This requires that you have      +"
 	@echo " + doxygen installed on your local system    +"
 	@echo " +-------------------------------------------+"
+	@$(MAKE) -s oldmodcheck
+
+NEWMODS=$(notdir $(wildcard */*.so))
+OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+
+oldmodcheck:
+	@if [ -n "$(OLDMODS)" ]; then \
+		echo " WARNING WARNING WARNING" ;\
+		echo "" ;\
+		echo " Your Asterisk modules directory, located at" ;\
+		echo " $(DESTDIR)$(MODULES_DIR)" ;\
+		echo " contains modules that were not installed by this " ;\
+		echo " version of Asterisk. Please ensure that these" ;\
+		echo " modules are compatible with this version before" ;\
+		echo " attempting to run Asterisk." ;\
+		echo "" ;\
+		for f in $(OLDMODS); do \
+			echo "    $$f" ;\
+		done ;\
+		echo "" ;\
+		echo " WARNING WARNING WARNING" ;\
+	fi
 
 install: all datafiles bininstall
 
 upgrade: all bininstall
 
-adsi: all
+adsi:
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.adsi; do \
-		if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
+		if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
 			install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
 		fi ; \
 	done
 
-samples: all datafiles adsi
+samples: adsi
 	mkdir -p $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.sample; do \
 		if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
-			mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
+			if [ "$(OVERWRITE)" = "y" ]; then \
+				if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+					echo "Config file $$x is unchanged"; \
+					continue; \
+				fi ; \
+				mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \
+			else \
+				echo "Skipping config file $$x"; \
+				continue; \
+			fi ;\
 		fi ; \
-		install $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+		install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
 	done
-	echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
-	echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf
+	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTETCDIR)/asterisk.conf ]; then \
+		echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo "; Changing the following lines may compromise your security." >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo ";[files]" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo ";astctlpermissions = 0660" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo ";astctlowner = root" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo ";astctlgroup = apache" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+		echo ";astctl = asterisk.ctl" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf ; \
+	else \
+		echo "Skipping asterisk.conf creation"; \
+	fi
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 	for x in sounds/demo-*; do \
-		if grep -q "^%`basename $$x`%" sounds.txt; then \
-			install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+			install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
+	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 	for x in sounds/*.mp3; do \
-		install $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+		install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
 	done
+	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
 	done
-	:> $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail/default/1234/busy.gsm
+	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
 		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
 	done
 
 webvmail:
-	@[ -d $(DESTDIR)$(HTTPDIR) ] || ( echo "No HTTP directory" && exit 1 )
-	@[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 )
-	@[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 )
-	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi
-	mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk
+	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+	install -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+	mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
 	for x in images/*.gif; do \
-		install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \
+		install -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
 	done
 	@echo " +--------- Asterisk Web Voicemail ----------+"  
 	@echo " +                                           +"
 	@echo " + Asterisk Web Voicemail is installed in    +"
-	@echo " + your cgi-bin directory.  IT USES A SETUID +"
-	@echo " + ROOT PERL SCRIPT, SO IF YOU DON'T LIKE    +"
-	@echo " + THAT, UNINSTALL IT!                       +"
+	@echo " + your cgi-bin directory:                   +"
+	@echo " + $(DESTDIR)$(HTTP_CGIDIR)"
+	@echo " + IT USES A SETUID ROOT PERL SCRIPT, SO     +"
+	@echo " + IF YOU DON'T LIKE THAT, UNINSTALL IT!     +"
+	@echo " +                                           +"
+	@echo " + Other static items have been stored in:   +"
+	@echo " + $(DESTDIR)$(HTTP_DOCSDIR)"
+	@echo " +                                           +"
+	@echo " + If these paths do not match your httpd    +"
+	@echo " + installation, correct the definitions     +"
+	@echo " + in your Makefile of HTTP_CGIDIR and       +"
+	@echo " + HTTP_DOCSDIR                              +"
 	@echo " +                                           +"
 	@echo " +-------------------------------------------+"  
 
-mailbox:
-	./contrib/scripts/addmailbox 
-	
+spec: 
+	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
 
 rpm: __rpm
 
-__rpm: _version
+__rpm: include/asterisk/version.h spec
 	rm -rf /tmp/asterisk ; \
 	mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
 	$(MAKE) DESTDIR=/tmp/asterisk install ; \
 	$(MAKE) DESTDIR=/tmp/asterisk samples ; \
 	mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
 	cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
-	sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
 	rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
-	
+
 progdocs:
 	doxygen contrib/asterisk-ng-doxygen
 
+mpg123:
+	@wget -V >/dev/null || (echo "You need wget" ; false )
+	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
+	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
+	$(MAKE) -C mpg123-0.59r $(MPG123TARG)
+
 config:
 	if [ -d /etc/rc.d/init.d ]; then \
 		install -m 755 contrib/init.d/rc.redhat.asterisk /etc/rc.d/init.d/asterisk; \
@@ -447,16 +750,101 @@ config:
 		install -m 755 init.asterisk /etc/init.d/asterisk; \
 	fi 
 
-	
 dont-optimize:
 	$(MAKE) OPTIMIZE= K6OPT= install
 
 valgrind: dont-optimize
 
-depend: .depend
+depend: include/asterisk/build.h include/asterisk/version.h .depend defaults.h 
 	for x in $(SUBDIRS); do $(MAKE) -C $$x depend || exit 1 ; done
 
-.depend:
-	./mkdep ${CFLAGS} `ls *.c`
+.depend: include/asterisk/version.h
+	build_tools/mkdep ${CFLAGS} $(wildcard *.c)
+
+.tags-depend:
+	@echo -n ".tags-depend: " > $@
+	@find . -maxdepth 1 -name \*.c -printf "\t%p \\\\\n" >> $@
+	@find . -maxdepth 1 -name \*.h -printf "\t%p \\\\\n" >> $@
+	@find ${SUBDIRS} -name \*.c -printf "\t%p \\\\\n" >> $@
+	@find ${SUBDIRS} -name \*.h -printf "\t%p \\\\\n" >> $@
+	@find include -name \*.h -printf "\t%p \\\\\n" >> $@
+	@echo >> $@
+
+.tags-sources:
+	@rm -f $@
+	@find . -maxdepth 1 -name \*.c -print >> $@
+	@find . -maxdepth 1 -name \*.h -print >> $@
+	@find ${SUBDIRS} -name \*.c -print >> $@
+	@find ${SUBDIRS} -name \*.h -print >> $@
+	@find include -name \*.h -print >> $@
+
+tags: .tags-depend .tags-sources
+	ctags -L .tags-sources -o $@
+
+ctags: tags
+
+TAGS: .tags-depend .tags-sources
+	etags -o $@ `cat .tags-sources`
+
+etags: TAGS
 
 FORCE:
+
+%_env:
+	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+
+env:
+	env
+
+# If the cleancount has been changed, force a make clean.
+# .cleancount is the global clean count, and .lastclean is the 
+# last clean count we had
+# We can avoid this by making noclean
+
+cleantest:
+	if cmp -s .cleancount .lastclean ; then echo ; else \
+		$(MAKE) clean; cp -f .cleancount .lastclean;\
+	fi
+
+patchlist:
+	@echo "Experimental Patches:"
+	@for x in patches/*; do \
+		patch=`basename $$x`; \
+		if [ "$$patch" = "CVS" ]; then \
+			continue; \
+		fi; \
+		if grep -q ^$$patch$$ patches/.applied; then \
+			echo "$$patch (applied)"; \
+		else \
+			echo "$$patch (available)"; \
+		fi; \
+	done
+
+apply: 
+	@if [ -z "$(PATCH)" ]; then \
+		echo "Usage: make PATCH=<patchname> apply"; \
+	elif grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
+		echo "Patch $(PATCH) is already applied"; \
+	elif [ -f "patches/$(PATCH)" ]; then \
+		echo "Applying patch $(PATCH)"; \
+		patch -p0 < patches/$(PATCH); \
+		echo "$(PATCH)" >> patches/.applied; \
+	else \
+		echo "No such patch $(PATCH) in patches directory"; \
+	fi
+
+unapply: 
+	@if [ -z "$(PATCH)" ]; then \
+		echo "Usage: make PATCH=<patchname> unapply"; \
+	elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \
+		echo "Patch $(PATCH) is not applied"; \
+	elif [ -f "patches/$(PATCH)" ]; then \
+		echo "Un-applying patch $(PATCH)"; \
+		patch -p0 -R < patches/$(PATCH); \
+		rm -f patches/.tmpapplied || :; \
+		mv patches/.applied patches/.tmpapplied; \
+		cat patches/.tmpapplied | grep -v ^$(PATCH)$$ > patches/.applied; \
+		rm -f patches/.tmpapplied; \
+	else \
+		echo "No such patch $(PATCH) in patches directory"; \
+	fi

README

@@ -1,6 +1,6 @@
 The Asterisk Open Source PBX
 by Mark Spencer <markster@digium.com>
-Copyright (C) 2001-2004 Digium
+Copyright (C) 2001-2005 Digium, Inc.
 ================================================================
 * SECURITY
   It is imperative that you read and fully understand the contents of
@@ -14,24 +14,31 @@ on the project itself, please visit the Asterisk home page at:
 
            http://www.asterisk.org
 
+In addition you'll find lots of information compiled by the Asterisk
+community on this Wiki:
+
+           http://www.voip-info.org/wiki-Asterisk
+
 * LICENSING
-  Asterisk is distributed under GNU General Public License.  The GPL also
-must apply to all loadable modules as well, except as defined below.
-
-  Digium, Inc. (formerly Linux Support Services) retains copyright to all 
-of the core Asterisk system, and therefore can grant, at its sole discression, 
-the ability for companies, individuals, or organizations to create proprietary
-or Open Source (but non-GPL'd) modules which may be dynamically linked at
-runtime with the portions of Asterisk which fall under our copyright
-umbrella, or are distributed under more flexible licenses than GPL.  
+  Asterisk is distributed under GNU General Public License and is also
+available under alternative licenses negotiated directly with Digium, Inc.
+If you obtained Asterisk under the GPL, then the GPL applies to all
+loadable modules used on your system as well, except as defined below.
 
+  Digium, Inc. (formerly Linux Support Services) retains copyright and/or a
+sufficient license to all components of the core Asterisk system, and therefore
+can grant, at its sole discretion, the ability for companies, individuals, or
+organizations to create proprietary or Open Source (but non-GPL'd) modules
+which may be dynamically linked at runtime with the portions of Asterisk which
+fall under our copyright/license umbrella, or are distributed under more
+flexible licenses than GPL.  
 
   If you wish to use our code in other GPL programs, don't worry -- there
-is no requirement that you provide the same exemption in your GPL'd
+is no requirement that you provide the same exception in your GPL'd
 products (although if you've written a module for Asterisk we would
-strongly encourage you to make the same excemption that we do).
+strongly encourage you to make the same exception that we do).
 
-  Specific permission is also granted to OpenSSL and OpenH323 to link to
+  Specific permission is also granted to OpenSSL and OpenH323 to link with
 Asterisk.
 
   If you have any questions, whatsoever, regarding our licensing policy,
@@ -40,64 +47,88 @@ please contact us.
   Modules that are GPL-licensed and not available under Digium's 
 licensing scheme are added to the Asterisk-addons CVS module.
   
-* REQUIRED COMPONENTS
+* OPERATING SYSTEMS
 
 == Linux ==
-  Currently, the Asterisk Open Source PBX is only known to run on the
-Linux OS, although it may be portable to other UNIX-like operating systems
-as well. 
+  The Asterisk Open Source PBX is developed and tested primarily on the
+GNU/Linux operating system, and is supported on every major GNU/Linux
+distribution.
 
+== Others ==
+  Asterisk has also been 'ported' and reportedly runs properly on other
+operating systems as well, including Sun Solaris, Apple's Mac OS X, and
+the BSD variants.
 
 * GETTING STARTED
 
-First, be sure you've got supported hardware.  To use Asterisk right now,
-you will need one of the following:
+  First, be sure you've got supported hardware (but note that you don't need
+ANY special hardware, not even a soundcard) to install and run Asterisk.
+
+  Supported telephony hardware includes:
 
 	* All Wildcard (tm) products from Digium (www.digium.com)
 	* QuickNet Internet PhoneJack and LineJack (http://www.quicknet.net)
-	* Full Duplex Sound Card supported by Linux
-	* Adtran Atlas 800 Plus
+	* any full duplex sound card supported by ALSA or OSS
 	* ISDN4Linux compatible ISDN card
-	* Tormenta Dual T1 card (www.bsdtelephony.com.mx)
+        * VoiceTronix OpenLine products
 
-Assuming you have one of these (most likely the third) you're ready to 
-proceed:
+Hint: CAPI compatible ISDN cards can be run using the add-on channel chan_capi.
+
+  Second, ensure that your system contains a compatible compiler and development
+libraries.  Asterisk requires either the GNU Compiler Collection (GCC) version
+3.0 or higher, or a compiler that supports the C99 specification and some of
+the gcc language extensions.  In addition, your system needs to have the C
+library headers available, and the headers and libraries for OpenSSL and zlib.
+On many distributions, these files are installed by packages with names like
+'libc-devel', 'openssl-devel' and 'zlib-devel' or similar.
+
+  So let's proceed:
 
 1) Run "make"
+
+  Assuming the build completes successfully:
+
 2) Run "make install"
 
-If this is your first time working with Asterisk, you may wish to install
+  Each time you update or checkout from CVS, you are strongly encouraged 
+to ensure all previous object files are removed to avoid internal 
+inconsistency in Asterisk. Normally, this is automatically done with 
+the presence of the file .cleancount, which increments each time a 'make clean'
+is required, and the file .lastclean, which contains the last .cleancount used. 
+
+  If this is your first time working with Asterisk, you may wish to install
 the sample PBX, with demonstration extensions, etc.  If so, run:
 
-	"make samples"
+3) "make samples"
 
-Doing so will overwrite any existing config files you have.
+  Doing so will overwrite any existing config files you have. If you are lacking a
+soundcard you won't be able to use the DIAL command on the console, though.
 
-Finally, you can launch Asterisk with:
+  Finally, you can launch Asterisk with:
 
-	./asterisk -vvvc
+# asterisk -vvvc
 
-You'll see a bunch of verbose messages fly by your screen as Asterisk
+  You'll see a bunch of verbose messages fly by your screen as Asterisk
 initializes (that's the "very very verbose" mode).  When it's ready, if
 you specified the "c" then you'll get a command line console, that looks
 like this:
 
 *CLI>
 
-You can type "help" at any time to get help with the system.  For help
+  You can type "help" at any time to get help with the system.  For help
 with a specific command, type "help <command>".  To start the PBX using
 your sound card, you can type "dial" to dial the PBX.  Then you can use
 "answer", "hangup", and "dial" to simulate the actions of a telephone.
-Remember that if you don't have a full duplex sound card (And asterisk
-will tell you somewhere in its verbose messages if you do/don't) than it
+Remember that if you don't have a full duplex sound card (and Asterisk
+will tell you somewhere in its verbose messages if you do/don't) then it
 won't work right (not yet).
 
-Feel free to look over the configuration files in /etc/asterisk, where
+  Feel free to look over the configuration files in /etc/asterisk, where
 you'll find a lot of information about what you can do with Asterisk.
 
 * ABOUT CONFIGURATION FILES
 
-All Asterisk configuration files share a common format.  Comments are
+  All Asterisk configuration files share a common format.  Comments are
 delimited by ';' (since '#' of course, being a DTMF digit, may occur in
 many places).  A configuration file is divided into sections whose names
 appear in []'s.  Each section typically contains two types of statements,
@@ -106,12 +137,12 @@ parameters'.  Internally the use of '=' and '=>' is exactly the same, so
 they're used only to help make the configuration file easier to
 understand, and do not affect how it is actually parsed.
 
-Entries of the form 'variable=value' set the value of some parameter in
-asterisk.  For example, in tormenta.conf, one might specify:
+  Entries of the form 'variable=value' set the value of some parameter in
+asterisk.  For example, in zapata.conf, one might specify:
 
 	switchtype=national
 
-In order to indicate to Asterisk that the switch they are connecting to is
+in order to indicate to Asterisk that the switch they are connecting to is
 of the type "national".  In general, the parameter will apply to
 instantiations which occur below its specification.  For example, if the
 configuration file read:
@@ -122,24 +153,84 @@ configuration file read:
 	switchtype = dms100
 	channel => 25-47
 
-Then, the "national" switchtype would be applied to channels one through
+the "national" switchtype would be applied to channels one through
 four and channels 10 through 12, whereas the "dms100" switchtype would
 apply to channels 25 through 47.
   
-The "object => parameters" instantiates an object with the given
+  The "object => parameters" instantiates an object with the given
 parameters.  For example, the line "channel => 25-47" creates objects for
-the channels 25 through 47 of the tormenta card, obtaining the settings
+the channels 25 through 47 of the card, obtaining the settings
 from the variables specified above.
 
+* SPECIAL NOTE ON TIME
+  
+  Those using SIP phones should be aware that Asterisk is sensitive to
+large jumps in time.  Manually changing the system time using date(1)
+(or other similar commands) may cause SIP registrations and other
+internal processes to fail.  If your system cannot keep accurate time
+by itself use NTP (http://www.ntp.org/) to keep the system clock
+synchronized to "real time".  NTP is designed to keep the system clock
+synchronized by speeding up or slowing down the system clock until it
+is synchronized to "real time" rather than by jumping the time and
+causing discontinuities. Most Linux distributions include precompiled
+versions of NTP.  Beware of some time synchronization methods that get
+the correct real time periodically and then manually set the system
+clock.
+
+  Apparent time changes due to daylight savings time are just that,
+apparent.  The use of daylight savings time in a Linux system is
+purely a user interface issue and does not affect the operation of the
+Linux kernel or Asterisk.  The system clock on Linux kernels operates
+on UTC.  UTC does not use daylight savings time.
+
+  Also note that this issue is separate from the clocking of TDM
+channels, and is known to at least affect SIP registrations.
+
+* FILE DESCRIPTORS
+
+  Depending on the size of your system and your configuration,
+Asterisk can consume a large number of file descriptors.  In UNIX,
+file descriptors are used for more than just files on disk.  File
+descriptors are also used for handling network communication
+(e.g. SIP, IAX2, or H.323 calls) and hardware access (e.g. analog and
+digital trunk hardware).  Asterisk accesses many on-disk files for
+everything from configuration information to voicemail storage.
+
+  Most systems limit the number of file descriptors that Asterisk can
+have open at one time.  This can limit the number of simultaneous
+calls that your system can handle.  For example, if the limit is set
+at 1024 (a common default value) Asterisk can handle approxiately 150
+SIP calls simultaneously.  To change the number of file descriptors
+follow the instructions for your system below:
+
+== PAM-based Linux System ==
+
+  If your system uses PAM (Pluggable Authentication Modules) edit
+/etc/security/limits.conf.  Add these lines to the bottom of the file:
+
+root            soft    nofile          4096
+root            hard    nofile          8196
+asterisk        soft    nofile          4096
+asterisk        hard    nofile          8196
+
+(adjust the numbers to taste).  You may need to reboot the system for
+these changes to take effect.
+
+== Generic UNIX System ==
+
+  If there are no instructions specifically adapted to your system
+above you can try adding the command "ulimit -n 8192" to the script
+that starts Asterisk.
+
 * MORE INFORMATION
 
-See the doc directory for more documentation.
+  See the doc directory for more documentation.
 
-Finally, you may wish to visit the web site and join the mailing list if
+  Finally, you may wish to visit the web site and join the mailing list if
 you're interested in getting more information.
 
    http://www.asterisk.org/index.php?menu=support
 
-Welcome to the growing worldwide community of Asterisk users!
+  Welcome to the growing worldwide community of Asterisk users!
 
 Mark Spencer

README.opsound

@@ -0,0 +1,22 @@
+About Hold Music
+================
+These files were obtained from http://opsound.org, where the authors placed them
+under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
+may be found at http://creativecommons.org.
+
+Credits
+================
+macroform-cold_day - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-robot_dity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-the_simplicity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+manolo_camp-morning_coffee - Manolo Camp
+beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
+
+reno_project-system - Reno Project
+renoproject@hotmail.com - http://www.jamendo.com/en/album/23661

SECURITY

@@ -25,15 +25,15 @@ the "default" context within other private contexts by using:
 in the appropriate section.  A well designed PBX might look like this:
 
 [longdistance]
-exten => _91NXXNXXXXXX,1,Dial,Tor/g2/BYEXTENSION
+exten => _91NXXNXXXXXX,1,Dial(Zap/g2/${EXTEN:1})
 include => local
 
 [local]
-exten => _9NXXNXXX,1,Dial,Tor/g2/BYEXTENSION
+exten => _9NXXNXXX,1,Dial(Zap/g2/${EXTEN:1})
 include => default
 
 [default]
-exten => 6123,Dial,Tor/1
+exten => 6123,Dial(Zap/1)
 
 
 DON'T FORGET TO TAKE THE DEMO CONTEXT OUT OF YOUR DEFAULT CONTEXT.  There

UPGRADE.txt

@@ -0,0 +1,145 @@
+Information for Upgrading From Asterisk 1.0
+===========================================
+
+Compiling:
+
+* The Asterisk 1.2 source code now uses C language features
+  supported only by 'modern' C compilers.  Generally, this means GCC
+  version 3.0 or higher, although some GCC 2.96 releases will also
+  work.  Some non-GCC compilers that support C99 and the common GCC
+  extensions (including anonymous structures and unions) will also
+  work.  All releases of GCC 2.95 do _not_ have the requisite feature
+  support; systems using that compiler will need to be upgraded to
+  a more recent compiler release.
+
+Agents:
+
+* The default for ackcall has been changed to "no" instead of "yes" 
+  because of a bug which caused the "yes" behavior to generally act like
+  "no".  You may need to adjust the value if your agents behave 
+  differently than you expect with respect to acknowledgement.
+
+Dialing:
+
+* The Caller*ID of the outbound leg is now the extension that was 
+  called, rather than the Caller*ID of the inbound leg of the call.  The 
+  "o" flag for Dial can be used to restore the original behavior if 
+  desired.  Note that if you are looking for the originating callerid
+  from the manager event, there is a new manager event "Dial" which 
+  provides the source and destination channels and callerid.
+
+IAX: 
+
+* The naming convention for IAX channels has changed in a minor way such 
+  that the call number follows a "-" rather than a "/" character.
+
+SIP:
+
+* The global option "port" in 1.0.X that is used to set which port to
+  bind to has been changed to "bindport" to be more consistent with
+  the other channel drivers and to avoid confusion with the "port"
+  option for users/peers.
+
+* The "Registry" event now uses "Username" rather than "User" for 
+  consistency with IAX.
+
+Applications:
+
+* With the addition of dialplan functions (which operate similarly
+  to variables), the SetVar application has been renamed to Set.
+
+* The CallerPres application has been removed.  Use SetCallerPres 
+  instead.  It accepts both numeric and symbolic names.
+
+* The applications GetGroupCount, GetGroupMatchCount, SetGroup, and
+  CheckGroup have been deprecated in favor of functions.  Here is a
+  table of their replacements:
+
+  GetGroupCount([groupname][@category]	       GROUP_COUNT([groupname][@category])	Set(GROUPCOUNT=${GROUP_COUNT()})
+  GroupMatchCount(groupmatch[@category])       GROUP_MATCH_COUNT(groupmatch[@category])	Set(GROUPCOUNT=${GROUP_MATCH_COUNT(SIP/.*)})
+  SetGroup(groupname[@category])	       GROUP([category])=groupname		Set(GROUP()=test)
+  CheckGroup(max[@category])		       N/A					GotoIf($[ ${GROUP_COUNT()} > 5 ]?103)
+
+  Note that CheckGroup does not have a direct replacement.  There is
+  also a new function called GROUP_LIST() which will return a space
+  separated list of all of the groups set on a channel.  The GROUP()
+  function can also return the name of the group set on a channel when
+  used in a read environment.
+
+* The applications DBGet and DBPut have been deprecated in favor of
+  functions.  Here is a table of their replacements:
+
+  DBGet(foo=family/key)        Set(foo=${DB(family/key)})
+  DBPut(family/key=${foo})     Set(DB(family/key)=${foo})
+
+* The application SetLanguage has been deprecated in favor of the
+  function LANGUAGE().
+
+  SetLanguage(fr)		Set(LANGUAGE()=fr)
+
+  The LANGUAGE function can also return the currently set language:
+
+  Set(MYLANG=${LANGUAGE()})
+
+* The applications AbsoluteTimeout, DigitTimeout, and ResponseTimeout
+  have been deprecated in favor of the function TIMEOUT(timeouttype):
+
+  AbsoluteTimeout(300)		Set(TIMEOUT(absolute)=300)
+  DigitTimeout(15)		Set(TIMEOUT(digit)=15)
+  ResponseTimeout(15)		Set(TIMEOUT(response)=15)
+
+  The TIMEOUT() function can also return the currently set timeouts:
+
+  Set(DTIMEOUT=${TIMEOUT(digit)})
+
+* The applications SetCIDName, SetCIDNum, and SetRDNIS have been
+  deprecated in favor of the CALLERID(datatype) function:
+
+  SetCIDName(Joe Cool)		Set(CALLERID(name)=Joe Cool)
+  SetCIDNum(2025551212)		Set(CALLERID(number)=2025551212)
+  SetRDNIS(2024561414)		Set(CALLERID(RDNIS)=2024561414)
+
+* The application Record now uses the period to separate the filename
+  from the format, rather than the colon.
+
+* The application VoiceMail now supports a 'temporary' greeting for each
+  mailbox. This greeting can be recorded by using option 4 in the
+  'mailbox options' menu, and 'change your password' option has been
+  moved to option 5.
+
+Queues:
+
+* A queue is now considered empty not only if there are no members but if
+  none of the members are available (e.g. agents not logged on).  To
+  restore the original behavior, use "leavewhenempty=strict" or 
+  "joinwhenempty=strict" instead of "=yes" for those options.
+
+* It is now possible to use multi-digit extensions in the exit context
+  for a queue (although you should not have overlapping extensions,
+  as there is no digit timeout). This means that the EXITWITHKEY event
+  in queue_log can now contain a key field with more than a single
+  character in it.
+
+Extensions:
+
+* By default, there is a new option called "autofallthrough" in
+  extensions.conf that is set to yes.  Asterisk 1.0 (and earlier) 
+  behavior was to wait for an extension to be dialed after there were no 
+  more extensions to execute.  "autofallthrough" changes this behavior
+  so that the call will immediately be terminated with BUSY,
+  CONGESTION, or HANGUP based on Asterisk's best guess.  If you are
+  writing an extension for IVR, you must use the WaitExten application
+  if "autofallthrough" is set to yes.
+
+AGI:
+
+* AGI scripts did not always get SIGHUP at the end, previously.  That 
+  behavior has been fixed.  If you do not want your script to terminate 
+  at the end of AGI being called (e.g. on a hangup) then set SIGHUP to 
+  be ignored within your application.
+
+Music On Hold:
+
+* The preferred format for musiconhold.conf has changed; please see the
+  sample configuration file for the new format. The existing format
+  is still supported but will generate warnings when the module is loaded.

acl.c

@@ -3,9 +3,9 @@
  *
  * Various sorts of access control
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
@@ -13,31 +13,48 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <string.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <errno.h>
 #include <unistd.h>
-#include <asterisk/acl.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <net/if.h>
+#include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <sys/ioctl.h>
-#ifdef __OpenBSD__
+
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
 #include <fcntl.h>
 #include <net/route.h>
-
-static ast_mutex_t routeseq_lock = AST_MUTEX_INITIALIZER;
 #endif
 
-#define AST_SENSE_DENY			0
-#define AST_SENSE_ALLOW			1
+#if defined (SOLARIS) || defined(__OpenBSD__)
+#include <sys/sockio.h>
+/* netinet/ip.h does not define the following (See RFCs 791 and 1349) */
+#define       IPTOS_LOWCOST           0x02
+#define       IPTOS_MINCOST           IPTOS_LOWCOST
+#endif
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/acl.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+#include "asterisk/srv.h"
+
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
+AST_MUTEX_DEFINE_STATIC(routeseq_lock);
+#endif
 
 struct ast_ha {
 	/* Host access rule */
@@ -55,6 +72,7 @@ struct my_ifreq {
 	struct sockaddr_in ifru_addr;
 };
 
+/* Free HA structure */
 void ast_free_ha(struct ast_ha *ha)
 {
 	struct ast_ha *hal;
@@ -65,31 +83,71 @@ void ast_free_ha(struct ast_ha *ha)
 	}
 }
 
+/* Copy HA structure */
+static void ast_copy_ha(struct ast_ha *from, struct ast_ha *to)
+{
+	memcpy(&to->netaddr, &from->netaddr, sizeof(from->netaddr));
+	memcpy(&to->netmask, &from->netmask, sizeof(from->netmask));
+	to->sense = from->sense;
+}
+
+/* Create duplicate of ha structure */
+static struct ast_ha *ast_duplicate_ha(struct ast_ha *original)
+{
+	struct ast_ha *new_ha = malloc(sizeof(struct ast_ha));
+	/* Copy from original to new object */
+	ast_copy_ha(original, new_ha); 
+
+	return new_ha;
+}
+
+/* Create duplicate HA link list */
+/*  Used in chan_sip2 templates */
+struct ast_ha *ast_duplicate_ha_list(struct ast_ha *original)
+{
+	struct ast_ha *start=original;
+	struct ast_ha *ret = NULL;
+	struct ast_ha *link,*prev=NULL;
+
+	while (start) {
+		link = ast_duplicate_ha(start);  /* Create copy of this object */
+		if (prev)
+			prev->next = link;		/* Link previous to this object */
+
+		if (!ret) 
+			ret = link;		/* Save starting point */
+
+		start = start->next;		/* Go to next object */
+		prev = link;			/* Save pointer to this object */
+	}
+	return ret;    			/* Return start of list */
+}
+
 struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
 {
 	struct ast_ha *ha = malloc(sizeof(struct ast_ha));
-	char *nm;
+	char *nm = "255.255.255.255";
 	char tmp[256] = "";
 	struct ast_ha *prev = NULL;
 	struct ast_ha *ret;
-	int x,z;
+	int x, z;
 	unsigned int y;
 	ret = path;
-	while(path) {
+	while (path) {
 		prev = path;
 		path = path->next;
 	}
 	if (ha) {
-		strncpy(tmp, stuff, sizeof(tmp) - 1);
+		ast_copy_string(tmp, stuff, sizeof(tmp));
 		nm = strchr(tmp, '/');
-		if (!nm)
+		if (!nm) {
 			nm = "255.255.255.255";
-		else {
+		} else {
 			*nm = '\0';
 			nm++;
 		}
 		if (!strchr(nm, '.')) {
-			if ((sscanf(nm, "%i", &x) == 1) && (x >= 0) && (x <= 32)) {
+			if ((sscanf(nm, "%d", &x) == 1) && (x >= 0) && (x <= 32)) {
 				y = 0;
 				for (z=0;z<x;z++) {
 					y >>= 1;
@@ -98,12 +156,12 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
 				ha->netmask.s_addr = htonl(y);
 			}
 		} else if (!inet_aton(nm, &ha->netmask)) {
-			ast_log(LOG_WARNING, "%s not a valid netmask\n", nm);
+			ast_log(LOG_WARNING, "%s is not a valid netmask\n", nm);
 			free(ha);
 			return path;
 		}
 		if (!inet_aton(tmp, &ha->netaddr)) {
-			ast_log(LOG_WARNING, "%s not a valid IP\n", tmp);
+			ast_log(LOG_WARNING, "%s is not a valid IP\n", tmp);
 			free(ha);
 			return path;
 		}
@@ -114,11 +172,13 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path)
 			ha->sense = AST_SENSE_DENY;
 		}
 		ha->next = NULL;
-		if (prev)
+		if (prev) {
 			prev->next = ha;
-		else
+		} else {
 			ret = ha;
+		}
 	}
+	ast_log(LOG_DEBUG, "%s/%s appended to acl for peer\n", stuff, nm);
 	return ret;
 }
 
@@ -126,20 +186,40 @@ int ast_apply_ha(struct ast_ha *ha, struct sockaddr_in *sin)
 {
 	/* Start optimistic */
 	int res = AST_SENSE_ALLOW;
-	while(ha) {
+	while (ha) {
+		char iabuf[INET_ADDRSTRLEN];
+		char iabuf2[INET_ADDRSTRLEN];
+		/* DEBUG */
+		ast_log(LOG_DEBUG,
+			"##### Testing %s with %s\n",
+			ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr),
+			ast_inet_ntoa(iabuf2, sizeof(iabuf2), ha->netaddr));
 		/* For each rule, if this address and the netmask = the net address
 		   apply the current rule */
-		if ((sin->sin_addr.s_addr & ha->netmask.s_addr) == (ha->netaddr.s_addr))
+		if ((sin->sin_addr.s_addr & ha->netmask.s_addr) == ha->netaddr.s_addr)
 			res = ha->sense;
 		ha = ha->next;
 	}
 	return res;
 }
 
-int ast_get_ip(struct sockaddr_in *sin, char *value)
+int ast_get_ip_or_srv(struct sockaddr_in *sin, const char *value, const char *service)
 {
 	struct hostent *hp;
-	hp = gethostbyname(value);
+	struct ast_hostent ahp;
+	char srv[256];
+	char host[256];
+	int tportno = ntohs(sin->sin_port);
+	if (inet_aton(value, &sin->sin_addr))
+		return 0;
+	if (service) {
+		snprintf(srv, sizeof(srv), "%s.%s", service, value);
+		if (ast_get_srv(NULL, host, sizeof(host), &tportno, srv) > 0) {
+			sin->sin_port = htons(tportno);
+			value = host;
+		}
+	}
+	hp = ast_gethostbyname(value, &ahp);
 	if (hp) {
 		memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
 	} else {
@@ -149,183 +229,109 @@ int ast_get_ip(struct sockaddr_in *sin, char *value)
 	return 0;
 }
 
-int inaddrcmp(struct sockaddr_in *sin1, struct sockaddr_in *sin2)
+int ast_str2tos(const char *value, int *tos)
 {
-	return ((sin1->sin_addr.s_addr != sin2->sin_addr.s_addr )
-			|| (sin1->sin_port != sin2->sin_port));
+	int fval;
+	if (sscanf(value, "%i", &fval) == 1)
+		*tos = fval & 0xff;
+	else if (!strcasecmp(value, "lowdelay"))
+		*tos = IPTOS_LOWDELAY;
+	else if (!strcasecmp(value, "throughput"))
+		*tos = IPTOS_THROUGHPUT;
+	else if (!strcasecmp(value, "reliability"))
+		*tos = IPTOS_RELIABILITY;
+	else if (!strcasecmp(value, "mincost"))
+		*tos = IPTOS_MINCOST;
+	else if (!strcasecmp(value, "none"))
+		*tos = 0;
+	else
+		return -1;
+	return 0;
+}
+
+int ast_get_ip(struct sockaddr_in *sin, const char *value)
+{
+	return ast_get_ip_or_srv(sin, value, NULL);
 }
 
 /* iface is the interface (e.g. eth0); address is the return value */
-int ast_lookup_iface(char *iface, struct in_addr *address) {
+int ast_lookup_iface(char *iface, struct in_addr *address) 
+{
 	int mysock, res = 0;
 	struct my_ifreq ifreq;
 
 	memset(&ifreq, 0, sizeof(ifreq));
-	strncpy(ifreq.ifrn_name,iface,sizeof(ifreq.ifrn_name) - 1);
+	ast_copy_string(ifreq.ifrn_name, iface, sizeof(ifreq.ifrn_name));
 
-	mysock = socket(PF_INET,SOCK_DGRAM,IPPROTO_IP);
-	res = ioctl(mysock,SIOCGIFADDR,&ifreq);
+	mysock = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
+	res = ioctl(mysock, SIOCGIFADDR, &ifreq);
 
 	close(mysock);
 	if (res < 0) {
 		ast_log(LOG_WARNING, "Unable to get IP of %s: %s\n", iface, strerror(errno));
-		memcpy((char *)address,(char *)&__ourip,sizeof(__ourip));
+		memcpy((char *)address, (char *)&__ourip, sizeof(__ourip));
 		return -1;
 	} else {
-		memcpy((char *)address,(char *)&ifreq.ifru_addr.sin_addr,sizeof(ifreq.ifru_addr.sin_addr));
+		memcpy((char *)address, (char *)&ifreq.ifru_addr.sin_addr, sizeof(ifreq.ifru_addr.sin_addr));
 		return 0;
 	}
 }
 
 int ast_ouraddrfor(struct in_addr *them, struct in_addr *us)
 {
-#ifdef __OpenBSD__
-	struct sockaddr_in *sin;
-	struct sockaddr *sa;
-	struct {
-		struct	rt_msghdr m_rtm;
-		char	m_space[512];
-	} m_rtmsg;
-	char *cp, *p = ast_strdupa(inet_ntoa(*them));
-	int i, l, s, seq, flags;
-	pid_t pid = getpid();
-	static int routeseq;	/* Protected by "routeseq_lock" mutex */
+	int s;
+	struct sockaddr_in sin;
+	socklen_t slen;
 
-	memset(us, 0, sizeof(struct in_addr));
-
-	memset(&m_rtmsg, 0, sizeof(m_rtmsg));
-	m_rtmsg.m_rtm.rtm_type = RTM_GET;
-	m_rtmsg.m_rtm.rtm_flags = RTF_UP | RTF_HOST;
-	m_rtmsg.m_rtm.rtm_version = RTM_VERSION;
-	ast_mutex_lock(&routeseq_lock);
-	seq = ++routeseq;
-	ast_mutex_unlock(&routeseq_lock);
-	m_rtmsg.m_rtm.rtm_seq = seq;
-	m_rtmsg.m_rtm.rtm_addrs = RTA_IFA | RTA_DST;
-	m_rtmsg.m_rtm.rtm_msglen = sizeof(struct rt_msghdr) + sizeof(struct sockaddr_in);
-	sin = (struct sockaddr_in *)m_rtmsg.m_space;
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(struct sockaddr_in);
-	sin->sin_addr = *them;
-
-	if ((s = socket(PF_ROUTE, SOCK_RAW, 0)) < 0) {
-		ast_log(LOG_ERROR, "Error opening routing socket\n");
+	s = socket(PF_INET, SOCK_DGRAM, 0);
+	if (s < 0) {
+		ast_log(LOG_WARNING, "Cannot create socket\n");
 		return -1;
 	}
-	flags = fcntl(s, F_GETFL);
-	fcntl(s, F_SETFL, flags | O_NONBLOCK);
-	if (write(s, (char *)&m_rtmsg, m_rtmsg.m_rtm.rtm_msglen) < 0) {
-		ast_log(LOG_ERROR, "Error writing to routing socket: %s\n", strerror(errno));
+	sin.sin_family = AF_INET;
+	sin.sin_port = 5060;
+	sin.sin_addr = *them;
+	if (connect(s, (struct sockaddr *)&sin, sizeof(sin))) {
+		ast_log(LOG_WARNING, "Cannot connect\n");
 		close(s);
 		return -1;
 	}
-	do {
-		l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
-	} while (l > 0 && (m_rtmsg.m_rtm.rtm_seq != 1 || m_rtmsg.m_rtm.rtm_pid != pid));
-	if (l < 0) {
-		if (errno != EAGAIN)
-			ast_log(LOG_ERROR, "Error reading from routing socket\n");
+	slen = sizeof(sin);
+	if (getsockname(s, (struct sockaddr *)&sin, &slen)) {
+		ast_log(LOG_WARNING, "Cannot get socket name\n");
 		close(s);
 		return -1;
 	}
 	close(s);
-
-	if (m_rtmsg.m_rtm.rtm_version != RTM_VERSION) {
-		ast_log(LOG_ERROR, "Unsupported route socket protocol version\n");
-		return -1;
-	}
-
-	if (m_rtmsg.m_rtm.rtm_msglen != l)
-		ast_log(LOG_WARNING, "Message length mismatch, in packet %d, returned %d\n",
-				m_rtmsg.m_rtm.rtm_msglen, l);
-
-	if (m_rtmsg.m_rtm.rtm_errno) {
-		ast_log(LOG_ERROR, "RTM_GET got %s (%d)\n",
-				strerror(m_rtmsg.m_rtm.rtm_errno), m_rtmsg.m_rtm.rtm_errno);
-		return -1;
-	}
-
-	cp = (char *)m_rtmsg.m_space;
-	if (m_rtmsg.m_rtm.rtm_addrs)
-		for (i = 1; i; i <<= 1)
-			if (m_rtmsg.m_rtm.rtm_addrs & i) {
-				sa = (struct sockaddr *)cp;
-				if (i == RTA_IFA && sa->sa_family == AF_INET) {
-					sin = (struct sockaddr_in *)sa;
-					*us = sin->sin_addr;
-					ast_log(LOG_DEBUG, "Found route to %s, output from our address %s.\n", p, inet_ntoa(*us));
-					return 0;
-				}
-				cp += sa->sa_len > 0 ?
-					  (1 + ((sa->sa_len - 1) | (sizeof(long) - 1))) :
-					  sizeof(long);
-			}
-
-	ast_log(LOG_DEBUG, "No route found for address %s!\n", p);
-	return -1;
-#else
-	FILE *PROC;
-	unsigned int remote_ip;
-	int res = 1;
-	char line[256];
-	remote_ip = them->s_addr;
-	
-	PROC = fopen("/proc/net/route","r");
-	if (!PROC) {
-		bzero(us,sizeof(struct in_addr));
-		return -1;
-	}
-	/* First line contains headers */
-	fgets(line,sizeof(line),PROC);
-
-	while (!feof(PROC)) {
-		char iface[8];
-		unsigned int dest, gateway, mask;
-		int i,fieldnum;
-		char *fields[40];
-
-		fgets(line,sizeof(line),PROC);
-
-		fieldnum = 0;
-		for (i=0;i<sizeof(line);i++) {
-			char *offset;
-
-			fields[fieldnum++] = line + i;
-			offset = strchr(line + i,'\t');
-			if (offset == NULL) {
-				/* Exit loop */
-				break;
-			} else if (fieldnum >= 9) {
-				/* Short-circuit: can't break at 8, since the end of field 7 is figured when fieldnum=8 */
-				break;
-			} else {
-				*offset = '\0';
-				i = offset - line;
-			}
-		}
-
-		sscanf(fields[0],"%s",iface);
-		sscanf(fields[1],"%x",&dest);
-		sscanf(fields[2],"%x",&gateway);
-		sscanf(fields[7],"%x",&mask);
-#if 0
-		printf("Addr: %s %08x Dest: %08x Mask: %08x\n", inet_ntoa(*them), remote_ip, dest, mask);
-#endif		
-		/* Looks simple, but here is the magic */
-		if (((remote_ip & mask) ^ dest) == 0) {
-			res = ast_lookup_iface(iface,us);
-			break;
-		}
-	}
-	fclose(PROC);
-	if (res == 1) {
-		ast_log(LOG_WARNING, "Yikes!  No default route?!!\n");
-		bzero(us,sizeof(struct in_addr));
-		return -2;
-	} else if (res) {
-		/* We've already warned in subroutine */
-		return -1;
- 	}
+	*us = sin.sin_addr;
 	return 0;
-#endif
 }
+
+int ast_find_ourip(struct in_addr *ourip, struct sockaddr_in bindaddr)
+{
+	char ourhost[MAXHOSTNAMELEN] = "";
+	struct ast_hostent ahp;
+	struct hostent *hp;
+	struct in_addr saddr;
+
+	/* just use the bind address if it is nonzero */
+	if (ntohl(bindaddr.sin_addr.s_addr)) {
+		memcpy(ourip, &bindaddr.sin_addr, sizeof(*ourip));
+		return 0;
+	}
+	/* try to use our hostname */
+	if (gethostname(ourhost, sizeof(ourhost) - 1)) {
+		ast_log(LOG_WARNING, "Unable to get hostname\n");
+	} else {
+		hp = ast_gethostbyname(ourhost, &ahp);
+		if (hp) {
+			memcpy(ourip, hp->h_addr, sizeof(*ourip));
+			return 0;
+		}
+	}
+	/* A.ROOT-SERVERS.NET. */
+	if (inet_aton("198.41.0.4", &saddr) && !ast_ouraddrfor(&saddr, ourip))
+		return 0;
+	return -1;
+}
+

aesopt.h

@@ -135,7 +135,8 @@
 #ifndef _AESOPT_H
 #define _AESOPT_H
 
-#include <asterisk/aes.h>
+#include "asterisk/aes.h"
+#include "asterisk/endian.h"
 
 /*  CONFIGURATION - USE OF DEFINES
 
@@ -146,19 +147,6 @@
     #if clauses.
 */
 
-/*  PLATFORM SPECIFIC INCLUDES */
-
-#if defined( __FreeBSD__ ) || defined( __OpenBSD__ )
-#  include <sys/endian.h>
-#elif defined( BSD ) && ( BSD >= 199103 )
-#  include <machine/endian.h>
-#elif defined( __GNUC__ ) || defined( __GNU_LIBRARY__ )
-#  include <endian.h>
-#  include <byteswap.h>
-#elif defined( linux )
-#  include <endian.h>
-#endif
-
 /*  BYTE ORDER IN 32-BIT WORDS
 
     To obtain the highest speed on processors with 32-bit words, this code

agi/.cvsignore

@@ -1,3 +0,0 @@
-eagi-test
-eagi-sphinx-test
-.depend

agi/Makefile

@@ -1,11 +1,11 @@
 #
 # Asterisk -- A telephony toolkit for Linux.
 # 
-# Makefile for PBX frontends (dynamically loaded)
+# Makefile for AGI-related stuff
 #
-# Copyright (C) 1999, Mark Spencer
+# Copyright (C) 1999-2005, Digium
 #
-# Mark Spencer <markster@linux-support.net>
+# Mark Spencer <markster@digium.com>
 #
 # This program is free software, distributed under the terms of
 # the GNU General Public License
@@ -15,6 +15,11 @@ AGIS=agi-test.agi eagi-test eagi-sphinx-test
 
 CFLAGS+=
 
+LIBS=
+ifeq ($(OSARCH),SunOS)
+LIBS=-lsocket -lnsl ../strcompat.o
+endif
+
 all: depend $(AGIS)
 
 install: all
@@ -22,13 +27,13 @@ install: all
 	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
 
 eagi-test: eagi-test.o
-	$(CC) -o eagi-test eagi-test.o
-	
+	$(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
+
 eagi-sphinx-test: eagi-sphinx-test.o
-	$(CC) -o eagi-sphinx-test eagi-sphinx-test.o
+	$(CC) $(CFLAGS) -o eagi-sphinx-test eagi-sphinx-test.o $(LIBS) 
 
 clean:
-	rm -f *.so *.o look .depend
+	rm -f *.so *.o look .depend eagi-test eagi-sphinx-test
 
 %.so : %.o
 	$(CC) -shared -Xlinker -x -o $@ $<
@@ -40,4 +45,4 @@ endif
 depend: .depend
 
 .depend:
-	../mkdep $(CFLAGS) `ls *.c`
+	../build_tools/mkdep $(CFLAGS) `ls *.c`

agi/eagi-sphinx-test.c

@@ -17,6 +17,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#ifdef SOLARIS
+#include <solaris-compat/compat.h>
+#endif
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 

agi/eagi-test.c

@@ -11,6 +11,9 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/select.h>
+#ifdef SOLARIS
+#include <solaris-compat/compat.h>
+#endif
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
 

agi/fastagi-test

@@ -0,0 +1,94 @@
+#!/usr/bin/perl
+use strict;
+use Socket;
+use Carp;
+use IO::Handle;
+
+my $port = 4573;
+
+$|=1;
+
+# Setup some variables
+my %AGI; my $tests = 0; my $fail = 0; my $pass = 0;
+
+sub checkresult {
+	my ($res) = @_;
+	my $retval;
+	$tests++;
+	chomp $res;
+	if ($res =~ /^200/) {
+		$res =~ /result=(-?\d+)/;
+		if (!length($1)) {
+			print STDERR "FAIL ($res)\n";
+			$fail++;
+		} else {
+			print STDERR "PASS ($1)\n";
+			$pass++;
+		}
+	} else {
+		print STDERR "FAIL (unexpected result '$res')\n";
+		$fail++;
+	}
+}
+
+socket(SERVER, PF_INET, SOCK_STREAM, 0);
+setsockopt(SERVER, SOL_SOCKET, SO_REUSEADDR, pack("l", 1));
+bind(SERVER, sockaddr_in($port, INADDR_ANY)) || die("can't bind\n");
+listen(SERVER, SOMAXCONN);
+
+for(;;) {
+	my $raddr = accept(CLIENT, SERVER);
+	my ($s, $p) = sockaddr_in($raddr);
+	CLIENT->autoflush(1);
+	while(<CLIENT>) {
+		chomp;
+		last unless length($_);
+		if (/^agi_(\w+)\:\s+(.*)$/) {
+			$AGI{$1} = $2;
+		}
+	}
+	print STDERR "AGI Environment Dump from $s:$p --\n";
+	foreach my $i (sort keys %AGI) {
+		print STDERR " -- $i = $AGI{$i}\n";
+	}
+
+	print STDERR "1.  Testing 'sendfile'...";
+	print CLIENT "STREAM FILE beep \"\"\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "2.  Testing 'sendtext'...";
+	print CLIENT "SEND TEXT \"hello world\"\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "3.  Testing 'sendimage'...";
+	print CLIENT "SEND IMAGE asterisk-image\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "4.  Testing 'saynumber'...";
+	print CLIENT "SAY NUMBER 192837465 \"\"\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "5.  Testing 'waitdtmf'...";
+	print CLIENT "WAIT FOR DIGIT 1000\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "6.  Testing 'record'...";
+	print CLIENT "RECORD FILE testagi gsm 1234 3000\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+
+	print STDERR "6a.  Testing 'record' playback...";
+	print CLIENT "STREAM FILE testagi \"\"\n";
+	my $result = <CLIENT>;
+	&checkresult($result);
+	close(CLIENT);
+	print STDERR "================== Complete ======================\n";
+	print STDERR "$tests tests completed, $pass passed, $fail failed\n";
+	print STDERR "==================================================\n";
+}
+

alaw.c

@@ -11,7 +11,11 @@
  * the GNU General Public License
  */
 
-#include <asterisk/alaw.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/alaw.h"
 
 #define AMI_MASK 0x55
 

apps/.cvsignore

@@ -1 +0,0 @@
-.depend

apps/Makefile

@@ -1,11 +1,11 @@
 #
 # Asterisk -- A telephony toolkit for Linux.
 # 
-# Makefile for PBX frontends (dynamically loaded)
+# Makefile for PBX applications
 #
-# Copyright (C) 1999, Mark Spencer
+# Copyright (C) 1999-2005, Digium
 #
-# Mark Spencer <markster@linux-support.net>
+# Mark Spencer <markster@digium.com>
 #
 # This program is free software, distributed under the terms of
 # the GNU General Public License
@@ -17,35 +17,65 @@ USE_POSTGRES_VM_INTERFACE=0
 #APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so 
 APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
      app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \
-     app_agi.so app_qcall.so app_adsiprog.so app_getcpeid.so app_milliwatt.so \
-     app_zapateller.so app_datetime.so app_setcallerid.so app_festival.so \
+     app_adsiprog.so app_getcpeid.so app_milliwatt.so \
+     app_zapateller.so app_setcallerid.so app_festival.so \
      app_queue.so app_senddtmf.so app_parkandannounce.so app_striplsd.so \
      app_setcidname.so app_lookupcidname.so app_substring.so app_macro.so \
      app_authenticate.so app_softhangup.so app_lookupblacklist.so \
      app_waitforring.so app_privacy.so app_db.so app_chanisavail.so \
      app_enumlookup.so app_transfer.so app_setcidnum.so app_cdr.so \
      app_hasnewvoicemail.so app_sayunixtime.so app_cut.so app_read.so \
-     app_setcdruserfield.so app_random.so
+     app_setcdruserfield.so app_random.so app_ices.so app_eval.so \
+     app_nbscat.so app_sendtext.so app_exec.so app_sms.so \
+     app_groupcount.so app_txtcidname.so app_controlplayback.so \
+     app_talkdetect.so app_alarmreceiver.so app_userevent.so app_verbose.so \
+     app_test.so app_forkcdr.so app_math.so app_realtime.so \
+     app_dumpchan.so app_waitforsilence.so app_while.so app_setrdnis.so \
+     app_md5.so app_readfile.so app_chanspy.so app_settransfercapability.so \
+     app_dictate.so app_externalivr.so
 
 ifneq (${OSARCH},Darwin)
-APPS+=app_intercom.so
+ifneq (${OSARCH},SunOS)
+#APPS+=app_intercom.so
 endif
+endif
+
+#
+# Obsolete things...
+#
 
 #APPS+=app_sql_postgres.so
 #APPS+=app_sql_odbc.so
+#APPS+=app_rpt.so
+#
+# Experimental things
+#
+#APPS+=app_ivrdemo.so
+#APPS+=app_skel.so
 
-APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
-#APPS+=$(shell if [ -f /usr/include/zap.h ]; then echo "app_rpt.so" ; fi)
+APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi)
+APPS+=$(shell if [ -f $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi)
 
+CURLLIBS=$(shell $(CROSS_COMPILE_BIN)curl-config --libs)
+ifneq ($(shell if [[ 0x`$(CROSS_COMPILE_BIN)curl-config --vernum` -ge 0x70907 ]]; then echo "OK" ; fi),)
+	ifneq (${CURLLIBS},)
+		APPS+=app_curl.so
+		ifeq (${OSARCH},OpenBSD)
+			CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
+		endif
+	endif 
+endif
 CFLAGS+=-fPIC
-
-ifeq ($(USE_POSTGRES_VM_INTERFACE),1)
-CFLAGS+=-DUSEPOSTGRESVM
-endif
-
-ifeq ($(USE_MYSQL_VM_INTERFACE),1)
-CFLAGS+=-DUSEMYSQLVM
-endif
+#
+# If you have MySQL 4.1 or later you can use ODBC
+# storage
+#
+# Uncomment to use odbc storage
+#CFLAGS+=-DUSE_ODBC_STORAGE
+# Uncomment for extended odbc voicemail storage
+#CFLAGS+=-DEXTENDED_ODBC_STORAGE
+# See doc/README.odbcstorage for more information
 
 all: $(APPS)
 
@@ -60,12 +90,11 @@ app_rpt.so : app_rpt.o
 
 install: all
 	for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+	rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
+	rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so
 
-app_todd.o: app_todd.c
-	gcc -pipe -O6 -g  -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o  app_todd.o app_todd.c
-
-app_todd.so: app_todd.o
-	$(CC) $(SOLINK) -o $@ $< -L/usr/local/ssl/lib -lssl -lcrypto
+app_curl.so: app_curl.o
+	$(CC) $(SOLINK) -o $@ $< $(CURLLIBS)
 
 app_voicemail.so : app_voicemail.o
 ifeq ($(USE_MYSQL_VM_INTERFACE),1)
@@ -88,7 +117,13 @@ app_sql_odbc.so: app_sql_odbc.o
 	$(CC) $(SOLINK) -o $@ $< -lodbc
 
 look:	look.c
-	gcc -pipe -O6 -g look.c -o look -lncurses
+	$(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
@@ -97,4 +132,7 @@ endif
 depend: .depend
 
 .depend:
-	../mkdep $(CFLAGS) `ls *.c`
+	../build_tools/mkdep $(CFLAGS) `ls *.c`
+
+env:
+	env

apps/app_adsiprog.c

@@ -12,13 +12,6 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/adsi.h>
-#include <asterisk/options.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -28,10 +21,19 @@
 #include <stdio.h>
 #include <errno.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
-#include "../asterisk.h"
-#include "../astconf.h"
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/adsi.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 static char *tdesc = "Asterisk ADSI Programming Application";
 
@@ -178,7 +180,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype)
 			maxlen = strlen(src) - 1;
 		memcpy(out, src, maxlen);
 		((char *)out)[maxlen] = '\0';
-	} else if (strlen(src) && (src[0] == '\\')) {
+	} else if (!ast_strlen_zero(src) && (src[0] == '\\')) {
 		if (!(argtype & ARG_NUMBER))
 			return -1;
 		/* Octal value */
@@ -198,7 +200,7 @@ static int process_token(void *out, char *src, int maxlen, int argtype)
 			/* Convert */
 			*((unsigned int *)out) = htonl(*((unsigned int *)out));
 		}
-	} else if ((strlen(src) && isdigit(src[0]))) {
+	} else if ((!ast_strlen_zero(src) && isdigit(src[0]))) {
 		if (!(argtype & ARG_NUMBER))
 			return -1;
 		/* Hex value */
@@ -400,7 +402,7 @@ static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, ch
 		ast_log(LOG_WARNING, "No more flag space at line %d of %s\n", lineno, script);
 		return NULL;
 	}
-	strncpy(state->flags[state->numflags].vname, name, sizeof(state->flags[state->numflags].vname) - 1);
+	ast_copy_string(state->flags[state->numflags].vname, name, sizeof(state->flags[state->numflags].vname));
 	state->flags[state->numflags].id = state->numflags + 1;
 	state->numflags++;
 	return &state->flags[state->numflags-1];
@@ -503,7 +505,7 @@ static struct adsi_soft_key *getkeybyname(struct adsi_script *state, char *name,
 		ast_log(LOG_WARNING, "No more key space at line %d of %s\n", lineno, script);
 		return NULL;
 	}
-	strncpy(state->keys[state->numkeys].vname, name, sizeof(state->keys[state->numkeys].vname) - 1);
+	ast_copy_string(state->keys[state->numkeys].vname, name, sizeof(state->keys[state->numkeys].vname));
 	state->keys[state->numkeys].id = state->numkeys + 2;
 	state->numkeys++;
 	return &state->keys[state->numkeys-1];
@@ -519,7 +521,7 @@ static struct adsi_subscript *getsubbyname(struct adsi_script *state, char *name
 		ast_log(LOG_WARNING, "No more subscript space at line %d of %s\n", lineno, script);
 		return NULL;
 	}
-	strncpy(state->subs[state->numsubs].vname, name, sizeof(state->subs[state->numsubs].vname) - 1);
+	ast_copy_string(state->subs[state->numsubs].vname, name, sizeof(state->subs[state->numsubs].vname));
 	state->subs[state->numsubs].id = state->numsubs;
 	state->numsubs++;
 	return &state->subs[state->numsubs-1];
@@ -538,7 +540,7 @@ static struct adsi_state *getstatebyname(struct adsi_script *state, char *name,
 		ast_log(LOG_WARNING, "No more state space at line %d of %s\n", lineno, script);
 		return NULL;
 	}
-	strncpy(state->states[state->numstates].vname, name, sizeof(state->states[state->numstates].vname) - 1);
+	ast_copy_string(state->states[state->numstates].vname, name, sizeof(state->states[state->numstates].vname));
 	state->states[state->numstates].id = state->numstates + 1;
 	state->numstates++;
 	return &state->states[state->numstates-1];
@@ -557,7 +559,7 @@ static struct adsi_display *getdisplaybyname(struct adsi_script *state, char *na
 		ast_log(LOG_WARNING, "No more display space at line %d of %s\n", lineno, script);
 		return NULL;
 	}
-	strncpy(state->displays[state->numdisplays].vname, name, sizeof(state->displays[state->numdisplays].vname) - 1);
+	ast_copy_string(state->displays[state->numdisplays].vname, name, sizeof(state->displays[state->numdisplays].vname));
 	state->displays[state->numdisplays].id = state->numdisplays + 1;
 	state->numdisplays++;
 	return &state->displays[state->numdisplays-1];
@@ -666,7 +668,7 @@ static int showdisplay(char *buf, char *name, int id, char *args, struct adsi_sc
 	}
 				   
 	buf[0] = id;
-	buf[1] = (cmd << 6) | (disp->id & 0x2f); 
+	buf[1] = (cmd << 6) | (disp->id & 0x3f); 
 	buf[2] = ((line & 0x1f) << 3) | (flag & 0x7);
 	return 3;
 }
@@ -695,6 +697,18 @@ static int digitdirect(char *buf, char *name, int id, char *args, struct adsi_sc
 	return 2;
 }
 
+static int clearcbone(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
+{
+	char *tok;
+	tok = get_token(&args, script, lineno);
+	if (tok)
+		ast_log(LOG_WARNING, "CLEARCB1 requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
+
+	buf[0] = id;
+	buf[1] = 0;
+	return 2;
+}
+
 static int digitcollect(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
 {
 	char *tok;
@@ -831,6 +845,7 @@ static struct adsi_key_cmd kcmds[] = {
 	{ "VOICEMODE", 0x93 },
 	/* Display call buffer 'n' */
 	/* Clear call buffer 'n' */
+	{ "CLEARCB1", 0x95, clearcbone },
 	{ "DIGITCOLLECT", 0x96, digitcollect },
 	{ "DIGITDIRECT", 0x96, digitdirect },
 	{ "CLEAR", 0x97 },
@@ -1030,7 +1045,7 @@ static int adsi_process(struct adsi_script *state, char *buf, char *script, int
 					break;
 				}
 			} else {
-				strncpy(tmp2, tmp, sizeof(tmp2) - 1);
+				ast_copy_string(tmp2, tmp, sizeof(tmp2));
 			}
 			if (strlen(tmp2) > 18) {
 				ast_log(LOG_WARNING, "Truncating full name to 18 characters at line %d of %s\n", lineno, script);
@@ -1323,7 +1338,7 @@ static struct adsi_script *compile_script(char *script)
 	int x, err;
 	struct adsi_script *scr;
 	if (script[0] == '/')
-		strncpy(fn, script, sizeof(fn) - 1);
+		ast_copy_string(fn, script, sizeof(fn));
 	else
 		snprintf(fn, sizeof(fn), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, script);
 	f = fopen(fn, "r");
@@ -1350,7 +1365,7 @@ static struct adsi_script *compile_script(char *script)
 			/* Strip comments */
 			if (c)
 				*c = '\0';
-			if (strlen(buf))
+			if (!ast_strlen_zero(buf))
 				adsi_process(scr, buf, script, lineno);
 		}
 	}
@@ -1435,7 +1450,7 @@ static int adsi_prog(struct ast_channel *chan, char *script)
 	bytes = 0;
 	/* Start with key definitions */
 	for (x=0;x<scr->numkeys;x++) {
-		if (bytes + scr->keys[x].retstrlen > 254) {
+		if (bytes + scr->keys[x].retstrlen > 253) {
 			/* Send what we've collected so far */
 			if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
 				ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
@@ -1459,7 +1474,7 @@ static int adsi_prog(struct ast_channel *chan, char *script)
 	bytes = 0;
 	/* Continue with the display messages */
 	for (x=0;x<scr->numdisplays;x++) {
-		if (bytes + scr->displays[x].datalen > 254) {
+		if (bytes + scr->displays[x].datalen > 253) {
 			/* Send what we've collected so far */
 			if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
 				ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
@@ -1483,7 +1498,7 @@ static int adsi_prog(struct ast_channel *chan, char *script)
 	bytes = 0;
 	/* Send subroutines */
 	for (x=0;x<scr->numsubs;x++) {
-		if (bytes + scr->subs[x].datalen > 254) {
+		if (bytes + scr->subs[x].datalen > 253) {
 			/* Send what we've collected so far */
 			if (adsi_transmit_message(chan, buf, bytes, ADSI_MSG_DOWNLOAD)) {
 				ast_log(LOG_WARNING, "Unable to send chunk ending at %d\n", x);
@@ -1527,7 +1542,7 @@ static int adsi_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
 	struct localuser *u;
-	if (!data || !strlen(data))
+	if (!data || ast_strlen_zero(data))
 		data = "asterisk.adsi";
 	LOCAL_USER_ADD(u);
 	if (!adsi_available(chan)) {

apps/app_alarmreceiver.c

@@ -0,0 +1,847 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Central Station Alarm receiver for Ademco Contact ID  
+ * 
+ * Copyright (C)  2004 - 2005 Steve Rodgers
+ *
+ * Steve Rodgers <hwstar@rodgers.sdcoxmail.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ *
+ * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** 
+ *
+ * Use at your own risk. Please consult the GNU GPL license document included with Asterisk details. *
+ *
+ * *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING ***
+ *
+ */ 
+ 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <math.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/time.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/ulaw.h"
+#include "asterisk/options.h"
+#include "asterisk/app.h"
+#include "asterisk/dsp.h"
+#include "asterisk/config.h"
+#include "asterisk/localtime.h"
+#include "asterisk/callerid.h"
+#include "asterisk/astdb.h"
+
+#define ALMRCV_CONFIG "alarmreceiver.conf"
+#define ADEMCO_CONTACT_ID "ADEMCO_CONTACT_ID"
+
+struct event_node{
+	char data[17];
+	struct event_node *next;
+};
+
+typedef struct event_node event_node_t;
+
+static char *tdesc = "Alarm Receiver for Asterisk";
+
+static char *app = "AlarmReceiver";
+
+static char *synopsis = "Provide support for receving alarm reports from a burglar or fire alarm panel";
+static char *descrip =
+"Alarm receiver application for Asterisk. Only 1 signalling format is supported at this time:\n"
+"Ademco Contact ID. This application should be called whenever there is an alarm panel calling in\n"
+"to dump its events. The application will handshake with the alarm panel, and receive events,\n"
+"validate them, handshake them, and store them until the panel hangs up. Once the panel hangs up,\n"
+"the application will run the command line specified by the eventcmd setting in alarmreceiver.conf\n"
+"and pipe the events to the standard input of the application. Alarmreceiver.conf also contains settings\n"
+"for DTMF timing, and for the loudness of the acknowledgement tones.\n";
+
+/* Config Variables */
+
+static int fdtimeout = 2000;
+static int sdtimeout = 200; 
+static int toneloudness = 4096;
+static int log_individual_events = 0;
+static char event_spool_dir[128] = {'\0'};
+static char event_app[128] = {'\0'};
+static char db_family[128] = {'\0'};
+static char time_stamp_format[128] = {"%a %b %d, %Y @ %H:%M:%S %Z"};
+
+
+/* Misc variables */
+
+	
+static char event_file[14] = "/event-XXXXXX";
+
+
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+/*
+* Attempt to access a database variable and increment it,
+* provided that the user defined db-family in alarmreceiver.conf
+* The alarmreceiver app will write statistics to a few variables
+* in this family if it is defined. If the new key doesn't exist in the
+* family, then create it and set its value to 1.
+*/
+
+static void database_increment( char *key )
+{
+	int res = 0;
+	unsigned v;
+	char value[16];
+	
+	
+	if(!strlen(db_family))
+		return; /* If not defined, don't do anything */
+	
+	res = ast_db_get(db_family, key, value, sizeof(value) - 1);
+	
+	if(res){
+		if(option_verbose >= 4)
+			ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Creating database entry %s and setting to 1\n", key);
+		/* Guess we have to create it */
+		res = ast_db_put(db_family, key, "1");
+		return;
+	}
+	
+	sscanf(value, "%u", &v);
+	v++;
+	
+	if(option_verbose >= 4)
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: New value for %s: %u\n", key, v);
+		
+	snprintf(value, sizeof(value), "%u", v);
+	
+	res = ast_db_put(db_family, key, value);
+	
+	if((res)&&(option_verbose >= 4))
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: database_increment write error");
+	
+	return;	
+}
+
+
+/*
+* Build a MuLaw data block for a single frequency tone
+*/
+
+static void make_tone_burst(unsigned char *data, float freq, float loudness, int len, int *x)
+{
+	int     i;
+	float   val;
+                                                                                                                                    
+        for(i = 0; i < len; i++){
+		val = loudness * sin((freq * 2.0 * M_PI * (*x)++)/8000.0);
+		data[i] = AST_LIN2MU((int)val);
+	}
+
+	/* wrap back around from 8000 */
+
+	if (*x >= 8000) *x = 0;
+	return;
+}
+
+/*
+* Send a single tone burst for a specifed duration and frequency. 
+* Returns 0 if successful
+*/
+
+static int send_tone_burst(struct ast_channel *chan, float freq, int duration, int tldn)
+{
+	int res = 0;
+	int i = 0;
+	int x = 0;
+	struct ast_frame *f, wf;
+	
+	struct {
+		unsigned char offset[AST_FRIENDLY_OFFSET];
+		unsigned char buf[640];
+	} tone_block;
+
+	for(;;)
+	{
+	
+		if (ast_waitfor(chan, -1) < 0){
+			res = -1;
+			break;
+		}
+		
+		f = ast_read(chan);
+		if (!f){
+			res = -1;
+			break;
+		}
+		
+		if (f->frametype == AST_FRAME_VOICE) {
+			wf.frametype = AST_FRAME_VOICE;
+			wf.subclass = AST_FORMAT_ULAW;
+			wf.offset = AST_FRIENDLY_OFFSET;
+			wf.mallocd = 0;
+			wf.data = tone_block.buf;
+			wf.datalen = f->datalen;
+			wf.samples = wf.datalen;
+			
+			make_tone_burst(tone_block.buf, freq, (float) tldn, wf.datalen, &x);
+
+			i += wf.datalen / 8;
+			if (i > duration) {
+				break;
+			}
+			if (ast_write(chan, &wf)){
+				if(option_verbose >= 4)
+					ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Failed to write frame on %s\n", chan->name);
+				ast_log(LOG_WARNING, "AlarmReceiver Failed to write frame on %s\n",chan->name);
+				res = -1;
+				break;
+			}
+		}
+		
+		ast_frfree(f);
+	}
+	return res;
+}
+
+/*
+* Receive a string of DTMF digits where the length of the digit string is known in advance. Do not give preferential
+* treatment to any digit value, and allow separate time out values to be specified for the first digit and all subsequent
+* digits.
+*
+* Returns 0 if all digits successfully received.
+* Returns 1 if a digit time out occurred
+* Returns -1 if the caller hung up or there was a channel error.
+*
+*/
+
+static int receive_dtmf_digits(struct ast_channel *chan, char *digit_string, int length, int fdto, int sdto)
+{
+	int res = 0;
+	int i = 0;
+	int r;
+	struct ast_frame *f;
+	struct timeval lastdigittime;
+	
+	lastdigittime = ast_tvnow();
+	for(;;){
+		  /* if outa time, leave */
+		if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) >
+		    ((i > 0) ? sdto : fdto)){
+			if(option_verbose >= 4)
+				ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: DTMF Digit Timeout on %s\n", chan->name);
+				
+			ast_log(LOG_DEBUG,"AlarmReceiver: DTMF timeout on chan %s\n",chan->name);
+				
+			res = 1;
+			break;
+		}
+		
+		if ((r = ast_waitfor(chan, -1) < 0)) {
+			ast_log(LOG_DEBUG, "Waitfor returned %d\n", r);
+			continue;
+		}
+			
+		f = ast_read(chan);
+		
+		if (f == NULL){
+			res = -1;
+			break;
+		}
+		
+		/* If they hung up, leave */
+		if ((f->frametype == AST_FRAME_CONTROL) &&
+		    (f->subclass == AST_CONTROL_HANGUP)){
+			ast_frfree(f);
+			res = -1;
+			break;
+		}
+		
+		/* if not DTMF, just do it again */
+		if (f->frametype != AST_FRAME_DTMF){
+			ast_frfree(f);
+			continue;
+		}
+
+		digit_string[i++] = f->subclass;  /* save digit */
+		
+		ast_frfree(f);
+		
+		/* If we have all the digits we expect, leave */
+		if(i >= length)
+			break;
+		
+		lastdigittime = ast_tvnow();
+	}
+	
+	digit_string[i] = '\0'; /* Nul terminate the end of the digit string */
+	return res;
+
+}
+
+/*
+* Write the metadata to the log file
+*/
+
+static int write_metadata( FILE *logfile, char *signalling_type, struct ast_channel *chan)
+{
+	int res = 0;
+	time_t t;
+	struct tm now;
+	char *cl,*cn;
+	char workstring[80];
+	char timestamp[80];
+	
+	/* Extract the caller ID location */
+	if (chan->cid.cid_num)
+		ast_copy_string(workstring, chan->cid.cid_num, sizeof(workstring));
+	workstring[sizeof(workstring) - 1] = '\0';
+	
+	ast_callerid_parse(workstring, &cn, &cl);
+	if (cl) 
+		ast_shrink_phone_number(cl);
+                
+
+	/* Get the current time */
+		
+	time(&t);
+	ast_localtime(&t, &now, NULL);
+	
+	/* Format the time */
+	
+	strftime(timestamp, sizeof(timestamp), time_stamp_format, &now); 
+
+	
+	res = fprintf(logfile, "\n\n[metadata]\n\n");
+	
+	if(res >= 0)
+		res = fprintf(logfile, "PROTOCOL=%s\n", signalling_type);
+		
+	if(res >= 0)	
+		res = fprintf(logfile, "CALLINGFROM=%s\n", (!cl) ? "<unknown>" : cl);
+		
+	if(res >- 0)
+		res = fprintf(logfile, "CALLERNAME=%s\n", (!cn) ? "<unknown>" : cn);
+		
+	if(res >= 0)
+		res = fprintf(logfile, "TIMESTAMP=%s\n\n", timestamp);
+	
+	if(res >= 0)
+		res = fprintf(logfile, "[events]\n\n");
+	
+	if(res < 0){
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't write metadata\n");	
+		
+		ast_log(LOG_DEBUG,"AlarmReceiver: can't write metadata\n");
+	}
+	else
+		res = 0;
+
+	return res;
+}
+
+/*
+* Write a single event to the log file
+*/
+
+static int write_event( FILE *logfile,  event_node_t *event)
+{
+	int res = 0;
+
+	if( fprintf(logfile, "%s\n", event->data) < 0)
+		res = -1;
+			
+	return res;
+}
+
+
+/*
+* If we are configured to log events, do so here.
+*
+*/
+
+static int log_events(struct ast_channel *chan,  char *signalling_type, event_node_t *event)
+{
+
+	int res = 0;
+	char workstring[sizeof(event_spool_dir)+sizeof(event_file)] = "";
+	int fd;
+	FILE *logfile;
+	event_node_t *elp = event;
+	
+	if(strlen(event_spool_dir)){
+		
+		/* Make a template */
+		
+		ast_copy_string(workstring, event_spool_dir, sizeof(workstring));
+		strncat(workstring, event_file, sizeof(workstring) - strlen(workstring) - 1);
+		
+		/* Make the temporary file */
+		
+		fd = mkstemp(workstring);
+		
+		if(fd == -1){
+			ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: can't make temporary file\n");	
+			ast_log(LOG_DEBUG,"AlarmReceiver: can't make temporary file\n");
+			res = -1;
+		}
+		
+		if(!res){
+			logfile = fdopen(fd, "w");
+			if(logfile){
+				/* Write the file */
+				res = write_metadata(logfile, signalling_type, chan);
+				if(!res)
+					while((!res) && (elp != NULL)){
+						res = write_event(logfile, elp);
+						elp = elp->next;
+					}
+				if(!res){
+					if(fflush(logfile) == EOF)
+						res = -1;
+					if(!res){
+						if(fclose(logfile) == EOF)
+							res = -1;
+					}				
+				}
+			}
+			else
+				res = -1;
+		}
+	}
+
+	return res;	
+}
+
+/*
+* This function implements the logic to receive the Ademco contact ID  format.
+*
+* The function will return 0 when the caller hangs up, else a -1 if there was a problem.
+*/
+
+static int receive_ademco_contact_id( struct ast_channel *chan, void *data, int fdto, int sdto, int tldn, event_node_t **ehead)
+{
+	int i,j;
+	int res = 0;
+	int checksum;
+	char event[17];
+	event_node_t *enew, *elp;
+	int got_some_digits = 0;
+	int events_received = 0;
+	int ack_retries = 0;
+	
+	static char digit_map[15] = "0123456789*#ABC";
+        static unsigned char digit_weights[15] = {10,1,2,3,4,5,6,7,8,9,11,12,13,14,15};
+                                                                                                                      
+	database_increment("calls-received");
+
+	/* Wait for first event */
+
+	if(option_verbose >= 4)
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Waiting for first event from panel\n");
+
+	while(res >= 0){
+
+		if(got_some_digits == 0){
+
+	        	/* Send ACK tone sequence */
+                        
+		                                                                                                                    
+        		if(option_verbose >= 4)
+                		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Sending 1400Hz 100ms burst (ACK)\n");
+                                                                                                                                            
+                                                                                                                                            
+        		res = send_tone_burst(chan, 1400.0, 100, tldn);
+                                                                                                                                            
+        		if(!res)
+                		res = ast_safe_sleep(chan, 100);
+                                                                                                                                            
+        		if(!res){
+                		if(option_verbose >= 4)
+                        		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Sending 2300Hz 100ms burst (ACK)\n");
+                                                                                                                                            
+                		res = send_tone_burst(chan, 2300.0, 100, tldn);
+        		}
+                                                                                                                                            
+		}
+
+		if( res >= 0)
+			res = receive_dtmf_digits(chan, event, sizeof(event) - 1, fdto, sdto);
+		
+		if (res < 0){
+		
+			if(events_received == 0)
+				/* Hangup with no events received should be logged in the DB */
+				database_increment("no-events-received");
+			else{
+				if(ack_retries){
+					if(option_verbose >= 4)
+						ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: ACK retries during this call: %d\n", ack_retries);
+					
+					database_increment("ack-retries");
+				}
+			}
+			if(option_verbose >= 4)
+				ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: App exiting...\n");
+			res = -1;
+			break;
+		}
+		
+		if(res != 0){
+			 /* Didn't get all of the digits */
+			if(option_verbose >= 2)
+				ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Incomplete string: %s, trying again...\n", event);
+
+			if(!got_some_digits){
+				got_some_digits = (strlen(event)) ? 1 : 0;
+				ack_retries++;
+			}
+			continue;	
+		}		
+		
+		got_some_digits = 1;
+
+		if(option_verbose >= 2)
+			ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Received Event %s\n", event);
+		ast_log(LOG_DEBUG, "AlarmReceiver: Received event: %s\n", event);
+		
+		/* Calculate checksum */
+		
+		for(j = 0, checksum = 0; j < 16; j++){
+			for(i = 0 ; i < sizeof(digit_map) ; i++){
+				if(digit_map[i] == event[j])
+					break;
+			}
+			
+			if(i == 16)
+				break;
+				
+			checksum += digit_weights[i];
+		}
+		
+		if(i == 16){
+			if(option_verbose >= 2)
+				ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Bad DTMF character %c, trying again\n", event[j]);
+			continue; /* Bad character */
+		}
+
+		/* Checksum is mod(15) of the total */
+
+		checksum = checksum % 15;
+
+		if(checksum){
+			database_increment("checksum-errors");
+			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 */
+
+		if(strncmp(event + 4, "18", 2)){
+			if(strncmp(event + 4, "98", 2)){
+				database_increment("format-errors");
+				if(option_verbose >= 2)
+					ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Wrong message type\n");
+				ast_log(LOG_DEBUG, "AlarmReceiver: Wrong message type\n");
+			continue;
+			}
+		}
+
+		events_received++;
+		
+		/* Queue the Event */
+
+		if((enew = malloc(sizeof(event_node_t))) == NULL){
+			if(option_verbose >= 1)
+				ast_verbose(VERBOSE_PREFIX_1 "AlarmReceiver: Failed to allocate memory\n");
+			ast_log(LOG_WARNING, "AlarmReceiver Failed to allocate memory\n");
+			res = -1;
+                        break;
+		}
+
+		memset(enew, 0, sizeof(event_node_t));
+		
+		enew->next = NULL;
+		ast_copy_string(enew->data, event, sizeof(enew->data));
+
+		/*
+		* Insert event onto end of list
+		*/
+		
+		if(*ehead == NULL){
+			*ehead = enew;
+		}
+		else{
+			for(elp = *ehead; elp->next != NULL; elp = elp->next)
+			;
+			
+			elp->next = enew;
+		}
+		
+		if(res > 0)
+			res = 0;
+		
+		/* Let the user have the option of logging the single event before sending the kissoff tone */
+
+		if((res == 0) && (log_individual_events))
+			res = log_events(chan, ADEMCO_CONTACT_ID, enew);
+	
+		/* Wait 200 msec before sending kissoff */	
+			
+		if(res == 0)	
+			res = ast_safe_sleep(chan, 200);
+
+		/* Send the kissoff tone */
+
+		if(res == 0)		
+			res = send_tone_burst(chan, 1400.0, 900, tldn);
+	}
+
+	
+	return res;
+}
+
+
+/*
+* This is the main function called by Asterisk Core whenever the App is invoked in the extension logic.
+* This function will always return 0.
+*/
+
+static int alarmreceiver_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	event_node_t *elp, *efree;
+	char signalling_type[64] = "";
+
+	event_node_t *event_head = NULL;
+
+	LOCAL_USER_ADD(u);
+
+	/* Set write and read formats to ULAW */
+
+	if(option_verbose >= 4)
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Setting read and write formats to ULAW\n");
+
+	if (ast_set_write_format(chan,AST_FORMAT_ULAW)){
+		ast_log(LOG_WARNING, "AlarmReceiver: Unable to set write format to Mu-law on %s\n",chan->name);
+		return -1;
+	}
+	
+	if (ast_set_read_format(chan,AST_FORMAT_ULAW)){
+		ast_log(LOG_WARNING, "AlarmReceiver: Unable to set read format to Mu-law on %s\n",chan->name);
+		return -1;
+	}
+
+	/* Set default values for this invokation of the application */
+	
+	ast_copy_string(signalling_type, ADEMCO_CONTACT_ID, sizeof(signalling_type));
+
+
+	/* Answer the channel if it is not already */
+
+	if(option_verbose >= 4)
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Answering channel\n");
+
+	if (chan->_state != AST_STATE_UP) {
+	
+		res = ast_answer(chan);
+		
+		if (res) {
+			LOCAL_USER_REMOVE(u);
+			return -1;
+		}
+	}
+
+	/* Wait for the connection to settle post-answer */
+
+	if(option_verbose >= 4)
+		ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: Waiting for connection to stabilize\n");
+
+	res = ast_safe_sleep(chan, 1250);
+
+	/* Attempt to receive the events */
+
+	if(!res){
+	
+		/* Determine the protocol to receive in advance */
+		/* Note: Ademco contact is the only one supported at this time */
+		/* Others may be added later */
+		
+		if(!strcmp(signalling_type, ADEMCO_CONTACT_ID))
+			receive_ademco_contact_id(chan, data, fdtimeout, sdtimeout, toneloudness, &event_head);
+		else
+			res = -1;
+	}
+	
+		
+	
+	/* Events queued by receiver, write them all out here if so configured */
+
+	if((!res) && (log_individual_events == 0)){
+		res = log_events(chan, signalling_type, event_head);
+
+	}
+
+	/*
+	* Do we exec a command line at the end?
+	*/
+	
+	if((!res) && (strlen(event_app)) && (event_head)){
+		ast_log(LOG_DEBUG,"Alarmreceiver: executing: %s\n", event_app);
+		ast_safe_system(event_app);
+	}
+
+	/*
+	* Free up the data allocated in our linked list
+	*/
+		
+	for(elp = event_head; (elp != NULL);){
+		efree = elp;
+		elp = elp->next;
+		free(efree);
+	}
+
+
+	LOCAL_USER_REMOVE(u);
+
+	return 0;
+}
+
+/* 
+* Load the configuration from the configuration file
+*/
+
+static int load_config(void)
+{
+	struct ast_config *cfg;
+	char *p;
+
+	/* Read in the config file */
+
+	cfg = ast_config_load(ALMRCV_CONFIG);
+                                                                                                                                  
+	if(!cfg){
+	
+		if(option_verbose >= 4)
+			ast_verbose(VERBOSE_PREFIX_4 "AlarmReceiver: No config file\n");
+	}
+	else{
+
+		
+		p = ast_variable_retrieve(cfg, "general", "eventcmd");
+		
+		if(p){
+			ast_copy_string(event_app, p, sizeof(event_app));
+			event_app[sizeof(event_app) - 1] = '\0';
+		}
+		
+		p = ast_variable_retrieve(cfg, "general", "loudness");
+		if(p){
+			toneloudness = atoi(p);
+			if(toneloudness < 100)
+				toneloudness = 100;
+			if(toneloudness > 8192)
+				toneloudness = 8192;
+		}
+		p = ast_variable_retrieve(cfg, "general", "fdtimeout");
+		if(p){
+			fdtimeout = atoi(p);
+			if(fdtimeout < 1000)
+				fdtimeout = 1000;
+			if(fdtimeout > 10000)
+				fdtimeout = 10000;	
+		}
+		
+		p = ast_variable_retrieve(cfg, "general", "sdtimeout");
+		if(p){
+			sdtimeout = atoi(p);
+			if(sdtimeout < 110)
+				sdtimeout = 110;
+			if(sdtimeout > 4000)
+				sdtimeout = 4000;			
+
+		}
+		
+		p = ast_variable_retrieve(cfg, "general", "logindividualevents");
+		if(p){
+			log_individual_events = ast_true(p);
+
+		}
+		
+		p = ast_variable_retrieve(cfg, "general", "eventspooldir");
+			
+		if(p){
+			ast_copy_string(event_spool_dir, p, sizeof(event_spool_dir));
+			event_spool_dir[sizeof(event_spool_dir) - 1] = '\0';
+		}
+		
+		p = ast_variable_retrieve(cfg, "general", "timestampformat");
+			
+		if(p){
+			ast_copy_string(time_stamp_format, p, sizeof(time_stamp_format));
+			time_stamp_format[sizeof(time_stamp_format) - 1] = '\0';
+		}
+
+		p = ast_variable_retrieve(cfg, "general", "db-family");
+                                                                                                                                            
+		if(p){
+			ast_copy_string(db_family, p, sizeof(db_family));
+			db_family[sizeof(db_family) - 1] = '\0';
+		}
+		ast_config_destroy(cfg);
+	}
+	return 0;
+
+}
+
+/*
+* These functions are required to implement an Asterisk App.
+*/
+
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	load_config();
+	return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_authenticate.c

@@ -11,21 +11,25 @@
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/app.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <pthread.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/app.h"
+#include "asterisk/astdb.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Authentication Application";
 
@@ -41,9 +45,20 @@ static char *descrip =
 "an optional set of opions may be provided by concatenating any\n"
 "of the following letters:\n"
 "     a - Set account code to the password that is entered\n"
+"     d - Interpret path as database key, not literal file\n"
+"     m - Interpret path as a file which contains a list of\n"
+"         account codes and password hashes delimited with ':'\n"
+"         one per line. When password matched, corresponding\n"
+"         account code will be set\n"
+"     j - Support jumping to n+101\n"
+"     r - Remove database key upon successful entry (valid with 'd' only)\n"
 "\n"
+"When using a database key, the value associated with the key can be\n"
+"anything.\n"
 "Returns 0 if the user enters a valid password within three\n"
-"tries, or -1 otherwise (or on hangup).\n";
+"tries, or -1 on hangup.  If the priority n+101 exists and invalid\n"
+"authentication was entered, and the 'j' flag was specified, processing\n"
+"will jump to n+101 and 0 will be returned.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -52,13 +67,14 @@ LOCAL_USER_DECL;
 static int auth_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
+	int jump = 0;
 	int retries;
 	struct localuser *u;
 	char password[256]="";
 	char passwd[256];
 	char *opts;
 	char *prompt;
-	if (!data || !strlen(data)) {
+	if (!data || ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "Authenticate requires an argument(password)\n");
 		return -1;
 	}
@@ -77,6 +93,8 @@ static int auth_exec(struct ast_channel *chan, void *data)
 		opts++;
 	} else
 		opts = "";
+	if (strchr(opts, 'j'))
+		jump = 1;
 	/* Start asking for password */
 	prompt = "agent-pass";
 	for (retries = 0; retries < 3; retries++) {
@@ -85,24 +103,63 @@ static int auth_exec(struct ast_channel *chan, void *data)
 			break;
 		res = 0;
 		if (password[0] == '/') {
-			/* Compare against a file */
-			FILE *f;
-			f = fopen(password, "r");
-			if (f) {
-				char buf[256] = "";
-				while(!feof(f)) {
-					fgets(buf, sizeof(buf), f);
-					if (!feof(f) && strlen(buf)) {
-						buf[strlen(buf) - 1] = '\0';
-						if (strlen(buf) && !strcmp(passwd, buf))
-							break;
+			if (strchr(opts, 'd')) {
+				char tmp[256];
+				/* Compare against a database key */
+				if (!ast_db_get(password + 1, passwd, tmp, sizeof(tmp))) {
+					/* It's a good password */
+					if (strchr(opts, 'r')) {
+						ast_db_del(password + 1, passwd);
 					}
-				}
-				fclose(f);
-				if (strlen(buf) && !strcmp(passwd, buf))
 					break;
-			} else 
-				ast_log(LOG_WARNING, "Unable to open file '%s' for authentication: %s\n", password, strerror(errno));
+				}
+			} else {
+				/* Compare against a file */
+				FILE *f;
+				f = fopen(password, "r");
+				if (f) {
+					char buf[256] = "";
+					char md5passwd[33] = "";
+					char *md5secret = NULL;
+
+					while (!feof(f)) {
+						fgets(buf, sizeof(buf), f);
+						if (!feof(f) && !ast_strlen_zero(buf)) {
+							buf[strlen(buf) - 1] = '\0';
+							if (strchr(opts, 'm')) {
+								md5secret = strchr(buf, ':');
+								if (md5secret == NULL)
+									continue;
+								*md5secret = '\0';
+								md5secret++;
+								ast_md5_hash(md5passwd, passwd);
+								if (!strcmp(md5passwd, md5secret)) {
+									if (strchr(opts, 'a'))
+										ast_cdr_setaccount(chan, buf);
+									break;
+								}
+							} else {
+								if (!strcmp(passwd, buf)) {
+									if (strchr(opts, 'a'))
+										ast_cdr_setaccount(chan, buf);
+									break;
+								}
+							}
+						}
+					}
+					fclose(f);
+					if (!ast_strlen_zero(buf)) {
+						if (strchr(opts, 'm')) {
+							if (md5secret && !strcmp(md5passwd, md5secret))
+								break;
+						} else {
+							if (!strcmp(passwd, buf))
+								break;
+						}
+					}
+				} else 
+					ast_log(LOG_WARNING, "Unable to open file '%s' for authentication: %s\n", password, strerror(errno));
+			}
 		} else {
 			/* Compare against a fixed password */
 			if (!strcmp(passwd, password)) 
@@ -111,17 +168,20 @@ static int auth_exec(struct ast_channel *chan, void *data)
 		prompt="auth-incorrect";
 	}
 	if ((retries < 3) && !res) {
-		if (strchr(opts, 'a')) 
+		if (strchr(opts, 'a') && !strchr(opts, 'm')) 
 			ast_cdr_setaccount(chan, passwd);
 		res = ast_streamfile(chan, "auth-thankyou", chan->language);
 		if (!res)
 			res = ast_waitstream(chan, "");
 	} else {
-		if (!res)
-			res = ast_streamfile(chan, "vm-goodbye", chan->language);
-		if (!res)
-			res = ast_waitstream(chan, "");
-		res = -1;
+		if (jump && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
+			chan->priority+=100;
+			res = 0;
+		} else {
+			if (!ast_streamfile(chan, "vm-goodbye", chan->language))
+				res = ast_waitstream(chan, "");
+			res = -1;
+		}
 	}
 	LOCAL_USER_REMOVE(u);
 	return res;

apps/app_cdr.c

@@ -12,11 +12,16 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/channel.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
 #include <stdlib.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/channel.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+
 
 static char *tdesc = "Make sure asterisk doesn't save CDR for a certain call";
 

apps/app_chanisavail.c

@@ -3,7 +3,7 @@
  *
  * Check if Channel is Available
  * 
- * Copyright (C) 2003, Digium
+ * Copyright (C) 2003 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  * James Golovich <james@gnuinter.net>
@@ -13,13 +13,6 @@
  *
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/app.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -27,7 +20,18 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 
-#include <pthread.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/app.h"
+#include "asterisk/devicestate.h"
 
 static char *tdesc = "Check if channel is available";
 
@@ -36,14 +40,18 @@ static char *app = "ChanIsAvail";
 static char *synopsis = "Check if channel is available";
 
 static char *descrip = 
-"  ChanIsAvail(Technology/resource[&Technology2/resource2...]): \n"
+"  ChanIsAvail(Technology/resource[&Technology2/resource2...][|option]): \n"
 "Checks is any of the requested channels are available.  If none\n"
-"of the requested channels are available the new priority will\n"
-"be n+101 (unless such a priority does not exist, in which case\n"
-"ChanIsAvail will return -1.  If any of the requested channels\n"
-"are available, the next priority will be n+1, the channel variable\n"
-"${AVAILCHAN} will be set to the name of the available channel and\n"
-"the ChanIsAvail app will return 0.\n";
+"of the requested channels are available the new priority will be\n"
+"n+101 (unless such a priority does not exist or on error, in which\n"
+"case ChanIsAvail will return -1).\n"
+"If any of the requested channels are available, the next priority will be n+1,\n"
+"the channel variable ${AVAILCHAN} will be set to the name of the available channel\n"
+"and the ChanIsAvail app will return 0.\n"
+"${AVAILORIGCHAN} is the canonical channel name that was used to create the channel.\n"
+"${AVAILSTATUS} is the status code for the channel.\n"
+"If the option 's' is specified (state), will consider channel unavailable\n"
+"when the channel is in use at all, even if it can take another call.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -51,9 +59,10 @@ LOCAL_USER_DECL;
 
 static int chanavail_exec(struct ast_channel *chan, void *data)
 {
-	int res=-1;
+	int res=-1, inuse=-1, option_state=0;
+	int status;
 	struct localuser *u;
-	char info[256], *peers, *tech, *number, *rest, *cur;
+	char info[512], tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur, *options, *stringp;
 	struct ast_channel *tempchan;
 
 	if (!data) {
@@ -62,7 +71,12 @@ static int chanavail_exec(struct ast_channel *chan, void *data)
 	}
 	LOCAL_USER_ADD(u);
 
-	strncpy(info, (char *)data, strlen((char *)data) + AST_MAX_EXTENSION-1);
+	strncpy(info, (char *)data, sizeof(info)-1);
+	stringp = info;
+	strsep(&stringp, "|");
+	options = strsep(&stringp, "|");
+	if (options && *options == 's')
+		option_state = 1;
 	peers = info;
 	if (peers) {
 		cur = peers;
@@ -76,25 +90,42 @@ static int chanavail_exec(struct ast_channel *chan, void *data)
 			tech = cur;
 			number = strchr(tech, '/');
 			if (!number) {
-				ast_log(LOG_WARNING, "ChanIsAvail argument takes format (Zap/[device])\n");
-				continue;
+				ast_log(LOG_WARNING, "ChanIsAvail argument takes format ([technology]/[device])\n");
+				return -1;
 			}
 			*number = '\0';
 			number++;
-			if ((tempchan = ast_request(tech, chan->nativeformats, number))) {
+			
+			if (option_state) {
+				/* If the pbx says in use then don't bother trying further.
+				   This is to permit testing if someone's on a call, even if the 
+	 			   channel can permit more calls (ie callwaiting, sip calls, etc).  */
+                               
+				snprintf(trychan, sizeof(trychan), "%s/%s",cur,number);
+				status = inuse = ast_device_state(trychan);
+			}
+			if ((inuse < 1) && (tempchan = ast_request(tech, chan->nativeformats, number, &status))) {
 					pbx_builtin_setvar_helper(chan, "AVAILCHAN", tempchan->name);
+					/* Store the originally used channel too */
+					snprintf(tmp, sizeof(tmp), "%s/%s", tech, number);
+					pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", tmp);
+					snprintf(tmp, sizeof(tmp), "%d", status);
+					pbx_builtin_setvar_helper(chan, "AVAILSTATUS", tmp);
 					ast_hangup(tempchan);
 					tempchan = NULL;
 					res = 1;
 					break;
+			} else {
+				snprintf(tmp, sizeof(tmp), "%d", status);
+				pbx_builtin_setvar_helper(chan, "AVAILSTATUS", tmp);
 			}
 			cur = rest;
 		} while (cur);
 	}
-
 	if (res < 1) {
 		pbx_builtin_setvar_helper(chan, "AVAILCHAN", "");
-		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+		pbx_builtin_setvar_helper(chan, "AVAILORIGCHAN", "");
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
 			chan->priority+=100;
 		else
 			return -1;

apps/app_chanspy.c

@@ -0,0 +1,710 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * ChanSpy Listen in on any channel.
+ * 
+ * Copyright (C) 2005 Anthony Minessale II (anthmct@yahoo.com)
+ *
+ * Disclaimed to Digium
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/features.h"
+#include "asterisk/options.h"
+#include "asterisk/slinfactory.h"
+#include "asterisk/app.h"
+#include "asterisk/utils.h"
+#include "asterisk/say.h"
+#include "asterisk/pbx.h"
+#include "asterisk/translate.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+
+AST_MUTEX_DEFINE_STATIC(modlock);
+
+#define AST_NAME_STRLEN 256
+#define ALL_DONE(u, ret) LOCAL_USER_REMOVE(u); return ret;
+#define get_volfactor(x) x ? ((x > 0) ? (1 << x) : ((1 << abs(x)) * -1)) : 0
+#define minmax(x,y) x ? (x > y) ? y : ((x < (y * -1)) ? (y * -1) : x) : 0
+
+
+static char *synopsis = "Tap into any type of asterisk channel and listen to audio";
+static char *app = "ChanSpy";
+static char *desc = "   Chanspy([<scanspec>][|<options>])\n\n"
+"Valid Options:\n"
+" - q: quiet, don't announce channels beep, etc.\n"
+" - b: bridged, only spy on channels involved in a bridged call.\n"
+" - v([-4..4]): adjust the initial volume. (negative is quieter)\n"
+" - g(grp): enforce group.  Match only calls where their ${SPYGROUP} is 'grp'.\n"
+" - r[(basename)]: Record session to monitor spool dir (with optional basename, default is 'chanspy')\n\n"
+"If <scanspec> is specified, only channel names *beginning* with that string will be scanned.\n"
+"('all' or an empty string are also both valid <scanspec>)\n\n"
+"While Spying:\n\n"
+"Dialing # cycles the volume level.\n"
+"Dialing * will stop spying and look for another channel to spy on.\n"
+"Dialing a series of digits followed by # builds a channel name to append to <scanspec>\n"
+"(e.g. run Chanspy(Agent) and dial 1234# while spying to jump to channel Agent/1234)\n\n"
+"";
+
+#define OPTION_QUIET	 (1 << 0)	/* Quiet, no announcement */
+#define OPTION_BRIDGED   (1 << 1)	/* Only look at bridged calls */
+#define OPTION_VOLUME    (1 << 2)	/* Specify initial volume */
+#define OPTION_GROUP     (1 << 3)   /* Only look at channels in group */
+#define OPTION_RECORD    (1 << 4)   /* Record */
+
+AST_DECLARE_OPTIONS(chanspy_opts,{
+	['q'] = { OPTION_QUIET },
+	['b'] = { OPTION_BRIDGED },
+	['v'] = { OPTION_VOLUME, 1 },
+	['g'] = { OPTION_GROUP, 2 },
+	['r'] = { OPTION_RECORD, 3 },
+});
+
+STANDARD_LOCAL_USER;
+LOCAL_USER_DECL;
+
+struct chanspy_translation_helper {
+	/* spy data */
+	struct ast_channel_spy spy;
+	int volfactor;
+	int fd;
+	struct ast_slinfactory slinfactory[2];
+};
+
+/* Prototypes */
+static struct ast_channel *local_get_channel_begin_name(char *name);
+static struct ast_channel *local_channel_walk(struct ast_channel *chan);
+static void spy_release(struct ast_channel *chan, void *data);
+static void *spy_alloc(struct ast_channel *chan, void *params);
+static struct ast_frame *spy_queue_shift(struct ast_channel_spy *spy, int qnum);
+static void ast_flush_spy_queue(struct ast_channel_spy *spy);
+static int spy_generate(struct ast_channel *chan, void *data, int len, int samples);
+static void start_spying(struct ast_channel *chan, struct ast_channel *spychan, struct ast_channel_spy *spy);
+static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy);
+static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int *volfactor, int fd);
+static int chanspy_exec(struct ast_channel *chan, void *data);
+
+
+#if 0
+static struct ast_channel *local_get_channel_by_name(char *name) 
+{
+	struct ast_channel *ret;
+	ast_mutex_lock(&modlock);
+	if ((ret = ast_get_channel_by_name_locked(name))) {
+		ast_mutex_unlock(&ret->lock);
+	}
+	ast_mutex_unlock(&modlock);
+
+	return ret;
+}
+#endif
+
+static struct ast_channel *local_channel_walk(struct ast_channel *chan) 
+{
+	struct ast_channel *ret;
+	ast_mutex_lock(&modlock);	
+	if ((ret = ast_channel_walk_locked(chan))) {
+		ast_mutex_unlock(&ret->lock);
+	}
+	ast_mutex_unlock(&modlock);			
+	return ret;
+}
+
+static struct ast_channel *local_get_channel_begin_name(char *name) 
+{
+	struct ast_channel *chan, *ret = NULL;
+	ast_mutex_lock(&modlock);
+	chan = local_channel_walk(NULL);
+	while (chan) {
+		if (!strncmp(chan->name, name, strlen(name))) {
+			ret = chan;
+			break;
+		}
+		chan = local_channel_walk(chan);
+	}
+	ast_mutex_unlock(&modlock);
+	
+	return ret;
+}
+
+
+static void spy_release(struct ast_channel *chan, void *data) 
+{
+	struct chanspy_translation_helper *csth = data;
+
+	ast_slinfactory_destroy(&csth->slinfactory[0]);
+	ast_slinfactory_destroy(&csth->slinfactory[1]);
+
+	return;
+}
+
+static void *spy_alloc(struct ast_channel *chan, void *params) 
+{
+	struct chanspy_translation_helper *csth = params;
+	ast_slinfactory_init(&csth->slinfactory[0]);
+	ast_slinfactory_init(&csth->slinfactory[1]);
+	return params;
+}
+
+static struct ast_frame *spy_queue_shift(struct ast_channel_spy *spy, int qnum) 
+{
+	struct ast_frame *f;
+	
+	if (qnum < 0 || qnum > 1)
+		return NULL;
+
+	f = spy->queue[qnum];
+	if (f) {
+		spy->queue[qnum] = f->next;
+		return f;
+	}
+	return NULL;
+}
+
+
+static void ast_flush_spy_queue(struct ast_channel_spy *spy) 
+{
+	struct ast_frame *f=NULL;
+	int x = 0;
+	ast_mutex_lock(&spy->lock);
+	for(x=0;x<2;x++) {
+		f = NULL;
+		while((f = spy_queue_shift(spy, x))) 
+			ast_frfree(f);
+	}
+	ast_mutex_unlock(&spy->lock);
+}
+
+
+#if 0
+static int extract_audio(short *buf, size_t len, struct ast_trans_pvt *trans, struct ast_frame *fr, int *maxsamp)
+{
+	struct ast_frame *f;
+	int size, retlen = 0;
+	
+	if (trans) {
+		if ((f = ast_translate(trans, fr, 0))) {
+			size = (f->datalen > len) ? len : f->datalen;
+			memcpy(buf, f->data, size);
+			retlen = f->datalen;
+			ast_frfree(f);
+		} else {
+			/* your guess is as good as mine why this will happen but it seems to only happen on iax and appears harmless */
+			ast_log(LOG_DEBUG, "Failed to translate frame from %s\n", ast_getformatname(fr->subclass));
+		}
+	} else {
+		size = (fr->datalen > len) ? len : fr->datalen;
+		memcpy(buf, fr->data, size);
+		retlen = fr->datalen;
+	}
+
+	if (retlen > 0 && (size = retlen / 2)) {
+		if (size > *maxsamp) {
+			*maxsamp = size;
+		}
+	}
+	
+	return retlen;
+}
+
+
+static int spy_queue_ready(struct ast_channel_spy *spy)
+{
+	int res = 0;
+
+	ast_mutex_lock(&spy->lock);
+	if (spy->status == CHANSPY_RUNNING) {
+		res = (spy->queue[0] && spy->queue[1]) ? 1 : 0;
+	} else {
+		res = (spy->queue[0] || spy->queue[1]) ? 1 : -1;
+	}
+	ast_mutex_unlock(&spy->lock);
+	return res;
+}
+#endif
+
+
+static int spy_generate(struct ast_channel *chan, void *data, int len, int samples) 
+{
+
+		struct chanspy_translation_helper *csth = data;
+		struct ast_frame frame, *f;
+		int len0 = 0, len1 = 0, samp0 = 0, samp1 = 0, x, vf, maxsamp;
+		short buf0[1280], buf1[1280], buf[1280];
+		
+		if (csth->spy.status == CHANSPY_DONE) {
+            return -1;
+        }
+
+		ast_mutex_lock(&csth->spy.lock);
+		while((f = csth->spy.queue[0])) {
+			csth->spy.queue[0] = f->next;
+			ast_slinfactory_feed(&csth->slinfactory[0], f);
+			ast_frfree(f);
+		}
+		ast_mutex_unlock(&csth->spy.lock);
+		ast_mutex_lock(&csth->spy.lock);
+		while((f = csth->spy.queue[1])) {
+			csth->spy.queue[1] = f->next;
+			ast_slinfactory_feed(&csth->slinfactory[1], f);
+			ast_frfree(f);
+		}
+		ast_mutex_unlock(&csth->spy.lock);
+		
+		if (csth->slinfactory[0].size < len || csth->slinfactory[1].size < len) {
+			return 0;
+		}
+		
+		if ((len0 = ast_slinfactory_read(&csth->slinfactory[0], buf0, len))) {
+			samp0 = len0 / 2;
+		} 
+		if((len1 = ast_slinfactory_read(&csth->slinfactory[1], buf1, len))) {
+			samp1 = len1 / 2;
+		}
+
+		maxsamp = (samp0 > samp1) ? samp0 : samp1;
+		vf = get_volfactor(csth->volfactor);
+        vf = minmax(vf, 16);
+		
+		for(x=0; x < maxsamp; x++) {
+			if (vf < 0) {
+				if (samp0) {
+					buf0[x] /= abs(vf);
+				}
+				if (samp1) {
+					buf1[x] /= abs(vf);
+				}
+			} else if (vf > 0) {
+				if (samp0) {
+					buf0[x] *= vf;
+				}
+				if (samp1) {
+					buf1[x] *= vf;
+				}
+			}
+			if (samp0 && samp1) {
+				if (x < samp0 && x < samp1) {
+					buf[x] = buf0[x] + buf1[x];
+				} else if (x < samp0) {
+					buf[x] = buf0[x];
+				} else if (x < samp1) {
+					buf[x] = buf1[x];
+				}
+			} else if (x < samp0) {
+				buf[x] = buf0[x];
+			} else if (x < samp1) {
+				buf[x] = buf1[x];
+			}
+		}
+		
+		memset(&frame, 0, sizeof(frame));
+		frame.frametype = AST_FRAME_VOICE;
+		frame.subclass = AST_FORMAT_SLINEAR;
+		frame.data = buf;
+		frame.samples = x;
+		frame.datalen = x * 2;
+
+		if (ast_write(chan, &frame)) {
+			csth->spy.status = CHANSPY_DONE;
+			return -1;
+		}
+
+		if (csth->fd) {
+			write(csth->fd, buf1, len1);
+		}
+
+		return 0;
+}
+
+
+static struct ast_generator spygen = {
+    alloc: spy_alloc, 
+    release: spy_release, 
+    generate: spy_generate, 
+};
+
+static void start_spying(struct ast_channel *chan, struct ast_channel *spychan, struct ast_channel_spy *spy) 
+{
+
+	struct ast_channel_spy *cptr=NULL;
+	struct ast_channel *peer;
+
+
+	ast_log(LOG_WARNING, "Attaching %s to %s\n", spychan->name, chan->name);
+
+
+	ast_mutex_lock(&chan->lock);
+	if (chan->spiers) {
+		for(cptr=chan->spiers;cptr && cptr->next;cptr=cptr->next);
+		cptr->next = spy;
+	} else {
+		chan->spiers = spy;
+	}
+	ast_mutex_unlock(&chan->lock);
+	if ( ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) {
+		ast_softhangup(peer, AST_SOFTHANGUP_UNBRIDGE);	
+	}
+
+}
+
+static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy) 
+{
+	struct ast_channel_spy *cptr=NULL, *prev=NULL;
+	int count = 0;
+
+	while(ast_mutex_trylock(&chan->lock)) {
+		/* if its locked already it's almost surely hanging up and we are too late 
+		   we can safely remove the head pointer if it points at us without needing a lock.
+		   since everybody spying will be in the same boat whomever is pointing at the head
+		   will surely erase it which is all we really need since it's a linked list of
+		   staticly declared structs that belong to each spy.
+		*/
+		if (chan->spiers == spy) {
+			chan->spiers = NULL;
+			return;
+		}
+		count++;
+		if (count > 10) {
+			return;
+		}
+		sched_yield();
+	}
+
+	for(cptr=chan->spiers; cptr; cptr=cptr->next) {
+		if (cptr == spy) {
+			if (prev) {
+				prev->next = cptr->next;
+				cptr->next = NULL;
+			} else
+				chan->spiers = NULL;
+		}
+		prev = cptr;
+	}
+	ast_mutex_unlock(&chan->lock);
+
+}
+
+static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int *volfactor, int fd) 
+{
+	struct chanspy_translation_helper csth;
+	int running = 1, res = 0, x = 0;
+	char inp[24];
+	char *name=NULL;
+	struct ast_frame *f;
+
+	if (chan && !ast_check_hangup(chan) && spyee && !ast_check_hangup(spyee)) {
+		memset(inp, 0, sizeof(inp));
+		name = ast_strdupa(spyee->name);
+		if (option_verbose >= 2)
+			ast_verbose(VERBOSE_PREFIX_2 "Spying on channel %s\n", name);
+
+		memset(&csth, 0, sizeof(csth));
+		csth.spy.status = CHANSPY_RUNNING;
+		ast_mutex_init(&csth.spy.lock);
+		csth.volfactor = *volfactor;
+		
+		if (fd) {
+			csth.fd = fd;
+		}
+		start_spying(spyee, chan, &csth.spy);
+		ast_activate_generator(chan, &spygen, &csth);
+
+		while(csth.spy.status == CHANSPY_RUNNING && 
+			  chan && !ast_check_hangup(chan) && 
+			  spyee && 
+			  !ast_check_hangup(spyee) 
+			  && running == 1 && 
+			  (res = ast_waitfor(chan, -1) > -1)) {
+			if ((f = ast_read(chan))) {
+				res = 0;
+				if (f->frametype == AST_FRAME_DTMF) {
+					res = f->subclass;
+				}
+				ast_frfree(f);
+				if (!res) {
+					continue;
+				}
+			} else {
+				break;
+			}
+			if (x == sizeof(inp)) {
+				x = 0;
+			}
+			if (res < 0) {
+				running = -1;
+			}
+			if (res == 0) {
+				continue;
+			} else if (res == '*') {
+				running = 0; 
+			} else if (res == '#') {
+				if (!ast_strlen_zero(inp)) {
+					running = x ? atoi(inp) : -1;
+					break;
+				} else {
+					csth.volfactor++;
+					if (csth.volfactor > 4) {
+						csth.volfactor = -4;
+					}
+					if (option_verbose > 2) {
+						ast_verbose(VERBOSE_PREFIX_3"Setting spy volume on %s to %d\n", chan->name, csth.volfactor);
+					}
+					*volfactor = csth.volfactor;
+				}
+			} else if (res >= 48 && res <= 57) {
+				inp[x++] = res;
+			}
+		}
+		ast_deactivate_generator(chan);
+		stop_spying(spyee, &csth.spy);
+
+		if (option_verbose >= 2) {
+			ast_verbose(VERBOSE_PREFIX_2 "Done Spying on channel %s\n", name);
+		}
+		ast_flush_spy_queue(&csth.spy);
+	} else {
+		running = 0;
+	}
+	ast_mutex_destroy(&csth.spy.lock);
+	return running;
+}
+
+
+
+static int chanspy_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u;
+	struct ast_channel *peer=NULL, *prev=NULL;
+	char name[AST_NAME_STRLEN],
+		peer_name[AST_NAME_STRLEN],
+		*args,
+		*ptr = NULL,
+		*options = NULL,
+		*spec = NULL,
+		*argv[5],
+		*mygroup = NULL,
+		*recbase = NULL;
+	int res = -1,
+		volfactor = 0,
+		silent = 0,
+		argc = 0,
+		bronly = 0,
+		chosen = 0,
+		count=0,
+		waitms = 100,
+		num = 0,
+		oldrf = 0,
+		oldwf = 0,
+		fd = 0;
+	struct ast_flags flags;
+
+
+	if (!(args = ast_strdupa((char *)data))) {
+		ast_log(LOG_ERROR, "Out of memory!\n");
+		return -1;
+	}
+
+	oldrf = chan->readformat;
+	oldwf = chan->writeformat;
+	if (ast_set_read_format(chan, AST_FORMAT_SLINEAR) < 0) {
+		ast_log(LOG_ERROR, "Could Not Set Read Format.\n");
+		return -1;
+	}
+	
+	if (ast_set_write_format(chan, AST_FORMAT_SLINEAR) < 0) {
+		ast_log(LOG_ERROR, "Could Not Set Write Format.\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+	ast_answer(chan);
+
+	ast_set_flag(chan, AST_FLAG_SPYING); /* so nobody can spy on us while we are spying */
+
+
+	if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
+		spec = argv[0];
+		if ( argc > 1) {
+			options = argv[1];
+		}
+		if (ast_strlen_zero(spec) || !strcmp(spec, "all")) {
+			spec = NULL;
+		}
+	}
+	
+	if (options) {
+		char *opts[3];
+		ast_parseoptions(chanspy_opts, &flags, opts, options);
+		if (ast_test_flag(&flags, OPTION_GROUP)) {
+			mygroup = opts[1];
+		}
+		if (ast_test_flag(&flags, OPTION_RECORD)) {
+			if (!(recbase = opts[2])) {
+				recbase = "chanspy";
+			}
+		}
+		silent = ast_test_flag(&flags, OPTION_QUIET);
+		bronly = ast_test_flag(&flags, OPTION_BRIDGED);
+		if (ast_test_flag(&flags, OPTION_VOLUME) && opts[1]) {
+			if (sscanf(opts[0], "%d", &volfactor) != 1)
+				ast_log(LOG_NOTICE, "volfactor must be a number between -4 and 4\n");
+			else {
+				volfactor = minmax(volfactor, 4);
+			}
+		}
+	}
+
+	if (recbase) {
+		char filename[512];
+		snprintf(filename,sizeof(filename),"%s/%s.%ld.raw",ast_config_AST_MONITOR_DIR, recbase, time(NULL));
+		if ((fd = open(filename, O_CREAT | O_WRONLY, O_TRUNC)) <= 0) {
+			ast_log(LOG_WARNING, "Cannot open %s for recording\n", filename);
+			fd = 0;
+		}
+	}
+
+	for(;;) {
+		if (!silent) {
+			res = ast_streamfile(chan, "beep", chan->language);
+			if (!res)
+				res = ast_waitstream(chan, "");
+			if (res < 0) {
+				ast_clear_flag(chan, AST_FLAG_SPYING);
+				break;
+			}
+		}
+
+		count = 0;
+		res = ast_waitfordigit(chan, waitms);
+		if (res < 0) {
+			ast_clear_flag(chan, AST_FLAG_SPYING);
+			break;
+		}
+				
+		peer = local_channel_walk(NULL);
+		prev=NULL;
+		while(peer) {
+			if (peer != chan) {
+				char *group = NULL;
+				int igrp = 1;
+
+				if (peer == prev && !chosen) {
+					break;
+				}
+				chosen = 0;
+				group = pbx_builtin_getvar_helper(peer, "SPYGROUP");
+				if (mygroup) {
+					if (!group || strcmp(mygroup, group)) {
+						igrp = 0;
+					}
+				}
+				
+				if (igrp && (!spec || ((strlen(spec) < strlen(peer->name) &&
+									   !strncasecmp(peer->name, spec, strlen(spec)))))) {
+					if (peer && (!bronly || ast_bridged_channel(peer)) &&
+						!ast_check_hangup(peer) && !ast_test_flag(peer, AST_FLAG_SPYING)) {
+						int x = 0;
+
+						strncpy(peer_name, peer->name, AST_NAME_STRLEN);
+						ptr = strchr(peer_name, '/');
+						*ptr = '\0';
+						ptr++;
+						for (x = 0 ; x < strlen(peer_name) ; x++) {
+							if (peer_name[x] == '/') {
+								break;
+							}
+							peer_name[x] = tolower(peer_name[x]);
+						}
+
+						if (!silent) {
+							if (ast_fileexists(peer_name, NULL, NULL) != -1) {
+								res = ast_streamfile(chan, peer_name, chan->language);
+								if (!res)
+									res = ast_waitstream(chan, "");
+								if (res)
+									break;
+							} else
+								res = ast_say_character_str(chan, peer_name, "", chan->language);
+							if ((num=atoi(ptr))) 
+								ast_say_digits(chan, atoi(ptr), "", chan->language);
+						}
+						count++;
+						prev = peer;
+						res = channel_spy(chan, peer, &volfactor, fd);
+						if (res == -1) {
+							break;
+						} else if (res > 1 && spec) {
+							snprintf(name, AST_NAME_STRLEN, "%s/%d", spec, res);
+							if ((peer = local_get_channel_begin_name(name))) {
+								chosen = 1;
+							}
+							continue;
+						}
+					}
+				}
+			}
+			if ((peer = local_channel_walk(peer)) == NULL) {
+				break;
+			}
+		}
+		waitms = count ? 100 : 5000;
+	}
+	
+
+	if (fd > 0) {
+		close(fd);
+	}
+
+	if (oldrf && ast_set_read_format(chan, oldrf) < 0) {
+		ast_log(LOG_ERROR, "Could Not Set Read Format.\n");
+	}
+	
+	if (oldwf && ast_set_write_format(chan, oldwf) < 0) {
+		ast_log(LOG_ERROR, "Could Not Set Write Format.\n");
+	}
+
+	ast_clear_flag(chan, AST_FLAG_SPYING);
+	ALL_DONE(u, res);
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, chanspy_exec, synopsis, desc);
+}
+
+char *description(void)
+{
+	return synopsis;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_controlplayback.c

@@ -0,0 +1,150 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Trivial application to control playback a sound file
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/app.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/utils.h"
+
+static const char *tdesc = "Control Playback Application";
+
+static const char *app = "ControlPlayback";
+
+static const char *synopsis = "Play a file with fast forward and rewind";
+
+static const char *descrip = 
+"ControlPlayback(filename[|skipms[|ffchar[|rewchar[|stopchar[|pausechar[|restartchar]]]]]]):\n"
+"  Plays  back  a  given  filename (do not put extension). Options may also\n"
+"  be included following a pipe symbol.  You can use * and # to rewind and\n"
+"  fast forward the playback specified. If 'stopchar' is added the file will\n"
+"  terminate playback when 'stopchar' is pressed. If 'restartchar' is added, the file\n"
+"  will restart when 'restartchar' is pressed. Returns -1 if the channel\n"
+"  was hung up. if the file does not exist jumps to n+101 if it present.\n\n"
+"  Example:  exten => 1234,1,ControlPlayback(file|4000|*|#|1|0|5)\n\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int is_on_phonepad(char key)
+{
+	return key == 35 || key == 42 || (key >= 48 && key <= 57);
+}
+
+static int controlplayback_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	int skipms = 0;
+	struct localuser *u;
+	char *tmp;
+	int argc;
+	char *argv[7];
+	enum arg_ids {
+		arg_file = 0,
+		arg_skip = 1,
+		arg_fwd = 2,
+		arg_rev = 3,
+		arg_stop = 4,
+		arg_pause = 5,
+		arg_restart = 6,
+	};
+
+	if (!data || ast_strlen_zero((char *)data)) {
+		ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n");
+		return -1;
+	}
+
+	tmp = ast_strdupa(data);
+	memset(argv, 0, sizeof(argv));
+
+	argc = ast_separate_app_args(tmp, '|', argv, sizeof(argv) / sizeof(argv[0]));
+
+	if (argc < 1) {
+		ast_log(LOG_WARNING, "ControlPlayback requires an argument (filename)\n");
+		return -1;
+	}
+
+	skipms = argv[arg_skip] ? atoi(argv[arg_skip]) : 3000;
+	if (!skipms)
+		skipms = 3000;
+
+	if (!argv[arg_fwd] || !is_on_phonepad(*argv[arg_fwd]))
+		argv[arg_fwd] = "#";
+	if (!argv[arg_rev] || !is_on_phonepad(*argv[arg_rev]))
+		argv[arg_rev] = "*";
+	if (argv[arg_stop] && !is_on_phonepad(*argv[arg_stop]))
+		argv[arg_stop] = NULL;
+	if (argv[arg_pause] && !is_on_phonepad(*argv[arg_pause]))
+		argv[arg_pause] = NULL;
+	if (argv[arg_restart] && !is_on_phonepad(*argv[arg_restart]))
+		argv[arg_restart] = NULL;
+
+	LOCAL_USER_ADD(u);
+
+	res = ast_control_streamfile(chan, argv[arg_file], argv[arg_fwd], argv[arg_rev], argv[arg_stop], argv[arg_pause], argv[arg_restart], skipms);
+
+	LOCAL_USER_REMOVE(u);
+	
+	/* If we stopped on one of our stop keys, return 0  */
+	if (argv[arg_stop] && strchr(argv[arg_stop], res)) 
+		res = 0;
+
+	if (res < 0) {
+		if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101))
+			res = 0;
+	}
+
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, controlplayback_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return (char *) tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_curl.c

@@ -0,0 +1,167 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Curl - App to load a URL
+ * 
+ * Copyright (C)  2004 - 2005, Tilghman Lesher
+ *
+ * Tilghman Lesher <curl-20041222@the-tilghman.com>
+ * and Brian Wilkins <bwilkins@cfl.rr.com> (Added POST option)
+ *
+ * app_curl.c is distributed with no restrictions on usage or
+ * redistribution.
+ */
+ 
+#include <stdlib.h>
+#include <string.h>
+#include <curl/curl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/cli.h"
+#include "asterisk/options.h"
+#include "asterisk/module.h"
+
+static char *tdesc = "Load external URL";
+
+static char *app = "Curl";
+
+static char *synopsis = "Load an external URL";
+
+static char *descrip = 
+"  Curl(URL[|postdata]): Requests the URL.  Mainly used for signalling\n"
+"external applications of an event.  Returns 0 or -1 on fatal error.\n"
+"Argument specified treated as POST data.  Also sets CURL variable with the\n"
+"resulting page.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+extern int errno;
+
+struct MemoryStruct {
+	char *memory;
+	size_t size;
+};
+
+static void *myrealloc(void *ptr, size_t size)
+{
+	/* There might be a realloc() out there that doesn't like reallocing
+	   NULL pointers, so we take care of it here */
+	if (ptr)
+		return realloc(ptr, size);
+	else
+		return malloc(size);
+}
+
+static size_t WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
+{
+	register int realsize = size * nmemb;
+	struct MemoryStruct *mem = (struct MemoryStruct *)data;
+
+	mem->memory = (char *)myrealloc(mem->memory, mem->size + realsize + 1);
+	if (mem->memory) {
+		memcpy(&(mem->memory[mem->size]), ptr, realsize);
+		mem->size += realsize;
+		mem->memory[mem->size] = 0;
+	}
+	return realsize;
+}
+
+static int curl_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	CURL *curl;
+	char *info, *post_data=NULL, *url;
+
+	if (!data || !strlen((char *)data)) {
+		ast_log(LOG_WARNING, "Curl requires an argument (URL)\n");
+		return -1;
+	}
+
+	if ((info = ast_strdupa((char *)data))) {
+		url = strsep(&info, "|");
+		post_data = info;
+	} else {
+		ast_log(LOG_ERROR, "Out of memory\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+
+	curl_global_init(CURL_GLOBAL_ALL);
+	curl = curl_easy_init();
+
+	if (curl) {
+		struct MemoryStruct chunk;
+
+		chunk.memory=NULL; /* we expect realloc(NULL, size) to work */
+		chunk.size = 0;    /* no data at this point */
+
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&chunk);
+		curl_easy_setopt(curl, CURLOPT_USERAGENT, "asterisk-libcurl-agent/1.0");
+
+		if (post_data) {
+			curl_easy_setopt(curl, CURLOPT_POST, 1);
+			curl_easy_setopt(curl, CURLOPT_POSTFIELDS, post_data);
+		}
+
+		curl_easy_perform(curl);
+		curl_easy_cleanup(curl);
+
+		if (chunk.memory) {
+			chunk.memory[chunk.size] = '\0';
+			if (chunk.memory[chunk.size - 1] == 10)
+				chunk.memory[chunk.size - 1] = '\0';
+
+			pbx_builtin_setvar_helper(chan, "CURL", chunk.memory);
+
+			free(chunk.memory);
+		}
+	} else {
+		ast_log(LOG_ERROR, "Cannot allocate curl structure\n");
+		res = -1;
+	}
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, curl_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_cut.c

@@ -5,7 +5,7 @@
  *
  * Copyright (c) 2003 Tilghman Lesher.  All rights reserved.
  *
- * Tilghman Lesher <app_cut__v002@the-tilghman.com>
+ * Tilghman Lesher <app_cut__v003@the-tilghman.com>
  *
  * $Id$
  *
@@ -17,24 +17,30 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/version.h"
 
 /* Maximum length of any variable */
 #define MAXRESULT	1024
 
-static char *tdesc = "Cuts up variables";
+static char *tdesc = "String manipulation";
 
 static char *app_cut = "Cut";
 
-static char *cut_synopsis = "Cut(newvar=varname|delimiter|fieldspec)";
+static char *cut_synopsis = "Splits a variable's content using the specified delimiter";
 
 static char *cut_descrip =
-"Cut(newvar=varname,delimiter,field)\n"
+"Usage: Cut(newvar=varname,delimiter,fieldspec)\n"
 "  newvar    - new variable created from result string\n"
 "  varname   - variable you want cut\n"
 "  delimiter - defaults to '-'\n"
@@ -43,56 +49,134 @@ static char *cut_descrip =
 "            or group of ranges and fields (with &)\n" 
 "  Returns 0 or -1 on hangup or error.\n";
 
+static char *app_sort = "Sort";
+static char *app_sort_synopsis = "Sorts a list of keywords and values";
+static char *app_sort_descrip =
+"   Sort(<newvar>=<key1>:<val1>[,<key2>:<val2>[[...],<keyN>:<valN>]])\n"
+"Sorts the list provided by using the value as a float to order the list of\n"
+"keywords in ascending order.  Sets the variable provided to the list of\n"
+"sorted keywords.  Always returns 0.\n";
+
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static int cut_exec(struct ast_channel *chan, void *data)
+struct sortable_keys {
+	char *key;
+	float value;
+};
+
+static int sort_subroutine(const void *arg1, const void *arg2)
 {
-	int res=0;
-	struct localuser *u;
-	char *s, *newvar=NULL, *varname=NULL, *delimiter=NULL, *field=NULL;
+	const struct sortable_keys *one=arg1, *two=arg2;
+	if (one->value < two->value) {
+		return -1;
+	} else if (one->value == two->value) {
+		return 0;
+	} else {
+		return 1;
+	}
+}
+
+#define ERROR_NOARG	(-1)
+#define ERROR_NOMEM	(-2)
+#define ERROR_USAGE	(-3)
+
+static int sort_internal(struct ast_channel *chan, char *data, char *buffer, size_t buflen)
+{
+	char *strings, *ptrkey, *ptrvalue;
+	int count=1, count2;
+	struct sortable_keys *sortable_keys;
+
+	memset(buffer, 0, buflen);
+
+	if (!data) {
+		return ERROR_NOARG;
+	}
+
+	strings = ast_strdupa((char *)data);
+	if (!strings) {
+		return ERROR_NOMEM;
+	}
+
+	for (ptrkey = strings; *ptrkey; ptrkey++) {
+		if (*ptrkey == '|') {
+			count++;
+		}
+	}
+
+	sortable_keys = alloca(count * sizeof(struct sortable_keys));
+	if (!sortable_keys) {
+		return ERROR_NOMEM;
+	}
+
+	memset(sortable_keys, 0, count * sizeof(struct sortable_keys));
+
+	/* Parse each into a struct */
+	count2 = 0;
+	while ((ptrkey = strsep(&strings, "|"))) {
+		ptrvalue = index(ptrkey, ':');
+		if (!ptrvalue) {
+			count--;
+			continue;
+		}
+		*ptrvalue = '\0';
+		ptrvalue++;
+		sortable_keys[count2].key = ptrkey;
+		sscanf(ptrvalue, "%f", &sortable_keys[count2].value);
+		count2++;
+	}
+
+	/* Sort the structs */
+	qsort(sortable_keys, count, sizeof(struct sortable_keys), sort_subroutine);
+
+	for (count2 = 0; count2 < count; count2++) {
+		strncat(buffer + strlen(buffer), sortable_keys[count2].key, buflen - strlen(buffer));
+		strncat(buffer + strlen(buffer), ",", buflen - strlen(buffer));
+	}
+
+	/* Remove trailing comma */
+	buffer[strlen(buffer) - 1] = '\0';
+
+	return 0;
+}
+
+static int cut_internal(struct ast_channel *chan, char *data, char *buffer, size_t buflen)
+{
+	char *s, *varname=NULL, *delimiter=NULL, *field=NULL;
 	int args_okay = 0;
 
-	LOCAL_USER_ADD(u);
+	memset(buffer, 0, buflen);
 
 	/* Check and parse arguments */
 	if (data) {
 		s = ast_strdupa((char *)data);
 		if (s) {
-			newvar = strsep(&s, "=");
-			if (newvar && (newvar[0] != '\0')) {
-				varname = strsep(&s, "|");
-				if (varname && (varname[0] != '\0')) {
-					delimiter = strsep(&s, "|");
-					if (delimiter) {
-						field = strsep(&s, "|");
-						if (field) {
-							args_okay = 1;
-						}
+			varname = strsep(&s, "|");
+			if (varname && (varname[0] != '\0')) {
+				delimiter = strsep(&s, "|");
+				if (delimiter) {
+					field = strsep(&s, "|");
+					if (field) {
+						args_okay = 1;
 					}
 				}
 			}
 		} else {
-			ast_log(LOG_ERROR, "Out of memory\n");
-			res = -1;
+			return ERROR_NOMEM;
 		}
 	}
 
 	if (args_okay) {
 		char d, ds[2];
 		char *tmp = alloca(strlen(varname) + 4);
-		char *tmp2 = alloca(MAXRESULT);
-		char retstring[MAXRESULT];
+		char varvalue[MAXRESULT], *tmp2=varvalue;
 
-		memset(retstring, 0, MAXRESULT);
-
-		if (tmp && tmp2) {
+		if (tmp) {
 			snprintf(tmp, strlen(varname) + 4, "${%s}", varname);
-			memset(tmp2, 0, sizeof(tmp2));
+			memset(varvalue, 0, sizeof(varvalue));
 		} else {
-			ast_log(LOG_ERROR, "Out of memory");
-			return -1;
+			return ERROR_NOMEM;
 		}
 
 		if (delimiter[0])
@@ -101,7 +185,7 @@ static int cut_exec(struct ast_channel *chan, void *data)
 			d = '-';
 
 		/* String form of the delimiter, for use with strsep(3) */
-		sprintf(ds,"%c",d);
+		snprintf(ds, sizeof(ds), "%c", d);
 
 		pbx_substitute_variables_helper(chan, tmp, tmp2, MAXRESULT - 1);
 
@@ -124,9 +208,7 @@ static int cut_exec(struct ast_channel *chan, void *data)
 					/* single number */
 					num2 = num1;
 				} else {
-					ast_log(LOG_ERROR, "Cut(): Illegal range '%s'\n", nextgroup);
-					ast_log(LOG_ERROR, "Usage: %s\n", cut_synopsis);
-					return -1;
+					return ERROR_USAGE;
 				}
 
 				/* Get to start, if any */
@@ -139,7 +221,7 @@ static int cut_exec(struct ast_channel *chan, void *data)
 
 				/* Most frequent problem is the expectation of reordering fields */
 				if ((num1 > 0) && (curfieldnum > num1)) {
-					ast_log(LOG_WARNING, "Cut(): we're already past the field you wanted?\n");
+					ast_log(LOG_WARNING, "We're already past the field you wanted?\n");
 				}
 
 				/* Re-null tmp2 if we added 1 to NULL */
@@ -149,34 +231,206 @@ static int cut_exec(struct ast_channel *chan, void *data)
 				/* Output fields until we either run out of fields or num2 is reached */
 				while ((tmp2 != NULL) && (curfieldnum <= num2)) {
 					char *tmp3 = strsep(&tmp2, ds);
-					int curlen = strlen(retstring);
+					int curlen = strlen(buffer);
 
-					if (strlen(retstring)) {
-						snprintf(retstring + curlen, MAXRESULT - curlen, "%c%s", d, tmp3);
+					if (curlen) {
+						snprintf(buffer + curlen, buflen - curlen, "%c%s", d, tmp3);
 					} else {
-						snprintf(retstring, MAXRESULT, "%s", tmp3);
+						snprintf(buffer, buflen, "%s", tmp3);
 					}
 
 					curfieldnum++;
 				}
 			}
 		}
+	}
+	return 0;
+}
 
-		pbx_builtin_setvar_helper(chan, newvar, retstring);
+static int sort_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *varname, *strings, result[512] = "";
+	static int dep_warning=0;
+
+	LOCAL_USER_ADD(u);
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "The application Sort is deprecated.  Please use the SORT() function instead.\n");
+		dep_warning=1;
 	}
 
+	if (!data) {
+		ast_log(LOG_ERROR, "Sort() requires an argument\n");
+		LOCAL_USER_REMOVE(u);
+		return 0;
+	}
+
+	strings = ast_strdupa((char *)data);
+	if (!strings) {
+		ast_log(LOG_ERROR, "Out of memory\n");
+		LOCAL_USER_REMOVE(u);
+		return 0;
+	}
+
+	varname = strsep(&strings, "=");
+	switch (sort_internal(chan, strings, result, sizeof(result))) {
+	case ERROR_NOARG:
+		ast_log(LOG_ERROR, "Sort() requires an argument\n");
+		res = 0;
+		break;
+	case ERROR_NOMEM:
+		ast_log(LOG_ERROR, "Out of memory\n");
+		res = -1;
+		break;
+	case 0:
+		pbx_builtin_setvar_helper(chan, varname, result);
+		res = 0;
+		break;
+	default:
+		ast_log(LOG_ERROR, "Unknown internal error\n");
+		res = -1;
+	}
 	LOCAL_USER_REMOVE(u);
 	return res;
 }
 
+static int cut_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *s, *newvar=NULL, result[512];
+	static int dep_warning = 0;
+
+	LOCAL_USER_ADD(u);
+
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "The application Cut is deprecated.  Please use the CUT() function instead.\n");
+		dep_warning=1;
+	}
+
+	/* Check and parse arguments */
+	if (data) {
+		s = ast_strdupa((char *)data);
+		if (s) {
+			newvar = strsep(&s, "=");
+		} else {
+			ast_log(LOG_ERROR, "Out of memory\n");
+			LOCAL_USER_REMOVE(u);
+			return -1;
+		}
+	}
+
+	switch (cut_internal(chan, s, result, sizeof(result))) {
+	case ERROR_NOARG:
+		ast_log(LOG_ERROR, "Cut() requires an argument\n");
+		res = 0;
+		break;
+	case ERROR_NOMEM:
+		ast_log(LOG_ERROR, "Out of memory\n");
+		res = -1;
+		break;
+	case ERROR_USAGE:
+		ast_log(LOG_ERROR, "Usage: %s\n", cut_synopsis);
+		res = 0;
+		break;
+	case 0:
+		pbx_builtin_setvar_helper(chan, newvar, result);
+		res = 0;
+		break;
+	default:
+		ast_log(LOG_ERROR, "Unknown internal error\n");
+		res = -1;
+	}
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static char *acf_sort_exec(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
+{
+	struct localuser *u;
+
+	LOCAL_USER_ACF_ADD(u);
+
+	switch (sort_internal(chan, data, buf, len)) {
+	case ERROR_NOARG:
+		ast_log(LOG_ERROR, "SORT() requires an argument\n");
+		break;
+	case ERROR_NOMEM:
+		ast_log(LOG_ERROR, "Out of memory\n");
+		break;
+	case 0:
+		break;
+	default:
+		ast_log(LOG_ERROR, "Unknown internal error\n");
+	}
+	LOCAL_USER_REMOVE(u);
+	return buf;
+}
+
+static char *acf_cut_exec(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
+{
+	struct localuser *u;
+
+	LOCAL_USER_ACF_ADD(u);
+
+	switch (cut_internal(chan, data, buf, len)) {
+	case ERROR_NOARG:
+		ast_log(LOG_ERROR, "Cut() requires an argument\n");
+		break;
+	case ERROR_NOMEM:
+		ast_log(LOG_ERROR, "Out of memory\n");
+		break;
+	case ERROR_USAGE:
+		ast_log(LOG_ERROR, "Usage: %s\n", cut_synopsis);
+		break;
+	case 0:
+		break;
+	default:
+		ast_log(LOG_ERROR, "Unknown internal error\n");
+	}
+	LOCAL_USER_REMOVE(u);
+	return buf;
+}
+
+struct ast_custom_function acf_sort = {
+	.name = "SORT",
+	.synopsis = "Sorts a list of key/vals into a list of keys, based upon the vals",
+	.syntax = "SORT(key1:val1[...][,keyN:valN])",
+	.desc =
+"Takes a comma-separated list of keys and values, each separated by a colon, and returns a\n"
+"comma-separated list of the keys, sorted by their values.  Values will be evaluated as\n"
+"floating-point numbers.\n",
+	.read = acf_sort_exec,
+};
+
+struct ast_custom_function acf_cut = {
+	.name = "CUT",
+	.synopsis = "Slices and dices strings, based upon a named delimiter.",
+	.syntax = "CUT(<varname>,<char-delim>,<range-spec>)",
+	.desc =
+"  varname    - variable you want cut\n"
+"  char-delim - defaults to '-'\n"
+"  range-spec - number of the field you want (1-based offset)\n"
+"             may also be specified as a range (with -)\n"
+"             or group of ranges and fields (with &)\n",
+	.read = acf_cut_exec,
+};
+
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
+	ast_custom_function_unregister(&acf_cut);
+	ast_custom_function_unregister(&acf_sort);
+	ast_unregister_application(app_sort);
 	return ast_unregister_application(app_cut);
 }
 
 int load_module(void)
 {
+	ast_custom_function_register(&acf_cut);
+	ast_custom_function_register(&acf_sort);
+	ast_register_application(app_sort, sort_exec, app_sort_synopsis, app_sort_descrip);
 	return ast_register_application(app_cut, cut_exec, cut_synopsis, cut_descrip);
 }
 

apps/app_datetime.c

@@ -11,20 +11,21 @@
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/say.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/say.h"
 
 static char *tdesc = "Date and Time";
 

apps/app_db.c

@@ -3,50 +3,52 @@
  *
  * Database access functions
  *
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  * Copyright (C) 2003, Jefferson Noxon
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  * Jefferson Noxon <jeff@debian.org>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <sys/types.h>
-#include <asterisk/options.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
-#include <asterisk/astdb.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
+#include <sys/types.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/options.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/astdb.h"
+#include "asterisk/lock.h"
 
 static char *tdesc = "Database access functions for Asterisk extension logic";
 
 static char *g_descrip =
-  "  DBget(varname=family/key): Retrieves a value from the Asterisk\n"
-  "database and stores it in the given variable.  Always returns 0.  If the\n"
-  "requested key is not found, jumps to priority n+101 if available.\n";
+	"  DBget(varname=family/key): Retrieves a value from the Asterisk\n"
+	"database and stores it in the given variable.  Always returns 0.  If the\n"
+	"requested key is not found, jumps to priority n+101 if available.\n";
 
 static char *p_descrip =
-  "  DBput(family/key=value): Stores the given value in the Asterisk\n"
-  "database.  Always returns 0.\n";
+	"  DBput(family/key=value): Stores the given value in the Asterisk\n"
+	"database.  Always returns 0.\n";
 
 static char *d_descrip =
-  "  DBdel(family/key): Deletes a key from the Asterisk database.  Always\n"
-  "returns 0.\n";
+	"  DBdel(family/key): Deletes a key from the Asterisk database.  Always\n"
+	"returns 0.\n";
 
 static char *dt_descrip =
-  "  DBdeltree(family[/keytree]): Deletes a family or keytree from the Asterisk\n"
-  "database.  Always returns 0.\n";
+	"  DBdeltree(family[/keytree]): Deletes a family or keytree from the Asterisk\n"
+	"database.  Always returns 0.\n";
 
 static char *g_app = "DBget";
 static char *p_app = "DBput";
@@ -62,255 +64,208 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-
-static int
-deltree_exec (struct ast_channel *chan, void *data)
+static int deltree_exec(struct ast_channel *chan, void *data)
 {
-  int arglen;
-  char *argv, *family, *keytree;
+	int arglen;
+	char *argv, *family, *keytree;
 
-  arglen = strlen (data);
-  argv = alloca (arglen + 1);
-  if (!argv)			/* Why would this fail? */
-    {
-      ast_log (LOG_DEBUG, "Memory allocation failed\n");
-      return 0;
-    }
-  memcpy (argv, data, arglen + 1);
-
-  if (strchr (argv, '/')) {
-    {
-      family = strsep (&argv, "/");
-      keytree = strsep (&argv, "\0");
-      if (!family || !keytree)
-	{
-	  ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-	  return 0;
+	arglen = strlen(data);
+	argv = alloca(arglen + 1);
+	if (!argv) {	/* Why would this fail? */
+		ast_log(LOG_DEBUG, "Memory allocation failed\n");
+		return 0;
 	}
-      if (!strlen (keytree))
-	keytree = 0;
-    }
-  } else
-    {
-      family = argv;
-      keytree = 0;
-    }
+	memcpy(argv, data, arglen + 1);
 
-  if (option_verbose > 2)
-    {
-    if (keytree)
-      ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s, keytree=%s\n",
-		   family, keytree);
-    else
-      ast_verbose (VERBOSE_PREFIX_3 "DBdeltree: family=%s\n", family);
-    }
-
-  if (ast_db_deltree (family, keytree))
-    {
-      if (option_verbose > 2)
-	ast_verbose (VERBOSE_PREFIX_3
-		     "DBdeltree: Error deleting key from database.\n");
-    }
-
-  return 0;
-}
-
-
-static int
-del_exec (struct ast_channel *chan, void *data)
-{
-  int arglen;
-  char *argv, *family, *key;
-
-  arglen = strlen (data);
-  argv = alloca (arglen + 1);
-  if (!argv)			/* Why would this fail? */
-    {
-      ast_log (LOG_DEBUG, "Memory allocation failed\n");
-      return 0;
-    }
-  memcpy (argv, data, arglen + 1);
-
-  if (strchr (argv, '/'))
-    {
-      family = strsep (&argv, "/");
-      key = strsep (&argv, "\0");
-      if (!family || !key)
-	{
-	  ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-	  return 0;
-	}
-      if (option_verbose > 2)
-	ast_verbose (VERBOSE_PREFIX_3
-		     "DBdel: family=%s, key=%s\n", family, key);
-      if (ast_db_del (family, key))
-	{
-	  if (option_verbose > 2)
-	    ast_verbose (VERBOSE_PREFIX_3
-			 "DBdel: Error deleting key from database.\n");
-	}
-    }
-  else
-    {
-      ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
-    }
-
-  return 0;
-}
-
-static int
-put_exec (struct ast_channel *chan, void *data)
-{
-  int arglen;
-  char *argv, *value, *family, *key;
-
-  arglen = strlen (data);
-  argv = alloca (arglen + 1);
-  if (!argv)			/* Why would this fail? */
-    {
-      ast_log (LOG_DEBUG, "Memory allocation failed\n");
-      return 0;
-    }
-  memcpy (argv, data, arglen + 1);
-
-  if (strchr (argv, '/') && strchr (argv, '='))
-    {
-      family = strsep (&argv, "/");
-      key = strsep (&argv, "=");
-      value = strsep (&argv, "\0");
-      if (!value || !family || !key)
-	{
-	  ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-	  return 0;
-	}
-      if (option_verbose > 2)
-	ast_verbose (VERBOSE_PREFIX_3
-		     "DBput: family=%s, key=%s, value=%s\n", family, key,
-		     value);
-      if (ast_db_put (family, key, value))
-	{
-	  if (option_verbose > 2)
-	    ast_verbose (VERBOSE_PREFIX_3
-			 "DBput: Error writing value to database.\n");
+	if (strchr(argv, '/')) {
+		family = strsep(&argv, "/");
+		keytree = strsep(&argv, "\0");
+			if (!family || !keytree) {
+				ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+				return 0;
+			}
+		if (!strlen(keytree))
+			keytree = 0;
+	} else {
+		family = argv;
+		keytree = 0;
 	}
 
-    }
-  else
-    {
-      ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
-    }
-
-  return 0;
-}
-
-static int
-get_exec (struct ast_channel *chan, void *data)
-{
-  int arglen;
-  char *argv, *varname, *family, *key;
-  char dbresult[256];
-
-  arglen = strlen (data);
-  argv = alloca (arglen + 1);
-  if (!argv)			/* Why would this fail? */
-    {
-      ast_log (LOG_DEBUG, "Memory allocation failed\n");
-      return 0;
-    }
-  memcpy (argv, data, arglen + 1);
-
-  if (strchr (argv, '=') && strchr (argv, '/'))
-    {
-      varname = strsep (&argv, "=");
-      family = strsep (&argv, "/");
-      key = strsep (&argv, "\0");
-      if (!varname || !family || !key)
-	{
-	  ast_log (LOG_DEBUG, "Ignoring; Syntax error in argument\n");
-	  return 0;
-	}
-      if (option_verbose > 2)
-	ast_verbose (VERBOSE_PREFIX_3
-		     "DBget: varname=%s, family=%s, key=%s\n", varname,
-		     family, key);
-      if (!ast_db_get (family, key, dbresult, sizeof (dbresult) - 1))
-	{
-	  pbx_builtin_setvar_helper (chan, varname, dbresult);
-	  if (option_verbose > 2)
-	    ast_verbose (VERBOSE_PREFIX_3
-			 "DBget: set variable %s to %s\n", varname, dbresult);
-	}
-      else
-	{
-	  if (option_verbose > 2)
-	    ast_verbose (VERBOSE_PREFIX_3
-			 "DBget: Value not found in database.\n");
-	  /* Send the call to n+101 priority, where n is the current priority */
-	  if (ast_exists_extension
-	      (chan, chan->context, chan->exten, chan->priority + 101,
-	       chan->callerid))
-	    chan->priority += 100;
+	if (option_verbose > 2)	{
+		if (keytree)
+			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s, keytree=%s\n", family, keytree);
+		else
+			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: family=%s\n", family);
 	}
 
-    }
-  else
-    {
-      ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
-    }
+	if (ast_db_deltree(family, keytree)) {
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "DBdeltree: Error deleting key from database.\n");
+	}
 
-  return 0;
+	return 0;
 }
 
-int
-unload_module (void)
+static int del_exec(struct ast_channel *chan, void *data)
 {
-  int retval;
+	int arglen;
+	char *argv, *family, *key;
 
-  STANDARD_HANGUP_LOCALUSERS;
-  retval = ast_unregister_application (dt_app);
-  retval |= ast_unregister_application (d_app);
-  retval |= ast_unregister_application (p_app);
-  retval |= ast_unregister_application (g_app);
+	arglen = strlen(data);
+	argv = alloca(arglen + 1);
+	if (!argv) {	/* Why would this fail? */
+		ast_log (LOG_DEBUG, "Memory allocation failed\n");
+		return 0;
+	}
+	memcpy(argv, data, arglen + 1);
 
-  return retval;
+	if (strchr(argv, '/')) {
+		family = strsep(&argv, "/");
+		key = strsep(&argv, "\0");
+		if (!family || !key) {
+			ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+			return 0;
+		}
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "DBdel: family=%s, key=%s\n", family, key);
+		if (ast_db_del(family, key)) {
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "DBdel: Error deleting key from database.\n");
+		}
+	} else {
+		ast_log(LOG_DEBUG, "Ignoring, no parameters\n");
+	}
+	return 0;
 }
 
-int
-load_module (void)
+static int put_exec(struct ast_channel *chan, void *data)
 {
-  int retval;
+	int arglen;
+	char *argv, *value, *family, *key;
+	static int dep_warning = 0;
 
-  retval = ast_register_application (g_app, get_exec, g_synopsis, g_descrip);
-  if (!retval)
-    retval =
-      ast_register_application (p_app, put_exec, p_synopsis, p_descrip);
-  if (!retval)
-    retval =
-      ast_register_application (d_app, del_exec, d_synopsis, d_descrip);
-  if (!retval)
-    retval =
-      ast_register_application (dt_app, deltree_exec, dt_synopsis,
-				dt_descrip);
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
+		dep_warning = 1;
+	}
+	
+	arglen = strlen(data);
+	argv = alloca(arglen + 1);
+	if (!argv) {	/* Why would this fail? */
+		ast_log(LOG_DEBUG, "Memory allocation failed\n");
+		return 0;
+	}
+	memcpy(argv, data, arglen + 1);
 
-  return retval;
+	if (strchr(argv, '/') && strchr(argv, '=')) {
+		family = strsep(&argv, "/");
+		key = strsep(&argv, "=");
+		value = strsep(&argv, "\0");
+		if (!value || !family || !key) {
+			ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+			return 0;
+		}
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "DBput: family=%s, key=%s, value=%s\n", family, key, value);
+		if (ast_db_put(family, key, value)) {
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "DBput: Error writing value to database.\n");
+		}
+
+	} else	{
+		ast_log (LOG_DEBUG, "Ignoring, no parameters\n");
+	}
+	return 0;
 }
 
-char *
-description (void)
+static int get_exec(struct ast_channel *chan, void *data)
 {
-  return tdesc;
+	int arglen;
+	char *argv, *varname, *family, *key;
+	char dbresult[256];
+	static int dep_warning = 0;
+
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "This application has been deprecated, please use the ${DB(family/key)} function instead.\n");
+		dep_warning = 1;
+	}
+	
+	arglen = strlen(data);
+	argv = alloca(arglen + 1);
+	if (!argv) {	/* Why would this fail? */
+		ast_log(LOG_DEBUG, "Memory allocation failed\n");
+		return 0;
+	}
+	memcpy(argv, data, arglen + 1);
+
+	if (strchr(argv, '=') && strchr(argv, '/')) {
+		varname = strsep(&argv, "=");
+		family = strsep(&argv, "/");
+		key = strsep(&argv, "\0");
+		if (!varname || !family || !key) {
+			ast_log(LOG_DEBUG, "Ignoring; Syntax error in argument\n");
+			return 0;
+		}
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "DBget: varname=%s, family=%s, key=%s\n", varname, family, key);
+		if (!ast_db_get(family, key, dbresult, sizeof (dbresult) - 1)) {
+			pbx_builtin_setvar_helper(chan, varname, dbresult);
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "DBget: set variable %s to %s\n", varname, dbresult);
+		} else {
+			if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "DBget: Value not found in database.\n");
+			/* Send the call to n+101 priority, where n is the current priority */
+			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+				chan->priority += 100;
+		}
+
+	} else {
+		ast_log(LOG_DEBUG, "Ignoring, no parameters\n");
+	}
+	return 0;
 }
 
-int
-usecount (void)
+int unload_module(void)
 {
-  int res;
-  STANDARD_USECOUNT (res);
-  return res;
+	int retval;
+
+	STANDARD_HANGUP_LOCALUSERS;
+	retval = ast_unregister_application(dt_app);
+	retval |= ast_unregister_application(d_app);
+	retval |= ast_unregister_application(p_app);
+	retval |= ast_unregister_application(g_app);
+
+	return retval;
 }
 
-char *
-key ()
+int load_module(void)
 {
-  return ASTERISK_GPL_KEY;
+	int retval;
+
+	retval = ast_register_application(g_app, get_exec, g_synopsis, g_descrip);
+	if (!retval)
+		retval = ast_register_application(p_app, put_exec, p_synopsis, p_descrip);
+	if (!retval)
+		retval = ast_register_application(d_app, del_exec, d_synopsis, d_descrip);
+	if (!retval)
+		retval = ast_register_application(dt_app, deltree_exec, dt_synopsis, dt_descrip);
+	return retval;
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
 }

apps/app_dictate.c

@@ -0,0 +1,339 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Virtual Dictation Machine Application For Asterisk
+ *
+ * Copyright (C) 2005, Anthony Minessale II
+ *
+ * Anthony Minessale II <anthmct@yahoo.com>
+ *
+ * Donated by Sangoma Technologies <http://www.samgoma.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>	/* for mkdir */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/say.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
+
+static char *tdesc = "Virtual Dictation Machine";
+static char *app = "Dictate";
+static char *synopsis = "Virtual Dictation Machine";
+static char *desc = "  Dictate([<base_dir>])\n"
+"Start dictation machine using optional base dir for files.\n";
+
+
+STANDARD_LOCAL_USER;
+LOCAL_USER_DECL;
+
+typedef enum {
+	DFLAG_RECORD = (1 << 0),
+	DFLAG_PLAY = (1 << 1),
+	DFLAG_TRUNC = (1 << 2),
+	DFLAG_PAUSE = (1 << 3),
+} dflags;
+
+typedef enum {
+	DMODE_INIT,
+	DMODE_RECORD,
+	DMODE_PLAY
+} dmodes;
+
+#define ast_toggle_flag(it,flag) if(ast_test_flag(it, flag)) ast_clear_flag(it, flag); else ast_set_flag(it, flag)
+
+static int play_and_wait(struct ast_channel *chan, char *file, char *digits) 
+{
+	int res = -1;
+	if (!ast_streamfile(chan, file, chan->language)) {
+		res = ast_waitstream(chan, digits);
+	}
+	return res;
+}
+
+static int dictate_exec(struct ast_channel *chan, void *data)
+{
+	char *mydata, *argv[2], *path = NULL, filein[256];
+	char dftbase[256];
+	char *base;
+	struct ast_flags flags = {0};
+	struct ast_filestream *fs;
+	struct ast_frame *f = NULL;
+	struct localuser *u;
+	int ffactor = 320 * 80,
+		res = 0,
+		argc = 0,
+		done = 0,
+		oldr = 0,
+		lastop = 0,
+		samples = 0,
+		speed = 1,
+		digit = 0,
+		len = 0,
+		maxlen = 0,
+		mode = 0;
+		
+
+	snprintf(dftbase, sizeof(dftbase), "%s/dictate", ast_config_AST_SPOOL_DIR);
+	if (data && !ast_strlen_zero(data) && (mydata = ast_strdupa(data))) {
+		argc = ast_separate_app_args(mydata, '|', argv, sizeof(argv) / sizeof(argv[0]));
+	}
+	
+	if (argc) {
+		base = argv[0];
+	} else {
+		base = dftbase;
+	}
+
+	oldr = chan->readformat;
+	if ((res = ast_set_read_format(chan, AST_FORMAT_SLINEAR)) < 0) {
+		ast_log(LOG_WARNING, "Unable to set to linear mode.\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+	ast_answer(chan);
+	ast_safe_sleep(chan, 200);
+	for(res = 0; !res;) {
+		if (ast_app_getdata(chan, "dictate/enter_filename", filein, sizeof(filein), 0) || 
+			ast_strlen_zero(filein)) {
+			res = -1;
+			break;
+		}
+		
+		mkdir(base, 0755);
+		len = strlen(base) + strlen(filein) + 2;
+		if (!path || len > maxlen) {
+			path = alloca(len);
+			memset(path, 0, len);
+			maxlen = len;
+		} else {
+			memset(path, 0, maxlen);
+		}
+
+		snprintf(path, len, "%s/%s", base, filein);
+		fs = ast_writefile(path, "raw", NULL, O_CREAT|O_APPEND, 0, 0700);
+		mode = DMODE_PLAY;
+		memset(&flags, 0, sizeof(flags));
+		ast_set_flag(&flags, DFLAG_PAUSE);
+		digit = play_and_wait(chan, "dictate/forhelp", AST_DIGIT_ANY);
+		done = 0;
+		speed = 1;
+		res = 0;
+		lastop = 0;
+		samples = 0;
+		while (!done && ((res = ast_waitfor(chan, -1)) > -1) && fs && (f = ast_read(chan))) {
+			if (digit) {
+				struct ast_frame fr = {AST_FRAME_DTMF, digit};
+				ast_queue_frame(chan, &fr);
+				digit = 0;
+			}
+			if ((f->frametype == AST_FRAME_DTMF)) {
+				int got = 1;
+				switch(mode) {
+				case DMODE_PLAY:
+					switch(f->subclass) {
+					case '1':
+						ast_set_flag(&flags, DFLAG_PAUSE);
+						mode = DMODE_RECORD;
+						break;
+					case '2':
+						speed++;
+						if (speed > 4) {
+							speed = 1;
+						}
+						res = ast_say_number(chan, speed, AST_DIGIT_ANY, chan->language, (char *) NULL);
+						break;
+					case '7':
+						samples -= ffactor;
+						if(samples < 0) {
+							samples = 0;
+						}
+						ast_seekstream(fs, samples, SEEK_SET);
+						break;
+					case '8':
+						samples += ffactor;
+						ast_seekstream(fs, samples, SEEK_SET);
+						break;
+						
+					default:
+						got = 0;
+					}
+					break;
+				case DMODE_RECORD:
+					switch(f->subclass) {
+					case '1':
+						ast_set_flag(&flags, DFLAG_PAUSE);
+						mode = DMODE_PLAY;
+						break;
+					case '8':
+						ast_toggle_flag(&flags, DFLAG_TRUNC);
+						lastop = 0;
+						break;
+					default:
+						got = 0;
+					}
+					break;
+				default:
+					got = 0;
+				}
+				if (!got) {
+					switch(f->subclass) {
+					case '#':
+						done = 1;
+						continue;
+						break;
+					case '*':
+						ast_toggle_flag(&flags, DFLAG_PAUSE);
+						if (ast_test_flag(&flags, DFLAG_PAUSE)) {
+							digit = play_and_wait(chan, "dictate/pause", AST_DIGIT_ANY);
+						} else {
+							digit = play_and_wait(chan, mode == DMODE_PLAY ? "dictate/playback" : "dictate/record", AST_DIGIT_ANY);
+						}
+						break;
+					case '0':
+						ast_set_flag(&flags, DFLAG_PAUSE);
+						digit = play_and_wait(chan, "dictate/paused", AST_DIGIT_ANY);
+						switch(mode) {
+						case DMODE_PLAY:
+							digit = play_and_wait(chan, "dictate/play_help", AST_DIGIT_ANY);
+							break;
+						case DMODE_RECORD:
+							digit = play_and_wait(chan, "dictate/record_help", AST_DIGIT_ANY);
+							break;
+						}
+						if (digit == 0) {
+							digit = play_and_wait(chan, "dictate/both_help", AST_DIGIT_ANY);
+						} else if (digit < 0) {
+							done = 1;
+							break;
+						}
+						break;
+					}
+				}
+				
+			} else if (f->frametype == AST_FRAME_VOICE) {
+				switch(mode) {
+					struct ast_frame *fr;
+					int x;
+				case DMODE_PLAY:
+					if (lastop != DMODE_PLAY) {
+						if (ast_test_flag(&flags, DFLAG_PAUSE)) {
+							digit = play_and_wait(chan, "dictate/playback_mode", AST_DIGIT_ANY);
+							if (digit == 0) {
+								digit = play_and_wait(chan, "dictate/paused", AST_DIGIT_ANY);
+							} else if (digit < 0) {
+								break;
+							}
+						}
+						if (lastop != DFLAG_PLAY) {
+							lastop = DFLAG_PLAY;
+							ast_closestream(fs);
+							fs = ast_openstream(chan, path, chan->language);
+							ast_seekstream(fs, samples, SEEK_SET);
+							chan->stream = NULL;
+						}
+						lastop = DMODE_PLAY;
+					}
+
+					if (!ast_test_flag(&flags, DFLAG_PAUSE)) {
+						for (x = 0; x < speed; x++) {
+							if ((fr = ast_readframe(fs))) {
+								ast_write(chan, fr);
+								samples += fr->samples;
+								ast_frfree(fr);
+								fr = NULL;
+							} else {
+								samples = 0;
+								ast_seekstream(fs, 0, SEEK_SET);
+							}
+						}
+					}
+					break;
+				case DMODE_RECORD:
+					if (lastop != DMODE_RECORD) {
+						int oflags = O_CREAT | O_WRONLY;
+						if (ast_test_flag(&flags, DFLAG_PAUSE)) {						
+							digit = play_and_wait(chan, "dictate/record_mode", AST_DIGIT_ANY);
+							if (digit == 0) {
+								digit = play_and_wait(chan, "dictate/paused", AST_DIGIT_ANY);
+							} else if (digit < 0) {
+								break;
+							}
+						}
+						lastop = DMODE_RECORD;
+						ast_closestream(fs);
+						if ( ast_test_flag(&flags, DFLAG_TRUNC)) {
+							oflags |= O_TRUNC;
+							digit = play_and_wait(chan, "dictate/truncating_audio", AST_DIGIT_ANY);
+						} else {
+							oflags |= O_APPEND;
+						}
+						fs = ast_writefile(path, "raw", NULL, oflags, 0, 0700);
+						if (ast_test_flag(&flags, DFLAG_TRUNC)) {
+							ast_seekstream(fs, 0, SEEK_SET);
+							ast_clear_flag(&flags, DFLAG_TRUNC);
+						} else {
+							ast_seekstream(fs, 0, SEEK_END);
+						}
+					}
+					if (!ast_test_flag(&flags, DFLAG_PAUSE)) {
+						res = ast_writestream(fs, f);
+					}
+					break;
+				}
+				
+			}
+
+			ast_frfree(f);
+		}
+	}
+	if (oldr) {
+		ast_set_read_format(chan, oldr);
+	}
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, dictate_exec, synopsis, desc);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+

apps/app_directory.c

@@ -3,46 +3,55 @@
  *
  * Provide a directory of extensions
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/config.h>
-#include <asterisk/say.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <stdio.h>
-#include "../asterisk.h"
-#include "../astconf.h"
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/config.h"
+#include "asterisk/say.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Extension Directory";
 static char *app = "Directory";
 
 static char *synopsis = "Provide directory of voicemail extensions";
 static char *descrip =
-"  Directory(context): Presents the user with a directory of extensions from\n"
-"which they  may  select  by name. The  list  of  names  and  extensions  is\n"
-"discovered from  voicemail.conf. The  context  argument  is  required,  and\n"
-"specifies  the  context  in  which to interpret the extensions. Returns 0\n"
-"unless the user hangs up. It  also sets up the channel on exit to enter the\n"
-"extension the user selected.\n";
+"  Directory(vm-context[|dial-context[|options]]): Presents the user with a directory\n"
+"of extensions from which they  may  select  by name. The  list  of  names \n"
+"and  extensions  is discovered from  voicemail.conf. The  vm-context  argument\n"
+"is required, and specifies  the  context  of voicemail.conf to use.  The\n"
+"dial-context is the context to use for dialing the users, and defaults to\n"
+"the vm-context if unspecified. The 'f' option causes the directory to match\n"
+"based on the first name in voicemail.conf instead of the last name.\n"
+"Returns 0 unless the user hangs up. It  also sets up the channel on exit\n"
+"to enter the extension the user selected.  If the user enters '0' and there\n"
+"exists an extension 'o' in the current context, the directory will exit with 0\n"
+"and call control will resume at that extension.  Entering '*' will exit similarly,\n"
+"but to the 'a' extension, much like app_voicemail's behavior.\n";
 
 /* For simplicity, I'm keeping the format compatible with the voicemail config,
    but i'm open to suggestions for isolating it */
 
-#define DIRECTORY_CONFIG "voicemail.conf"
+#define VOICEMAIL_CONFIG "voicemail.conf"
 
 /* How many digits to read in */
 #define NUMDIGITS 3
@@ -120,20 +129,197 @@ static char *convert(char *lastname)
 	return tmp;
 }
 
-static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *context, char digit)
+/* play name of mailbox owner.
+ * returns:  -1 for bad or missing extension
+ *           '1' for selected entry from directory
+ *           '*' for skipped entry from directory
+ */
+static int play_mailbox_owner(struct ast_channel *chan, char *context, char *dialcontext, char *ext, char *name) {
+	int res = 0;
+	int loop = 3;
+	char fn[256];
+	char fn2[256];
+
+	/* Check for the VoiceMail2 greeting first */
+	snprintf(fn, sizeof(fn), "%s/voicemail/%s/%s/greet",
+		(char *)ast_config_AST_SPOOL_DIR, context, ext);
+
+	/* Otherwise, check for an old-style Voicemail greeting */
+	snprintf(fn2, sizeof(fn2), "%s/vm/%s/greet",
+		(char *)ast_config_AST_SPOOL_DIR, ext);
+
+	if (ast_fileexists(fn, NULL, chan->language) > 0) {
+		res = ast_streamfile(chan, fn, chan->language);
+		if (!res) {
+			res = ast_waitstream(chan, AST_DIGIT_ANY);
+		}
+		ast_stopstream(chan);
+	} else if (ast_fileexists(fn2, NULL, chan->language) > 0) {
+		res = ast_streamfile(chan, fn2, chan->language);
+		if (!res) {
+			res = ast_waitstream(chan, AST_DIGIT_ANY);
+		}
+		ast_stopstream(chan);
+	} else {
+		res = ast_say_character_str(chan, !ast_strlen_zero(name) ? name : ext,
+					AST_DIGIT_ANY, chan->language);
+	}
+
+	while (loop) {
+		if (!res) {
+			res = ast_streamfile(chan, "dir-instr", chan->language);
+		}
+		if (!res) {
+			res = ast_waitstream(chan, AST_DIGIT_ANY);
+		}
+		if (!res) {
+			res = ast_waitfordigit(chan, 3000);
+		}
+		ast_stopstream(chan);
+	
+		if (res > -1) {
+			switch (res) {
+				case '1':
+					/* Name selected */
+					loop = 0;
+					if (ast_exists_extension(chan,dialcontext,ext,1,chan->cid.cid_num)) {
+						ast_copy_string(chan->exten, ext, sizeof(chan->exten));
+						chan->priority = 0;
+						ast_copy_string(chan->context, dialcontext, sizeof(chan->context));
+					} else {
+						ast_log(LOG_WARNING,
+							"Can't find extension '%s' in context '%s'.  "
+							"Did you pass the wrong context to Directory?\n",
+							ext, dialcontext);
+						res = -1;
+					}
+					break;
+	
+				case '*':   
+					/* Skip to next match in list */
+					loop = 0;
+					break;
+	
+				default:
+					/* Not '1', or '*', so decrement number of tries */
+					res = 0;
+					loop--;
+					break;
+			} /* end switch */
+		} /* end if */
+		else {
+			/* User hungup, so jump out now */
+			loop = 0;
+		}
+	} /* end while */
+
+	return(res);
+}
+
+static struct ast_config *realtime_directory(char *context)
+{
+	struct ast_config *cfg;
+	struct ast_config *rtdata;
+	struct ast_category *cat;
+	struct ast_variable *var;
+	char *mailbox;
+	char *fullname;
+	char *hidefromdir;
+	char tmp[100];
+
+	/* Load flat file config. */
+	cfg = ast_config_load(VOICEMAIL_CONFIG);
+
+	if (!cfg) {
+		/* Loading config failed. */
+		ast_log(LOG_WARNING, "Loading config failed.\n");
+		return NULL;
+	}
+
+	/* Get realtime entries, categorized by their mailbox number
+	   and present in the requested context */
+	rtdata = ast_load_realtime_multientry("voicemail", "mailbox LIKE", "%", "context", context, NULL);
+
+	/* if there are no results, just return the entries from the config file */
+	if (!rtdata)
+		return cfg;
+
+	/* Does the context exist within the config file? If not, make one */
+	cat = ast_category_get(cfg, context);
+	if (!cat) {
+		cat = ast_category_new(context);
+		if (!cat) {
+			ast_log(LOG_WARNING, "Out of memory\n");
+			ast_config_destroy(cfg);
+			return NULL;
+		}
+		ast_category_append(cfg, cat);
+	}
+
+	mailbox = ast_category_browse(rtdata, NULL);
+	while (mailbox) {
+		fullname = ast_variable_retrieve(rtdata, mailbox, "fullname");
+		hidefromdir = ast_variable_retrieve(rtdata, mailbox, "hidefromdir");
+		snprintf(tmp, sizeof(tmp), "no-password,%s,hidefromdir=%s",
+			 fullname ? fullname : "",
+			 hidefromdir ? hidefromdir : "no");
+		var = ast_variable_new(mailbox, tmp);
+		if (var)
+			ast_variable_append(cat, var);
+		else
+			ast_log(LOG_WARNING, "Out of memory adding mailbox '%s'\n", mailbox);
+		mailbox = ast_category_browse(rtdata, mailbox);
+	}
+	ast_config_destroy(rtdata);
+
+	return cfg;
+}
+
+static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *context, char *dialcontext, char digit, int last)
 {
 	/* Read in the first three digits..  "digit" is the first digit, already read */
 	char ext[NUMDIGITS + 1];
+	char name[80] = "";
 	struct ast_variable *v;
 	int res;
 	int found=0;
+	int lastuserchoice = 0;
 	char *start, *pos, *conv,*stringp=NULL;
-	char fn[256];
-	char fn2[256];
-	if (!context || !strlen(context)) {
-		ast_log(LOG_WARNING, "Directory must be called with an argument (context in which to interpret extensions)\n");
+
+	if (!context || ast_strlen_zero(context)) {
+		ast_log(LOG_WARNING,
+			"Directory must be called with an argument "
+			"(context in which to interpret extensions)\n");
 		return -1;
 	}
+	if (digit == '0') {
+		if (ast_exists_extension(chan,chan->context,"o",1,chan->cid.cid_num) || 
+			(!ast_strlen_zero(chan->macrocontext) &&
+		     ast_exists_extension(chan, chan->macrocontext, "o", 1, chan->cid.cid_num))) {
+			strcpy(chan->exten, "o");
+			chan->priority = 0;
+			return 0;
+		} else {
+
+			ast_log(LOG_WARNING, "Can't find extension 'o' in current context.  "
+				"Not Exiting the Directory!\n");
+			res = 0;
+		}
+	}	
+	if (digit == '*') {
+		if (ast_exists_extension(chan,chan->context,"a",1,chan->cid.cid_num) || 
+			(!ast_strlen_zero(chan->macrocontext) &&
+		     ast_exists_extension(chan, chan->macrocontext, "a", 1, chan->cid.cid_num))) {
+			strcpy(chan->exten, "a");
+			chan->priority = 0;
+			return 0;
+		} else {
+
+			ast_log(LOG_WARNING, "Can't find extension 'a' in current context.  "
+				"Not Exiting the Directory!\n");
+			res = 0;
+		}
+	}	
 	memset(ext, 0, sizeof(ext));
 	ext[0] = digit;
 	res = 0;
@@ -146,13 +332,14 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
 			while(v) {
 				/* Find a candidate extension */
 				start = strdup(v->value);
-				if (start) {
+				if (start && !strcasestr(start, "hidefromdir=yes")) {
 					stringp=start;
 					strsep(&stringp, ",");
 					pos = strsep(&stringp, ",");
 					if (pos) {
+						ast_copy_string(name, pos, sizeof(name));
 						/* Grab the last name */
-						if (strrchr(pos, ' '))
+						if (last && strrchr(pos,' '))
 							pos = strrchr(pos, ' ') + 1;
 						conv = convert(pos);
 						if (conv) {
@@ -170,59 +357,46 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char *
 				}
 				v = v->next;
 			}
+
 			if (v) {
 				/* We have a match -- play a greeting if they have it */
-				/* Check for the VoiceMail2 greeting first */
-				snprintf(fn, sizeof(fn), "%s/voicemail/%s/%s/greet", (char *)ast_config_AST_SPOOL_DIR, context, v->name);
-				/* Otherwise, check for an old-style Voicemail greeting */
-				snprintf(fn2, sizeof(fn2), "%s/vm/%s/greet", (char *)ast_config_AST_SPOOL_DIR, v->name);
-				if (ast_fileexists(fn, NULL, chan->language) > 0) {
-					res = ast_streamfile(chan, fn, chan->language);
-					if (!res)
-						res = ast_waitstream(chan, AST_DIGIT_ANY);
-					ast_stopstream(chan);
-				} else if (ast_fileexists(fn2, NULL, chan->language) > 0) {
-					res = ast_streamfile(chan, fn2, chan->language);
-					if (!res)
-						res = ast_waitstream(chan, AST_DIGIT_ANY);
-					ast_stopstream(chan);
-				} else {
-					res = ast_say_digit_str(chan, v->name, AST_DIGIT_ANY, chan->language);
-				}
-ahem:
-				if (!res)
-					res = ast_streamfile(chan, "dir-instr", chan->language);
-				if (!res)
-					res = ast_waitstream(chan, AST_DIGIT_ANY);
-				if (!res)
-					res = ast_waitfordigit(chan, 3000);
-				ast_stopstream(chan);
-				if (res > -1) {
-					if (res == '1') {
-						strncpy(chan->exten, v->name, sizeof(chan->exten)-1);
+				res = play_mailbox_owner(chan, context, dialcontext, v->name, name);
+				switch (res) {
+					case -1:
+						/* user pressed '1' but extension does not exist, or
+						 * user hungup
+						 */
+						lastuserchoice = 0;
+						break;
+					case '1':
+						/* user pressed '1' and extensions exists */
+						lastuserchoice = res;
+						ast_copy_string(chan->context, dialcontext, sizeof(chan->context));
+						ast_copy_string(chan->exten, v->name, sizeof(chan->exten));
 						chan->priority = 0;
-						strncpy(chan->context, context, sizeof(chan->context)-1);
+						break;
+					case '*':
+						/* user pressed '*' to skip something found */
+						lastuserchoice = res;
 						res = 0;
 						break;
-					} else if (res == '*') {
-						res = 0;
-						v = v->next;
-					} else {
-						res = 0;
-						goto ahem;
-					}
+					default:
+						break;
 				}
-			} else {
-				if (found) 
-					res = ast_streamfile(chan, "dir-nomore", chan->language);
-				else
-					res = ast_streamfile(chan, "dir-nomatch", chan->language);
-				if (!res)
-					res = 1;
-				return res;
+				v = v->next;
 			}
 		}
-		
+
+		if (lastuserchoice != '1') {
+			if (found) 
+				res = ast_streamfile(chan, "dir-nomore", chan->language);
+			else
+				res = ast_streamfile(chan, "dir-nomatch", chan->language);
+			if (!res)
+				res = 1;
+			return res;
+		}
+		return 0;
 	}
 	return res;
 }
@@ -232,28 +406,56 @@ static int directory_exec(struct ast_channel *chan, void *data)
 	int res = 0;
 	struct localuser *u;
 	struct ast_config *cfg;
+	int last = 1;
+	char *context, *dialcontext, *dirintro, *options;
+
 	if (!data) {
-		ast_log(LOG_WARNING, "directory requires an argument (context)\n");
+		ast_log(LOG_WARNING, "directory requires an argument (context[,dialcontext])\n");
 		return -1;
 	}
-	cfg = ast_load(DIRECTORY_CONFIG);
-	if (!cfg) {
-		ast_log(LOG_WARNING, "Unable to open directory configuration %s\n", DIRECTORY_CONFIG);
-		return -1;
-	}
-	LOCAL_USER_ADD(u);
+
 top:
+	context = ast_strdupa(data);
+	dialcontext = strchr(context, '|');
+	if (dialcontext) {
+		*dialcontext = '\0';
+		dialcontext++;
+		options = strchr(dialcontext, '|');
+		if (options) {
+			*options = '\0';
+			options++; 
+			if (strchr(options, 'f'))
+				last = 0;
+		}
+	} else	
+		dialcontext = context;
+
+	cfg = realtime_directory(context);
+	if (!cfg)
+		return -1;
+
+	LOCAL_USER_ADD(u);
+
+	dirintro = ast_variable_retrieve(cfg, context, "directoryintro");
+	if (!dirintro || ast_strlen_zero(dirintro))
+		dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
+	if (!dirintro || ast_strlen_zero(dirintro)) {
+		if (last)
+			dirintro = "dir-intro";	
+		else
+			dirintro = "dir-intro-fn";
+	}
 	if (chan->_state != AST_STATE_UP) 
 		res = ast_answer(chan);
 	if (!res)
-		res = ast_streamfile(chan, "dir-intro", chan->language);
+		res = ast_streamfile(chan, dirintro, chan->language);
 	if (!res)
 		res = ast_waitstream(chan, AST_DIGIT_ANY);
 	ast_stopstream(chan);
 	if (!res)
 		res = ast_waitfordigit(chan, 5000);
 	if (res > 0) {
-		res = do_directory(chan, cfg, (char *)data, res);
+		res = do_directory(chan, cfg, context, dialcontext, res, last);
 		if (res > 0) {
 			res = ast_waitstream(chan, AST_DIGIT_ANY);
 			ast_stopstream(chan);
@@ -262,7 +464,7 @@ top:
 			}
 		}
 	}
-	ast_destroy(cfg);
+	ast_config_destroy(cfg);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }

apps/app_disa.c

@@ -3,7 +3,7 @@
  *
  * DISA -- Direct Inward System Access Application  6/20/2001
  * 
- * Copyright (C) 2001, Linux Support Services, Inc.
+ * Copyright (C) 2001 - 2005, Digium, Inc.
  *
  * Jim Dixon <jim@lambdatel.com>
  *
@@ -13,24 +13,27 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/ulaw.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-#include <pthread.h>
 #include <sys/time.h>
 
-/*
-#define	TONE_BLOCK_SIZE 320
-*/
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/app.h"
+#include "asterisk/indications.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/ulaw.h"
+#include "asterisk/callerid.h"
 
 static char *tdesc = "DISA (Direct Inward System Access) Application";
 
@@ -70,7 +73,11 @@ static char *descrip =
 	"above arguments may have |new-callerid-string appended to them, to\n"
 	"specify a new (different) callerid to be used for this call, for\n"
 	"example: numeric-passcode|context|\"My Phone\" <(234) 123-4567> or \n"
-	"full-pathname-of-passcode-file|\"My Phone\" <(234) 123-4567>. Note that\n"
+	"full-pathname-of-passcode-file|\"My Phone\" <(234) 123-4567>.  Last\n"
+	"but not least, |mailbox[@context] may be appended, which will cause\n"
+	"a stutter-dialtone (indication \"dialrecall\") to be used, if the\n"
+	"specified mailbox contains any new messages, for example:\n"
+	"numeric-passcode|context||1234 (w/a changing callerid).  Note that\n"
 	"in the case of specifying the numeric-passcode, the context must be\n"
 	"specified if the callerid is specified also.\n\n"
 	"If login is successful, the application parses the dialed number in\n"
@@ -83,52 +90,39 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static float loudness=4096.0;
-
-static int firstdigittimeout = 20000; /* 20 seconds first digit timeout */
-static int digittimeout = 10000; /* 10 seconds subsequent digit timeout */
-
-static void make_tone_block(unsigned char *data, float f1, float f2, int len, int *x)
+static void play_dialtone(struct ast_channel *chan, char *mailbox)
 {
-int	i;
-float	val;
-
-	for(i = 0; i < len; i++)
-	{
-		val = loudness * sin((f1 * 2.0 * M_PI * (*x))/8000.0);
-		val += loudness * sin((f2 * 2.0 * M_PI * (*x)++)/8000.0);
-		data[i] = AST_LIN2MU((int)val);
-	 }		
-	  /* wrap back around from 8000 */
-	if (*x >= 8000) *x = 0;
-	return;
-}
-
-static int ms_diff(struct timeval *tv1, struct timeval *tv2)
-{
-int	ms;
-	
-	ms = (tv1->tv_sec - tv2->tv_sec) * 1000;
-	ms += (tv1->tv_usec - tv2->tv_usec) / 1000;
-	return(ms);
+	const struct tone_zone_sound *ts = NULL;
+	if(ast_app_has_voicemail(mailbox, NULL))
+		ts = ast_get_indication_tone(chan->zone, "dialrecall");
+	else
+		ts = ast_get_indication_tone(chan->zone, "dial");
+	if (ts)
+		ast_playtones_start(chan, 0, ts->data, 0);
+	else
+		ast_tonepair_start(chan, 350, 440, 0, 0);
 }
 
 static int disa_exec(struct ast_channel *chan, void *data)
 {
-	int i,j,k,x;
+	int i,j,k,x,did_ignore;
+	int firstdigittimeout = 20000;
+	int digittimeout = 10000;
 	struct localuser *u;
-	char tmp[256],arg2[256],exten[AST_MAX_EXTENSION],acctcode[20];
-	struct {
-		unsigned char offset[AST_FRIENDLY_OFFSET];
-		unsigned char buf[640];
-	} tone_block;
-	char *ourcontext,*ourcallerid;
-	struct ast_frame *f,wf;
-	struct timeval lastout, now, lastdigittime;
+	char tmp[256],arg2[256]="",exten[AST_MAX_EXTENSION],acctcode[20]="";
+	char *ourcontext,*ourcallerid,ourcidname[256],ourcidnum[256],*mailbox;
+	struct ast_frame *f;
+	struct timeval lastdigittime;
 	int res;
+	time_t rstart;
 	FILE *fp;
 	char *stringp=NULL;
 
+	if (chan->pbx) {
+		firstdigittimeout = chan->pbx->rtimeout*1000;
+		digittimeout = chan->pbx->dtimeout*1000;
+	}
+	
 	if (ast_set_write_format(chan,AST_FORMAT_ULAW))
 	{
 		ast_log(LOG_WARNING, "Unable to set write format to Mu-law on %s\n",chan->name);
@@ -139,18 +133,19 @@ static int disa_exec(struct ast_channel *chan, void *data)
 		ast_log(LOG_WARNING, "Unable to set read format to Mu-law on %s\n",chan->name);
 		return -1;
 	}
-	lastout.tv_sec = lastout.tv_usec = 0;
 	if (!data || !strlen((char *)data)) {
 		ast_log(LOG_WARNING, "disa requires an argument (passcode/passcode file)\n");
 		return -1;
 	}
+	ast_log(LOG_DEBUG, "Digittimeout: %d\n", digittimeout);
+	ast_log(LOG_DEBUG, "Responsetimeout: %d\n", firstdigittimeout);
 	strncpy(tmp, (char *)data, sizeof(tmp)-1);
 	stringp=tmp;
 	strsep(&stringp, "|");
 	ourcontext = strsep(&stringp, "|");
 	/* if context specified, save 2nd arg and parse third */
 	if (ourcontext) {
-		strcpy(arg2,ourcontext);
+		strncpy(arg2,ourcontext, sizeof(arg2) - 1);
 		ourcallerid = strsep(&stringp,"|");
 	}
 	  /* if context not specified, use "disa" */
@@ -159,6 +154,10 @@ static int disa_exec(struct ast_channel *chan, void *data)
 		ourcallerid = NULL;
 		ourcontext = "disa";
 	}
+	mailbox = strsep(&stringp, "|");
+	if (!mailbox)
+		mailbox = "";
+	ast_log(LOG_DEBUG, "Mailbox: %s\n",mailbox);
 	LOCAL_USER_ADD(u);
 	if (chan->_state != AST_STATE_UP)
 	{
@@ -166,24 +165,30 @@ static int disa_exec(struct ast_channel *chan, void *data)
 		ast_answer(chan);
 	}
 	i = k = x = 0; /* k is 0 for pswd entry, 1 for ext entry */
+	did_ignore = 0;
 	exten[0] = 0;
 	acctcode[0] = 0;
 	/* can we access DISA without password? */ 
+
+	ast_log(LOG_DEBUG, "Context: %s\n",ourcontext);
+
 	if (!strcasecmp(tmp, "no-password"))
 	{;
-		k = 1;
+		k |= 1; /* We have the password */
 		ast_log(LOG_DEBUG, "DISA no-password login success\n");
 	}
-	gettimeofday(&lastdigittime,NULL);
+	lastdigittime = ast_tvnow();
+
+	play_dialtone(chan, mailbox);
+
 	for(;;)
 	{
-		gettimeofday(&now,NULL);
 		  /* if outa time, give em reorder */
-		if (ms_diff(&now,&lastdigittime) > 
-		    ((k) ? digittimeout : firstdigittimeout))
+		if (ast_tvdiff_ms(ast_tvnow(), lastdigittime) > 
+		    ((k&2) ? digittimeout : firstdigittimeout))
 		{
 			ast_log(LOG_DEBUG,"DISA %s entry timeout on chan %s\n",
-				((k) ? "extension" : "password"),chan->name);
+				((k&1) ? "extension" : "password"),chan->name);
 			break;
 		}
 		if ((res = ast_waitfor(chan, -1) < 0)) {
@@ -205,24 +210,7 @@ static int disa_exec(struct ast_channel *chan, void *data)
 			return -1;
 		}
 		if (f->frametype == AST_FRAME_VOICE) {
-			if (!i || (ast_ignore_pattern(ourcontext, exten) && k)) {
-				wf.frametype = AST_FRAME_VOICE;
-				wf.subclass = AST_FORMAT_ULAW;
-				wf.offset = AST_FRIENDLY_OFFSET;
-				wf.mallocd = 0;
-				wf.data = tone_block.buf;
-				wf.datalen = f->datalen;
-				make_tone_block(tone_block.buf, 350, 440, f->datalen, &x);
-				wf.samples = wf.datalen;
-				ast_frfree(f);
-			    if (ast_write(chan, &wf)) 
-				{
-			        ast_log(LOG_WARNING, "DISA Failed to write frame on %s\n",chan->name);
-					LOCAL_USER_REMOVE(u);
-					return -1;
-				}
-			} else
-				ast_frfree(f);
+			ast_frfree(f);
 			continue;
 		}
 		  /* if not DTMF, just do it again */
@@ -234,12 +222,16 @@ static int disa_exec(struct ast_channel *chan, void *data)
 
 		j = f->subclass;  /* save digit */
 		ast_frfree(f);
-		
-		gettimeofday(&lastdigittime,NULL);
+		if (i == 0) 
+		{
+			k|=2; /* We have the first digit */ 
+			ast_playtones_stop(chan);
+		}
+		lastdigittime = ast_tvnow();
 		  /* got a DTMF tone */
 		if (i < AST_MAX_EXTENSION) /* if still valid number of digits */
 		{
-			if (!k) /* if in password state */
+			if (!(k&1)) /* if in password state */
 			{
 				if (j == '#') /* end of password */
 				{
@@ -272,6 +264,11 @@ static int disa_exec(struct ast_channel *chan, void *data)
 								stringp2=strsep(&stringp, "|");
 								if (stringp2) ourcallerid=stringp2;
 							}
+							mailbox = strsep(&stringp, "|");
+							if (!mailbox)
+								mailbox = "";
+							ast_log(LOG_DEBUG, "Mailbox: %s\n",mailbox);
+
 							  /* password must be in valid format (numeric) */
 							if (sscanf(tmp,"%d",&j) < 1) continue;
 							  /* if we got it */
@@ -287,83 +284,75 @@ static int disa_exec(struct ast_channel *chan, void *data)
 
 					}
 					 /* password good, set to dial state */
-						ast_log(LOG_WARNING,"DISA on chan %s password is good\n",chan->name);
-					k = 1;
+					ast_log(LOG_DEBUG,"DISA on chan %s password is good\n",chan->name);
+					play_dialtone(chan, mailbox);
+
+					k|=1; /* In number mode */
 					i = 0;  /* re-set buffer pointer */
 					exten[sizeof(acctcode)] = 0;
-					strcpy(acctcode,exten);
+					strncpy(acctcode,exten, sizeof(acctcode) - 1);
 					exten[0] = 0;
 					ast_log(LOG_DEBUG,"Successful DISA log-in on chan %s\n",chan->name);
 					continue;
 				}
 			}
+
 			exten[i++] = j;  /* save digit */
 			exten[i] = 0;
-			if (!k) continue; /* if getting password, continue doing it */
+			if (!(k&1)) continue; /* if getting password, continue doing it */
 			  /* if this exists */
 
+			if (ast_ignore_pattern(ourcontext, exten)) {
+				play_dialtone(chan, "");
+				did_ignore = 1;
+			} else
+				if (did_ignore) {
+					ast_playtones_stop(chan);
+					did_ignore = 0;
+				}
+
 			  /* if can do some more, do it */
-			if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->callerid)) 
+			if (!ast_matchmore_extension(chan,ourcontext,exten,1, chan->cid.cid_num)) {
 				break;
+			}
 		}
 	}
 
-	if (k && ast_exists_extension(chan,ourcontext,exten,1, chan->callerid))
+	if (k==3 && ast_exists_extension(chan,ourcontext,exten,1, chan->cid.cid_num))
 	{
+		ast_playtones_stop(chan);
 		/* We're authenticated and have a valid extension */
 		if (ourcallerid && *ourcallerid)
 		{
-			if (chan->callerid) free(chan->callerid);
-			chan->callerid = strdup(ourcallerid);
+			ast_callerid_split(ourcallerid, ourcidname, sizeof(ourcidname), ourcidnum, sizeof(ourcidnum));
+			ast_set_callerid(chan, ourcidnum, ourcidname, ourcidnum);
+		}
+		strncpy(chan->exten, exten, sizeof(chan->exten) - 1);
+		strncpy(chan->context, ourcontext, sizeof(chan->context) - 1);
+		if (!ast_strlen_zero(acctcode)) {
+			strncpy(chan->accountcode, acctcode, sizeof(chan->accountcode) - 1);
 		}
-		strcpy(chan->exten,exten);
-		strcpy(chan->context,ourcontext);
-		strcpy(chan->accountcode,acctcode);
 		chan->priority = 0;
-		ast_cdr_init(chan->cdr,chan);
+		ast_cdr_reset(chan->cdr,AST_CDR_FLAG_POSTED);
 		LOCAL_USER_REMOVE(u);
 		return 0;
 	}
 
 reorder:
-		
-	/* something is invalid, give em reorder forever */
-	x = 0;
-	k = 0;	/* k = 0 means busy tone, k = 1 means silence) */
-	i = 0;	/* Number of samples we've done */
-	for(;;)
+
+	ast_indicate(chan,AST_CONTROL_CONGESTION);
+	/* something is invalid, give em reorder for several seconds */
+	time(&rstart);
+	while(time(NULL) < rstart + 10)
 	{
 		if (ast_waitfor(chan, -1) < 0)
 			break;
 		f = ast_read(chan);
 		if (!f)
 			break;
-		if (f->frametype == AST_FRAME_VOICE) {
-			wf.frametype = AST_FRAME_VOICE;
-			wf.subclass = AST_FORMAT_ULAW;
-			wf.offset = AST_FRIENDLY_OFFSET;
-			wf.mallocd = 0;
-			wf.data = tone_block.buf;
-			wf.datalen = f->datalen;
-			wf.samples = wf.datalen;
-			if (k) 
-				memset(tone_block.buf, 0x7f, wf.datalen);
-			else
-				make_tone_block(tone_block.buf,480.0, 620.0,wf.datalen, &x);
-			i += wf.datalen / 8;
-			if (i > 250) {
-				i = 0;
-				k = !k;
-			}
-		    if (ast_write(chan, &wf)) 
-			{
-		        ast_log(LOG_WARNING, "DISA Failed to write frame on %s\n",chan->name);
-				LOCAL_USER_REMOVE(u);
-				return -1;
-			}
-		}
 		ast_frfree(f);
 	}
+	ast_playtones_stop(chan);
 	LOCAL_USER_REMOVE(u);
 	return -1;
 }

apps/app_dumpchan.c

@@ -0,0 +1,170 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Application to dump channel variables
+ * 
+ * Copyright (C) 2004 - 2005, Anthony Minessale II.
+ *
+ * Anthony Minessale <anthmct@yahoo.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License (and disclaimed to Digium)
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
+#include "asterisk/utils.h"
+
+static char *tdesc = "Dump Info About The Calling Channel";
+static char *app = "DumpChan";
+static char *synopsis = "Dump Info About The Calling Channel";
+static char *desc = 
+"   DumpChan([<min_verbose_level>])\n"
+"Displays information on channel and listing of all channel\n"
+"variables. If min_verbose_level is specified, output is only\n"
+"displayed when the verbose level is currently set to that number\n"
+"or greater. Always returns 0.\n\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int ast_serialize_showchan(struct ast_channel *c, char *buf, size_t size)
+{
+	struct timeval now;
+	long elapsed_seconds=0;
+	int hour=0, min=0, sec=0;
+	char cgrp[256];
+	char pgrp[256];
+	
+	now = ast_tvnow();
+	memset(buf,0,size);
+	if (!c)
+		return 0;
+
+	if (c->cdr) {
+		elapsed_seconds = now.tv_sec - c->cdr->start.tv_sec;
+		hour = elapsed_seconds / 3600;
+		min = (elapsed_seconds % 3600) / 60;
+		sec = elapsed_seconds % 60;
+	}
+
+	snprintf(buf,size, 
+			 "Name=               %s\n"
+			 "Type=               %s\n"
+			 "UniqueID=           %s\n"
+			 "CallerID=           %s\n"
+			 "CallerIDName=       %s\n"
+			 "DNIDDigits=         %s\n"
+			 "State=              %s (%d)\n"
+			 "Rings=              %d\n"
+			 "NativeFormat=       %d\n"
+			 "WriteFormat=        %d\n"
+			 "ReadFormat=         %d\n"
+			 "1stFileDescriptor=  %d\n"
+			 "Framesin=           %d %s\n"
+			 "Framesout=          %d %s\n"
+			 "TimetoHangup=       %ld\n"
+			 "ElapsedTime=        %dh%dm%ds\n"
+			 "Context=            %s\n"
+			 "Extension=          %s\n"
+			 "Priority=           %d\n"
+			 "CallGroup=          %s\n"
+			 "PickupGroup=        %s\n"
+			 "Application=        %s\n"
+			 "Data=               %s\n"
+			 "Blocking_in=        %s\n",
+			 c->name,
+			 c->type,
+			 c->uniqueid,
+			 (c->cid.cid_num ? c->cid.cid_num : "(N/A)"),
+			 (c->cid.cid_name ? c->cid.cid_name : "(N/A)"),
+			 (c->cid.cid_dnid ? c->cid.cid_dnid : "(N/A)" ),
+			 ast_state2str(c->_state),
+			 c->_state,
+			 c->rings,
+			 c->nativeformats,
+			 c->writeformat,
+			 c->readformat,
+			 c->fds[0], c->fin & 0x7fffffff, (c->fin & 0x80000000) ? " (DEBUGGED)" : "",
+			 c->fout & 0x7fffffff, (c->fout & 0x80000000) ? " (DEBUGGED)" : "", (long)c->whentohangup,
+			 hour,
+			 min,
+			 sec,
+			 c->context,
+			 c->exten,
+			 c->priority,
+			 ast_print_group(cgrp, sizeof(cgrp), c->callgroup),
+			 ast_print_group(pgrp, sizeof(pgrp), c->pickupgroup),
+			 ( c->appl ? c->appl : "(N/A)" ),
+			 ( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
+			 (ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
+
+	return 0;
+}
+
+static int dumpchan_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char vars[1024];
+	char info[1024];
+	int level = 0;
+	static char *line = "================================================================================";
+	LOCAL_USER_ADD(u);
+
+	if (data) {
+		level = atoi(data);
+	}
+
+	pbx_builtin_serialize_variables(chan, vars, sizeof(vars));
+	ast_serialize_showchan(chan, info, sizeof(info));
+	if (option_verbose >= level)
+		ast_verbose("\nDumping Info For Channel: %s:\n%s\nInfo:\n%s\nVariables:\n%s%s\n",chan->name, line, info, vars, line);
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, dumpchan_exec, synopsis, desc);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+

apps/app_echo.c

@@ -11,19 +11,20 @@
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
 
 static char *tdesc = "Simple Echo Application";
 
@@ -52,6 +53,8 @@ static int echo_exec(struct ast_channel *chan, void *data)
 		f = ast_read(chan);
 		if (!f)
 			break;
+		f->delivery.tv_sec = 0;
+		f->delivery.tv_usec = 0;
 		if (f->frametype == AST_FRAME_VOICE) {
 			if (ast_write(chan, f)) 
 				break;

apps/app_enumlookup.c

@@ -1,33 +1,36 @@
 /*
  * Asterisk -- A telephony toolkit for Linux.
  *
- * Time of day - Report the time of day
- * 
- * Copyright (C) 1999, Mark Spencer
+ * Enumlookup - lookup entry in ENUM
  *
- * Mark Spencer <markster@linux-support.net>
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/options.h>
-#include <asterisk/config.h>
-#include <asterisk/module.h>
-#include <asterisk/enum.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/options.h"
+#include "asterisk/config.h"
+#include "asterisk/module.h"
+#include "asterisk/enum.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "ENUM Lookup";
 
@@ -39,23 +42,28 @@ static char *descrip =
 "  EnumLookup(exten):  Looks up an extension via ENUM and sets\n"
 "the variable 'ENUM'. For VoIP URIs this variable will \n"
 "look like 'TECHNOLOGY/URI' with the appropriate technology.\n"
-"Returns -1 on hangup, or 0 on completion regardless of whether the \n"
-"lookup was successful. \n"
+"Returns -1 on hangup, or 0 on completion\n"
 "Currently, the enumservices SIP, H323, IAX, IAX2 and TEL are recognized. \n"
-"A good SIP, H323, IAX or IAX2 entry will result in normal priority handling, \n"
-"whereas a good TEL entry will increase the priority by 51 (if existing).\n"
+"\nReturns status in the ENUMSTATUS channel variable:\n"
+"    ERROR	Failed to do a lookup\n"
+"    <tech>	Technology of the successful lookup: SIP, H323, IAX, IAX2 or TEL\n"
+"    BADURI	Got URI Asterisk does not understand.\n"
+"\nOld, depreciated, behaviour:\n"
+"\nA SIP, H323, IAX or IAX2 entry will result in normal priority handling, \n"
+"whereas a TEL entry will increase the priority by 51 (if existing).\n"
 "If the lookup was *not* successful and there exists a priority n + 101,\n"
 "then that priority will be taken next.\n" ;
 
 #define ENUM_CONFIG "enum.conf"
 
-static char h323driver[80];
+static char h323driver[80] = "";
 #define H323DRIVERDEFAULT "H323"
 
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
+/*--- enumlookup_exec: Look up number in ENUM and return result */
 static int enumlookup_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
@@ -64,9 +72,10 @@ static int enumlookup_exec(struct ast_channel *chan, void *data)
 	char tmp[256];
 	char *c,*t;
 	struct localuser *u;
-	if (!data || !strlen(data)) {
+
+	if (!data || ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "EnumLookup requires an argument (extension)\n");
-		res = 1;
+		res = 0;
 	}
 	LOCAL_USER_ADD(u);
 	if (!res) {
@@ -74,6 +83,13 @@ static int enumlookup_exec(struct ast_channel *chan, void *data)
 		printf("ENUM got '%d'\n", res);
 	}
 	LOCAL_USER_REMOVE(u);
+	if (!res) {	/* Failed to do a lookup */
+		/* Look for a "busy" place */
+		ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
+		pbx_builtin_setvar_helper(chan, "ENUMSTATUS", "ERROR");
+		return 0;
+	}
+	pbx_builtin_setvar_helper(chan, "ENUMSTATUS", tech);
 	/* Parse it out */
 	if (res > 0) {
 		if (!strcasecmp(tech, "SIP")) {
@@ -123,38 +139,32 @@ static int enumlookup_exec(struct ast_channel *chan, void *data)
 				*t = 0;
 				pbx_builtin_setvar_helper(chan, "ENUM", tmp);
 				ast_log(LOG_NOTICE, "tel: ENUM set to \"%s\"\n", tmp);
-				if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 51, chan->callerid))
-					chan->priority += 50;
-				else
+				if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 51))
 					res = 0;
 			}
-		} else if (strlen(tech)) {
+		} else if (!ast_strlen_zero(tech)) {
 			ast_log(LOG_NOTICE, "Don't know how to handle technology '%s'\n", tech);
+			pbx_builtin_setvar_helper(chan, "ENUMSTATUS", "BADURI");
 			res = 0;
 		}
 	}
-	if (!res) {
-		/* Look for a "busy" place */
-		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
-			chan->priority += 100;
-	} else if (res > 0)
-		res = 0;
-	return res;
+	return 0;
 }
 
+/*--- load_config: Load enum.conf and find out how to handle H.323 */
 static int load_config(void)
 {
 	struct ast_config *cfg;
 	char *s;
 
-	cfg = ast_load(ENUM_CONFIG);
+	cfg = ast_config_load(ENUM_CONFIG);
 	if (cfg) {
 		if (!(s=ast_variable_retrieve(cfg, "general", "h323driver"))) {
-			strcpy(h323driver, H323DRIVERDEFAULT);
+			strncpy(h323driver, H323DRIVERDEFAULT, sizeof(h323driver) - 1);
 		} else {
-			strcpy(h323driver, s);
+			strncpy(h323driver, s, sizeof(h323driver) - 1);
 		}
-		ast_destroy(cfg);
+		ast_config_destroy(cfg);
 		return 0;
 	}
 	ast_log(LOG_NOTICE, "No ENUM Config file, using defaults\n");
@@ -162,12 +172,14 @@ static int load_config(void)
 }
 
 
+/*--- unload_module: Unload this application from PBX */
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
 	return ast_unregister_application(app);
 }
 
+/*--- load_module: Load this application into PBX */
 int load_module(void)
 {
 	int res;
@@ -180,12 +192,14 @@ int load_module(void)
 	return(0);
 }
 
+/*--- reload: Reload configuration file */
 int reload(void)
 {
 	return(load_config());
 }
 
 
+/*--- description: Describe module */
 char *description(void)
 {
 	return tdesc;

apps/app_eval.c

@@ -0,0 +1,112 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Eval application
+ *
+ * Copyright (c) 2004 - 2005, Tilghman Lesher.  All rights reserved.
+ *
+ * Tilghman Lesher <app_eval__v001@the-tilghman.com>
+ *
+ * $Id$
+ *
+ * This code is released by the author with no restrictions on usage.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+
+/* Maximum length of any variable */
+#define MAXRESULT	1024
+
+static char *tdesc = "Reevaluates strings";
+
+static char *app_eval = "Eval";
+
+static char *eval_synopsis = "Evaluates a string";
+
+static char *eval_descrip =
+"Usage: Eval(newvar=somestring)\n"
+"  Normally Asterisk evaluates variables inline.  But what if you want to\n"
+"store variable offsets in a database, to be evaluated later?  Eval is\n"
+"the answer, by allowing a string to be evaluated twice in the dialplan,\n"
+"the first time as part of the normal dialplan, and the second using Eval.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int eval_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *s, *newvar=NULL, tmp[MAXRESULT];
+	static int dep_warning = 0;
+
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "This application has been deprecated in favor of the dialplan function, EVAL\n");
+		dep_warning = 1;
+	}
+
+	LOCAL_USER_ADD(u);
+
+	/* Check and parse arguments */
+	if (data) {
+		s = ast_strdupa((char *)data);
+		if (s) {
+			newvar = strsep(&s, "=");
+			if (newvar && (newvar[0] != '\0')) {
+				memset(tmp, 0, MAXRESULT);
+				pbx_substitute_variables_helper(chan, s, tmp, MAXRESULT - 1);
+				pbx_builtin_setvar_helper(chan, newvar, tmp);
+			}
+		} else {
+			ast_log(LOG_ERROR, "Out of memory\n");
+			res = -1;
+		}
+	}
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app_eval);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app_eval, eval_exec, eval_synopsis, eval_descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_exec.c

@@ -0,0 +1,119 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Exec application
+ *
+ * Copyright (c) 2004 - 2005, Tilghman Lesher.  All rights reserved.
+ *
+ * Tilghman Lesher <app_exec__v001@the-tilghman.com>
+ *
+ * $Id$
+ *
+ * This code is released by the author with no restrictions on usage.
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+
+/* Maximum length of any variable */
+#define MAXRESULT	1024
+
+static char *tdesc = "Executes applications";
+
+static char *app_exec = "Exec";
+
+static char *exec_synopsis = "Executes internal application";
+
+static char *exec_descrip =
+"Usage: Exec(appname(arguments))\n"
+"  Allows an arbitrary application to be invoked even when not\n"
+"hardcoded into the dialplan. To invoke external applications\n"
+"see the application System. Returns whatever value the\n"
+"app returns or a non-zero value if the app cannot be found.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int exec_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *s, *appname, *endargs, args[MAXRESULT];
+	struct ast_app *app;
+
+	LOCAL_USER_ADD(u);
+
+	memset(args, 0, MAXRESULT);
+
+	/* Check and parse arguments */
+	if (data) {
+		s = ast_strdupa((char *)data);
+		if (s) {
+			appname = strsep(&s, "(");
+			if (s) {
+				endargs = strrchr(s, ')');
+				if (endargs)
+					*endargs = '\0';
+				pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1);
+			}
+			if (appname) {
+				app = pbx_findapp(appname);
+				if (app) {
+					res = pbx_exec(chan, app, args, 1);
+				} else {
+					ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
+					res = -1;
+				}
+			}
+		} else {
+			ast_log(LOG_ERROR, "Out of memory\n");
+			res = -1;
+		}
+	}
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app_exec);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app_exec, exec_exec, exec_synopsis, exec_descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_externalivr.c

@@ -0,0 +1,561 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * External IVR application interface
+ * 
+ * Copyright (C) 2005, Digium, Inc.
+ *
+ * Kevin P. Fleming <kpfleming@digium.com>
+ *
+ * Portions taken from the file-based music-on-hold work
+ * created by Anthony Minessale II in res_musiconhold.c
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/linkedlists.h"
+
+static const char *tdesc = "External IVR Interface Application";
+
+static const char *app = "ExternalIVR";
+
+static const char *synopsis = "Interfaces with an external IVR application";
+
+static const char *descrip = 
+"  ExternalIVR(command[|arg[|arg...]]): Forks an process to run the supplied command,\n"
+"and starts a generator on the channel. The generator's play list is\n"
+"controlled by the external application, which can add and clear entries\n"
+"via simple commands issued over its stdout. The external application\n"
+"will receive all DTMF events received on the channel, and notification\n"
+"if the channel is hung up. The application will not be forcibly terminated\n"
+"when the channel is hung up.\n"
+"See doc/README.externalivr for a protocol specification.\n";
+
+#define ast_chan_log(level, channel, format, ...) ast_log(level, "%s: " format, channel->name, ## __VA_ARGS__)
+
+struct playlist_entry {
+	AST_LIST_ENTRY(playlist_entry) list;
+	char filename[1];
+};
+
+struct localuser {
+	struct ast_channel *chan;
+	struct localuser *next;
+	AST_LIST_HEAD(playlist, playlist_entry) playlist;
+	AST_LIST_HEAD(finishlist, playlist_entry) finishlist;
+	int list_cleared;
+	int playing_silence;
+	int option_autoclear;
+};
+
+LOCAL_USER_DECL;
+
+struct gen_state {
+	struct localuser *u;
+	struct ast_filestream *stream;
+	struct playlist_entry *current;
+	int sample_queue;
+};
+
+static void send_child_event(FILE *handle, const char event, const char *data,
+			     const struct ast_channel *chan)
+{
+	char tmp[256];
+
+	if (!data) {
+		snprintf(tmp, sizeof(tmp), "%c,%10ld", event, time(NULL));
+	} else {
+		snprintf(tmp, sizeof(tmp), "%c,%10ld,%s", event, time(NULL), data);
+	}
+
+	fprintf(handle, "%s\n", tmp);
+	ast_chan_log(LOG_DEBUG, chan, "sent '%s'\n", tmp);
+}
+
+static void *gen_alloc(struct ast_channel *chan, void *params)
+{
+	struct localuser *u = params;
+	struct gen_state *state;
+
+	state = calloc(1, sizeof(*state));
+
+	if (!state)
+		return NULL;
+
+	state->u = u;
+
+	return state;
+}
+
+static void gen_closestream(struct gen_state *state)
+{
+	if (!state->stream)
+		return;
+
+	ast_closestream(state->stream);
+	state->u->chan->stream = NULL;
+	state->stream = NULL;
+}
+
+static void gen_release(struct ast_channel *chan, void *data)
+{
+	struct gen_state *state = data;
+
+	gen_closestream(state);
+	free(data);
+}
+
+/* caller has the playlist locked */
+static int gen_nextfile(struct gen_state *state)
+{
+	struct localuser *u = state->u;
+	char *file_to_stream;
+	
+	u->list_cleared = 0;
+	u->playing_silence = 0;
+	gen_closestream(state);
+
+	while (!state->stream) {
+		state->current = AST_LIST_REMOVE_HEAD(&u->playlist, list);
+		if (state->current) {
+			file_to_stream = state->current->filename;
+		} else {
+			file_to_stream = "silence-10";
+			u->playing_silence = 1;
+		}
+
+		if (!(state->stream = ast_openstream_full(u->chan, file_to_stream, u->chan->language, 1))) {
+			ast_chan_log(LOG_WARNING, u->chan, "File '%s' could not be opened: %s\n", file_to_stream, strerror(errno));
+			if (!u->playing_silence) {
+				continue;
+			} else { 
+				break;
+			}
+		}
+	}
+
+	return (!state->stream);
+}
+
+static struct ast_frame *gen_readframe(struct gen_state *state)
+{
+	struct ast_frame *f = NULL;
+	struct localuser *u = state->u;
+	
+	if (u->list_cleared ||
+	    (u->playing_silence && AST_LIST_FIRST(&u->playlist))) {
+		gen_closestream(state);
+		AST_LIST_LOCK(&u->playlist);
+		gen_nextfile(state);
+		AST_LIST_UNLOCK(&u->playlist);
+	}
+
+	if (!(state->stream && (f = ast_readframe(state->stream)))) {
+		if (state->current) {
+			AST_LIST_LOCK(&u->finishlist);
+			AST_LIST_INSERT_TAIL(&u->finishlist, state->current, list);
+			AST_LIST_UNLOCK(&u->finishlist);
+			state->current = NULL;
+		}
+		if (!gen_nextfile(state))
+			f = ast_readframe(state->stream);
+	}
+
+	return f;
+}
+
+static int gen_generate(struct ast_channel *chan, void *data, int len, int samples)
+{
+	struct gen_state *state = data;
+	struct ast_frame *f = NULL;
+	int res = 0;
+
+	state->sample_queue += samples;
+
+	while (state->sample_queue > 0) {
+		if (!(f = gen_readframe(state)))
+			return -1;
+
+		res = ast_write(chan, f);
+		ast_frfree(f);
+		if (res < 0) {
+			ast_chan_log(LOG_WARNING, chan, "Failed to write frame: %s\n", strerror(errno));
+			return -1;
+		}
+		state->sample_queue -= f->samples;
+	}
+
+	return res;
+}
+
+static struct ast_generator gen =
+{
+	alloc: gen_alloc,
+	release: gen_release,
+	generate: gen_generate,
+};
+
+static struct playlist_entry *make_entry(const char *filename)
+{
+	struct playlist_entry *entry;
+
+	entry = calloc(1, sizeof(*entry) + strlen(filename) + 10);
+
+	if (!entry)
+		return NULL;
+
+	strcpy(entry->filename, filename);
+
+	return entry;
+}
+
+static int app_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u = NULL;
+	struct playlist_entry *entry;
+	const char *args = data;
+	int child_stdin[2] = { 0,0 };
+	int child_stdout[2] = { 0,0 };
+	int child_stderr[2] = { 0,0 };
+	int res = -1;
+	int gen_active = 0;
+	int pid;
+	char *command;
+	char *argv[32];
+	int argc = 1;
+	char *buf;
+	FILE *child_commands = NULL;
+	FILE *child_errors = NULL;
+	FILE *child_events = NULL;
+
+	if (!args || ast_strlen_zero(args)) {
+		ast_log(LOG_WARNING, "ExternalIVR requires a command to execute\n");
+		goto exit;
+	}
+
+	buf = ast_strdupa(data);
+	command = strsep(&buf, "|");
+	memset(argv, 0, sizeof(argv) / sizeof(argv[0]));
+	argv[0] = command;
+	while ((argc < 31) && (argv[argc++] = strsep(&buf, "|")));
+	argv[argc] = NULL;
+
+	LOCAL_USER_ADD(u);
+
+	if (pipe(child_stdin)) {
+		ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child input: %s\n", strerror(errno));
+		goto exit;
+	}
+
+	if (pipe(child_stdout)) {
+		ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child output: %s\n", strerror(errno));
+		goto exit;
+	}
+
+	if (pipe(child_stderr)) {
+		ast_chan_log(LOG_WARNING, chan, "Could not create pipe for child errors: %s\n", strerror(errno));
+		goto exit;
+	}
+
+	u->list_cleared = 0;
+	AST_LIST_HEAD_INIT(&u->playlist);
+	AST_LIST_HEAD_INIT(&u->finishlist);
+
+	if (chan->_state != AST_STATE_UP) {
+		ast_answer(chan);
+	}
+
+	if (ast_activate_generator(chan, &gen, u) < 0) {
+		ast_chan_log(LOG_WARNING, chan, "Failed to activate generator\n");
+		goto exit;
+	} else
+		gen_active = 1;
+
+	pid = fork();
+	if (pid < 0) {
+		ast_log(LOG_WARNING, "Failed to fork(): %s\n", strerror(errno));
+		goto exit;
+	}
+
+	if (!pid) {
+		/* child process */
+		int i;
+
+		dup2(child_stdin[0], STDIN_FILENO);
+		dup2(child_stdout[1], STDOUT_FILENO);
+		dup2(child_stderr[1], STDERR_FILENO);
+		close(child_stdin[1]);
+		close(child_stdout[0]);
+		close(child_stderr[0]);
+		for (i = STDERR_FILENO + 1; i < 1024; i++)
+			close(i);
+		execv(command, argv);
+		fprintf(stderr, "Failed to execute '%s': %s\n", command, strerror(errno));
+		exit(1);
+	} else {
+		/* parent process */
+		int child_events_fd = child_stdin[1];
+		int child_commands_fd = child_stdout[0];
+		int child_errors_fd = child_stderr[0];
+		struct ast_frame *f;
+		int ms;
+		int exception;
+		int ready_fd;
+		int waitfds[2] = { child_errors_fd, child_commands_fd };
+		struct ast_channel *rchan;
+
+		close(child_stdin[0]);
+		close(child_stdout[1]);
+		close(child_stderr[1]);
+
+		if (!(child_events = fdopen(child_events_fd, "w"))) {
+			ast_chan_log(LOG_WARNING, chan, "Could not open stream for child events\n");
+			goto exit;
+		}
+
+		setvbuf(child_events, NULL, _IONBF, 0);
+
+		if (!(child_commands = fdopen(child_commands_fd, "r"))) {
+			ast_chan_log(LOG_WARNING, chan, "Could not open stream for child commands\n");
+			goto exit;
+		}
+
+		if (!(child_errors = fdopen(child_errors_fd, "r"))) {
+			ast_chan_log(LOG_WARNING, chan, "Could not open stream for child errors\n");
+			goto exit;
+		}
+
+		res = 0;
+
+		while (1) {
+			if (ast_test_flag(chan, AST_FLAG_ZOMBIE)) {
+				ast_chan_log(LOG_NOTICE, chan, "Is a zombie\n");
+				res = -1;
+				break;
+			}
+
+			if (ast_check_hangup(chan)) {
+				ast_chan_log(LOG_NOTICE, chan, "Got check_hangup\n");
+				send_child_event(child_events, 'H', NULL, chan);
+				res = -1;
+				break;
+			}
+
+			ready_fd = 0;
+			ms = 100;
+			errno = 0;
+			exception = 0;
+
+			rchan = ast_waitfor_nandfds(&chan, 1, waitfds, 2, &exception, &ready_fd, &ms);
+
+			if (!AST_LIST_EMPTY(&u->finishlist)) {
+				AST_LIST_LOCK(&u->finishlist);
+				while ((entry = AST_LIST_REMOVE_HEAD(&u->finishlist, list))) {
+					send_child_event(child_events, 'F', entry->filename, chan);
+					free(entry);
+				}
+				AST_LIST_UNLOCK(&u->finishlist);
+			}
+
+			if (rchan) {
+				/* the channel has something */
+				f = ast_read(chan);
+				if (!f) {
+					ast_chan_log(LOG_NOTICE, chan, "Returned no frame\n");
+					send_child_event(child_events, 'H', NULL, chan);
+					res = -1;
+					break;
+				}
+
+				if (f->frametype == AST_FRAME_DTMF) {
+					send_child_event(child_events, f->subclass, NULL, chan);
+					if (u->option_autoclear) {
+						if (!u->list_cleared && !u->playing_silence)
+							send_child_event(child_events, 'T', NULL, chan);
+						AST_LIST_LOCK(&u->playlist);
+						while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
+							if (!u->playing_silence)
+								send_child_event(child_events, 'D', entry->filename, chan);
+							free(entry);
+						}
+						u->list_cleared = 1;
+						AST_LIST_UNLOCK(&u->playlist);
+					}
+				} else if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP)) {
+					ast_chan_log(LOG_NOTICE, chan, "Got AST_CONTROL_HANGUP\n");
+					send_child_event(child_events, 'H', NULL, chan);
+					ast_frfree(f);
+					res = -1;
+					break;
+				}
+				ast_frfree(f);
+			} else if (ready_fd == child_commands_fd) {
+				char input[1024];
+
+				if (exception || feof(child_commands)) {
+					ast_chan_log(LOG_WARNING, chan, "Child process went away\n");
+					res = -1;
+					break;
+				}
+
+				if (!fgets(input, sizeof(input), child_commands))
+					continue;
+
+				command = ast_strip(input);
+
+				ast_chan_log(LOG_DEBUG, chan, "got command '%s'\n", input);
+
+				if (strlen(input) < 4)
+					continue;
+
+				if (input[0] == 'S') {
+					if (ast_fileexists(&input[2], NULL, NULL) == -1) {
+						ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]);
+						send_child_event(child_events, 'Z', NULL, chan);
+						strcpy(&input[2], "exception");
+					}
+					if (!u->list_cleared && !u->playing_silence)
+						send_child_event(child_events, 'T', NULL, chan);
+					AST_LIST_LOCK(&u->playlist);
+					while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list))) {
+						if (!u->playing_silence)
+							send_child_event(child_events, 'D', entry->filename, chan);
+						free(entry);
+					}
+					u->list_cleared = 1;
+					entry = make_entry(&input[2]);
+					if (entry)
+						AST_LIST_INSERT_TAIL(&u->playlist, entry, list);
+					AST_LIST_UNLOCK(&u->playlist);
+				} else if (input[0] == 'A') {
+					if (ast_fileexists(&input[2], NULL, NULL) == -1) {
+						ast_chan_log(LOG_WARNING, chan, "Unknown file requested '%s'\n", &input[2]);
+						send_child_event(child_events, 'Z', NULL, chan);
+						strcpy(&input[2], "exception");
+					}
+					entry = make_entry(&input[2]);
+					if (entry) {
+						AST_LIST_LOCK(&u->playlist);
+						AST_LIST_INSERT_TAIL(&u->playlist, entry, list);
+						AST_LIST_UNLOCK(&u->playlist);
+					}
+				} else if (input[0] == 'H') {
+					ast_chan_log(LOG_NOTICE, chan, "Hanging up: %s\n", &input[2]);
+					send_child_event(child_events, 'H', NULL, chan);
+					break;
+				} else if (input[0] == 'O') {
+					if (!strcasecmp(&input[2], "autoclear"))
+						u->option_autoclear = 1;
+					else if (!strcasecmp(&input[2], "noautoclear"))
+						u->option_autoclear = 0;
+					else
+						ast_chan_log(LOG_WARNING, chan, "Unknown option requested '%s'\n", &input[2]);
+				}
+			} else if (ready_fd == child_errors_fd) {
+				char input[1024];
+
+				if (exception || feof(child_errors)) {
+					ast_chan_log(LOG_WARNING, chan, "Child process went away\n");
+					res = -1;
+					break;
+				}
+
+				if (fgets(input, sizeof(input), child_errors)) {
+					command = ast_strip(input);
+					ast_chan_log(LOG_NOTICE, chan, "stderr: %s\n", command);
+				}
+			} else if ((ready_fd < 0) && ms) { 
+				if (errno == 0 || errno == EINTR)
+					continue;
+
+				ast_chan_log(LOG_WARNING, chan, "Wait failed (%s)\n", strerror(errno));
+				break;
+			}
+		}
+	}
+
+ exit:
+	if (gen_active)
+		ast_deactivate_generator(chan);
+
+	if (child_events)
+		fclose(child_events);
+
+	if (child_commands)
+		fclose(child_commands);
+
+	if (child_errors)
+		fclose(child_errors);
+
+	if (child_stdin[0]) {
+		close(child_stdin[0]);
+		close(child_stdin[1]);
+	}
+
+	if (child_stdout[0]) {
+		close(child_stdout[0]);
+		close(child_stdout[1]);
+	}
+
+	if (child_stderr[0]) {
+		close(child_stderr[0]);
+		close(child_stderr[1]);
+	}
+
+	if (u) {
+		while ((entry = AST_LIST_REMOVE_HEAD(&u->playlist, list)))
+			free(entry);
+
+		LOCAL_USER_REMOVE(u);
+	}
+
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, app_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return (char *) tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+
+	STANDARD_USECOUNT(res);
+
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_festival.c

@@ -5,20 +5,13 @@
  * 
  * Copyright (C) 2002, Christos Ricudis
  *
- * Christos Ricudis <ricudis@paiko.gr>
+ * Christos Ricudis <ricudis@itc.auth.gr>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/md5.h>
-#include <asterisk/config.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
@@ -34,8 +27,20 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
-#include <pthread.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/md5.h"
+#include "asterisk/config.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 #define FESTIVAL_CONFIG "festival.conf"
 
@@ -119,7 +124,7 @@ static int send_waveform_to_fd(char *waveform, int length, int fd) {
                 if (x != fd)
                         close(x);
         }
-//IAS
+/*IAS */
 #ifdef __PPC__  
 	for( x=0; x<length; x+=2)
 	{
@@ -130,7 +135,6 @@ static int send_waveform_to_fd(char *waveform, int length, int fd) {
 #endif
 	
 	write(fd,waveform,length);
-	write(fd,"a",1);
 	close(fd);
 	exit(0);
 }
@@ -155,6 +159,9 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
         	return -1;
         }
 	                                                
+	/* Answer if it's not already going */
+	if (chan->_state != AST_STATE_UP)
+		ast_answer(chan);
 	ast_stopstream(chan);
 
 	owriteformat = chan->writeformat;
@@ -195,7 +202,7 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
 				needed = f->samples * 2;
 				if (needed > sizeof(myf.frdata)) {
 					ast_log(LOG_WARNING, "Only able to deliver %d of %d requested samples\n",
-						sizeof(myf.frdata) / 2, needed/2);
+						(int)sizeof(myf.frdata) / 2, needed/2);
 					needed = sizeof(myf.frdata);
 				}
 				res = read(fds[0], myf.frdata, needed);
@@ -212,7 +219,7 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
 						res = -1;
 						break;
 					}
-					if (res < needed) { // last frame
+					if (res < needed) { /* last frame */
 						ast_log(LOG_DEBUG, "Last frame\n");
 						res=0;
 						break;
@@ -227,8 +234,9 @@ static int send_waveform_to_channel(struct ast_channel *chan, char *waveform, in
 	}
 	close(fds[0]);
 	close(fds[1]);
-//	if (pid > -1)
-//		kill(pid, SIGKILL);
+
+/*	if (pid > -1) */
+/*		kill(pid, SIGKILL); */
 	if (!res && owriteformat)
 		ast_set_write_format(chan, owriteformat);
 	return res;
@@ -247,6 +255,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 	struct localuser *u;
  	struct sockaddr_in serv_addr;
 	struct hostent *serverhost;
+	struct ast_hostent ahp;
 	int fd;
 	FILE *fs;
 	char *host;
@@ -263,9 +272,9 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 	int i;
 	struct MD5Context md5ctx;
 	unsigned char MD5Res[16];
-	char MD5Hex[32];
-	char koko[4];
-	char cachefile[MAXFESTLEN];
+	char MD5Hex[33] = "";
+	char koko[4] = "";
+	char cachefile[MAXFESTLEN]="";
 	int readcache=0;
 	int writecache=0;
 	int strln;
@@ -276,7 +285,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 	char *intstr;
 	
 	struct ast_config *cfg;
-	cfg = ast_load(FESTIVAL_CONFIG);
+	cfg = ast_config_load(FESTIVAL_CONFIG);
 	if (!cfg) {
 		ast_log(LOG_WARNING, "No such configuration file %s\n", FESTIVAL_CONFIG);
 		return -1;
@@ -300,11 +309,9 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 	if (!(festivalcommand = ast_variable_retrieve(cfg, "general", "festivalcommand"))) {
 		festivalcommand = "(tts_textasterisk \"%s\" 'file)(quit)\n";
 	}
-	
-		
-
-	if (!vdata || !strlen(vdata)) {
+	if (!vdata || ast_strlen_zero(vdata)) {
 		ast_log(LOG_WARNING, "festival requires an argument (text)\n");
+		ast_config_destroy(cfg);
 		return -1;
 	}
 	strncpy(data, vdata, sizeof(data) - 1);
@@ -322,14 +329,16 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 
     	if (fd < 0) {
 		ast_log(LOG_WARNING,"festival_client: can't get socket\n");
+		ast_config_destroy(cfg);
         	return -1;
 	}
         memset(&serv_addr, 0, sizeof(serv_addr));
         if ((serv_addr.sin_addr.s_addr = inet_addr(host)) == -1) {
 	        /* its a name rather than an ipnum */
-	        serverhost = gethostbyname(host);
+	        serverhost = ast_gethostbyname(host, &ahp);
 	        if (serverhost == (struct hostent *)0) {
         	    	ast_log(LOG_WARNING,"festival_client: gethostbyname failed\n");
+			ast_config_destroy(cfg);
 	            	return -1;
         	}
 	        memmove(&serv_addr.sin_addr,serverhost->h_addr, serverhost->h_length);
@@ -339,6 +348,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
 
 	if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) {
 		ast_log(LOG_WARNING,"festival_client: connect to server failed\n");
+		ast_config_destroy(cfg);
         	return -1;
     	}
     	
@@ -346,21 +356,21 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
     	MD5Init(&md5ctx);
     	MD5Update(&md5ctx,(unsigned char const *)data,strlen(data));
     	MD5Final(MD5Res,&md5ctx);
-    	strcpy(MD5Hex,"");
+		MD5Hex[0] = '\0';
     	
     	/* Convert to HEX and look if there is any matching file in the cache 
     		directory */
     	for (i=0;i<16;i++) {
-    		sprintf(koko,"%X",MD5Res[i]);
-    		strcat(MD5Hex,koko);
+    		snprintf(koko, sizeof(koko), "%X",MD5Res[i]);
+    		strncat(MD5Hex, koko, sizeof(MD5Hex) - strlen(MD5Hex) - 1);
     	}
     	readcache=0;
     	writecache=0;
     	if (strlen(cachedir)+strlen(MD5Hex)+1<=MAXFESTLEN && (usecache==-1)) {
-    		sprintf(cachefile,"%s/%s",cachedir,MD5Hex);
+    		snprintf(cachefile, sizeof(cachefile), "%s/%s", cachedir, MD5Hex);
     		fdesc=open(cachefile,O_RDWR);
     		if (fdesc==-1) {
-    			fdesc=open(cachefile,O_CREAT|O_RDWR,0);
+    			fdesc=open(cachefile,O_CREAT|O_RDWR,0777);
     			if (fdesc!=-1) {
     				writecache=1;
     				strln=strlen((char *)data);
@@ -372,11 +382,12 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
     			}
     		} else {
     			read(fdesc,&strln,sizeof(int));
-    			ast_log(LOG_DEBUG,"Cache file exists, strln=%d, strlen=%d\n",strln,strlen((char *)data));
+    			ast_log(LOG_DEBUG,"Cache file exists, strln=%d, strlen=%d\n",strln,(int)strlen((char *)data));
     			if (strlen((char *)data)==strln) {
     				ast_log(LOG_DEBUG,"Size OK\n");
     				read(fdesc,&bigstring,strln);
-	    			if (strcmp(bigstring,data)==0) { 
+	    			bigstring[strln] = 0;
+				if (strcmp(bigstring,data)==0) { 
 	    				readcache=1;
 	    			} else {
 	    				ast_log(LOG_WARNING,"Strings do not match\n");
@@ -440,6 +451,7 @@ static int festival_exec(struct ast_channel *chan, void *vdata)
     		}
 	} while (strcmp(ack,"OK\n") != 0);
 	close(fd);
+	ast_config_destroy(cfg);
 	LOCAL_USER_REMOVE(u);                                                                                
 	return res;
 

apps/app_flash.c

@@ -11,21 +11,29 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/options.h>
-#include <sys/ioctl.h>
-#include <linux/zaptel.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <pthread.h>
+#include <sys/ioctl.h>
+#ifdef __linux__
+#include <linux/zaptel.h>
+#else
+#include <zaptel.h>
+#endif /* __linux__ */
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/options.h"
 
 static char *tdesc = "Flash zap trunk application";
 

apps/app_forkcdr.c

@@ -0,0 +1,100 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Fork CDR application
+ * Copyright Anthony Minessale anthmct@yahoo.com
+ * Development of this app Sponsered/Funded  by TAAN Softworks Corp
+ * 
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/cdr.h"
+#include "asterisk/module.h"
+
+static char *tdesc = "Fork The CDR into 2 separate entities.";
+static char *app = "ForkCDR";
+static char *synopsis = 
+"Forks the Call Data Record";
+static char *descrip = 
+"  ForkCDR([options]):  Causes the Call Data Record to fork an additional\n"
+	"cdr record starting from the time of the fork call\n"
+"If the option 'v' is passed all cdr variables will be passed along also.\n"
+"";
+
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static void ast_cdr_fork(struct ast_channel *chan) 
+{
+	struct ast_cdr *cdr;
+	struct ast_cdr *newcdr;
+	if (!chan || !(cdr = chan->cdr))
+		return;
+	while (cdr->next)
+		cdr = cdr->next;
+	if (!(newcdr = ast_cdr_dup(cdr)))
+		return;
+	ast_cdr_append(cdr, newcdr);
+	ast_cdr_reset(newcdr, AST_CDR_FLAG_KEEP_VARS);
+	if (!ast_test_flag(cdr, AST_CDR_FLAG_KEEP_VARS))
+		ast_cdr_free_vars(cdr, 0);
+	ast_set_flag(cdr, AST_CDR_FLAG_CHILD | AST_CDR_FLAG_LOCKED);
+}
+
+static int forkcdr_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	LOCAL_USER_ADD(u);
+	if (data && !ast_strlen_zero(data))
+		ast_set2_flag(chan->cdr, strchr((char *)data, 'v'), AST_CDR_FLAG_KEEP_VARS);
+	
+	ast_cdr_fork(chan);
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, forkcdr_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_getcpeid.c

@@ -3,29 +3,30 @@
  *
  * Execute arbitrary system commands
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2005, Digium, inc
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/adsi.h>
-#include <asterisk/options.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/adsi.h"
+#include "asterisk/options.h"
 
 static char *tdesc = "Get ADSI CPE ID";
 
@@ -34,9 +35,9 @@ static char *app = "GetCPEID";
 static char *synopsis = "Get ADSI CPE ID";
 
 static char *descrip =
-"  GetCPEID: Obtains and displays CPE ID and other information in order to\n"
-"properly setup zapata.conf for on-hook operations.  Returns -1 on hanup\n"
-"only.";
+"  GetCPEID: Obtains and displays ADSI CPE ID and other information in order\n"
+"to properly setup zapata.conf for on-hook operations.\n"
+"Returns -1 on hangup only.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -70,9 +71,9 @@ static int cpeid_exec(struct ast_channel *chan, void *idata)
 	stuff[2] = data[2];
 	stuff[3] = data[3];
 	memset(data, 0, sizeof(data));
-	strcpy(stuff[0], "** CPE Info **");
-	strcpy(stuff[1], "Identifying CPE...");
-	strcpy(stuff[2], "Please wait...");
+	strncpy(stuff[0], "** CPE Info **", sizeof(data[0]) - 1);
+	strncpy(stuff[1], "Identifying CPE...", sizeof(data[1]) - 1);
+	strncpy(stuff[2], "Please wait...", sizeof(data[2]) - 1);
 	res = adsi_load_session(chan, NULL, 0, 1);
 	if (res > 0) {
 		cpeid_setstatus(chan, stuff, 0);
@@ -83,8 +84,8 @@ static int cpeid_exec(struct ast_channel *chan, void *idata)
 				ast_verbose(VERBOSE_PREFIX_3 "Got CPEID of '%02x:%02x:%02x:%02x' on '%s'\n", cpeid[0], cpeid[1], cpeid[2], cpeid[3], chan->name);
 		}
 		if (res > -1) {
-			strcpy(stuff[1], "Measuring CPE...");
-			strcpy(stuff[2], "Please wait...");
+			strncpy(stuff[1], "Measuring CPE...", sizeof(data[1]) - 1);
+			strncpy(stuff[2], "Please wait...", sizeof(data[2]) - 1);
 			cpeid_setstatus(chan, stuff, 0);
 			res = adsi_get_cpeinfo(chan, &width, &height, &buttons, 0);
 			if (res > -1) {
@@ -95,14 +96,14 @@ static int cpeid_exec(struct ast_channel *chan, void *idata)
 		}
 		if (res > -1) {
 			if (gotcpeid)
-				sprintf(stuff[1], "CPEID: %02x:%02x:%02x:%02x", cpeid[0], cpeid[1], cpeid[2], cpeid[3]);
+				snprintf(stuff[1], sizeof(data[1]), "CPEID: %02x:%02x:%02x:%02x", cpeid[0], cpeid[1], cpeid[2], cpeid[3]);
 			else
-				strcpy(stuff[1], "CPEID Unknown");
+				strncpy(stuff[1], "CPEID Unknown", sizeof(data[1]) - 1);
 			if (gotgeometry) 
-				sprintf(stuff[2], "Geom: %dx%d, %d buttons", width, height, buttons);
+				snprintf(stuff[2], sizeof(data[2]), "Geom: %dx%d, %d buttons", width, height, buttons);
 			else
-				strcpy(stuff[2], "Geometry unknown");
-			strcpy(stuff[3], "Press # to exit");
+				strncpy(stuff[2], "Geometry unknown", sizeof(data[2]) - 1);
+			strncpy(stuff[3], "Press # to exit", sizeof(data[3]) - 1);
 			cpeid_setstatus(chan, stuff, 1);
 			for(;;) {
 				res = ast_waitfordigit(chan, 1000);

apps/app_groupcount.c

@@ -0,0 +1,296 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Group Manipulation Applications
+ *
+ * Copyright (c) 2004 - 2005, Digium Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/types.h>
+#include <regex.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/utils.h"
+#include "asterisk/cli.h"
+#include "asterisk/app.h"
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int group_count_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	int count;
+	struct localuser *u;
+	char group[80] = "";
+	char category[80] = "";
+	char ret[80] = "";
+	char *grp;
+	static int deprecation_warning = 0;
+
+	LOCAL_USER_ADD(u);
+
+	if (!deprecation_warning) {
+	        ast_log(LOG_WARNING, "The GetGroupCount application has been deprecated, please use the GROUP_COUNT function.\n");
+		deprecation_warning = 1;
+	}
+
+	ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category));
+
+	if (ast_strlen_zero(group)) {
+		grp = pbx_builtin_getvar_helper(chan, category);
+		strncpy(group, grp, sizeof(group) - 1);
+	}
+
+	count = ast_app_group_get_count(group, category);
+	snprintf(ret, sizeof(ret), "%d", count);
+	pbx_builtin_setvar_helper(chan, "GROUPCOUNT", ret);
+
+	LOCAL_USER_REMOVE(u);
+
+	return res;
+}
+
+static int group_match_count_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	int count;
+	struct localuser *u;
+	char group[80] = "";
+	char category[80] = "";
+	char ret[80] = "";
+	static int deprecation_warning = 0;
+
+	LOCAL_USER_ADD(u);
+
+	if (!deprecation_warning) {
+	        ast_log(LOG_WARNING, "The GetGroupMatchCount application has been deprecated, please use the GROUP_MATCH_COUNT function.\n");
+		deprecation_warning = 1;
+	}
+
+	ast_app_group_split_group(data, group, sizeof(group), category, sizeof(category));
+
+	if (!ast_strlen_zero(group)) {
+		count = ast_app_group_match_get_count(group, category);
+		snprintf(ret, sizeof(ret), "%d", count);
+		pbx_builtin_setvar_helper(chan, "GROUPCOUNT", ret);
+	}
+
+	LOCAL_USER_REMOVE(u);
+
+	return res;
+}
+
+static int group_set_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+	        ast_log(LOG_WARNING, "The SetGroup application has been deprecated, please use the GROUP() function.\n");
+		deprecation_warning = 1;
+	}
+
+	LOCAL_USER_ADD(u);
+
+	if (ast_app_group_set_channel(chan, data))
+		ast_log(LOG_WARNING, "SetGroup requires an argument (group name)\n");
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int group_check_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	int max, count;
+	struct localuser *u;
+	char limit[80]="";
+	char category[80]="";
+	static int deprecation_warning = 0;
+
+	LOCAL_USER_ADD(u);
+
+	if (!deprecation_warning) {
+	        ast_log(LOG_WARNING, "The CheckGroup application has been deprecated, please use a combination of the GotoIf application and the GROUP_COUNT() function.\n");
+		deprecation_warning = 1;
+	}
+
+	if (!data || ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "CheckGroup requires an argument(max[@category])\n");
+		return res;
+	}
+
+  	ast_app_group_split_group(data, limit, sizeof(limit), category, sizeof(category));
+
+ 	if ((sscanf(limit, "%d", &max) == 1) && (max > -1)) {
+		count = ast_app_group_get_count(pbx_builtin_getvar_helper(chan, category), category);
+		if (count > max) {
+			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+				chan->priority += 100;
+			else
+				res = -1;
+		}
+	} else
+		ast_log(LOG_WARNING, "CheckGroup requires a positive integer argument (max)\n");
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int group_show_channels(int fd, int argc, char *argv[])
+{
+#define FORMAT_STRING  "%-25s  %-20s  %-20s\n"
+
+	struct ast_channel *c = NULL;
+	int numchans = 0;
+	struct ast_var_t *current;
+	struct varshead *headp;
+	regex_t regexbuf;
+	int havepattern = 0;
+
+	if (argc < 3 || argc > 4)
+		return RESULT_SHOWUSAGE;
+	
+	if (argc == 4) {
+		if (regcomp(&regexbuf, argv[3], REG_EXTENDED | REG_NOSUB))
+			return RESULT_SHOWUSAGE;
+		havepattern = 1;
+	}
+
+	ast_cli(fd, FORMAT_STRING, "Channel", "Group", "Category");
+	while ( (c = ast_channel_walk_locked(c)) != NULL) {
+		headp=&c->varshead;
+		AST_LIST_TRAVERSE(headp,current,entries) {
+			if (!strncmp(ast_var_name(current), GROUP_CATEGORY_PREFIX "_", strlen(GROUP_CATEGORY_PREFIX) + 1)) {
+				if (!havepattern || !regexec(&regexbuf, ast_var_value(current), 0, NULL, 0)) {
+					ast_cli(fd, FORMAT_STRING, c->name, ast_var_value(current),
+						(ast_var_name(current) + strlen(GROUP_CATEGORY_PREFIX) + 1));
+					numchans++;
+				}
+			} else if (!strcmp(ast_var_name(current), GROUP_CATEGORY_PREFIX)) {
+				if (!havepattern || !regexec(&regexbuf, ast_var_value(current), 0, NULL, 0)) {
+					ast_cli(fd, FORMAT_STRING, c->name, ast_var_value(current), "(default)");
+					numchans++;
+				}
+			}
+		}
+		numchans++;
+		ast_mutex_unlock(&c->lock);
+	}
+
+	if (havepattern)
+		regfree(&regexbuf);
+
+	ast_cli(fd, "%d active channel%s\n", numchans, (numchans != 1) ? "s" : "");
+	return RESULT_SUCCESS;
+#undef FORMAT_STRING
+}
+
+static char *tdesc = "Group Management Routines";
+
+static char *app_group_count = "GetGroupCount";
+static char *app_group_set = "SetGroup";
+static char *app_group_check = "CheckGroup";
+static char *app_group_match_count = "GetGroupMatchCount";
+
+static char *group_count_synopsis = "Get the channel count of a group";
+static char *group_set_synopsis = "Set the channel's group";
+static char *group_check_synopsis = "Check the channel count of a group against a limit";
+static char *group_match_count_synopsis = "Get the channel count of all groups that match a pattern";
+
+static char *group_count_descrip =
+"Usage: GetGroupCount([groupname][@category])\n"
+"  Calculates the group count for the specified group, or uses\n"
+"the current channel's group if not specifed (and non-empty).\n"
+"Stores result in GROUPCOUNT.  Always returns 0.\n"
+"This application has been deprecated, please use the function\n"
+"GroupCount.\n";
+
+static char *group_set_descrip =
+"Usage: SetGroup(groupname[@category])\n"
+"  Sets the channel group to the specified value.  Equivalent to\n"
+"Set(GROUP=group).  Always returns 0.\n";
+
+static char *group_check_descrip =
+"Usage: CheckGroup(max[@category])\n"
+"  Checks that the current number of total channels in the\n"
+"current channel's group does not exceed 'max'.  If the number\n"
+"does not exceed 'max', we continue to the next step. If the\n"
+"number does in fact exceed max, if priority n+101 exists, then\n"
+"execution continues at that step, otherwise -1 is returned.\n";
+
+static char *group_match_count_descrip =
+"Usage: GetGroupMatchCount(groupmatch[@category])\n"
+"  Calculates the group count for all groups that match the specified\n"
+"pattern. Uses standard regular expression matching (see regex(7)).\n"
+"Stores result in GROUPCOUNT.  Always returns 0.\n"
+"This application has been deprecated, please use the function\n"
+"GroupMatchCount.\n";
+
+static char show_channels_usage[] = 
+"Usage: group show channels [pattern]\n"
+"       Lists all currently active channels with channel group(s) specified.\n       Optional regular expression pattern is matched to group names for each channel.\n";
+
+static struct ast_cli_entry  cli_show_channels =
+	{ { "group", "show", "channels", NULL }, group_show_channels, "Show active channels with group(s)", show_channels_usage};
+
+int unload_module(void)
+{
+	int res;
+	STANDARD_HANGUP_LOCALUSERS;
+	ast_cli_unregister(&cli_show_channels);
+	res = ast_unregister_application(app_group_count);
+	res |= ast_unregister_application(app_group_set);
+	res |= ast_unregister_application(app_group_check);
+	res |= ast_unregister_application(app_group_match_count);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+	res = ast_register_application(app_group_count, group_count_exec, group_count_synopsis, group_count_descrip);
+	res |= ast_register_application(app_group_set, group_set_exec, group_set_synopsis, group_set_descrip);
+	res |= ast_register_application(app_group_check, group_check_exec, group_check_synopsis, group_check_descrip);
+	res |= ast_register_application(app_group_match_count, group_match_count_exec, group_match_count_synopsis, group_match_count_descrip);
+	ast_cli_register(&cli_show_channels);
+	return res;
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_hasnewvoicemail.c

@@ -1,8 +1,11 @@
 /*
  * Asterisk -- A telephony toolkit for Linux.
  *
- * HasNewVoicemail application
- *
+ * HasVoicemail application
+ * Changes Copyright (c) 2004 - 2005 Todd Freeman <freeman@andrews.edu>
+ * 
+ * 95% based on HasNewVoicemail by:
+ * 
  * Copyright (c) 2003 Tilghman Lesher.  All rights reserved.
  * 
  * Tilghman Lesher <asterisk-hasnewvoicemail-app@the-tilghman.com>
@@ -29,61 +32,85 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 #include <dirent.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
-#include "../astconf.h"
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/utils.h"
+
+static char *tdesc = "Indicator for whether a voice mailbox has messages in a given folder.";
+static char *app_hasvoicemail = "HasVoicemail";
+static char *hasvoicemail_synopsis = "Conditionally branches to priority + 101";
+static char *hasvoicemail_descrip =
+"HasVoicemail(vmbox[@context][:folder][|varname])\n"
+"  Branches to priority + 101, if there is voicemail in folder indicated."
+"  Optionally sets <varname> to the number of messages in that folder."
+"  Assumes folder of INBOX if not specified.\n";
 
-static char *tdesc = "Indicator for whether a voice mailbox has new messages.";
 static char *app_hasnewvoicemail = "HasNewVoicemail";
 static char *hasnewvoicemail_synopsis = "Conditionally branches to priority + 101";
 static char *hasnewvoicemail_descrip =
-"HasNewVoicemail(vmbox[@context][|varname])\n"
-"  Branches to priority + 101, if there is new voicemail"
-"  Optionally sets <varname> to the number of new messages.\n";
+"HasNewVoicemail(vmbox[/folder][@context][|varname])\n"
+"  Branches to priority + 101, if there is voicemail in folder 'folder' or INBOX.\n"
+"if folder is not specified. Optionally sets <varname> to the number of messages\n" 
+"in that folder.\n";
 
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static int hasnewvoicemail_exec(struct ast_channel *chan, void *data)
+static int hasvoicemail_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
 	struct localuser *u;
-	char vmpath[256], *input, *varname = NULL, *vmbox, *context = "default";
+	char vmpath[256], *temps, *input, *varname = NULL, *vmbox, *context = "default";
+	char *vmfolder;
 	DIR *vmdir;
 	struct dirent *vment;
 	int vmcount = 0;
 
 	if (!data) {
-		ast_log(LOG_WARNING, "HasNewVoicemail requires an argument (vm-box[@context]|varname)\n");
+		ast_log(LOG_WARNING, "HasVoicemail requires an argument (vm-box[@context][:folder]|varname)\n");
 		return -1;
 	}
 	LOCAL_USER_ADD(u);
 
 	input = ast_strdupa((char *)data);
 	if (input) {
-		if ((vmbox = strsep(&input,"|")))
-			varname = input;
-		else
-			vmbox = input;
-
-		if (index(vmbox,'@')) {
-			context = vmbox;
-			vmbox = strsep(&context,"@");
+		temps = input;
+		if ((temps = strsep(&input, "|"))) {
+			if (input && !ast_strlen_zero(input))
+				varname = input;
+			input = temps;
 		}
-
-		snprintf(vmpath,sizeof(vmpath), "%s/voicemail/%s/%s/INBOX", (char *)ast_config_AST_SPOOL_DIR, context, vmbox);
+		if ((temps = strsep(&input, ":"))) {
+			if (input && !ast_strlen_zero(input))
+				vmfolder = input;
+			input = temps;
+		}
+		if ((vmbox = strsep(&input, "@")))
+			if (input && !ast_strlen_zero(input))
+				context = input;
+		if (!vmbox)
+			vmbox = input;
+		vmfolder = strchr(vmbox, '/');
+		if (vmfolder) {
+			*vmfolder = '\0';
+			vmfolder++;
+		} else
+			vmfolder = "INBOX";
+		snprintf(vmpath,sizeof(vmpath), "%s/voicemail/%s/%s/%s", (char *)ast_config_AST_SPOOL_DIR, context, vmbox, vmfolder);
 		if (!(vmdir = opendir(vmpath))) {
 			ast_log(LOG_NOTICE, "Voice mailbox %s at %s does not exist\n", vmbox, vmpath);
 		} else {
@@ -97,13 +124,13 @@ static int hasnewvoicemail_exec(struct ast_channel *chan, void *data)
 		/* Set the count in the channel variable */
 		if (varname) {
 			char tmp[12];
-			snprintf(tmp, sizeof(tmp) - 1, "%d", vmcount);
+			snprintf(tmp, sizeof(tmp), "%d", vmcount);
 			pbx_builtin_setvar_helper(chan, varname, tmp);
 		}
 
 		if (vmcount > 0) {
 			/* Branch to the next extension */
-			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) {
+			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
 				chan->priority += 100;
 			} else
 				ast_log(LOG_WARNING, "VM box %s@%s has new voicemail, but extension %s, priority %d doesn't exist\n", vmbox, context, chan->exten, chan->priority + 101);
@@ -118,13 +145,19 @@ static int hasnewvoicemail_exec(struct ast_channel *chan, void *data)
 
 int unload_module(void)
 {
+	int res;
 	STANDARD_HANGUP_LOCALUSERS;
-	return ast_unregister_application(app_hasnewvoicemail);
+	res = ast_unregister_application(app_hasvoicemail);
+	res |= ast_unregister_application(app_hasnewvoicemail);
+	return res;
 }
 
 int load_module(void)
 {
-	return ast_register_application(app_hasnewvoicemail, hasnewvoicemail_exec, hasnewvoicemail_synopsis, hasnewvoicemail_descrip);
+	int res;
+	res = ast_register_application(app_hasvoicemail, hasvoicemail_exec, hasvoicemail_synopsis, hasvoicemail_descrip);
+	res |= ast_register_application(app_hasnewvoicemail, hasvoicemail_exec, hasnewvoicemail_synopsis, hasnewvoicemail_descrip);
+	return res;
 }
 
 char *description(void)

apps/app_ices.c

@@ -0,0 +1,200 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Stream to an icecast server via ICES (see contrib/asterisk-ices.xml)
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <errno.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
+#define ICES "/usr/bin/ices"
+#define LOCAL_ICES "/usr/local/bin/ices"
+
+static char *tdesc = "Encode and Stream via icecast and ices";
+
+static char *app = "ICES";
+
+static char *synopsis = "Encode and stream using 'ices'";
+
+static char *descrip = 
+"  ICES(config.xml) Streams to an icecast server using ices\n"
+"(available separately).  A configuration file must be supplied\n"
+"for ices (see examples/asterisk-ices.conf).  Returns  -1  on\n"
+"hangup or 0 otherwise.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int icesencode(char *filename, int fd)
+{
+	int res;
+	int x;
+	res = fork();
+	if (res < 0) 
+		ast_log(LOG_WARNING, "Fork failed\n");
+	if (res)
+		return res;
+	dup2(fd, STDIN_FILENO);
+	for (x=STDERR_FILENO + 1;x<256;x++) {
+		if ((x != STDIN_FILENO) && (x != STDOUT_FILENO))
+			close(x);
+	}
+	/* Most commonly installed in /usr/local/bin */
+	execl(ICES, "ices", filename, (char *)NULL);
+	/* But many places has it in /usr/bin */
+	execl(LOCAL_ICES, "ices", filename, (char *)NULL);
+	/* As a last-ditch effort, try to use PATH */
+	execlp("ices", "ices", filename, (char *)NULL);
+	ast_log(LOG_WARNING, "Execute of ices failed\n");
+	return -1;
+}
+
+static int ices_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	int fds[2];
+	int ms = -1;
+	int pid = -1;
+	int flags;
+	int oreadformat;
+	struct timeval last;
+	struct ast_frame *f;
+	char filename[256]="";
+	char *c;
+	last.tv_usec = 0;
+	last.tv_sec = 0;
+	if (!data || !strlen(data)) {
+		ast_log(LOG_WARNING, "ICES requires an argument (configfile.xml)\n");
+		return -1;
+	}
+	if (pipe(fds)) {
+		ast_log(LOG_WARNING, "Unable to create pipe\n");
+		return -1;
+	}
+	flags = fcntl(fds[1], F_GETFL);
+	fcntl(fds[1], F_SETFL, flags | O_NONBLOCK);
+	
+	LOCAL_USER_ADD(u);
+	ast_stopstream(chan);
+
+	if (chan->_state != AST_STATE_UP)
+		res = ast_answer(chan);
+		
+	if (res) {
+		close(fds[0]);
+		close(fds[1]);
+		ast_log(LOG_WARNING, "Answer failed!\n");
+		return -1;
+	}
+
+	oreadformat = chan->readformat;
+	res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
+	if (res < 0) {
+		close(fds[0]);
+		close(fds[1]);
+		ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
+		return -1;
+	}
+	if (((char *)data)[0] == '/')
+		strncpy(filename, (char *)data, sizeof(filename) - 1);
+	else
+		snprintf(filename, sizeof(filename), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, (char *)data);
+	/* Placeholder for options */		
+	c = strchr(filename, '|');
+	if (c)
+		*c = '\0';	
+	res = icesencode(filename, fds[0]);
+	close(fds[0]);
+	if (res >= 0) {
+		pid = res;
+		for (;;) {
+			/* Wait for audio, and stream */
+			ms = ast_waitfor(chan, -1);
+			if (ms < 0) {
+				ast_log(LOG_DEBUG, "Hangup detected\n");
+				res = -1;
+				break;
+			}
+			f = ast_read(chan);
+			if (!f) {
+				ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
+				res = -1;
+				break;
+			}
+			if (f->frametype == AST_FRAME_VOICE) {
+				res = write(fds[1], f->data, f->datalen);
+				if (res < 0) {
+					if (errno != EAGAIN) {
+						ast_log(LOG_WARNING, "Write failed to pipe: %s\n", strerror(errno));
+						res = -1;
+						break;
+					}
+				}
+			}
+			ast_frfree(f);
+		}
+	}
+	close(fds[1]);
+	LOCAL_USER_REMOVE(u);
+	if (pid > -1)
+		kill(pid, SIGKILL);
+	if (!res && oreadformat)
+		ast_set_read_format(chan, oreadformat);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, ices_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_image.c

@@ -3,25 +3,29 @@
  *
  * App to transmit an image
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
 
 static char *tdesc = "Image Transmission Application";
 
@@ -52,7 +56,7 @@ static int sendimage_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 	if (!ast_supports_images(chan)) {
 		/* Does not support transport */
-		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
 			chan->priority += 100;
 		return 0;
 	}

apps/app_intercom.c

@@ -11,29 +11,34 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/frame.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/ioctl.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <sys/time.h>
-#ifdef __linux__
+#include <netinet/in.h>
+
+#if defined(__linux__)
 #include <linux/soundcard.h>
 #elif defined(__FreeBSD__)
-#include <machine/soundcard.h>
+#include <sys/soundcard.h>
 #else
 #include <soundcard.h>
 #endif
-#include <netinet/in.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/frame.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
 
 #ifdef __OpenBSD__
 #define DEV_DSP "/dev/audio"
@@ -58,7 +63,7 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static ast_mutex_t sound_lock = AST_MUTEX_INITIALIZER;
+AST_MUTEX_DEFINE_STATIC(sound_lock);
 static int sound = -1;
 
 static int write_audio(short *data, int len)

apps/app_ivrdemo.c

@@ -0,0 +1,120 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * IVR Demo application
+ * 
+ * Copyright (C) 2005, Mark Spencer
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
+
+static char *tdesc = "IVR Demo Application";
+static char *app = "IVRDemo";
+static char *synopsis = 
+"  This is a skeleton application that shows you the basic structure to create your\n"
+"own asterisk applications and demonstrates the IVR demo.\n";
+
+static int ivr_demo_func(struct ast_channel *chan, void *data)
+{
+	ast_verbose("IVR Demo, data is %s!\n", (char *)data);
+	return 0;
+}
+
+AST_IVR_DECLARE_MENU(ivr_submenu, "IVR Demo Sub Menu", 0, 
+{
+	{ "s", AST_ACTION_BACKGROUND, "demo-abouttotry" },
+	{ "s", AST_ACTION_WAITOPTION },
+	{ "1", AST_ACTION_PLAYBACK, "digits/1" },
+	{ "1", AST_ACTION_PLAYBACK, "digits/1" },
+	{ "1", AST_ACTION_RESTART },
+	{ "2", AST_ACTION_PLAYLIST, "digits/2;digits/3" },
+	{ "3", AST_ACTION_CALLBACK, ivr_demo_func },
+	{ "4", AST_ACTION_TRANSFER, "demo|s|1" },
+	{ "*", AST_ACTION_REPEAT },
+	{ "#", AST_ACTION_UPONE  },
+	{ NULL }
+});
+
+AST_IVR_DECLARE_MENU(ivr_demo, "IVR Demo Main Menu", 0, 
+{
+	{ "s", AST_ACTION_BACKGROUND, "demo-congrats" },
+	{ "g", AST_ACTION_BACKGROUND, "demo-instruct" },
+	{ "g", AST_ACTION_WAITOPTION },
+	{ "1", AST_ACTION_PLAYBACK, "digits/1" },
+	{ "1", AST_ACTION_RESTART },
+	{ "2", AST_ACTION_MENU, &ivr_submenu },
+	{ "2", AST_ACTION_RESTART },
+	{ "i", AST_ACTION_PLAYBACK, "invalid" },
+	{ "i", AST_ACTION_REPEAT, (void *)(unsigned long)2 },
+	{ "#", AST_ACTION_EXIT },
+	{ NULL },
+});
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int skel_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	if (!data) {
+		ast_log(LOG_WARNING, "skel requires an argument (filename)\n");
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	/* Do our thing here */
+	if (chan->_state != AST_STATE_UP)
+		res = ast_answer(chan);
+	if (!res)
+		res = ast_ivr_menu_run(chan, &ivr_demo, data);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, skel_exec, tdesc, synopsis);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_lookupblacklist.c

@@ -3,28 +3,32 @@
  *
  * App to lookup the callerid number, and see if it is blacklisted
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/callerid.h>
-#include <asterisk/astdb.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/astdb.h"
 
 static char *tdesc = "Look up Caller*ID name/number from blacklist database";
 
@@ -49,38 +53,30 @@ LOCAL_USER_DECL;
 static int
 lookupblacklist_exec (struct ast_channel *chan, void *data)
 {
-	char old_cid[144] = "", *num, *name;
 	char blacklist[1];
-	char shrunknum[64] = "";
 	struct localuser *u;
 	int bl = 0;
 
 	LOCAL_USER_ADD (u);
-	if (chan->callerid)
+	if (chan->cid.cid_num)
 	{
-		strncpy (old_cid, chan->callerid, sizeof (old_cid) - 1);
-		ast_callerid_parse (old_cid, &name, &num);
-		if (num)
-			strncpy (shrunknum, num, sizeof (shrunknum) - 1);
-		else
-			num = shrunknum;
-		
-		ast_shrink_phone_number (shrunknum);
-		if (!ast_db_get ("blacklist", shrunknum, blacklist, sizeof (blacklist)))
+		if (!ast_db_get ("blacklist", chan->cid.cid_num, blacklist, sizeof (blacklist)))
 		{
 			if (option_verbose > 2)
-				ast_log(LOG_NOTICE, "Blacklisted number %s found\n",shrunknum);
+				ast_log(LOG_NOTICE, "Blacklisted number %s found\n",chan->cid.cid_num);
 			bl = 1;
 		}
-		else if (!ast_db_get ("blacklist", name, blacklist, sizeof (blacklist)))
+	}
+	if (chan->cid.cid_name) {
+		if (!ast_db_get ("blacklist", chan->cid.cid_name, blacklist, sizeof (blacklist))) 
 		{
 			if (option_verbose > 2)
-				ast_log (LOG_NOTICE,"Blacklisted name \"%s\" found\n",name);
+				ast_log (LOG_NOTICE,"Blacklisted name \"%s\" found\n",chan->cid.cid_name);
 			bl = 1;
 		}
 	}
 	
-	if (bl && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+	if (bl && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
 		chan->priority+=100;
 	LOCAL_USER_REMOVE (u);
 	return 0;

apps/app_lookupcidname.c

@@ -3,28 +3,32 @@
  *
  * App to set callerid name from database, based on directory number
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/callerid.h>
-#include <asterisk/astdb.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/astdb.h"
 
 static char *tdesc = "Look up CallerID Name from local database";
 
@@ -47,32 +51,18 @@ LOCAL_USER_DECL;
 static int
 lookupcidname_exec (struct ast_channel *chan, void *data)
 {
-  char old_cid[144] = "", *num, *name;
-  char new_cid[144];
   char dbname[64];
-  char shrunknum[64] = "";
   struct localuser *u;
 
   LOCAL_USER_ADD (u);
-  if (chan->callerid)
-    {
-      strncpy (old_cid, chan->callerid, sizeof (old_cid) - 1);
-      ast_callerid_parse (old_cid, &name, &num);	/* this destroys the original string */
-      if (num)			/* It's possible to get an empty number */
-	strncpy (shrunknum, num, sizeof (shrunknum) - 1);
-      else
-	num = shrunknum;
-      ast_shrink_phone_number (shrunknum);
-      if (!ast_db_get ("cidname", shrunknum, dbname, sizeof (dbname)))
-	{
-	  snprintf (new_cid, sizeof (new_cid), "\"%s\" <%s>", dbname, num);
-	  ast_set_callerid (chan, new_cid, 0);
-	  if (option_verbose > 2)
-	    ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",
-			 new_cid);
+  if (chan->cid.cid_num) {
+	if (!ast_db_get ("cidname", chan->cid.cid_num, dbname, sizeof (dbname))) {
+		ast_set_callerid (chan, NULL, dbname, NULL);
+		  if (option_verbose > 2)
+		    ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID name to %s\n",
+				 dbname);
 	}
-
-    }
+  }
   LOCAL_USER_REMOVE (u);
   return 0;
 }

apps/app_macro.c

@@ -3,7 +3,7 @@
  *
  * Macro Implementation
  * 
- * Copyright (C) 2003, Digium
+ * Copyright (C) 2003 - 2005, Digium, Inc.
  *
  * Mark Spencer <markster@digium.com>
  *
@@ -12,39 +12,64 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/options.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/config.h"
+#include "asterisk/utils.h"
+#include "asterisk/lock.h"
 
 #define MAX_ARGS 80
 
+/* special result value used to force macro exit */
+#define MACRO_EXIT_RESULT 1024
+
 static char *tdesc = "Extension Macros";
 
 static char *descrip =
 "  Macro(macroname|arg1|arg2...): Executes a macro using the context\n"
 "'macro-<macroname>', jumping to the 's' extension of that context and\n"
-"executing each step, then returning when the steps end.  The calling\n"
-"extension, context, and priority are stored in ${MACRO_EXTEN}, \n"
+"executing each step, then returning when the steps end. \n"
+"The calling extension, context, and priority are stored in ${MACRO_EXTEN}, \n"
 "${MACRO_CONTEXT} and ${MACRO_PRIORITY} respectively.  Arguments become\n"
-"${ARG1}, ${ARG2}, etc in the macro context.  Macro returns -1 if\n"
-"any step in the macro returns -1, and 0 otherwise.  If you Goto out\n"
-"of the Macro context, the Macro will terminate and control will be return\n"
-"at the location of the Goto.  Otherwise if ${MACRO_OFFSET} is set at\n"
-"termination, Macro will attempt to continue at priority\n"
-"MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n";
+"${ARG1}, ${ARG2}, etc in the macro context.\n"
+"If you Goto out of the Macro context, the Macro will terminate and control\n"
+"will be returned at the location of the Goto.\n"
+"Macro returns -1 if any step in the macro returns -1, and 0 otherwise.\n" 
+"If ${MACRO_OFFSET} is set at termination, Macro will attempt to continue\n"
+"at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n";
+
+static char *if_descrip =
+"  MacroIf(<expr>?macroname_a[|arg1][:macroname_b[|arg1]])\n"
+"Executes macro defined in <macroname_a> if <expr> is true\n"
+"(otherwise <macroname_b> if provided)\n"
+"Arguments and return values as in application macro()\n";
+
+static char *exit_descrip =
+"  MacroExit():\n"
+"Causes the currently running macro to exit as if it had\n"
+"ended normally by running out of priorities to execute.\n"
+"If used outside a macro, will likely cause unexpected\n"
+"behavior.\n";
 
 static char *app = "Macro";
+static char *if_app = "MacroIf";
+static char *exit_app = "MacroExit";
 
 static char *synopsis = "Macro Implementation";
+static char *if_synopsis = "Conditional Macro Implementation";
+static char *exit_synopsis = "Exit From Macro";
 
 STANDARD_LOCAL_USER;
 
@@ -52,184 +77,240 @@ LOCAL_USER_DECL;
 
 static int macro_exec(struct ast_channel *chan, void *data)
 {
-  char tmp[256] = "";
-  char *cur, *rest;
-  char *macro;
-  char fullmacro[80];
-  char varname[80];
-  char *oldargs[MAX_ARGS + 1] = { NULL, };
-  int argc, x;
-  int res=0;
-  char oldexten[256]="";
-  int oldpriority;
-  char pc[80];
-  char oldcontext[256] = "";
-  char *offsets;
-  int offset;
-  int setmacrocontext=0;
+	char *tmp;
+	char *cur, *rest;
+	char *macro;
+	char fullmacro[80];
+	char varname[80];
+	char *oldargs[MAX_ARGS + 1] = { NULL, };
+	int argc, x;
+	int res=0;
+	char oldexten[256]="";
+	int oldpriority;
+	char pc[80];
+	char oldcontext[AST_MAX_CONTEXT] = "";
+	char *offsets;
+	int offset;
+	int setmacrocontext=0;
+	int autoloopflag;
   
-  char *save_macro_exten;
-  char *save_macro_context;
-  char *save_macro_priority;
-  char *save_macro_offset;
+	char *save_macro_exten;
+	char *save_macro_context;
+	char *save_macro_priority;
+	char *save_macro_offset;
+	struct localuser *u;
   
-  if (!data || !strlen(data)) {
-    ast_log(LOG_WARNING, "Invalid Macro incantation\n");
-    return 0;
-  }
-  strncpy(tmp, data, sizeof(tmp) - 1);
-  rest = tmp;
-  macro = strsep(&rest, "|");
-  if (!macro || !strlen(macro)) {
-  	ast_log(LOG_WARNING, "Invalid macro name specified\n");
-	return 0;
-  }
-  snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro);
-  if (!ast_exists_extension(chan, fullmacro, "s", 1, chan->callerid)) {
-  	if (!ast_context_find(fullmacro)) 
-		ast_log(LOG_WARNING, "No such context '%s' for macro '%s'\n", fullmacro, macro);
-	else
-	  	ast_log(LOG_WARNING, "Context '%s' for macro '%s' lacks 's' extension, priority 1\n", fullmacro, macro);
-	return 0;
-  }
-  /* Save old info */
-  oldpriority = chan->priority;
-  strncpy(oldexten, chan->exten, sizeof(oldexten) - 1);
-  strncpy(oldcontext, chan->context, sizeof(oldcontext) - 1);
-  if (!strlen(chan->macrocontext)) {
-	strncpy(chan->macrocontext, chan->context, sizeof(chan->macrocontext) - 1);
-	strncpy(chan->macroexten, chan->exten, sizeof(chan->macroexten) - 1);
-	chan->macropriority = chan->priority;
-	setmacrocontext=1;
-  }
-  argc = 1;
-  /* Save old macro variables */
-  save_macro_exten = pbx_builtin_getvar_helper(chan, "MACRO_EXTEN");
-  if (save_macro_exten) save_macro_exten = strdup(save_macro_exten);
-  pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", oldexten);
+	if (!data || ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "Macro() requires arguments. See \"show application macro\" for help.\n");
+		return 0;
+	}
 
-  save_macro_context = pbx_builtin_getvar_helper(chan, "MACRO_CONTEXT");
-  if (save_macro_context) save_macro_context = strdup(save_macro_context);
-  pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", oldcontext);
+	tmp = ast_strdupa((char *) data);
+	rest = tmp;
+	macro = strsep(&rest, "|");
+	if (!macro || ast_strlen_zero(macro)) {
+		ast_log(LOG_WARNING, "Invalid macro name specified\n");
+		return 0;
+	}
+	snprintf(fullmacro, sizeof(fullmacro), "macro-%s", macro);
+	if (!ast_exists_extension(chan, fullmacro, "s", 1, chan->cid.cid_num)) {
+  		if (!ast_context_find(fullmacro)) 
+			ast_log(LOG_WARNING, "No such context '%s' for macro '%s'\n", fullmacro, macro);
+		else
+	  		ast_log(LOG_WARNING, "Context '%s' for macro '%s' lacks 's' extension, priority 1\n", fullmacro, macro);
+		return 0;
+	}
 
-  save_macro_priority = pbx_builtin_getvar_helper(chan, "MACRO_PRIORITY");
-  if (save_macro_priority) save_macro_priority = strdup(save_macro_priority);
-  snprintf(pc, sizeof(pc), "%d", oldpriority);
-  pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", pc);
+	LOCAL_USER_ADD(u);
+	/* Save old info */
+	oldpriority = chan->priority;
+	ast_copy_string(oldexten, chan->exten, sizeof(oldexten));
+	ast_copy_string(oldcontext, chan->context, sizeof(oldcontext));
+	if (ast_strlen_zero(chan->macrocontext)) {
+		ast_copy_string(chan->macrocontext, chan->context, sizeof(chan->macrocontext));
+		ast_copy_string(chan->macroexten, chan->exten, sizeof(chan->macroexten));
+		chan->macropriority = chan->priority;
+		setmacrocontext=1;
+	}
+	argc = 1;
+	/* Save old macro variables */
+	save_macro_exten = pbx_builtin_getvar_helper(chan, "MACRO_EXTEN");
+	if (save_macro_exten) 
+		save_macro_exten = strdup(save_macro_exten);
+	pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", oldexten);
+
+	save_macro_context = pbx_builtin_getvar_helper(chan, "MACRO_CONTEXT");
+	if (save_macro_context)
+		save_macro_context = strdup(save_macro_context);
+	pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", oldcontext);
+
+	save_macro_priority = pbx_builtin_getvar_helper(chan, "MACRO_PRIORITY");
+	if (save_macro_priority) 
+		save_macro_priority = strdup(save_macro_priority);
+	snprintf(pc, sizeof(pc), "%d", oldpriority);
+	pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", pc);
   
-  save_macro_offset = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET");
-  if (save_macro_offset) save_macro_offset = strdup(save_macro_offset);
-  pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL);
+	save_macro_offset = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET");
+	if (save_macro_offset) 
+		save_macro_offset = strdup(save_macro_offset);
+	pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", NULL);
 
-  /* Setup environment for new run */
-  strcpy(chan->exten, "s");
-  strncpy(chan->context, fullmacro, sizeof(chan->context));
-  chan->priority = 1;
+	/* Setup environment for new run */
+	chan->exten[0] = 's';
+	chan->exten[1] = '\0';
+	ast_copy_string(chan->context, fullmacro, sizeof(chan->context));
+	chan->priority = 1;
 
-  while((cur = strsep(&rest, "|")) && (argc < MAX_ARGS)) {
-  	/* Save copy of old arguments if we're overwriting some, otherwise
-	   let them pass through to the other macro */
-  	snprintf(varname, sizeof(varname), "ARG%d", argc);
-	oldargs[argc] = pbx_builtin_getvar_helper(chan, varname);
-	if (oldargs[argc])
-		oldargs[argc] = strdup(oldargs[argc]);
-	pbx_builtin_setvar_helper(chan, varname, cur);
-	argc++;
-  }
-  while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid)) {
-	if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid))) {
-		/* Something bad happened, or a hangup has been requested. */
-		if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F'))) {
-			/* Just return result as to the previous application as if it had been dialed */
-			ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res);
+	while((cur = strsep(&rest, "|")) && (argc < MAX_ARGS)) {
+  		/* Save copy of old arguments if we're overwriting some, otherwise
+	   	let them pass through to the other macro */
+  		snprintf(varname, sizeof(varname), "ARG%d", argc);
+		oldargs[argc] = pbx_builtin_getvar_helper(chan, varname);
+		if (oldargs[argc])
+			oldargs[argc] = strdup(oldargs[argc]);
+		pbx_builtin_setvar_helper(chan, varname, cur);
+		argc++;
+	}
+	autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP);
+	ast_set_flag(chan, AST_FLAG_IN_AUTOLOOP);
+	while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
+		if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) {
+			/* Something bad happened, or a hangup has been requested. */
+			if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||
+		    	(res == '*') || (res == '#')) {
+				/* Just return result as to the previous application as if it had been dialed */
+				ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res);
+				break;
+			}
+			switch(res) {
+	        	case MACRO_EXIT_RESULT:
+                        	res = 0;
+				goto out;
+			case AST_PBX_KEEPALIVE:
+				if (option_debug)
+					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
+				else if (option_verbose > 1)
+					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
+				goto out;
+				break;
+			default:
+				if (option_debug)
+					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
+				else if (option_verbose > 1)
+					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
+				goto out;
+			}
+		}
+		if (strcasecmp(chan->context, fullmacro)) {
+			if (option_verbose > 1)
+				ast_verbose(VERBOSE_PREFIX_2 "Channel '%s' jumping out of macro '%s'\n", chan->name, macro);
 			break;
 		}
-		switch(res) {
-		case AST_PBX_KEEPALIVE:
-			if (option_debug)
-				ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
-			else if (option_verbose > 1)
-				ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
-			goto out;
-			break;
-		default:
-			if (option_debug)
-				ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
-			else if (option_verbose > 1)
-				ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
+		/* don't stop executing extensions when we're in "h" */
+		if (chan->_softhangup && strcasecmp(oldexten,"h")) {
+			ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
+				chan->exten, chan->priority);
 			goto out;
 		}
-	}
-	if (strcasecmp(chan->context, fullmacro)) {
-		if (option_verbose > 1)
-			ast_verbose(VERBOSE_PREFIX_2 "Channel '%s' jumping out of macro '%s'\n", chan->name, macro);
-		break;
-	}
-	/* don't stop executing extensions when we're in "h" */
-	if (chan->_softhangup && strcasecmp(oldexten,"h")) {
-		ast_log(LOG_DEBUG, "Extension %s, priority %d returned normally even though call was hung up\n",
-			chan->exten, chan->priority);
-		goto out;
-	}
-	chan->priority++;
-  }
-out:
-  for (x=1;x<argc;x++) {
-  	/* Restore old arguments and delete ours */
-	snprintf(varname, sizeof(varname), "ARG%d", x);
-  	if (oldargs[x]) {
-		pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
-		free(oldargs[x]);
-	} else {
-		pbx_builtin_setvar_helper(chan, varname, NULL);
-	}
-  }
+		chan->priority++;
+  	}
+	out:
+	ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
+  	for (x=1; x<argc; x++) {
+  		/* Restore old arguments and delete ours */
+		snprintf(varname, sizeof(varname), "ARG%d", x);
+  		if (oldargs[x]) {
+			pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
+			free(oldargs[x]);
+		} else {
+			pbx_builtin_setvar_helper(chan, varname, NULL);
+		}
+  	}
 
-  /* Restore macro variables */
-  pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
-  if (save_macro_exten) free(save_macro_exten);
-  pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
-  if (save_macro_context) free(save_macro_context);
-  pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
-  if (save_macro_priority) free(save_macro_priority);
-  if (setmacrocontext) {
-  	strcpy(chan->macrocontext, "");
-  	strcpy(chan->macroexten, "");
-	chan->macropriority = 0;
-  }
+	/* Restore macro variables */
+	pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
+	if (save_macro_exten)
+		free(save_macro_exten);
+	pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
+	if (save_macro_context)
+		free(save_macro_context);
+	pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
+	if (save_macro_priority)
+		free(save_macro_priority);
+	if (setmacrocontext) {
+		chan->macrocontext[0] = '\0';
+		chan->macroexten[0] = '\0';
+		chan->macropriority = 0;
+	}
 
-  if (!strcasecmp(chan->context, fullmacro)) {
-  	/* If we're leaving the macro normally, restore original information */
-	chan->priority = oldpriority;
-	strncpy(chan->context, oldcontext, sizeof(chan->context) - 1);
-	if (!chan->_softhangup) {
-		/* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */
-		strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1);
-		if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
-			/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
-			   normally if there is any problem */
-			if (sscanf(offsets, "%d", &offset) == 1) {
-				if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->callerid)) {
-					chan->priority += offset;
+	if (!strcasecmp(chan->context, fullmacro)) {
+  		/* If we're leaving the macro normally, restore original information */
+		chan->priority = oldpriority;
+		ast_copy_string(chan->context, oldcontext, sizeof(chan->context));
+		if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) {
+			/* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */
+			ast_copy_string(chan->exten, oldexten, sizeof(chan->exten));
+			if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
+				/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
+			   	normally if there is any problem */
+				if (sscanf(offsets, "%d", &offset) == 1) {
+					if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->cid.cid_num)) {
+						chan->priority += offset;
+					}
 				}
 			}
 		}
 	}
-  }
 
-  pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
-  if (save_macro_offset) free(save_macro_offset);
-  return res;
+	pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
+	if (save_macro_offset)
+		free(save_macro_offset);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int macroif_exec(struct ast_channel *chan, void *data) 
+{
+	char *expr = NULL, *label_a = NULL, *label_b = NULL;
+	int res = 0;
+
+	if((expr = ast_strdupa((char *) data))) {
+		if ((label_a = strchr(expr, '?'))) {
+			*label_a = '\0';
+			label_a++;
+			if ((label_b = strchr(label_a, ':'))) {
+				*label_b = '\0';
+				label_b++;
+			}
+			if (ast_true(expr))
+				macro_exec(chan, label_a);
+			else if (label_b) 
+				macro_exec(chan, label_b);
+			
+		} else
+			ast_log(LOG_WARNING, "Invalid Syntax.\n");
+	} else 
+		ast_log(LOG_ERROR, "Out of Memory!\n");
+	return res;
+}
+			
+static int macro_exit_exec(struct ast_channel *chan, void *data)
+{
+	return MACRO_EXIT_RESULT;
 }
 
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
+	ast_unregister_application(if_app);
+	ast_unregister_application(exit_app);
 	return ast_unregister_application(app);
 }
 
 int load_module(void)
 {
+	ast_register_application(exit_app, macro_exit_exec, exit_synopsis, exit_descrip);
+	ast_register_application(if_app, macroif_exec, if_synopsis, if_descrip);
 	return ast_register_application(app, macro_exec, synopsis, descrip);
 }
 

apps/app_math.c

@@ -0,0 +1,278 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * simple math application
+ * 
+ * Copyright (C) 2004 - 2005, Andy Powell 
+ *
+ * Updated by Mark Spencer <markster@digium.com>
+ *
+ */
+
+#include <stdlib.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <time.h>
+#include <dirent.h>
+#include <ctype.h>
+#include <sys/file.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/options.h"
+#include "asterisk/config.h"
+#include "asterisk/say.h"
+#include "asterisk/module.h"
+#include "asterisk/app.h"
+#include "asterisk/manager.h"
+#include "asterisk/localtime.h"
+#include "asterisk/cli.h"
+#include "asterisk/utils.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
+static char *tdesc = "Basic Math Functions";
+
+static char *app_math = "Math";
+
+static char *math_synopsis = "Performs Mathematical Functions";
+
+static char *math_descrip =
+"Math(returnvar,<number1><op><number 2>\n\n"
+"Perform floating point calculation on number 1 to number 2 and \n"
+"store the result in returnvar.  Valid ops are: \n"
+"    +,-,/,*,%,<,>,>=,<=,==\n"
+"and behave as their C equivalents.  Always returns 0.\n";
+
+#define ADDFUNCTION 0
+#define DIVIDEFUNCTION 1
+#define MULTIPLYFUNCTION 2
+#define SUBTRACTFUNCTION 3
+#define MODULUSFUNCTION 4
+
+#define GTFUNCTION 5
+#define LTFUNCTION 6
+#define GTEFUNCTION 7
+#define LTEFUNCTION 8
+#define EQFUNCTION 9
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int math_exec(struct ast_channel *chan, void *data) 
+{
+	float fnum1;
+	float fnum2;
+	float ftmp = 0;
+	char *op;
+	int iaction=-1;
+	static int deprecation_warning = 0;
+
+	/* dunno, big calulations :D */
+	char user_result[30];
+
+	char *s;
+	char *mvar, *mvalue1, *mvalue2=NULL;
+		
+	struct localuser *u;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "Math() is deprecated, please use Set(var=${MATH(...)} instead.\n");
+		deprecation_warning = 1;
+	}
+
+	if (!data) {
+		ast_log(LOG_WARNING, "No parameters passed. !\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+		
+	s = ast_strdupa((void *) data);
+
+	mvar = strsep(&s, "|");
+	mvalue1 = strsep(&s, "|");
+	
+	if ((op = strchr(mvalue1, '+'))) {
+		iaction = ADDFUNCTION;
+		*op = '\0';
+	} else if ((op = strchr(mvalue1, '-'))) {
+		iaction = SUBTRACTFUNCTION;
+		*op = '\0';
+	} else if ((op = strchr(mvalue1, '*'))) {
+		iaction = MULTIPLYFUNCTION;
+		*op = '\0';
+	} else if ((op = strchr(mvalue1, '/'))) {
+		iaction = DIVIDEFUNCTION;
+		*op = '\0';
+	} else if ((op = strchr(mvalue1, '>'))) {
+		iaction = GTFUNCTION;
+		*op = '\0';
+		if (*(op+1) == '=') {
+			op++;
+			*op = '\0';
+			iaction = GTEFUNCTION;
+		}
+	} else if ((op = strchr(mvalue1, '<'))) {
+		iaction = LTFUNCTION;
+		*op = '\0';
+		if (*(op+1) == '=') {
+			op++;
+			*op = '\0';
+			iaction = LTEFUNCTION;
+		}
+	} else if ((op = strchr(mvalue1, '='))) {
+		iaction = GTFUNCTION;
+		*op = '\0';
+		if (*(op+1) == '=') {
+			op++;
+			*op = '\0';
+			iaction = EQFUNCTION;
+		} else
+			op = NULL;
+	} 
+	
+	if (op) 
+		mvalue2 = op + 1;
+		
+	if (!mvar || !mvalue1 || !mvalue2) {
+		ast_log(LOG_WARNING, "Supply all the parameters - just this once, please\n");
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+
+	if (!strcmp(mvar,"")) {
+		ast_log(LOG_WARNING, "No return variable set.\n");
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+
+	if (sscanf(mvalue1, "%f", &fnum1) != 1) {
+		ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue1);
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+
+	if (sscanf(mvalue2, "%f", &fnum2) != 1) {
+		ast_log(LOG_WARNING, "'%s' is not a valid number\n", mvalue2);
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+
+	switch (iaction) {
+	case ADDFUNCTION :
+		ftmp = fnum1 + fnum2;
+		break;
+	case DIVIDEFUNCTION :
+		if (fnum2 <=0)
+			ftmp = 0; /* can't do a divide by 0 */
+		else
+			ftmp = (fnum1 / fnum2);
+		break;
+	case MULTIPLYFUNCTION :
+		ftmp = (fnum1 * fnum2);
+		break;
+	case SUBTRACTFUNCTION :
+		ftmp = (fnum1 - fnum2);
+		break;
+	case MODULUSFUNCTION : {
+		int inum1 = fnum1;
+		int inum2 = fnum2;
+			
+		ftmp = (inum1 % inum2);
+		
+		break;
+		}
+	case GTFUNCTION :
+		if (fnum1 > fnum2)
+			strcpy(user_result, "TRUE");
+		else
+			strcpy(user_result, "FALSE");
+		break;
+	case LTFUNCTION :
+		if (fnum1 < fnum2)
+			strcpy(user_result, "TRUE");
+		else
+			strcpy(user_result, "FALSE");
+		break;
+	case GTEFUNCTION :
+		if (fnum1 >= fnum2)
+			strcpy(user_result, "TRUE");
+		else
+			strcpy(user_result, "FALSE");
+		break;
+	case LTEFUNCTION :
+		if (fnum1 <= fnum2)
+			strcpy(user_result, "TRUE");
+		else
+			strcpy(user_result, "FALSE");
+		break;					
+	case EQFUNCTION :
+		if (fnum1 == fnum2)
+			strcpy(user_result, "TRUE");
+		else
+			strcpy(user_result, "FALSE");
+		break;
+	default :
+		ast_log(LOG_WARNING, "Something happened that neither of us should be proud of %d\n", iaction);
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+
+	if (iaction < GTFUNCTION || iaction > EQFUNCTION) 
+		snprintf(user_result,sizeof(user_result),"%f",ftmp);
+		
+	pbx_builtin_setvar_helper(chan, mvar, user_result);	
+	
+	LOCAL_USER_REMOVE(u);
+	return 0;
+}
+
+int unload_module(void)
+{
+	int res;
+	STANDARD_HANGUP_LOCALUSERS;
+
+	res  = ast_unregister_application(app_math);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+	res = ast_register_application(app_math, math_exec, math_synopsis, math_descrip);
+	return res;
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+
+/* Fading everything to black and blue... */

apps/app_md5.c

@@ -0,0 +1,163 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * MD5 checksum application
+ * 
+ * Copyright (C) 2005, Olle E. Johansson, Edvina.net
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/utils.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+
+static char *tdesc_md5 = "MD5 checksum applications";
+static char *app_md5 = "MD5";
+static char *desc_md5 = "Calculate MD5 checksum";
+static char *synopsis_md5 = 
+"  MD5(<var>=<string>): Calculates a MD5 checksum on <string>.\n"
+"Returns hash value in a channel variable. Always return 0\n";
+
+static char *app_md5check = "MD5Check";
+static char *desc_md5check = "Check MD5 checksum";
+static char *synopsis_md5check = 
+"  MD5Check(<md5hash>,<string>): Calculates a MD5 checksum on <string>\n"
+"and compares it with the hash. Returns 0 if <md5hash> is correct for <string>.\n"
+"Jumps to priority+101 if incorrect.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+/*--- md5_exec: Calculate MD5 checksum (hash) on given string and
+	return it in channel variable ---*/
+static int md5_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *varname= NULL; /* Variable to set */
+	char *string = NULL; /* String to calculate on */
+	char retvar[50]; /* Return value */
+	static int dep_warning = 0;
+
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "This application has been deprecated, please use the MD5 function instead.\n");
+		dep_warning = 1;
+	}	
+
+	if (!data) {
+		ast_log(LOG_WARNING, "Syntax: md5(<varname>=<string>) - missing argument!\n");
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	memset(retvar,0, sizeof(retvar));
+	string = ast_strdupa(data);
+	varname = strsep(&string,"=");
+	if (ast_strlen_zero(varname)) {
+		ast_log(LOG_WARNING, "Syntax: md5(<varname>=<string>) - missing argument!\n");
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+	ast_md5_hash(retvar, string);
+	pbx_builtin_setvar_helper(chan, varname, retvar);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+/*--- md5check_exec: Calculate MD5 checksum and compare it with
+	existing checksum. ---*/
+static int md5check_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *hash= NULL; /* Hash to compare with */
+	char *string = NULL; /* String to calculate on */
+	char newhash[50]; /* Return value */
+	static int dep_warning = 0;
+
+	if (!dep_warning) {
+		ast_log(LOG_WARNING, "This application has been deprecated, please use the CHECK_MD5 function instead.\n");
+		dep_warning = 1;
+	}
+	
+	if (!data) {
+		ast_log(LOG_WARNING, "Syntax: MD5Check(<md5hash>,<string>) - missing argument!\n");
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	memset(newhash,0, sizeof(newhash));
+
+	string = ast_strdupa(data);
+	hash = strsep(&string,"|");
+	if (ast_strlen_zero(hash)) {
+		ast_log(LOG_WARNING, "Syntax: MD5Check(<md5hash>,<string>) - missing argument!\n");
+		LOCAL_USER_REMOVE(u);
+		return -1;
+	}
+	ast_md5_hash(newhash, string);
+	if (!strcmp(newhash, hash)) {	/* Verification ok */
+		if (option_debug > 2)
+			ast_log(LOG_DEBUG, "MD5 verified ok: %s -- %s\n", hash, string);
+		LOCAL_USER_REMOVE(u);
+		return 0;
+	}
+	if (option_debug > 2)
+		ast_log(LOG_DEBUG, "ERROR: MD5 not verified: %s -- %s\n", hash, string);
+	if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+		chan->priority += 100;
+	else if (option_debug > 2)
+		ast_log(LOG_DEBUG, "ERROR: Can't jump to exten+101 (e%s,p%d), sorry\n", chan->exten,chan->priority+101);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	int res;
+
+	STANDARD_HANGUP_LOCALUSERS;
+	res =ast_unregister_application(app_md5);
+	res |= ast_unregister_application(app_md5check);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+
+	res = ast_register_application(app_md5check, md5check_exec, desc_md5check, synopsis_md5check);
+	res |= ast_register_application(app_md5, md5_exec, desc_md5, synopsis_md5);
+	return res;
+}
+
+char *description(void)
+{
+	return tdesc_md5;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_milliwatt.c

@@ -11,19 +11,22 @@
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 
-#include <pthread.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
 
 static char *tdesc = "Digital Milliwatt (mu-law) Test Application";
 
@@ -64,7 +67,7 @@ static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int
 
 	if (len > sizeof(buf))
 	{
-		ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",sizeof(buf),len);
+		ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)sizeof(buf),len);
 		len = sizeof(buf);
 	}
 	waste[0] = 0; /* make compiler happy */
@@ -76,6 +79,8 @@ static int milliwatt_generate(struct ast_channel *chan, void *data, int len, int
 	wf.datalen = len;
 	wf.samples = wf.datalen;
 	wf.src = "app_milliwatt";
+	wf.delivery.tv_sec = 0;
+	wf.delivery.tv_usec = 0;
 	/* create a buffer containing the digital milliwatt pattern */
 	for(i = 0; i < len; i++)
 	{

apps/app_mp3.c

@@ -3,31 +3,35 @@
  *
  * Silly application to play an MP3 file -- uses mpg123
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/frame.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <pthread.h>
 #include <sys/time.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
 #define LOCAL_MPG_123 "/usr/local/bin/mpg123"
 #define MPG_123 "/usr/bin/mpg123"
 
@@ -39,8 +43,8 @@ static char *synopsis = "Play an MP3 file or stream";
 
 static char *descrip = 
 "  MP3Player(location) Executes mpg123 to play the given location\n"
-"which typically would be a  filename  or  a URL. Returns  -1  on\n"
-"hangup or 0 otherwise. User can exit by pressing any key\n.";
+"which typically would be a filename o a URL. User can exit by pressing any key\n."
+"Returns  -1  on hangup or 0 otherwise."; 
 
 STANDARD_LOCAL_USER;
 
@@ -61,36 +65,35 @@ static int mp3play(char *filename, int fd)
 			close(x);
 	}
 	/* Execute mpg123, but buffer if it's a net connection */
-	if (strncmp(filename, "http://", 7)) {
+	if (!strncasecmp(filename, "http://", 7)) {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-b", "1024", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-b", "1024","-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-b", "1024",  "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	else {
 		/* Most commonly installed in /usr/local/bin */
-	    execl(MPG_123, "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execl(MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* But many places has it in /usr/bin */
-	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execl(LOCAL_MPG_123, "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 		/* As a last-ditch effort, try to use PATH */
-	    execlp("mpg123", "mpg123", "-q", "-s", "--mono", "-r", "8000", filename, (char *)NULL);
+	    execlp("mpg123", "mpg123", "-q", "-s", "-f", "8192", "--mono", "-r", "8000", filename, (char *)NULL);
 	}
 	ast_log(LOG_WARNING, "Execute of mpg123 failed\n");
 	return -1;
 }
 
-static int timed_read(int fd, void *data, int datalen)
+static int timed_read(int fd, void *data, int datalen, int timeout)
 {
 	int res;
-	fd_set fds;
-	struct timeval tv = { 2, 0 };		/* Wait no more than 2 seconds */
-	FD_ZERO(&fds);
-	FD_SET(fd, &fds);
-	res = ast_select(fd + 1, &fds, NULL, NULL, &tv);
+	struct pollfd fds[1];
+	fds[0].fd = fd;
+	fds[0].events = POLLIN;
+	res = poll(fds, 1, timeout);
 	if (res < 1) {
-		ast_log(LOG_NOTICE, "Selected timed out/errored out with %d\n", res);
+		ast_log(LOG_NOTICE, "Poll timed out/errored out with %d\n", res);
 		return -1;
 	}
 	return read(fd, data, datalen);
@@ -105,15 +108,14 @@ static int mp3_exec(struct ast_channel *chan, void *data)
 	int ms = -1;
 	int pid = -1;
 	int owriteformat;
-	struct timeval last;
+	int timeout = 2000;
+	struct timeval next;
 	struct ast_frame *f;
 	struct myframe {
 		struct ast_frame f;
 		char offset[AST_FRIENDLY_OFFSET];
 		short frdata[160];
 	} myf;
-	last.tv_usec = 0;
-	last.tv_sec = 0;
 	if (!data) {
 		ast_log(LOG_WARNING, "MP3 Playback requires an argument (filename)\n");
 		return -1;
@@ -133,35 +135,20 @@ static int mp3_exec(struct ast_channel *chan, void *data)
 	}
 	
 	res = mp3play((char *)data, fds[1]);
+	if (!strncasecmp((char *)data, "http://", 7)) {
+		timeout = 10000;
+	}
 	/* Wait 1000 ms first */
-	ms = 1000;
+	next = ast_tvnow();
+	next.tv_sec += 1;
 	if (res >= 0) {
 		pid = res;
 		/* Order is important -- there's almost always going to be mp3...  we want to prioritize the
 		   user */
 		for (;;) {
-			ms = ast_waitfor(chan, ms);
-			if (ms < 0) {
-				ast_log(LOG_DEBUG, "Hangup detected\n");
-				res = -1;
-				break;
-			}
-			if (ms) {
-				f = ast_read(chan);
-				if (!f) {
-					ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
-					res = -1;
-					break;
-				}
-				if (f->frametype == AST_FRAME_DTMF) {
-					ast_log(LOG_DEBUG, "User pressed a key\n");
-					ast_frfree(f);
-					res = 0;
-					break;
-				}
-				ast_frfree(f);
-			} else  {
-				res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata));
+			ms = ast_tvdiff_ms(next, ast_tvnow());
+			if (ms <= 0) {
+				res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata), timeout);
 				if (res > 0) {
 					myf.f.frametype = AST_FRAME_VOICE;
 					myf.f.subclass = AST_FORMAT_SLINEAR;
@@ -170,6 +157,8 @@ static int mp3_exec(struct ast_channel *chan, void *data)
 					myf.f.mallocd = 0;
 					myf.f.offset = AST_FRIENDLY_OFFSET;
 					myf.f.src = __PRETTY_FUNCTION__;
+					myf.f.delivery.tv_sec = 0;
+					myf.f.delivery.tv_usec = 0;
 					myf.f.data = myf.frdata;
 					if (ast_write(chan, &myf.f) < 0) {
 						res = -1;
@@ -180,7 +169,29 @@ static int mp3_exec(struct ast_channel *chan, void *data)
 					res = 0;
 					break;
 				}
-				ms = res / 16;
+				next = ast_tvadd(next, ast_samp2tv(myf.f.samples, 8000));
+			} else {
+				ms = ast_waitfor(chan, ms);
+				if (ms < 0) {
+					ast_log(LOG_DEBUG, "Hangup detected\n");
+					res = -1;
+					break;
+				}
+				if (ms) {
+					f = ast_read(chan);
+					if (!f) {
+						ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
+						res = -1;
+						break;
+					}
+					if (f->frametype == AST_FRAME_DTMF) {
+						ast_log(LOG_DEBUG, "User pressed a key\n");
+						ast_frfree(f);
+						res = 0;
+						break;
+					}
+					ast_frfree(f);
+				} 
 			}
 		}
 	}

apps/app_nbscat.c

@@ -0,0 +1,217 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Silly application to play an NBScat file -- uses nbscat8k
+ * 
+ * Copyright (C) 1999, Mark Spencer
+ *
+ * Mark Spencer <markster@linux-support.net>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdio.h>
+#include <signal.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/frame.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+
+#define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
+#define NBSCAT "/usr/bin/nbscat8k"
+
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#endif
+
+static char *tdesc = "Silly NBS Stream Application";
+
+static char *app = "NBScat";
+
+static char *synopsis = "Play an NBS local stream";
+
+static char *descrip = 
+"  NBScat: Executes nbscat to listen to the local NBS stream.\n"
+"Returns  -1  on\n hangup or 0 otherwise. User can exit by \n"
+"pressing any key\n.";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int NBScatplay(int fd)
+{
+	int res;
+	int x;
+	res = fork();
+	if (res < 0) 
+		ast_log(LOG_WARNING, "Fork failed\n");
+	if (res)
+		return res;
+	dup2(fd, STDOUT_FILENO);
+	for (x=0;x<256;x++) {
+		if (x != STDOUT_FILENO)
+			close(x);
+	}
+	/* Most commonly installed in /usr/local/bin */
+	execl(NBSCAT, "nbscat8k", "-d", (char *)NULL);
+	execl(LOCAL_NBSCAT, "nbscat8k", "-d", (char *)NULL);
+	ast_log(LOG_WARNING, "Execute of nbscat8k failed\n");
+	return -1;
+}
+
+static int timed_read(int fd, void *data, int datalen)
+{
+	int res;
+	struct pollfd fds[1];
+	fds[0].fd = fd;
+	fds[0].events = POLLIN;
+	res = poll(fds, 1, 2000);
+	if (res < 1) {
+		ast_log(LOG_NOTICE, "Selected timed out/errored out with %d\n", res);
+		return -1;
+	}
+	return read(fd, data, datalen);
+	
+}
+
+static int NBScat_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	int fds[2];
+	int ms = -1;
+	int pid = -1;
+	int owriteformat;
+	struct timeval next;
+	struct ast_frame *f;
+	struct myframe {
+		struct ast_frame f;
+		char offset[AST_FRIENDLY_OFFSET];
+		short frdata[160];
+	} myf;
+	if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds)) {
+		ast_log(LOG_WARNING, "Unable to create socketpair\n");
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	ast_stopstream(chan);
+
+	owriteformat = chan->writeformat;
+	res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
+	if (res < 0) {
+		ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
+		return -1;
+	}
+	
+	res = NBScatplay(fds[1]);
+	/* Wait 1000 ms first */
+	next = ast_tvnow();
+	next.tv_sec += 1;
+	if (res >= 0) {
+		pid = res;
+		/* Order is important -- there's almost always going to be mp3...  we want to prioritize the
+		   user */
+		for (;;) {
+			ms = ast_tvdiff_ms(next, ast_tvnow());
+			if (ms <= 0) {
+				res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata));
+				if (res > 0) {
+					myf.f.frametype = AST_FRAME_VOICE;
+					myf.f.subclass = AST_FORMAT_SLINEAR;
+					myf.f.datalen = res;
+					myf.f.samples = res / 2;
+					myf.f.mallocd = 0;
+					myf.f.offset = AST_FRIENDLY_OFFSET;
+					myf.f.src = __PRETTY_FUNCTION__;
+					myf.f.delivery.tv_sec = 0;
+					myf.f.delivery.tv_usec = 0;
+					myf.f.data = myf.frdata;
+					if (ast_write(chan, &myf.f) < 0) {
+						res = -1;
+						break;
+					}
+				} else {
+					ast_log(LOG_DEBUG, "No more mp3\n");
+					res = 0;
+					break;
+				}
+				next = ast_tvadd(next, ast_samp2tv(myf.f.samples, 8000));
+			} else {
+				ms = ast_waitfor(chan, ms);
+				if (ms < 0) {
+					ast_log(LOG_DEBUG, "Hangup detected\n");
+					res = -1;
+					break;
+				}
+				if (ms) {
+					f = ast_read(chan);
+					if (!f) {
+						ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
+						res = -1;
+						break;
+					}
+					if (f->frametype == AST_FRAME_DTMF) {
+						ast_log(LOG_DEBUG, "User pressed a key\n");
+						ast_frfree(f);
+						res = 0;
+						break;
+					}
+					ast_frfree(f);
+				} 
+			}
+		}
+	}
+	close(fds[0]);
+	close(fds[1]);
+	LOCAL_USER_REMOVE(u);
+	if (pid > -1)
+		kill(pid, SIGKILL);
+	if (!res && owriteformat)
+		ast_set_write_format(chan, owriteformat);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, NBScat_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_osplookup.c

@@ -0,0 +1,282 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Open Settlement Protocol Lookup
+ * 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/options.h"
+#include "asterisk/config.h"
+#include "asterisk/module.h"
+#include "asterisk/utils.h"
+#include "asterisk/causes.h"
+#include "asterisk/astosp.h"
+
+static char *tdesc = "OSP Lookup";
+
+static char *app = "OSPLookup";
+static char *app2 = "OSPNext";
+static char *app3 = "OSPFinish";
+
+static char *synopsis = "Lookup number in OSP";
+static char *synopsis2 = "Lookup next OSP entry";
+static char *synopsis3 = "Record OSP entry";
+
+static char *descrip = 
+"  OSPLookup(exten[|provider[|options]]):  Looks up an extension via OSP and sets\n"
+"the variables, where 'n' is the number of the result beginning with 1:\n"
+" ${OSPTECH}:   The technology to use for the call\n"
+" ${OSPDEST}:   The destination to use for the call\n"
+" ${OSPTOKEN}:  The actual OSP token as a string\n"
+" ${OSPHANDLE}: The OSP Handle for anything remaining\n"
+" ${OSPRESULTS}: The number of OSP results total remaining\n"
+"\n"
+"If the lookup was *not* successful and there exists a priority n + 101,\n"
+"then that priority will be taken next.\n" ;
+
+static char *descrip2 = 
+"  OSPNext:  Looks up the next OSP Destination for ${OSPHANDLE}\n"
+"See OSPLookup for more information\n"
+"\n"
+"If the lookup was *not* successful and there exists a priority n + 101,\n"
+"then that priority will be taken next.\n" ;
+
+static char *descrip3 = 
+"  OSPFinish(status):  Records call state for ${OSPHANDLE}, according to\n"
+"status, which should be one of BUSY, CONGESTION, ANSWER, NOANSWER, or NOCHANAVAIL\n"
+"or coincidentally, just what the Dial application stores in its ${DIALSTATUS}\n"
+"\n"
+"If the finishing was *not* successful and there exists a priority n + 101,\n"
+"then that priority will be taken next.\n" ;
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int str2cause(char *cause)
+{
+	if (!strcasecmp(cause, "BUSY"))
+		return AST_CAUSE_BUSY;
+	if (!strcasecmp(cause, "CONGESTION"))
+		return AST_CAUSE_CONGESTION;
+	if (!strcasecmp(cause, "ANSWER"))
+		return AST_CAUSE_NORMAL;
+	if (!strcasecmp(cause, "CANCEL"))
+		return AST_CAUSE_NORMAL;
+	if (!strcasecmp(cause, "NOANSWER"))
+		return AST_CAUSE_NOANSWER;
+	if (!strcasecmp(cause, "NOCHANAVAIL"))
+		return AST_CAUSE_CONGESTION;
+	ast_log(LOG_WARNING, "Unknown cause '%s', using NORMAL\n", cause);
+	return AST_CAUSE_NORMAL;
+}
+
+static int osplookup_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *temp;
+	char *provider, *opts=NULL;
+	struct ast_osp_result result;
+	if (!data || ast_strlen_zero(data) || !(temp = ast_strdupa(data))) {
+		ast_log(LOG_WARNING, "OSPLookup requires an argument (extension)\n");
+		return -1;
+	}
+	provider = strchr(temp, '|');
+	if (provider) {
+		*provider = '\0';
+		provider++;
+		opts = strchr(provider, '|');
+		if (opts) {
+			*opts = '\0';
+			opts++;
+		}
+	}
+	LOCAL_USER_ADD(u);
+	ast_log(LOG_DEBUG, "Whoo hoo, looking up OSP on '%s' via '%s'\n", temp, provider ? provider : "<default>");
+	if ((res = ast_osp_lookup(chan, provider, temp, chan->cid.cid_num, &result)) > 0) {
+		char tmp[80];
+		snprintf(tmp, sizeof(tmp), "%d", result.handle);
+		pbx_builtin_setvar_helper(chan, "_OSPHANDLE", tmp);
+		pbx_builtin_setvar_helper(chan, "_OSPTECH", result.tech);
+		pbx_builtin_setvar_helper(chan, "_OSPDEST", result.dest);
+		pbx_builtin_setvar_helper(chan, "_OSPTOKEN", result.token);
+		snprintf(tmp, sizeof(tmp), "%d", result.numresults);
+		pbx_builtin_setvar_helper(chan, "_OSPRESULTS", tmp);
+
+	} else {
+		if (!res)
+			ast_log(LOG_NOTICE, "OSP Lookup failed for '%s' (provider '%s')\n", temp, provider ? provider : "<default>");
+		else
+			ast_log(LOG_DEBUG, "Got hangup on '%s' while doing OSP Lookup for '%s' (provider '%s')!\n", chan->name, temp, provider ? provider : "<default>" );
+	}
+	if (!res) {
+		/* Look for a "busy" place */
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+			chan->priority += 100;
+	} else if (res > 0)
+		res = 0;
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int ospnext_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *temp;
+	int cause;
+	struct ast_osp_result result;
+	if (!data || ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "OSPNext should have an argument (cause)\n");
+	}
+	LOCAL_USER_ADD(u);
+	cause = str2cause((char *)data);
+	temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+	result.handle = -1;
+	if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
+		if ((res = ast_osp_next(&result, cause)) > 0) {
+			char tmp[80];
+			snprintf(tmp, sizeof(tmp), "%d", result.handle);
+			pbx_builtin_setvar_helper(chan, "_OSPHANDLE", tmp);
+			pbx_builtin_setvar_helper(chan, "_OSPTECH", result.tech);
+			pbx_builtin_setvar_helper(chan, "_OSPDEST", result.dest);
+			pbx_builtin_setvar_helper(chan, "_OSPTOKEN", result.token);
+			snprintf(tmp, sizeof(tmp), "%d", result.numresults);
+			pbx_builtin_setvar_helper(chan, "_OSPRESULTS", tmp);
+		}
+	} else {
+		if (!res) {
+			if (result.handle < 0)
+				ast_log(LOG_NOTICE, "OSP Lookup Next failed for handle '%d'\n", result.handle);
+			else
+				ast_log(LOG_DEBUG, "No OSP handle specified\n");
+		} else
+			ast_log(LOG_DEBUG, "Got hangup on '%s' while doing OSP Next!\n", chan->name);
+	}
+	if (!res) {
+		/* Look for a "busy" place */
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+			chan->priority += 100;
+	} else if (res > 0)
+		res = 0;
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int ospfinished_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *temp;
+	int cause;
+	time_t start=0, duration=0;
+	struct ast_osp_result result;
+	if (!data || ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "OSPFinish should have an argument (cause)\n");
+	}
+	if (chan->cdr) {
+		start = chan->cdr->answer.tv_sec;
+		if (start)
+			duration = time(NULL) - start;
+		else
+			duration = 0;
+	} else
+		ast_log(LOG_WARNING, "OSPFinish called on channel '%s' with no CDR!\n", chan->name);
+	LOCAL_USER_ADD(u);
+	cause = str2cause((char *)data);
+	temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
+	result.handle = -1;
+	if (temp && strlen(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
+		if (!ast_osp_terminate(result.handle, cause, start, duration)) {
+			pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
+			res = 1;
+		}
+	} else {
+		if (!res) {
+			if (result.handle > -1)
+				ast_log(LOG_NOTICE, "OSP Finish failed for handle '%d'\n", result.handle);
+			else
+				ast_log(LOG_DEBUG, "No OSP handle specified\n");
+		} else
+			ast_log(LOG_DEBUG, "Got hangup on '%s' while doing OSP Terminate!\n", chan->name);
+	}
+	if (!res) {
+		/* Look for a "busy" place */
+		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+			chan->priority += 100;
+	} else if (res > 0)
+		res = 0;
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+
+int unload_module(void)
+{
+	int res;
+	STANDARD_HANGUP_LOCALUSERS;
+	res = ast_unregister_application(app3);
+	res |= ast_unregister_application(app2);
+	res |= ast_unregister_application(app);
+	return res;
+}
+
+int load_module(void)
+{
+	int res;
+	res = ast_register_application(app, osplookup_exec, synopsis, descrip);
+	if (res)
+		return(res);
+	res = ast_register_application(app2, ospnext_exec, synopsis2, descrip2);
+	if (res)
+		return(res);
+	res = ast_register_application(app3, ospfinished_exec, synopsis3, descrip3);
+	if (res)
+		return(res);
+	return(0);
+}
+
+int reload(void)
+{
+	return 0;
+}
+
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+

apps/app_parkandannounce.c

@@ -6,32 +6,33 @@
  *    With TONS of help from Mark!
  * 
  * Asterisk is Copyrighted as follows
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/channel_pvt.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/parking.h>
-#include <asterisk/options.h>
-#include <asterisk/logger.h>
-#include <asterisk/say.h>
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/features.h"
+#include "asterisk/options.h"
+#include "asterisk/logger.h"
+#include "asterisk/say.h"
+#include "asterisk/lock.h"
 
 static char *tdesc = "Call Parking and Announce Application";
 
@@ -42,7 +43,7 @@ static char *synopsis = "Park and Announce";
 static char *descrip =
 "  ParkAndAnnounce(announce:template|timeout|dial|[return_context]):\n"
 "Park a call into the parkinglot and announce the call over the console.\n"
-"announce template: colon seperated list of files to announce, the word PARKED\n"
+"announce template: colon separated list of files to announce, the word PARKED\n"
 "                   will be replaced by a say_digits of the ext the call is parked in\n"
 "timeout: time in seconds before the call returns into the return context.\n"
 "dial: The app_dial style resource to call to make the announcement. Console/dsp calls the console.\n"
@@ -55,170 +56,171 @@ LOCAL_USER_DECL;
 
 static int parkandannounce_exec(struct ast_channel *chan, void *data)
 {
-  int res=0;
-  char *return_context;
-  int l, lot, timeout, dres;
-  char *working, *context, *exten, *priority, *dial, *dialtech, *dialstr;
-  char *template, *tpl_working, *tpl_current;
-  char *tmp[100];
-  int looptemp=0,i=0;
-  char *s,*orig_s;
+	int res=0;
+	char *return_context;
+	int l, lot, timeout = 0, dres;
+	char *working, *context, *exten, *priority, *dial, *dialtech, *dialstr;
+	char *template, *tpl_working, *tpl_current;
+	char *tmp[100];
+	int looptemp=0,i=0;
+	char *s,*orig_s;
 
-  struct ast_channel *dchan;
-  int outstate;
+	struct ast_channel *dchan;
+	int outstate;
 
-  struct localuser *u;
-  if (!data) {
-    ast_log(LOG_WARNING, "Park requires an argument (parkinglot)\n");
-    return -1;
-  }
+	struct localuser *u;
+	if(!data || (data && !strlen(data))) {
+		ast_log(LOG_WARNING, "ParkAndAnnounce requires arguments: (announce:template|timeout|dial|[return_context])\n");
+		return -1;
+	}
   
-  l=strlen(data)+2;
-  orig_s=malloc(l);
-  s=orig_s;
-  strncpy(s,data,l);
+	l=strlen(data)+2;
+	orig_s=malloc(l);
+	if(!orig_s) {
+		ast_log(LOG_WARNING, "Out of memory\n");
+		return -1;
+	}
+	s=orig_s;
+	strncpy(s,data,l);
 
-  template=strsep(&s,"|");
-  if (! template) {
-    ast_log(LOG_WARNING, "PARK: An announce template must be defined\n");
-    free(orig_s);
-    return -1;
-  }
+	template=strsep(&s,"|");
+	if(! template) {
+		ast_log(LOG_WARNING, "PARK: An announce template must be defined\n");
+		free(orig_s);
+		return -1;
+	}
   
-  timeout = atoi(strsep(&s, "|"));
-  timeout *= 1000;
+	if(s) {
+		timeout = atoi(strsep(&s, "|"));
+		timeout *= 1000;
+	}
+	dial=strsep(&s, "|");
+	if(!dial) {
+		ast_log(LOG_WARNING, "PARK: A dial resource must be specified i.e: Console/dsp or Zap/g1/5551212\n");
+		free(orig_s);
+		return -1;
+	} else {
+		dialtech=strsep(&dial, "/");
+		dialstr=dial;
+		ast_verbose( VERBOSE_PREFIX_3 "Dial Tech,String: (%s,%s)\n", dialtech,dialstr);
+	}
 
-  dial=strsep(&s, "|");
-  if (! dial) {
-    ast_log(LOG_WARNING, "PARK: A dial resouce must be specified i.e: Console/dsp or Zap/g1/5551212\n");
-    free(orig_s);
-    return -1;
-  }
-  else {
-    dialtech=strsep(&dial, "/");
-    dialstr=dial;
-    ast_verbose( VERBOSE_PREFIX_3 "Dial Tech,String: (%s,%s)\n", dialtech,dialstr);
-  }
-
-  return_context = s;
+	return_context = s;
   
-  if (return_context != NULL) {
-    /* set the return context. Code borrowed from the Goto builtin */
+	if(return_context != NULL) {
+		/* set the return context. Code borrowed from the Goto builtin */
     
-    working = return_context;
-    context = strsep(&working, "|");
-    exten = strsep(&working, "|");
-    if (!exten) {
-      /* Only a priority in this one */
-      priority = context;
-      exten = NULL;
-      context = NULL;
-    } else {
-      priority = strsep(&working, "|");
-      if (!priority) {
-	/* Only an extension and priority in this one */
-	priority = exten;
-	exten = context;
-	context = NULL;
-      }
-    }
-    if (atoi(priority) < 0) {
-      ast_log(LOG_WARNING, "Priority '%s' must be a number > 0\n", priority);
-      free(orig_s);
-      return -1;
-    }
-    /* At this point we have a priority and maybe an extension and a context */
-    chan->priority = atoi(priority);
-    if (exten && strcasecmp(exten, "BYEXTENSION"))
-      strncpy(chan->exten, exten, sizeof(chan->exten)-1);
-    if (context)
-      strncpy(chan->context, context, sizeof(chan->context)-1);
-  }
-  else {  /* increment the priority by default*/
-    chan->priority++;
-  }
+		working = return_context;
+		context = strsep(&working, "|");
+		exten = strsep(&working, "|");
+		if(!exten) {
+			/* Only a priority in this one */
+			priority = context;
+			exten = NULL;
+			context = NULL;
+		} else {
+			priority = strsep(&working, "|");
+			if(!priority) {
+				/* Only an extension and priority in this one */
+				priority = exten;
+				exten = context;
+				context = NULL;
+		}
+	}
+	if(atoi(priority) < 0) {
+		ast_log(LOG_WARNING, "Priority '%s' must be a number > 0\n", priority);
+		free(orig_s);
+		return -1;
+	}
+	/* At this point we have a priority and maybe an extension and a context */
+	chan->priority = atoi(priority);
+	if(exten && strcasecmp(exten, "BYEXTENSION"))
+		strncpy(chan->exten, exten, sizeof(chan->exten)-1);
+	if(context)
+		strncpy(chan->context, context, sizeof(chan->context)-1);
+	} else {  /* increment the priority by default*/
+		chan->priority++;
+	}
 
 
-  if (option_verbose > 2) {
-    ast_verbose( VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n", chan->context,chan->exten, chan->priority, chan->callerid);
-    if (!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid)) {
-      ast_verbose( VERBOSE_PREFIX_3 "Warning: Return Context Invalid, call will return to default|s\n");
-    }
-  }
+	if(option_verbose > 2) {
+		ast_verbose( VERBOSE_PREFIX_3 "Return Context: (%s,%s,%d) ID: %s\n", chan->context,chan->exten, chan->priority, chan->cid.cid_num);
+		if(!ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) {
+			ast_verbose( VERBOSE_PREFIX_3 "Warning: Return Context Invalid, call will return to default|s\n");
+		}
+	}
   
-  LOCAL_USER_ADD(u);
+	LOCAL_USER_ADD(u);
 
-  /* we are using masq_park here to protect * from touching the channel once we park it.  If the channel comes out of timeout
-     before we are done announcing and the channel is messed with, Kablooeee.  So we use Masq to prevent this.  */
+	/* we are using masq_park here to protect * from touching the channel once we park it.  If the channel comes out of timeout
+	before we are done announcing and the channel is messed with, Kablooeee.  So we use Masq to prevent this.  */
 
-  ast_masq_park_call(chan, NULL, timeout, &lot);
+	ast_masq_park_call(chan, NULL, timeout, &lot);
 
-  res=-1; 
+	res=-1; 
 
-  ast_verbose( VERBOSE_PREFIX_3 "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
+	ast_verbose( VERBOSE_PREFIX_3 "Call Parking Called, lot: %d, timeout: %d, context: %s\n", lot, timeout, return_context);
 
-  /* Now place the call to the extention */
+	/* Now place the call to the extention */
 
-  dchan = ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, dialstr,30000, &outstate, chan->callerid);
+	dchan = ast_request_and_dial(dialtech, AST_FORMAT_SLINEAR, dialstr,30000, &outstate, chan->cid.cid_num, chan->cid.cid_name);
 
-  if (dchan) {
-    if (dchan->_state == AST_STATE_UP) {
-      if (option_verbose > 3)
-	ast_verbose(VERBOSE_PREFIX_4 "Channel %s was answered.\n", dchan->name);
-    } else {
-      if (option_verbose > 3)
-	ast_verbose(VERBOSE_PREFIX_4 "Channel %s was never answered.\n", dchan->name);
-        ast_log(LOG_WARNING, "PARK: Channel %s was never answered for the announce.\n", dchan->name);
-      ast_hangup(dchan);
-      free(orig_s);
-      LOCAL_USER_REMOVE(u);
-      return -1;
-    }
-  }
-  else {
-    ast_log(LOG_WARNING, "PARK: Unable to allocate announce channel.\n");
-    free(orig_s);
-    LOCAL_USER_REMOVE(u);
-    return -1; 
-  }
+	if(dchan) {
+		if(dchan->_state == AST_STATE_UP) {
+			if(option_verbose > 3)
+				ast_verbose(VERBOSE_PREFIX_4 "Channel %s was answered.\n", dchan->name);
+		} else {
+			if(option_verbose > 3)
+				ast_verbose(VERBOSE_PREFIX_4 "Channel %s was never answered.\n", dchan->name);
+        			ast_log(LOG_WARNING, "PARK: Channel %s was never answered for the announce.\n", dchan->name);
+			ast_hangup(dchan);
+			free(orig_s);
+			LOCAL_USER_REMOVE(u);
+			return -1;
+		}
+	} else {
+		ast_log(LOG_WARNING, "PARK: Unable to allocate announce channel.\n");
+		free(orig_s);
+		LOCAL_USER_REMOVE(u);
+		return -1; 
+	}
 
-  ast_stopstream(dchan);
+	ast_stopstream(dchan);
 
-  /* now we have the call placed and are ready to play stuff to it */
+	/* now we have the call placed and are ready to play stuff to it */
 
-  ast_verbose(VERBOSE_PREFIX_4 "Announce Template:%s\n", template);
+	ast_verbose(VERBOSE_PREFIX_4 "Announce Template:%s\n", template);
 
-  tpl_working = template;
-  tpl_current=strsep(&tpl_working, ":");
+	tpl_working = template;
+	tpl_current=strsep(&tpl_working, ":");
 
-  while ( tpl_current && looptemp < sizeof(tmp)) {
-    tmp[looptemp]=tpl_current;
-    looptemp++;
-    tpl_current=strsep(&tpl_working,":");
-  }
+	while(tpl_current && looptemp < sizeof(tmp)) {
+		tmp[looptemp]=tpl_current;
+		looptemp++;
+		tpl_current=strsep(&tpl_working,":");
+	}
 
-  for(i=0; i<looptemp; i++) {
-    ast_verbose(VERBOSE_PREFIX_4 "Announce:%s\n", tmp[i]);
-    if (!strcmp(tmp[i], "PARKED")) {
-      ast_say_digits(dchan, lot, "", dchan->language);
-    }
-    else {
-      dres = ast_streamfile(dchan, tmp[i], dchan->language);
-      if (!dres)
-	dres = ast_waitstream(dchan, "");
-      else {
-	ast_log(LOG_WARNING, "ast_streamfile of %s failed on %s\n", tmp[i], dchan->name);
-	dres = 0;
-      }
-    }
-  }
+	for(i=0; i<looptemp; i++) {
+		ast_verbose(VERBOSE_PREFIX_4 "Announce:%s\n", tmp[i]);
+		if(!strcmp(tmp[i], "PARKED")) {
+			ast_say_digits(dchan, lot, "", dchan->language);
+		} else {
+			dres = ast_streamfile(dchan, tmp[i], dchan->language);
+			if(!dres) {
+				dres = ast_waitstream(dchan, "");
+			} else {
+				ast_log(LOG_WARNING, "ast_streamfile of %s failed on %s\n", tmp[i], dchan->name);
+				dres = 0;
+			}
+		}
+	}
 
-  ast_stopstream(dchan);  
-  ast_hangup(dchan);
+	ast_stopstream(dchan);  
+	ast_hangup(dchan);
 
-  LOCAL_USER_REMOVE(u);
-  free(orig_s);
-  return res;
+	LOCAL_USER_REMOVE(u);
+	free(orig_s);
+	return res;
 }
 
 
@@ -231,8 +233,8 @@ int unload_module(void)
 
 int load_module(void)
 {
-  /*	return ast_register_application(app, park_exec); */
-  return ast_register_application(app, parkandannounce_exec, synopsis, descrip);
+	/* return ast_register_application(app, park_exec); */
+	return ast_register_application(app, parkandannounce_exec, synopsis, descrip);
 }
 
 char *description(void)

apps/app_playback.c

@@ -3,41 +3,46 @@
  *
  * Trivial application to playback a sound file
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2005, Mark Spencer
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
 
-static char *tdesc = "Trivial Playback Application";
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/utils.h"
+
+static char *tdesc = "Sound File Playback Application";
 
 static char *app = "Playback";
 
 static char *synopsis = "Play a file";
 
 static char *descrip = 
-"  Playback(filename[|option]):  Plays  back  a  given  filename (do not put\n"
-"extension). Options may also be  included following a pipe symbol. The only\n"
-"defined option at this time is 'skip',  which  causes  the  playback of the\n"
-"message to  be  skipped  if  the  channel is not in the 'up' state (i.e. it\n"
-"hasn't been  answered  yet. If 'skip' is specified, the application will\n"
-"return immediately should the channel not be off hook.  Otherwise, unless\n"
-"'noanswer' is specified, the channel channel will be answered before the sound\n"
-"is played. Not all channels support playing messages while on hook. Returns -1\n"
-"if the channel was hung up, or if the file does not exist. Returns 0 otherwise.\n";
+"  Playback(filename[&filename2...][|option]):  Plays back given filenames (do not put\n"
+"extension). Options may also be  included following a pipe symbol. The 'skip'\n"
+"option causes the playback of the message to  be  skipped  if  the  channel\n"
+"is not in the 'up' state (i.e. it hasn't been  answered  yet. If 'skip' is \n"
+"specified, the application will return immediately should the channel not be\n"
+"off hook.  Otherwise, unless 'noanswer' is specified, the channel channel will\n"
+"be answered before the sound is played. Not all channels support playing\n"
+"messages while still hook. Returns -1 if the channel was hung up.  If the\n"
+"file does not exist, will jump to priority n+101 if present.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -47,17 +52,17 @@ static int playback_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
 	struct localuser *u;
-	char tmp[256];
-	char *options;
+	char *tmp = NULL;
+	char *options = NULL;
 	int option_skip=0;
 	int option_noanswer = 0;
-	char *stringp;
-	if (!data || !strlen((char *)data)) {
+	char *stringp = NULL;
+	char *front = NULL, *back = NULL;
+	if (!data || ast_strlen_zero((char *)data) || !(tmp = ast_strdupa(data))) {
 		ast_log(LOG_WARNING, "Playback requires an argument (filename)\n");
 		return -1;
 	}
-	strncpy(tmp, (char *)data, sizeof(tmp)-1);
-	stringp=tmp;
+	stringp = tmp;
 	strsep(&stringp, "|");
 	options = strsep(&stringp, "|");
 	if (options && !strcasecmp(options, "skip"))
@@ -76,14 +81,24 @@ static int playback_exec(struct ast_channel *chan, void *data)
 	}
 	if (!res) {
 		ast_stopstream(chan);
-		res = ast_streamfile(chan, tmp, chan->language);
-		if (!res) 
-			res = ast_waitstream(chan, "");
-		else {
-			ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char *)data);
-			res = 0;
+		front = tmp;
+		while (!res && front) {
+			if ((back = strchr(front, '&'))) {
+				*back = '\0';
+				back++;
+			}
+			res = ast_streamfile(chan, front, chan->language);
+			if (!res) { 
+				res = ast_waitstream(chan, "");	
+				ast_stopstream(chan);
+			} else {
+				ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char *)data);
+				if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
+					chan->priority+=100;
+				res = 0;
+			}
+			front = back;
 		}
-		ast_stopstream(chan);
 	}
 	LOCAL_USER_REMOVE(u);
 	return res;

apps/app_privacy.c

@@ -3,29 +3,34 @@
  *
  * Block all calls without Caller*ID, require phone # to be entered
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/callerid.h>
-#include <asterisk/app.h>
-#include <asterisk/config.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/utils.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/app.h"
+#include "asterisk/config.h"
 
 #define PRIV_CONFIG "privacy.conf"
 
@@ -37,39 +42,42 @@ static char *synopsis = "Require phone number to be entered, if no CallerID sent
 
 static char *descrip =
   "  PrivacyManager: If no Caller*ID is sent, PrivacyManager answers the\n"
-  "channel and asks the caller to enter their 10 digit phone number.\n"
+  "channel and asks the caller to enter their phone number.\n"
   "The caller is given 3 attempts.  If after 3 attempts, they do not enter\n"
-  "their 10 digit phone number, and if there exists a priority n + 101,\n"
+  "at least a 10 digit phone number, and if there exists a priority n + 101,\n"
   "where 'n' is the priority of the current instance, then  the\n"
   "channel  will  be  setup  to continue at that priority level.\n"
   "Otherwise, it returns 0.  Does nothing if Caller*ID was received on the\n"
-  "channel.\n";
+  "channel.\n"
+  "  Configuration file privacy.conf contains two variables:\n"
+  "   maxretries  default 3  -maximum number of attempts the caller is allowed to input a callerid.\n"
+  "   minlength   default 10 -minimum allowable digits in the input callerid number.\n"
+;
 
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
+
+
 static int
 privacy_exec (struct ast_channel *chan, void *data)
 {
 	int res=0;
 	int retries;
 	int maxretries = 3;
+	int minlength = 10;
 	int x;
 	char *s;
-	char phone[10];
-	char new_cid[144];
+	char phone[30];
 	struct localuser *u;
 	struct ast_config *cfg;
 
 	LOCAL_USER_ADD (u);
-	if (chan->callerid)
-	{
+	if (chan->cid.cid_num && !ast_strlen_zero(chan->cid.cid_num)) {
 		if (option_verbose > 2)
 			ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
-	}
-	else
-	{
+	} else {
 		/*Answer the channel if it is not already*/
 		if (chan->_state != AST_STATE_UP) {
 			res = ast_answer(chan);
@@ -79,7 +87,7 @@ privacy_exec (struct ast_channel *chan, void *data)
 			}
 		}
 		/*Read in the config file*/
-		cfg = ast_load(PRIV_CONFIG);
+		cfg = ast_config_load(PRIV_CONFIG);
 		
 		
 		/*Play unidentified call*/
@@ -96,16 +104,29 @@ privacy_exec (struct ast_channel *chan, void *data)
                         ast_log(LOG_WARNING, "Invalid max retries argument\n");
                 }
         }
+        if (cfg && (s = ast_variable_retrieve(cfg, "general", "minlength"))) {
+                if (sscanf(s, "%d", &x) == 1) {
+                        minlength = x;
+                } else {
+                        ast_log(LOG_WARNING, "Invalid min length argument\n");
+                }
+        }
 			
 		/*Ask for 10 digit number, give 3 attempts*/
 		for (retries = 0; retries < maxretries; retries++) {
 			if (!res)
-				res = ast_app_getdata(chan, "privacy-prompt", phone, sizeof(phone), 0);
+				res = ast_streamfile(chan, "privacy-prompt", chan->language);
+			if (!res)
+				res = ast_waitstream(chan, "");
+
+			if (!res ) 
+				res = ast_readstring(chan, phone, sizeof(phone) - 1, /* digit timeout ms */ 3200, /* first digit timeout */ 5000, "#");
+
 			if (res < 0)
 				break;
 
-			/*Make sure we get 10 digits*/
-			if (strlen(phone) == 10) 
+			/*Make sure we get at least digits*/
+			if (strlen(phone) >= minlength ) 
 				break;
 			else {
 				res = ast_streamfile(chan, "privacy-incorrect", chan->language);
@@ -115,21 +136,20 @@ privacy_exec (struct ast_channel *chan, void *data)
 		}
 		
 		/*Got a number, play sounds and send them on their way*/
-		if ((retries < maxretries) && !res) {
+		if ((retries < maxretries) && res == 1 ) {
 			res = ast_streamfile(chan, "privacy-thankyou", chan->language);
 			if (!res)
 				res = ast_waitstream(chan, "");
-			snprintf (new_cid, sizeof (new_cid), "\"%s\" <%s>", "Privacy Manager", phone);
-			ast_set_callerid (chan, new_cid, 0);
+			ast_set_callerid (chan, phone, "Privacy Manager", NULL);
 			if (option_verbose > 2)
-				ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",new_cid);
+				ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",phone);
 		} else {
 			/*Send the call to n+101 priority, where n is the current priority*/
-			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
+			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
 				chan->priority+=100;
 		}
 		if (cfg) 
-			ast_destroy(cfg);
+			ast_config_destroy(cfg);
 	}
 
   LOCAL_USER_REMOVE (u);

apps/app_qcall.c

@@ -1,386 +0,0 @@
-/** @file app_qcall.c 
- *
- * Asterisk -- A telephony toolkit for Linux.
- *
- * Call back a party and connect them to a running pbx thread
- * 
- * Copyright (C) 1999, Mark Spencer
- *
- * Mark Spencer <markster@linux-support.net>
- *
- * This program is free software, distributed under the terms of
- * the GNU General Public License
- *
- * Call a user from a file contained within a queue (/var/spool/asterisk/qcall)
- * 
- * The queue is a directory containing files with the call request information
- * as a single line of text as follows:
- * 
- * Dialstring Caller-ID Extension Maxsecs [Identifier] [Required-response]
- *
- *  Dialstring -- A Dial String (The number to be called) in the
- *  format Technology/Number, such IAX/mysys/1234 or Zap/g1/1234
- * 
- *  Caller-ID -- A Standard nomalized representation of the Caller-ID of
- *  the number being dialed (generally 10 digits in the US). Leave as
- *  "asreceived" to use the default Caller*ID
- *
- *  Extension -- The Extension (optionally Extension@context) that the
- *  user should be "transferred" to after acceptance of the call.
- *
- *  Maxsecs -- The Maximum time of the call in seconds. Specify 0 for infinite.
- *
- *  Identifier -- The "Identifier" of the request. This is used to determine
- *  the names of the audio prompt files played. The first prompt, the one that
- *  asks for the input, is just the exact string specified as the identifier.
- *  The second prompt, the one that is played after the correct input is given,
- *  (generally a "thank you" recording), is the specified string with "-ok" 
- *  added to the end. So, if you specify "foo" as the identifier, your first
- *  prompt file that will be played will be "foo" and the second one will be
- *  "foo-ok".  If omitted no prompt is given
- *
- *  Required-Response (Optional) -- Specify a digit string to be used as the
- *  acceptance "code" if you desire it to be something other then "1". This
- *  can be used to implement some sort of PIN or security system. It may be
- *  more then a single character.
- *
- * NOTE: It is important to remember that the process that creates these
- * files needs keep and maintain a write lock (using flock with the LOCK_EX
- * option) when writing these files.
- *
- */
- 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/options.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/file.h>
-#include "../astconf.h"
-
-static char qdir[255];
-static  char *tdesc = "Call from Queue";
-static  pthread_t qcall_thread;
-static int debug = 0;
-STANDARD_LOCAL_USER;
-LOCAL_USER_DECL;
-
-#define	OLDESTOK	14400		/* not any more then this number of secs old */
-#define	INITIALONE	1		/* initial wait before the first one in secs */
-#define	NEXTONE		600		/* wait before trying it again in secs */
-#define	MAXWAITFORANSWER 45000		/* max call time before answer */
-/* define either one or both of these two if your application requires it */
-#if	0
-#define	ACCTCODE	"SOMETHING"	/* Account code */
-#define	AMAFLAGS AST_CDR_BILLING	/* AMA flags */
-#endif
-/* define this if you want to have a particular CLID display on the user's
-   phone when they receive the call */
-#if	0
-#define	OURCLID	"2564286275"		/* The callerid to be displayed when calling */
-#endif
-
-static void *qcall_do(void *arg);
-
-static void *qcall(void *ignore)
-{
-pthread_t dialer_thread;
-DIR *dirp;
-FILE *fp;
-struct dirent *dp;
-char fname[80];
-struct stat mystat;
-time_t	t;
-void *arg;
-pthread_attr_t attr;
-
-	time(&t);
-	if (debug) printf("@@@@ qcall starting at %s",ctime(&t));
-	for(;;)
-	   {
-		time(&t);
-		dirp = opendir(qdir);
-		if (!dirp)
-		   {
-			perror("app_qcall:Cannot open queue directory");
-			break;
-		   }
-		while((dp = readdir(dirp)) != NULL)
-		   {
-			if (dp->d_name[0] == '.') continue;
-			sprintf(fname,"%s/%s",qdir,dp->d_name);
-			if (stat(fname,&mystat) == -1)
-			   {
-				perror("app_qcall:stat");
-				fprintf(stderr,"%s\n",fname);
-				continue;
-			   }
-			  /* if not a regular file, skip it */
-			if ((mystat.st_mode & S_IFMT) != S_IFREG) continue;
-			  /* if not yet .... */
-			if (mystat.st_atime == mystat.st_mtime)
-			   {  /* first time */
-				if ((mystat.st_atime + INITIALONE) > t) 
-					continue;
-			   }
-			else
-			   { /* already looked at once */
-				if ((mystat.st_atime + NEXTONE) > t) continue;
-			   }
-			  /* if too old */
-			if (mystat.st_mtime < (t - OLDESTOK))
-			   {
-				/* kill it, its too old */
-				unlink(fname);
-				continue;
-			   }				
-			 /* "touch" file's access time */
-			fp = fopen(fname,"r");
-			if (fp) fclose(fp);
-			/* make a copy of the filename string, so that we
-				may go on and use the buffer */
-			arg = (void *) strdup(fname);
-		        pthread_attr_init(&attr);
- 		        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-			if (pthread_create(&dialer_thread,&attr,qcall_do,arg) == -1)
-			   {
-				perror("qcall: Cannot create thread");
-				continue;
-			   }
-		   }
-		closedir(dirp);
-		sleep(1);
-	   }
-	pthread_exit(NULL);
-}
-	
-/* single thread with one file (request) to dial */
-static void *qcall_do(void *arg)
-{
-char fname[300],dialstr[300],extstr[300],ident[300],reqinp[300],buf[300];
-char clid[300],*tele,*context;
-FILE *fp;
-int ms = MAXWAITFORANSWER,maxsecs;
-struct ast_channel *channel;
-time_t	t;
-
-	  /* get the filename from the arg */
-	strcpy(fname,(char *)arg);
-	free(arg);
-	time(&t);
-	fp = fopen(fname,"r");
-	if (!fp) /* if cannot open request file */
-	   {
-		perror("qcall_do:fopen");
-		fprintf(stderr,"%s\n",fname);
-		unlink(fname);
-		pthread_exit(NULL);
-	   }
-	/* lock the file */
-	if (flock(fileno(fp),LOCK_EX) == -1)
-	   {
-		perror("qcall_do:flock");
-		fprintf(stderr,"%s\n",fname);
-		pthread_exit(NULL);
-	   }
-	strcpy(reqinp,"1");  /* default required input for acknowledgement */
-	strcpy(ident, "");	/* default no ident */
-	if (fscanf(fp,"%s %s %s %d %s %s",dialstr,clid,
-		extstr,&maxsecs,ident,reqinp) < 4)
-	   {
-		fprintf(stderr,"qcall_do:file line invalid in file %s:\n",fname);
-		pthread_exit(NULL);
-	   }
-	flock(fileno(fp),LOCK_UN);
-	fclose(fp);
-	tele = strchr(dialstr,'/');
-	if (!tele)
-	   {
-		fprintf(stderr,"qcall_do:Dial number must be in format tech/number\n");
-		unlink(fname);
-		pthread_exit(NULL);
-	   }
-	*tele++ = 0;
-	channel = ast_request(dialstr,AST_FORMAT_SLINEAR,tele);
-	if (channel)
-	   {
-		ast_set_read_format(channel,AST_FORMAT_SLINEAR);
-		ast_set_write_format(channel,AST_FORMAT_SLINEAR);
-#ifdef	OURCLID
-		if (channel->callerid)
-			free(channel->callerid);
-		channel->callerid = strdup(OURCLID);
-		if (channel->ani)
-			free(channel->ani);
-		channel->ani = strdup(OURCLID);
-#endif		
-		channel->whentohangup = 0;
-		channel->appl = "AppQcall";
-		channel->data = "(Outgoing Line)";
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "Qcall initiating call to %s/%s on %s (%s)\n",
-				dialstr,tele,channel->name,fname);
-		ast_call(channel,tele,MAXWAITFORANSWER);
-	   }
-	else
-	   {
-		fprintf(stderr,"qcall_do:Sorry unable to obtain channel\n");
-		pthread_exit(NULL);
-	   }
-	if (strcasecmp(clid, "asreceived")) {
-		if (channel->callerid) free(channel->callerid);
-		channel->callerid = NULL;
-		if (channel->ani) free(channel->ani);
-		channel->ani = NULL;
-	}
-	if (channel->_state == AST_STATE_UP)
-	if (debug) printf("@@@@ Autodial:Line is Up\n");
-	if (option_verbose > 2)
-	ast_verbose(VERBOSE_PREFIX_3 "Qcall waiting for answer on %s\n",
-		channel->name);
-	while(ms > 0){
-		struct ast_frame *f;
-		ms = ast_waitfor(channel,ms);
-		f = ast_read(channel);
-		if (!f)
-		   {
-			if (debug) printf("@@@@ qcall_do:Hung Up\n");
-			unlink(fname);
-			break;
-		   }
-		if (f->frametype == AST_FRAME_CONTROL)
-		   {
-			if (f->subclass == AST_CONTROL_HANGUP)
-			   {
-				if (debug) printf("@@@@ qcall_do:Hung Up\n");
-				unlink(fname);
-				ast_frfree(f);
-				break;
-			   }
-			if (f->subclass == AST_CONTROL_ANSWER)
-			   {
-				if (debug) printf("@@@@ qcall_do:Phone Answered\n");
-				if (channel->_state == AST_STATE_UP)
-				   {
-					unlink(fname);
-					if (option_verbose > 2)
-						ast_verbose(VERBOSE_PREFIX_3 "Qcall got answer on %s\n",
-							channel->name);
-					usleep(1500000);
-					if (strlen(ident)) {
-						ast_streamfile(channel,ident,0);
-						if (ast_readstring(channel,buf,strlen(reqinp),10000,5000,"#"))
-						{
-							ast_stopstream(channel);
-							if (debug) printf("@@@@ qcall_do: timeout or hangup in dtmf read\n");
-							ast_frfree(f);
-							break;
-						}
-						ast_stopstream(channel);
-						if (strcmp(buf,reqinp)) /* if not match */
-						{
-							if (debug) printf("@@@@ qcall_do: response (%s) does not match required (%s)\n",buf,reqinp);
-							ast_frfree(f);
-							break;
-						}
-						ast_frfree(f);
-					}
-					/* okay, now we go for it */
-					context = strchr(extstr,'@');
-					if (!context) context = "default";
-					else *context++ = 0;
-					if (option_verbose > 2)
-						ast_verbose(VERBOSE_PREFIX_3 "Qcall got accept, now putting through to %s@%s on %s\n",
-							extstr,context,channel->name);
-					if (strlen(ident)) {
-						strcat(ident,"-ok");
-						/* if file existant, play it */
-						if (!ast_streamfile(channel,ident,0))
-						{
-							ast_waitstream(channel,"");
-							ast_stopstream(channel);
-						}
-					}
-					if (strcasecmp(clid, "asreceived")) {
-						channel->callerid = strdup(clid);
-						channel->ani = strdup(clid);
-					}
-					channel->language[0] = 0;
-					channel->dnid = strdup(extstr);
-#ifdef	AMAFLAGS
-					channel->amaflags = AMAFLAGS;
-#endif
-#ifdef	ACCTCODE
-					strcpy(channel->accountcode,ACCTCODE);
-#else
-					channel->accountcode[0] = 0;
-#endif
-					if (maxsecs)  /* if finite length call */
-					   {
-						time(&channel->whentohangup);
-						channel->whentohangup += maxsecs;
-					   }
-					strcpy(channel->exten,extstr);
-					strcpy(channel->context,context);
-					channel->priority = 1;
-					printf("Caller ID is %s\n", channel->callerid);
-					ast_pbx_run(channel);
-					pthread_exit(NULL);
-				}
-			}
-			else if(f->subclass==AST_CONTROL_RINGING)
-				if (debug) printf("@@@@ qcall_do:Phone Ringing end\n");
-		}
-		ast_frfree(f);
-	}
-	ast_hangup(channel);
-	if (debug) printf("@@@@ qcall_do:Hung up channel\n");
-	pthread_exit(NULL);
-	return NULL;
-}
-
-int unload_module(void)
-{
-	STANDARD_HANGUP_LOCALUSERS;
-	return 0;
-}
-
-int load_module(void)
-{
-	snprintf((char *)qdir,sizeof(qdir)-1,"%s/%s",(char *)ast_config_AST_SPOOL_DIR,"qcall");
-	mkdir(qdir,0760);
-	pthread_create(&qcall_thread,NULL,qcall,NULL);
-	return 0;
-}
-
-char *description(void)
-{
-	return tdesc;
-}
-
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-char *key()
-{
-	return ASTERISK_GPL_KEY;
-}

apps/app_random.c

@@ -3,25 +3,29 @@
  *
  * Random application
  * 
- * Copyright (c) 2003-2004 Tilghman Lesher.  All rights reserved.
+ * Copyright (c) 2003 - 2005 Tilghman Lesher.  All rights reserved.
  *
- * Tilghman Lesher <asterisk__app_random__20040111@the-tilghman.com>
+ * Tilghman Lesher <asterisk__app_random__200508@the-tilghman.com>
  *
  * This code is released by the author with no restrictions on usage or distribution.
  *
  */
 
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
 
 static char *tdesc = "Random goto";
 
@@ -37,15 +41,16 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
+static char random_state[256];
+
 static int random_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
 	struct localuser *u;
 
-	char *s, *ts;
-	char *exten, *pri, *context;
+	char *s;
 	char *prob;
-	int probint, priorityint;
+	int probint;
 
 	if (!data) {
 		ast_log(LOG_WARNING, "Random requires an argument ([probability]:[[context|]extension|]priority)\n");
@@ -54,47 +59,17 @@ static int random_exec(struct ast_channel *chan, void *data)
 	LOCAL_USER_ADD(u);
 	s = ast_strdupa((void *) data);
 
-	prob = strsep(&ts,":");
+	prob = strsep(&s,":");
 	if ((!prob) || (sscanf(prob, "%d", &probint) != 1))
 		probint = 0;
 
 	if ((random() % 100) + probint > 100) {
-		context = strsep(&s, "|");
-		exten = strsep(&s, "|");
-		if (!exten) {
-			/* Only a priority */
-			pri = context;
-			exten = NULL;
-			context = NULL;
-		} else {
-			pri = strsep(&s, "|");
-			if (!pri) {
-				pri = exten;
-				exten = context;
-				context = NULL;
-			}
-		}
-		if (!pri) {
-			ast_log(LOG_WARNING, "No label specified\n");
-			LOCAL_USER_REMOVE(u);
-			return -1;
-		} else if (sscanf(pri, "%d", &priorityint) != 1) {
-			ast_log(LOG_WARNING, "Priority '%s' must be a number > 0\n", pri);
-			LOCAL_USER_REMOVE(u);
-			return -1;
-		}
-		/* At this point we have a priority and */
-		/* maybe an extension and a context     */
-		chan->priority = priorityint - 1;
-		if (exten && strcasecmp(exten, "BYEXTENSION"))
-			strncpy(chan->exten, exten, sizeof(chan->exten)-1);
-		if (context)
-			strncpy(chan->context, context, sizeof(chan->context)-1);
+		res = ast_parseable_goto(chan, s);
 		if (option_verbose > 2)
 			ast_verbose( VERBOSE_PREFIX_3 "Random branches to (%s,%s,%d)\n",
 				chan->context,chan->exten, chan->priority+1);
-		LOCAL_USER_REMOVE(u);
 	}
+	LOCAL_USER_REMOVE(u);
 	return res;
 }
 
@@ -106,7 +81,7 @@ int unload_module(void)
 
 int load_module(void)
 {
-	srandom((unsigned int)getpid() + (unsigned int)time(NULL));
+	initstate((getppid() * 65535 + getpid()) % RAND_MAX, random_state, 256);
 	return ast_register_application(app_random, random_exec, random_synopsis, random_descrip);
 }
 

apps/app_read.c

@@ -11,18 +11,23 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/app.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/options.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/app.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Read Variable Application";
 
@@ -31,45 +36,140 @@ static char *app = "Read";
 static char *synopsis = "Read a variable";
 
 static char *descrip = 
-"  Read(variable[|filename]):  Reads a '#' terminated string of digits from\n"
-"the user, optionally playing a given filename first.  Returns -1 on hangup or\n"
-"error and 0 otherwise.\n";
+"  Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n"
+"Reads a #-terminated string of digits a certain number of times from the\n"
+"user in to the given variable.\n"
+"  filename   -- file to play before reading digits.\n"
+"  maxdigits  -- maximum acceptable number of digits. Stops reading after\n"
+"                maxdigits have been entered (without requiring the user to\n"
+"                press the '#' key).\n"
+"                Defaults to 0 - no limit - wait for the user press the '#' key.\n"
+"                Any value below 0 means the same. Max accepted value is 255.\n"
+"  option     -- may be 'skip' to return immediately if the line is not up,\n"
+"                or 'noanswer' to read digits even if the line is not up.\n"
+"  attempts   -- if greater than 1, that many attempts will be made in the \n"
+"                event no data is entered.\n"
+"  timeout    -- if greater than 0, that value will override the default timeout.\n\n"
+"Returns -1 on hangup or error and 0 otherwise.\n";
 
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
+#define ast_next_data(instr,ptr,delim) if((ptr=strchr(instr,delim))) { *(ptr) = '\0' ; ptr++;}
+
 static int read_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
 	struct localuser *u;
 	char tmp[256];
-	char tmp2[128]="";
-	char *filename;
-	char *stringp;
-	if (!data || !strlen((char *)data)) {
-		ast_log(LOG_WARNING, "Read requires an argument (variable)\n");
+	char *timeout = NULL;
+	char *varname = NULL;
+	char *filename = NULL;
+	char *loops;
+	char *maxdigitstr=NULL;
+	char *options=NULL;
+	int option_skip = 0;
+	int option_noanswer = 0;
+	int maxdigits=255;
+	int tries = 1;
+	int to = 0;
+	int x = 0;
+	char *argcopy = NULL;
+	char *args[8];
+
+	if (data)
+		argcopy = ast_strdupa((char *)data);
+
+	if (ast_separate_app_args(argcopy, '|', args, sizeof(args) / sizeof(args[0])) < 1) {
+		ast_log(LOG_WARNING, "Cannot Parse Arguements.\n");
 		return -1;
 	}
-	strncpy(tmp, (char *)data, sizeof(tmp)-1);
-	stringp=tmp;
-	strsep(&stringp, "|");
-	filename = strsep(&stringp, "|");
-	if (!strlen(tmp)) {
-		ast_log(LOG_WARNING, "Read requires an variable name\n");
+
+	varname = args[x++];
+	filename = args[x++];
+	maxdigitstr = args[x++];
+	options = args[x++];
+	loops = args[x++];
+	timeout = args[x++];
+	
+	if (options) { 
+		if (!strcasecmp(options, "skip"))
+			option_skip = 1;
+		else if (!strcasecmp(options, "noanswer"))
+			option_noanswer = 1;
+		else {
+			if (strchr(options, 's'))
+				option_skip = 1;
+			if (strchr(options, 'n'))
+				option_noanswer = 1;
+		}
+	}
+
+	if(loops) {
+		tries = atoi(loops);
+		if(tries <= 0)
+			tries = 1;
+	}
+
+	if(timeout) {
+		to = atoi(timeout);
+		if (to <= 0)
+			to = 0;
+		else
+			to *= 1000;
+	}
+
+	if (!(filename) || ast_strlen_zero(filename)) 
+		filename = NULL;
+	if (maxdigitstr) {
+		maxdigits = atoi(maxdigitstr);
+		if ((maxdigits<1) || (maxdigits>255)) {
+    			maxdigits = 255;
+		} else if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "Accepting a maximum of %d digits.\n", maxdigits);
+	}
+	if (!(varname) || ast_strlen_zero(varname)) {
+		ast_log(LOG_WARNING, "Invalid! Usage: Read(variable[|filename][|maxdigits][|option][|attempts][|timeout])\n\n");
 		return -1;
 	}
 	LOCAL_USER_ADD(u);
 	if (chan->_state != AST_STATE_UP) {
-		/* Answer if the line isn't up. */
-		res = ast_answer(chan);
+		if (option_skip) {
+			/* At the user's option, skip if the line is not up */
+			pbx_builtin_setvar_helper(chan, varname, "\0");
+			LOCAL_USER_REMOVE(u);
+			return 0;
+		} else if (!option_noanswer) {
+			/* Otherwise answer unless we're supposed to read while on-hook */
+			res = ast_answer(chan);
+		}
 	}
 	if (!res) {
-		ast_stopstream(chan);
-		res = ast_app_getdata(chan, filename, tmp2, sizeof(tmp2) - 1, 0);
-		if (!res)
-			pbx_builtin_setvar_helper(chan, tmp, tmp2);
-		ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp2);
+		while(tries && !res) {
+			ast_stopstream(chan);
+			res = ast_app_getdata(chan, filename, tmp, maxdigits, to);
+			if (res > -1) {
+				pbx_builtin_setvar_helper(chan, varname, tmp);
+				if (!ast_strlen_zero(tmp)) {
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "User entered '%s'\n", tmp);
+					tries = 0;
+				} else {
+					tries--;
+					if (option_verbose > 2) {
+						if (tries)
+							ast_verbose(VERBOSE_PREFIX_3 "User entered nothing, %d chance%s left\n", tries, (tries != 1) ? "s" : "");
+						else
+							ast_verbose(VERBOSE_PREFIX_3 "User entered nothing.\n");
+					}
+				}
+				res = 0;
+			} else {
+				if (option_verbose > 2)
+					ast_verbose(VERBOSE_PREFIX_3 "User disconnected\n");
+			}
+		}
 	}
 	LOCAL_USER_REMOVE(u);
 	return res;

apps/app_readfile.c

@@ -0,0 +1,121 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * ReadFile application -- Reads in a File for you.
+ *
+ * Copyright (C) 2005 Digium, Inc.
+ *
+ * Matt O'Gorman <mogorman@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/app.h"
+#include "asterisk/module.h"
+
+static char *tdesc = "Stores output of file into a variable";
+
+static char *app_readfile = "ReadFile";
+
+static char *readfile_synopsis = "ReadFile(varname=file,length)";
+
+static char *readfile_descrip =
+"ReadFile(varname=file,length)\n"
+"  Varname - Result stored here.\n"
+"  File - The name of the file to read.\n"
+"  Length - Maximum number of characters to capture.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+
+static int readfile_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	char *s, *varname=NULL, *file=NULL, *length=NULL, *returnvar=NULL;
+	int len=0;
+
+
+	s = ast_strdupa(data);
+	if (!s) {
+		ast_log(LOG_ERROR, "Out of memory\n");
+		return -1;
+	}
+
+	varname = strsep(&s, "=");
+	file = strsep(&s, "|");
+	length = s;
+
+	if (!varname || !file) {
+		ast_log(LOG_ERROR, "No file or variable specified!\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+	if (length) {
+		if ((sscanf(length, "%d", &len) != 1) || (len < 0)) {
+			ast_log(LOG_WARNING, "%s is not a positive number, defaulting length to max\n", length);
+			len = 0;
+		}
+	}
+	
+	
+	returnvar = ast_read_textfile(file);
+	if(len > 0){
+		if(len < strlen(returnvar))
+			returnvar[len]='\0';
+		else
+			ast_log(LOG_WARNING,"%s is longer than %d, and %d \n", file, len, (int)strlen(returnvar));
+	}
+	pbx_builtin_setvar_helper(chan, varname, returnvar);
+	free(returnvar);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app_readfile);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app_readfile, readfile_exec, readfile_synopsis, readfile_descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_realtime.c

@@ -0,0 +1,235 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * RealTime App
+ * 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Anthony Minessale <anthmct@yahoo.com>
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/options.h"
+#include "asterisk/pbx.h"
+#include "asterisk/config.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/cli.h"
+
+#define next_one(var) var = var->next
+#define crop_data(str) { *(str) = '\0' ; (str)++; }
+
+static char *tdesc = "Realtime Data Lookup/Rewrite";
+static char *app = "RealTime";
+static char *uapp = "RealTimeUpdate";
+static char *synopsis = "Realtime Data Lookup";
+static char *usynopsis = "Realtime Data Rewrite";
+static char *USAGE = "RealTime(<family>|<colmatch>|<value>[|<prefix>])";
+static char *UUSAGE = "RealTimeUpdate(<family>|<colmatch>|<value>|<newcol>|<newval>)";
+static char *desc = "Use the RealTime config handler system to read data into channel variables.\n"
+"RealTime(<family>|<colmatch>|<value>[|<prefix>])\n\n"
+"All unique column names will be set as channel variables with optional prefix to the name.\n"
+"e.g. prefix of 'var_' would make the column 'name' become the variable ${var_name}\n\n";
+static char *udesc = "Use the RealTime config handler system to update a value\n"
+"RealTimeUpdate(<family>|<colmatch>|<value>|<newcol>|<newval>)\n\n"
+"The column <newcol> in 'family' matching column <colmatch>=<value> will be updated to <newval>\n";
+
+STANDARD_LOCAL_USER;
+LOCAL_USER_DECL;
+
+static int cli_load_realtime(int fd, int argc, char **argv) 
+{
+	char *header_format = "%30s  %-30s\n";
+	struct ast_variable *var=NULL;
+
+	if(argc<5) {
+		ast_cli(fd, "You must supply a family name, a column to match on, and a value to match to.\n");
+		return RESULT_FAILURE;
+	}
+
+	var = ast_load_realtime(argv[2], argv[3], argv[4], NULL);
+
+	if(var) {
+		ast_cli(fd, header_format, "Column Name", "Column Value");
+		ast_cli(fd, header_format, "--------------------", "--------------------");
+		while(var) {
+			ast_cli(fd, header_format, var->name, var->value);
+			var = var->next;
+		}
+	} else {
+		ast_cli(fd, "No rows found matching search criteria.\n");
+	}
+	return RESULT_SUCCESS;
+}
+
+static int cli_update_realtime(int fd, int argc, char **argv) {
+	int res = 0;
+
+	if(argc<7) {
+		ast_cli(fd, "You must supply a family name, a column to update on, a new value, column to match, and value to to match.\n");
+		ast_cli(fd, "Ex: realtime update sipfriends name bobsphone port 4343\n will execute SQL as UPDATE sipfriends SET port = 4343 WHERE name = bobsphone\n");
+		return RESULT_FAILURE;
+	}
+
+	res = ast_update_realtime(argv[2], argv[3], argv[4], argv[5], argv[6], NULL);
+
+	if(res < 0) {
+		ast_cli(fd, "Failed to update. Check the debug log for possible SQL related entries.\n");
+		return RESULT_SUCCESS;
+	}
+
+       ast_cli(fd, "Updated %d RealTime record%s.\n", res, (res != 1) ? "s" : "");
+
+	return RESULT_SUCCESS;
+}
+
+static char cli_load_realtime_usage[] =
+"Usage: realtime load <family> <colmatch> <value>\n"
+"       Prints out a list of variables using the RealTime driver.\n";
+
+static struct ast_cli_entry cli_load_realtime_cmd = {
+        { "realtime", "load", NULL, NULL }, cli_load_realtime,
+        "Used to print out RealTime variables.", cli_load_realtime_usage, NULL };
+
+static char cli_update_realtime_usage[] =
+"Usage: realtime update <family> <colmatch> <value>\n"
+"       Update a single variable using the RealTime driver.\n";
+
+static struct ast_cli_entry cli_update_realtime_cmd = {
+        { "realtime", "update", NULL, NULL }, cli_update_realtime,
+        "Used to update RealTime variables.", cli_update_realtime_usage, NULL };
+
+static int realtime_update_exec(struct ast_channel *chan, void *data) 
+{
+	char *family=NULL, *colmatch=NULL, *value=NULL, *newcol=NULL, *newval=NULL;
+	struct localuser *u;
+	int res = 0;
+	if (!data) {
+        ast_log(LOG_ERROR,"Invalid input %s\n",UUSAGE);
+        return -1;
+    }
+	LOCAL_USER_ADD(u);
+	if ((family = ast_strdupa(data))) {
+		if ((colmatch = strchr(family,'|'))) {
+			crop_data(colmatch);
+			if ((value = strchr(colmatch,'|'))) {
+				crop_data(value);
+				if ((newcol = strchr(value,'|'))) {
+					crop_data(newcol);
+					if ((newval = strchr(newcol,'|'))) 
+						crop_data(newval);
+				}
+			}
+		}
+	}
+	if (! (family && value && colmatch && newcol && newval) ) {
+		ast_log(LOG_ERROR,"Invalid input: usage %s\n",UUSAGE);
+		res = -1;
+	} else {
+		ast_update_realtime(family,colmatch,value,newcol,newval,NULL);
+	}
+
+	LOCAL_USER_REMOVE(u);
+	return res;
+
+}
+
+
+static int realtime_exec(struct ast_channel *chan, void *data)
+{
+	int res=0;
+	struct localuser *u;
+	struct ast_variable *var, *itt;
+	char *family=NULL, *colmatch=NULL, *value=NULL, *prefix=NULL, *vname=NULL;
+	size_t len;
+
+	if (!data) {
+		ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE);
+		return -1;
+	}
+	LOCAL_USER_ADD(u);
+	if ((family = ast_strdupa(data))) {
+		if ((colmatch = strchr(family,'|'))) {
+			crop_data(colmatch);
+			if ((value = strchr(colmatch,'|'))) {
+				crop_data(value);
+				if ((prefix = strchr(value,'|')))
+					crop_data(prefix);
+			}
+		}
+	}
+	if (! (family && value && colmatch) ) {
+		ast_log(LOG_ERROR,"Invalid input: usage %s\n",USAGE);
+		res = -1;
+	} else {
+		if (option_verbose > 3)
+			ast_verbose(VERBOSE_PREFIX_4"Realtime Lookup: family:'%s' colmatch:'%s' value:'%s'\n",family,colmatch,value);
+		if ((var = ast_load_realtime(family, colmatch, value, NULL))) {
+			for (itt = var; itt; itt = itt->next) {
+				if(prefix) {
+					len = strlen(prefix) + strlen(itt->name) + 2;
+					vname = alloca(len);
+					snprintf(vname,len,"%s%s",prefix,itt->name);
+					
+				} else 
+					vname = itt->name;
+
+				pbx_builtin_setvar_helper(chan, vname, itt->value);
+			}
+			ast_variables_destroy(var);
+		} else if (option_verbose > 3)
+			ast_verbose(VERBOSE_PREFIX_4"No Realtime Matches Found.\n");
+	}
+	
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	ast_cli_unregister(&cli_load_realtime_cmd);
+	ast_cli_unregister(&cli_update_realtime_cmd);
+	ast_unregister_application(uapp);
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	ast_cli_register(&cli_load_realtime_cmd);
+	ast_cli_register(&cli_update_realtime_cmd);
+	ast_register_application(uapp, realtime_update_exec, usynopsis, udesc);
+	return ast_register_application(app, realtime_exec, synopsis, desc);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}
+

apps/app_record.c

@@ -11,17 +11,22 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/dsp.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/dsp.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Trivial Record Application";
 
@@ -30,10 +35,24 @@ static char *app = "Record";
 static char *synopsis = "Record to a file";
 
 static char *descrip = 
-"  Record(filename:extension|silence): Records from the  channel into a given\n"
-"filename. If the file exists it will be overwritten. The 'extension'\n"
-"is the extension of the file type  to  be  recorded (wav, gsm, etc).\n"
-"'silence' is the number of seconds of silence to allow before returning.\n"
+"  Record(filename.format|silence[|maxduration][|options])\n\n"
+"Records from the channel into a given filename. If the file exists it will\n"
+"be overwritten.\n"
+"- 'format' is the format of the file type to be recorded (wav, gsm, etc).\n"
+"- 'silence' is the number of seconds of silence to allow before returning.\n"
+"- 'maxduration' is the maximum recording duration in seconds. If missing\n"
+"or 0 there is no maximum.\n"
+"- 'options' may contain any of the following letters:\n"
+"     's' : skip recording if the line is not yet answered\n"
+"     'n' : do not answer, but record anyway if line not yet answered\n"
+"     'a' : append to existing recording rather than replacing\n"
+"     't' : use alternate '*' terminator key instead of default '#'\n"
+"     'q' : quiet (do not play a beep tone)\n"
+"\n"
+"If filename contains '%d', these characters will be replaced with a number\n"
+"incremented by one each time the file is recorded. \n\n"
+"Use 'show file formats' to see the available formats on your system\n\n"
+"User can press '#' to terminate the recording and continue to the next priority.\n\n"
 "Returns -1 when the user hangs up.\n";
 
 STANDARD_LOCAL_USER;
@@ -45,12 +64,10 @@ static int record_exec(struct ast_channel *chan, void *data)
 	int res = 0;
 	int count = 0;
 	int percentflag = 0;
-	char fil[256];
-	char tmp[256];
-	char ext[10];
-	char * vdata;  /* Used so I don't have to typecast every use of *data */
+	char *filename, *ext = NULL, *silstr, *maxstr, *options;
+	char *vdata, *p;
 	int i = 0;
-	int j = 0;
+	char tmp[256];
 
 	struct ast_filestream *s = '\0';
 	struct localuser *u;
@@ -61,99 +78,155 @@ static int record_exec(struct ast_channel *chan, void *data)
 	int dspsilence = 0;
 	int silence = 0;		/* amount of silence to allow */
 	int gotsilence = 0;		/* did we timeout for silence? */
-	char silencestr[5];
-	int k = 0;
+	int maxduration = 0;		/* max duration of recording */
+	int gottimeout = 0;		/* did we timeout for maxduration exceeded? */
+	time_t timeout = 0;
+	int option_skip = 0;
+	int option_noanswer = 0;
+	int option_append = 0;
+	int terminator = '#';
+	int option_quiet = 0;
 	int rfmt = 0;
+	int flags;
+	
+
 
-	vdata = data; /* explained above */
 
 	/* The next few lines of code parse out the filename and header from the input string */
-	if (!vdata) { /* no data implies no filename or anything is present */
+	if (!data || ast_strlen_zero(data)) { /* no data implies no filename or anything is present */
 		ast_log(LOG_WARNING, "Record requires an argument (filename)\n");
 		return -1;
 	}
+	/* Yay for strsep being easy */
+	vdata = ast_strdupa(data);
+	p = vdata;
 	
-	for (; vdata[i] && (vdata[i] != ':') && (vdata[i] != '|'); i++ ) {
-		if ((vdata[i] == '%') && (vdata[i+1] == 'd')) {
-			percentflag = 1;                      /* the wildcard is used */
+	filename = strsep(&p, "|");
+	silstr = strsep(&p, "|");
+	maxstr = strsep(&p, "|");	
+	options = strsep(&p, "|");
+	
+	if (filename) {
+		if (strstr(filename, "%d"))
+			percentflag = 1;
+		ext = strrchr(filename, '.'); /* to support filename with a . in the filename, not format */
+		if (!ext)
+			ext = strchr(filename, ':');
+		if (ext) {
+			*ext = '\0';
+			ext++;
 		}
-		
-		if (i == strlen(vdata) ) {
-			ast_log(LOG_WARNING, "No extension found\n");
-			return -1;
+	}
+	if (!ext) {
+		ast_log(LOG_WARNING, "No extension specified to filename!\n");
+		return -1;
+	}
+	if (silstr) {
+		if ((sscanf(silstr, "%d", &i) == 1) && (i > -1)) {
+			silence = i * 1000;
+		} else if (!ast_strlen_zero(silstr)) {
+			ast_log(LOG_WARNING, "'%s' is not a valid silence duration\n", silstr);
 		}
-		fil[i] = vdata[i];
 	}
-	fil[i++] = '\0';
-
-	for (; j < 10 && i < strlen(data) && (vdata[i] != '|'); i++, j++)
-		ext[j] = vdata[i];
-	ext[j] = '\0';
-
-	if (vdata[i] && (vdata[i] == '|')) i++;
-	for (; vdata[i] && (vdata[i] != '|') && (k < 3) && i < strlen(data); i++, k++)
-		silencestr[k] = vdata[i];
-	silencestr[k] = '\0';
-
-	if (silencestr) {
-		silence = atoi(silencestr);
-		if (silence > 0)
-			silence *= 1000;
+	
+	if (maxstr) {
+		if ((sscanf(maxstr, "%d", &i) == 1) && (i > -1))
+			maxduration = i;
+		else if (!ast_strlen_zero(maxstr))
+			ast_log(LOG_WARNING, "'%s' is not a valid maximum duration\n", maxstr);
 	}
-
+	if (options) {
+		/* Retain backwards compatibility with old style options */
+		if (!strcasecmp(options, "skip"))
+			option_skip = 1;
+		else if (!strcasecmp(options, "noanswer"))
+			option_noanswer = 1;
+		else {
+			if (strchr(options, 's'))
+				option_skip = 1;
+			if (strchr(options, 'n'))
+				option_noanswer = 1;
+			if (strchr(options, 'a'))
+				option_append = 1;
+			if (strchr(options, 't'))
+				terminator = '*';
+			if (strchr(options, 'q'))
+				option_quiet = 1;
+		}
+	}
+	
 	/* done parsing */
 	
-	
 	/* these are to allow the use of the %d in the config file for a wild card of sort to
 	  create a new file with the inputed name scheme */
 	if (percentflag) {
 		do {
-			snprintf(tmp, 256, fil, count);
+			snprintf(tmp, sizeof(tmp), filename, count);
 			count++;
 		} while ( ast_fileexists(tmp, ext, chan->language) != -1 );
+		pbx_builtin_setvar_helper(chan, "RECORDED_FILE", tmp);
 	} else
-		strncpy(tmp, fil, 256-1);
+		strncpy(tmp, filename, sizeof(tmp)-1);
 	/* end of routine mentioned */
-
+	
 	LOCAL_USER_ADD(u);
-
+	
 	if (chan->_state != AST_STATE_UP) {
-		res = ast_answer(chan); /* Shouldn't need this, but checking to see if channel is already answered
-					 * Theoretically asterisk should already have answered before running the app */
+		if (option_skip) {
+			/* At the user's option, skip if the line is not up */
+			LOCAL_USER_REMOVE(u);
+			return 0;
+		} else if (!option_noanswer) {
+			/* Otherwise answer unless we're supposed to record while on-hook */
+			res = ast_answer(chan);
+		}
 	}
 	
 	if (!res) {
-		/* Some code to play a nice little beep to signify the start of the record operation */
-		res = ast_streamfile(chan, "beep", chan->language);
-		if (!res) {
-			res = ast_waitstream(chan, "");
-		} else {
-			ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", chan->name);
-		}
-		ast_stopstream(chan);
-
-		/* The end of beep code.  Now the recording starts */
-
-
-		if (silence > 0) {
-	        	rfmt = chan->readformat;
-        		res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
-        		if (res < 0) {
-                		ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
-        		        return -1;
-        		}
-			sildet = ast_dsp_new();
-        		if (!sildet) {
-                		ast_log(LOG_WARNING, "Unable to create silence detector :(\n");
-                		return -1;
-		       	}
-			ast_dsp_set_threshold(sildet, 256);
-		}
-
-		s = ast_writefile( tmp, ext, NULL, O_CREAT|O_TRUNC|O_WRONLY , 0, 0644);
 	
+		if (!option_quiet) {
+			/* Some code to play a nice little beep to signify the start of the record operation */
+			res = ast_streamfile(chan, "beep", chan->language);
+			if (!res) {
+				res = ast_waitstream(chan, "");
+			} else {
+				ast_log(LOG_WARNING, "ast_streamfile failed on %s\n", chan->name);
+			}
+			ast_stopstream(chan);
+		}
+		
+		/* The end of beep code.  Now the recording starts */
+		
+		if (silence > 0) {
+			rfmt = chan->readformat;
+			res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
+			if (res < 0) {
+				ast_log(LOG_WARNING, "Unable to set to linear mode, giving up\n");
+				return -1;
+			}
+			sildet = ast_dsp_new();
+			if (!sildet) {
+				ast_log(LOG_WARNING, "Unable to create silence detector :(\n");
+				return -1;
+			}
+			ast_dsp_set_threshold(sildet, 256);
+		} 
+		
+		
+		flags = option_append ? O_CREAT|O_APPEND|O_WRONLY : O_CREAT|O_TRUNC|O_WRONLY;
+		s = ast_writefile( tmp, ext, NULL, flags , 0, 0644);
+		
+		
 		if (s) {
+			if (maxduration > 0)
+				timeout = time(NULL) + (time_t)maxduration;
+			
 			while (ast_waitfor(chan, -1) > -1) {
+				if (maxduration > 0 && time(NULL) > timeout) {
+					gottimeout = 1;
+					break;
+				}
+				
 				f = ast_read(chan);
 				if (!f) {
 					res = -1;
@@ -166,7 +239,7 @@ static int record_exec(struct ast_channel *chan, void *data)
 						ast_log(LOG_WARNING, "Problem writing frame\n");
 						break;
 					}
-
+					
 					if (silence > 0) {
 						dspsilence = 0;
 						ast_dsp_silence(sildet, f, &dspsilence);
@@ -175,12 +248,12 @@ static int record_exec(struct ast_channel *chan, void *data)
 						} else {
 							totalsilence = 0;
 						}
-	                                	if (totalsilence > silence) {
-        	                        	        /* Ended happily with silence */
+						if (totalsilence > silence) {
+							/* Ended happily with silence */
 							ast_frfree(f);
 							gotsilence = 1;
-                	                	        break;
-	                     	        	}
+							break;
+						}
 					}
 				}
 				if (f->frametype == AST_FRAME_VIDEO) {
@@ -192,36 +265,36 @@ static int record_exec(struct ast_channel *chan, void *data)
 					}
 				}
 				if ((f->frametype == AST_FRAME_DTMF) &&
-					(f->subclass == '#')) {
+					(f->subclass == terminator)) {
 					ast_frfree(f);
 					break;
 				}
 				ast_frfree(f);
 			}
 			if (!f) {
-					ast_log(LOG_DEBUG, "Got hangup\n");
-					res = -1;
+				ast_log(LOG_DEBUG, "Got hangup\n");
+				res = -1;
 			}
-
+			
 			if (gotsilence) {
 				ast_stream_rewind(s, silence-1000);
 				ast_truncstream(s);
-			} else {
+			} else if (!gottimeout) {
 				/* Strip off the last 1/4 second of it */
 				ast_stream_rewind(s, 250);
 				ast_truncstream(s);
 			}
 			ast_closestream(s);
 		} else			
-			ast_log(LOG_WARNING, "Could not create file %s\n", fil);
+			ast_log(LOG_WARNING, "Could not create file %s\n", filename);
 	} else
 		ast_log(LOG_WARNING, "Could not answer channel '%s'\n", chan->name);
-
+	
 	LOCAL_USER_REMOVE(u);
-	if (silence > 0) {
-	        res = ast_set_read_format(chan, rfmt);
-        	if (res)
-        	        ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
+	if ((silence > 0) && rfmt) {
+		res = ast_set_read_format(chan, rfmt);
+		if (res)
+			ast_log(LOG_WARNING, "Unable to restore read format on '%s'\n", chan->name);
 		if (sildet)
 			ast_dsp_free(sildet);
 	}

apps/app_sayunixtime.c

@@ -15,18 +15,24 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/options.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/say.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/options.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/say.h"
 
 
 static char *tdesc = "Say time";
 
 static char *app_sayunixtime = "SayUnixTime";
+static char *app_datetime = "DateTime";
 
 static char *sayunixtime_synopsis = "Says a specified time in a custom format";
 
@@ -39,6 +45,15 @@ static char *sayunixtime_descrip =
 "  format:   a format the time is to be said in.  See voicemail.conf.\n"
 "              defaults to \"ABdY 'digits/at' IMp\"\n"
 "  Returns 0 or -1 on hangup.\n";
+static char *datetime_descrip =
+"DateTime([unixtime][|[timezone][|format]])\n"
+"  unixtime: time, in seconds since Jan 1, 1970.  May be negative.\n"
+"              defaults to now.\n"
+"  timezone: timezone, see /usr/share/zoneinfo for a list.\n"
+"              defaults to machine default.\n"
+"  format:   a format the time is to be said in.  See voicemail.conf.\n"
+"              defaults to \"ABdY 'digits/at' IMp\"\n"
+"  Returns 0 or -1 on hangup.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -48,16 +63,23 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
 {
 	int res=0;
 	struct localuser *u;
-	char *s,*zone=NULL,*timec;
+	char *s,*zone=NULL,*timec,*format;
 	time_t unixtime;
-	char *format = "ABdY 'digits/at' IMp";
 	struct timeval tv;
-
+	
 	LOCAL_USER_ADD(u);
 
-	gettimeofday(&tv,NULL);
+	tv = ast_tvnow();
 	unixtime = (time_t)tv.tv_sec;
 
+	if( !strcasecmp(chan->language, "da" ) ) {
+		format = "A dBY HMS";
+	} else if ( !strcasecmp(chan->language, "de" ) ) {
+		format = "A dBY HMS";
+	} else {
+		format = "ABdY 'digits/at' IMp";
+	} 
+
 	if (data) {
 		s = data;
 		s = ast_strdupa(s);
@@ -94,13 +116,23 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data)
 
 int unload_module(void)
 {
+	int res;
 	STANDARD_HANGUP_LOCALUSERS;
-	return ast_unregister_application(app_sayunixtime);
+	res = ast_unregister_application(app_sayunixtime);
+	if (! res)
+		return ast_unregister_application(app_datetime);
+	else
+		return res;
 }
 
 int load_module(void)
 {
-	return ast_register_application(app_sayunixtime, sayunixtime_exec, sayunixtime_synopsis, sayunixtime_descrip);
+	int res;
+	res = ast_register_application(app_sayunixtime, sayunixtime_exec, sayunixtime_synopsis, sayunixtime_descrip);
+	if (! res)
+		return ast_register_application(app_datetime, sayunixtime_exec, sayunixtime_synopsis, datetime_descrip);
+	else
+		return res;
 }
 
 char *description(void)

apps/app_senddtmf.c

@@ -11,17 +11,23 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/options.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/options.h"
+#include "asterisk/utils.h"
+#include "asterisk/app.h"
 
 static char *tdesc = "Send DTMF digits Application";
 
@@ -30,8 +36,9 @@ static char *app = "SendDTMF";
 static char *synopsis = "Sends arbitrary DTMF digits";
 
 static char *descrip = 
-"  SendDTMF(digits): Sends DTMF digits on a channel.  Returns 0 on success"
-"or -1 on a hangup.\n";
+"  SendDTMF(digits[|timeout_ms]): Sends DTMF digits on a channel. \n"
+"  Accepted digits: 0-9, *#abcd\n"
+" Returns 0 on success or -1 on a hangup.\n";
 
 STANDARD_LOCAL_USER;
 
@@ -41,32 +48,24 @@ static int senddtmf_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
 	struct localuser *u;
-	char *digits = data;
-	struct ast_frame f;
-	int x;
-	if (!digits || !strlen(digits)) {
-		ast_log(LOG_WARNING, "SendDTMF requires an argument (digits)\n");
-		return -1;
+	char *digits = NULL, *to = NULL;
+	int timeout = 250;
+
+	if (data && !ast_strlen_zero(data) && (digits = ast_strdupa((char *)data))) {
+		if((to = strchr(digits,'|'))) {
+			*to = '\0';
+			to++;
+			timeout = atoi(to);
+		}
+		LOCAL_USER_ADD(u);
+		if(timeout <= 0)
+			timeout = 250;
+
+		res = ast_dtmf_stream(chan,NULL,digits,timeout);
+		LOCAL_USER_REMOVE(u);
+	} else {
+		ast_log(LOG_WARNING, "SendDTMF requires an argument (digits or *#aAbBcCdD)\n");
 	}
-	LOCAL_USER_ADD(u);
-	for (x=0;x<strlen(digits);x++) {
-		memset(&f, 0, sizeof(f));
-		f.frametype = AST_FRAME_DTMF;
-		f.subclass = digits[x];
-		f.src = "app_senddtmf";
-		res = ast_write(chan, &f);
-		if (res)
-			break;
-		/* Wait 250ms */
-		res = ast_safe_sleep(chan, 250);
-		if (res)
-			break;
-	}
-	if (!res)
-		if (option_verbose > 2)
-			ast_verbose(VERBOSE_PREFIX_3 "Sent digit string '%s' on %s\n", digits, chan->name);
-			
-	LOCAL_USER_REMOVE(u);
 	return res;
 }
 

apps/app_sendtext.c

@@ -0,0 +1,117 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * App to transmit a text message
+ * 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/options.h"
+
+static const char *tdesc = "Send Text Applications";
+
+static const char *app = "SendText";
+
+static const char *synopsis = "Send a Text Message";
+
+static const char *descrip = 
+"  SendText(text): Sends text to current channel (callee).\n"
+"Otherwise, execution will continue at the next priority level.\n"
+"Result of transmission will be stored in the SENDTEXTSTATUS\n"
+"channel variable:\n"
+"      SUCCESS      Transmission succeeded\n"
+"      FAILURE      Transmission failed\n"
+"      UNSUPPORTED  Text transmission not supported by channel\n"
+"\n"
+"At this moment, text is supposed to be 7 bit ASCII in most channels.\n"
+"Old deprecated behavior: \n"
+" SendText only returns 0 if the text was sent correctly or if\n"
+" the channel does not support text transport.\n"
+" If the client does not support text transport, and there exists a\n"
+" step with priority n + 101, then execution will continue at that step.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int sendtext_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	char *status = "UNSUPPORTED";
+
+	if (!data || !strlen((char *)data)) {
+		ast_log(LOG_WARNING, "SendText requires an argument (text)\n");
+		return -1;
+	}
+
+	LOCAL_USER_ADD(u);
+	ast_mutex_lock(&chan->lock);
+	if (!chan->tech->send_text) {
+		ast_mutex_unlock(&chan->lock);
+		/* Does not support transport */
+		if (option_priority_jumping)
+			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
+		LOCAL_USER_REMOVE(u);
+		return 0;
+	}
+	status = "FAILURE";
+	ast_mutex_unlock(&chan->lock);
+	res = ast_sendtext(chan, (char *)data);
+	if (!res)
+		status = "SUCCESS";
+	pbx_builtin_setvar_helper(chan, "SENDTEXTSTATUS", status);
+	LOCAL_USER_REMOVE(u);
+	return 0;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, sendtext_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return (char *) tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+
+	STANDARD_USECOUNT(res);
+
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_setcallerid.c

@@ -11,17 +11,67 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+
+static char *app2 = "SetCallerPres";
+
+static char *synopsis2 = "Set CallerID Presentation";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static char *descrip2 = 
+"  SetCallerPres(presentation): Set Caller*ID presentation on a call.\n"
+"  Always returns 0.  Valid presentations are:\n"
+"\n"
+"      allowed_not_screened    : Presentation Allowed, Not Screened\n"
+"      allowed_passed_screen   : Presentation Allowed, Passed Screen\n" 
+"      allowed_failed_screen   : Presentation Allowed, Failed Screen\n" 
+"      allowed                 : Presentation Allowed, Network Number\n"
+"      prohib_not_screened     : Presentation Prohibited, Not Screened\n" 
+"      prohib_passed_screen    : Presentation Prohibited, Passed Screen\n"
+"      prohib_failed_screen    : Presentation Prohibited, Failed Screen\n"
+"      prohib                  : Presentation Prohibited, Network Number\n"
+"      unavailable             : Number Unavailable\n"
+"\n"
+;
+
+static int setcallerid_pres_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u;
+	int pres = -1;
+
+	pres = ast_parse_caller_presentation(data);
+
+	if (pres < 0) {
+		ast_log(LOG_WARNING, "'%s' is not a valid presentation (see 'show application SetCallerPres')\n",
+			(char *) data);
+		return 0;
+	}
+
+	LOCAL_USER_ADD(u);
+	chan->cid.cid_pres = pres;
+	LOCAL_USER_REMOVE(u);
+	return 0;
+}
+
+
 
 static char *tdesc = "Set CallerID Application";
 
@@ -33,19 +83,17 @@ static char *descrip =
 "  SetCallerID(clid[|a]): Set Caller*ID on a call to a new\n"
 "value.  Sets ANI as well if a flag is used.  Always returns 0\n";
 
-STANDARD_LOCAL_USER;
-
-LOCAL_USER_DECL;
-
 static int setcallerid_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
 	char tmp[256] = "";
+	char name[256];
+	char num[256];
 	struct localuser *u;
 	char *opt;
 	int anitoo = 0;
 	if (data)
-		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
+		ast_copy_string(tmp, (char *)data, sizeof(tmp));
 	opt = strchr(tmp, '|');
 	if (opt) {
 		*opt = '\0';
@@ -54,7 +102,8 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 			anitoo = 1;
 	}
 	LOCAL_USER_ADD(u);
-	ast_set_callerid(chan, strlen(tmp) ? tmp : NULL, anitoo);
+	ast_callerid_split(tmp, name, sizeof(name), num, sizeof(num));
+	ast_set_callerid(chan, num, name, anitoo ? num : NULL);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }
@@ -62,11 +111,13 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
+	ast_unregister_application(app2);
 	return ast_unregister_application(app);
 }
 
 int load_module(void)
 {
+	ast_register_application(app2, setcallerid_pres_exec, synopsis2, descrip2);
 	return ast_register_application(app, setcallerid_exec, synopsis, descrip);
 }
 

apps/app_setcdruserfield.c

@@ -12,15 +12,22 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/channel.h>
-#include <asterisk/cdr.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
-#include <asterisk/logger.h>
-
 #include <stdlib.h>
 #include <string.h>
 
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/channel.h"
+#include "asterisk/cdr.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+#include "asterisk/logger.h"
+#include "asterisk/config.h"
+#include "asterisk/manager.h"
+#include "asterisk/utils.h"
+
 
 static char *tdesc = "CDR user field apps";
 
@@ -59,6 +66,35 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
+static int action_setcdruserfield(struct mansession *s, struct message *m)
+{
+	struct ast_channel *c = NULL;
+	char *userfield = astman_get_header(m, "UserField");
+	char *channel = astman_get_header(m, "Channel");
+	char *append = astman_get_header(m, "Append");
+
+	if (ast_strlen_zero(channel)) {
+		astman_send_error(s, m, "No Channel specified");
+		return 0;
+	}
+	if (ast_strlen_zero(userfield)) {
+		astman_send_error(s, m, "No UserField specified");
+		return 0;
+	}
+	c = ast_get_channel_by_name_locked(channel);
+	if (!c) {
+		astman_send_error(s, m, "No such channel");
+		return 0;
+	}
+	if (ast_true(append))
+		ast_cdr_appenduserfield(c, userfield);
+	else
+		ast_cdr_setuserfield(c, userfield);
+	ast_mutex_unlock(&c->lock);
+	astman_send_ack(s, m, "CDR Userfield Set");
+	return 0;
+}
+
 static int setcdruserfield_exec(struct ast_channel *chan, void *data)
 {
 	struct localuser *u;
@@ -97,6 +133,7 @@ int unload_module(void)
 	STANDARD_HANGUP_LOCALUSERS;
 	res = ast_unregister_application(setcdruserfield_app);
 	res |= ast_unregister_application(appendcdruserfield_app);
+	ast_manager_unregister("SetCDRUserField");
 	return res;
 }
 
@@ -105,7 +142,7 @@ int load_module(void)
 	int res;
 	res = ast_register_application(setcdruserfield_app, setcdruserfield_exec, setcdruserfield_synopsis, setcdruserfield_descrip);
 	res |= ast_register_application(appendcdruserfield_app, appendcdruserfield_exec, appendcdruserfield_synopsis, appendcdruserfield_descrip);
-
+	ast_manager_register("SetCDRUserField", EVENT_FLAG_CALL, action_setcdruserfield, "Set the CDR UserField");
 	return res;
 }
 

apps/app_setcidname.c

@@ -11,18 +11,23 @@
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/callerid.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Set CallerID Name";
 
@@ -34,7 +39,9 @@ static char *descrip =
 "  SetCIDName(cname[|a]): Set Caller*ID Name on a call to a new\n"
 "value, while preserving the original Caller*ID number.  This is\n"
 "useful for providing additional information to the called\n"
-"party. Sets ANI as well if a flag is used.  Always returns 0\n";
+"party. Always returns 0\n"
+"SetCIDName has been deprecated in favor of the function\n"
+"CALLERID(name)\n";
 
 STANDARD_LOCAL_USER;
 
@@ -44,36 +51,23 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
 	char tmp[256] = "";
-	char oldcid[256] = "", *l, *n;
-	char newcid[256] = "";
 	struct localuser *u;
 	char *opt;
-	int anitoo = 0;
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetCIDName is deprecated, please use Set(CALLERID(name)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
 	if (data)
-		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
+		ast_copy_string(tmp, (char *)data, sizeof(tmp));
 	opt = strchr(tmp, '|');
 	if (opt) {
 		*opt = '\0';
-		opt++;
-		if (*opt == 'a')
-			anitoo = 1;
 	}
 	LOCAL_USER_ADD(u);
-	if (chan->callerid) {
-		strncpy(oldcid, chan->callerid, sizeof(oldcid) - 1);
-		ast_callerid_parse(oldcid, &n, &l);
-		n = tmp;
-		if (strlen(n)) {
-			if (l && strlen(l))
-				snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", n, l);
-			else
-				strncpy(newcid, tmp, sizeof(newcid) - 1);
-		} else if (l && strlen(l)) {
-			strncpy(newcid, l, sizeof(newcid) - 1);
-		}
-	} else
-		strncpy(newcid, tmp, sizeof(newcid));
-	ast_set_callerid(chan, strlen(newcid) ? newcid : NULL, anitoo);
+	ast_set_callerid(chan, NULL, tmp, NULL);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }

apps/app_setcidnum.c

@@ -3,27 +3,32 @@
  *
  * App to set callerid
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  * Oliver Daudey <traveler@xs4all.nl>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
  
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/translate.h>
-#include <asterisk/image.h>
-#include <asterisk/callerid.h>
 #include <string.h>
 #include <stdlib.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/utils.h"
 
 static char *tdesc = "Set CallerID Number";
 
@@ -35,7 +40,9 @@ static char *descrip =
 "  SetCIDNum(cnum[|a]): Set Caller*ID Number on a call to a new\n"
 "value, while preserving the original Caller*ID name.  This is\n"
 "useful for providing additional information to the called\n"
-"party. Sets ANI as well if a flag is used.  Always returns 0\n";
+"party. Sets ANI as well if a flag is used.  Always returns 0\n"
+"SetCIDNum has been deprecated in favor of the function\n"
+"CALLERID(number)\n";
 
 STANDARD_LOCAL_USER;
 
@@ -44,14 +51,19 @@ LOCAL_USER_DECL;
 static int setcallerid_exec(struct ast_channel *chan, void *data)
 {
 	int res = 0;
-	char tmp[256] = "";
-	char oldcid[256] = "", *l, *n;
-	char newcid[256] = "";
 	struct localuser *u;
 	char *opt;
 	int anitoo = 0;
+	char tmp[256];
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetCIDNum is deprecated, please use Set(CALLERID(number)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
 	if (data)
-		strncpy(tmp, (char *)data, sizeof(tmp) - 1);
+		ast_copy_string(tmp, (char *)data, sizeof(tmp));
 	opt = strchr(tmp, '|');
 	if (opt) {
 		*opt = '\0';
@@ -60,21 +72,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data)
 			anitoo = 1;
 	}
 	LOCAL_USER_ADD(u);
-	if (chan->callerid) {
-		strncpy(oldcid, chan->callerid, sizeof(oldcid) - 1);
-		ast_callerid_parse(oldcid, &n, &l);
-		l = tmp;
-		if (strlen(l)) {
-			if (n && strlen(n))
-				snprintf(newcid, sizeof(newcid), "\"%s\" <%s>", n, l);
-			else
-				strncpy(newcid, tmp, sizeof(newcid) - 1);
-		} else if (n && strlen(n)) {
-			strncpy(newcid, n, sizeof(newcid) - 1);
-		}
-	} else
-		strncpy(newcid, tmp, sizeof(newcid));
-	ast_set_callerid(chan, strlen(newcid) ? newcid : NULL, anitoo);
+	ast_set_callerid(chan, tmp, NULL, anitoo ? tmp : NULL);
 	LOCAL_USER_REMOVE(u);
 	return res;
 }

apps/app_setrdnis.c

@@ -0,0 +1,109 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * App to set rdnis
+ * 
+ * Copyright (C) 1999 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ * Oliver Daudey <traveler@xs4all.nl>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/image.h"
+#include "asterisk/callerid.h"
+#include "asterisk/utils.h"
+
+static char *tdesc = "Set RDNIS Number";
+
+static char *app = "SetRDNIS";
+
+static char *synopsis = "Set RDNIS Number";
+
+static char *descrip = 
+"  SetRDNIS(cnum): Set RDNIS Number on a call to a new\n"
+"value.  Always returns 0\n"
+"SetRDNIS has been deprecated in favor of the function\n"
+"CALLERID(rdnis)\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int setrdnis_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u;
+	char *opt, *n, *l;
+	char tmp[256];
+	static int deprecation_warning = 0;
+
+	if (!deprecation_warning) {
+		ast_log(LOG_WARNING, "SetRDNIS is deprecated, please use Set(CALLERID(rdnis)=value) instead.\n");
+		deprecation_warning = 1;
+	}
+
+	if (data)
+		ast_copy_string(tmp, (char *)data, sizeof(tmp));
+	else
+		tmp[0] = '\0';
+	opt = strchr(tmp, '|');
+	if (opt)
+		*opt = '\0';
+	LOCAL_USER_ADD(u);
+	n = l = NULL;
+	ast_callerid_parse(tmp, &n, &l);
+	if (l) {
+		ast_shrink_phone_number(l);
+		ast_mutex_lock(&chan->lock);
+		if (chan->cid.cid_rdnis)
+			free(chan->cid.cid_rdnis);
+		chan->cid.cid_rdnis = (l[0]) ? strdup(l) : NULL;
+		ast_mutex_unlock(&chan->lock);
+	}
+	LOCAL_USER_REMOVE(u);
+	return 0;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, setrdnis_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_settransfercapability.c

@@ -0,0 +1,119 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * App to set the ISDN Transfer Capability
+ * 
+ * Copyright (C) 2005, Frank Sautter, levigo holding gmbh, www.levigo.de
+ *
+ * Frank Sautter - asterisk+at+sautter+dot+com 
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
+#include "asterisk/transcap.h"
+
+
+static char *app = "SetTransferCapability";
+
+static char *synopsis = "Set ISDN Transfer Capability";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static struct {	int val; char *name; } transcaps[] = {
+	{ AST_TRANS_CAP_SPEECH,				"SPEECH" },
+	{ AST_TRANS_CAP_DIGITAL,			"DIGITAL" },
+	{ AST_TRANS_CAP_RESTRICTED_DIGITAL,	"RESTRICTED_DIGITAL" },
+	{ AST_TRANS_CAP_3_1K_AUDIO,			"3K1AUDIO" },
+	{ AST_TRANS_CAP_DIGITAL_W_TONES,	"DIGITAL_W_TONES" },
+	{ AST_TRANS_CAP_VIDEO,				"VIDEO" },
+};
+
+static char *descrip = 
+"  SetTransferCapability(transfercapability): Set the ISDN Transfer \n"
+"Capability of a call to a new value.\n"
+"Always returns 0.  Valid Transfer Capabilities are:\n"
+"\n"
+"  SPEECH             : 0x00 - Speech (default, voice calls)\n"
+"  DIGITAL            : 0x08 - Unrestricted digital information (data calls)\n"
+"  RESTRICTED_DIGITAL : 0x09 - Restricted digital information\n"
+"  3K1AUDIO           : 0x10 - 3.1kHz Audio (fax calls)\n"
+"  DIGITAL_W_TONES    : 0x11 - Unrestricted digital information with tones/announcements\n"
+"  VIDEO              : 0x18 - Video:\n"
+"\n"
+;
+
+static int settransfercapability_exec(struct ast_channel *chan, void *data)
+{
+	char tmp[256] = "";
+	struct localuser *u;
+	int x;
+	char *opts;
+	int transfercapability = -1;
+	
+	if (data)
+		ast_copy_string(tmp, (char *)data, sizeof(tmp));
+	opts = strchr(tmp, '|');
+	if (opts)
+		*opts = '\0';
+	for (x=0;x<sizeof(transcaps) / sizeof(transcaps[0]);x++) {
+		if (!strcasecmp(transcaps[x].name, tmp)) {
+			transfercapability = transcaps[x].val;
+			break;
+		}
+	}
+	if (transfercapability < 0) {
+		ast_log(LOG_WARNING, "'%s' is not a valid transfer capability (see 'show application SetTransferCapability')\n", tmp);
+		return 0;
+	} else {
+		LOCAL_USER_ADD(u);
+		chan->transfercapability = (unsigned short)transfercapability;
+		LOCAL_USER_REMOVE(u);
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "Setting transfer capability to: 0x%.2x - %s.\n", transfercapability, tmp);			
+		return 0;
+	}
+}
+
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, settransfercapability_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return synopsis;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_skel.c

@@ -3,43 +3,93 @@
  *
  * Skeleton application
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) <Year>, <Your Name Here>
  *
- * Mark Spencer <markster@linux-support.net>
+ * <Your Name Here> <<You Email Here>>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
 
 static char *tdesc = "Trivial skeleton Application";
-static char *app = "skel";
+static char *app = "Skel";
 static char *synopsis = 
-"  This is a skeleton application that shows you the basic structure to create your\n"
-"own asterisk applications.\n";
+"Skeleton application.";
+static char *descrip = "This application is a template to build other applications from.\n"
+ " It shows you the basic structure to create your own Asterisk applications.\n";
+
+#define OPTION_A	(1 << 0)	/* Option A */
+#define OPTION_B	(1 << 1)	/* Option B(n) */
+#define OPTION_C	(1 << 2)	/* Option C(str) */
+#define OPTION_NULL	(1 << 3)	/* Dummy Termination */
+
+AST_DECLARE_OPTIONS(app_opts,{
+	['a'] = { OPTION_A },
+	['b'] = { OPTION_B, 1 },
+	['c'] = { OPTION_C, 2 }
+});
 
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static int skel_exec(struct ast_channel *chan, void *data)
+static int app_exec(struct ast_channel *chan, void *data)
 {
-	int res=0;
+	int res = 0;
+	struct ast_flags flags;
 	struct localuser *u;
-	if (!data) {
-		ast_log(LOG_WARNING, "skel requires an argument (filename)\n");
+	char *options=NULL;
+	char *dummy = NULL;
+	char *args;
+	int argc = 0;
+	char *opts[2];
+	char *argv[2];
+
+	if (!(args = ast_strdupa((char *)data))) {
+		ast_log(LOG_ERROR, "Out of memory!\n");
 		return -1;
 	}
+
+	if (!data) {
+		ast_log(LOG_WARNING, "%s requires an argument (dummy|[options])\n",app);
+		return -1;
+	}
+
 	LOCAL_USER_ADD(u);
+	if ((argc = ast_separate_app_args(args, '|', argv, sizeof(argv) / sizeof(argv[0])))) {
+		dummy = argv[0];
+		options = argv[1];
+		ast_parseoptions(app_opts, &flags, opts, options);
+	}
+
+	if (dummy && !ast_strlen_zero(dummy)) 
+		ast_log(LOG_NOTICE, "Dummy value is : %s\n", dummy);
+
+	if (ast_test_flag(&flags, OPTION_A))
+		ast_log(LOG_NOTICE, "Option A is set\n");
+
+	if (ast_test_flag(&flags, OPTION_B))
+		ast_log(LOG_NOTICE,"Option B is set with : %s\n", opts[0] ? opts[0] : "<unspecified>");
+
+	if (ast_test_flag(&flags, OPTION_C))
+		ast_log(LOG_NOTICE,"Option C is set with : %s\n", opts[1] ? opts[1] : "<unspecified>");
+
 	/* Do our thing here */
 	LOCAL_USER_REMOVE(u);
 	return res;
@@ -53,7 +103,7 @@ int unload_module(void)
 
 int load_module(void)
 {
-	return ast_register_application(app, skel_exec, synopsis, tdesc);
+	return ast_register_application(app, app_exec, synopsis, descrip);
 }
 
 char *description(void)

apps/app_softhangup.c

@@ -12,25 +12,29 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
 
 static char *synopsis = "Soft Hangup Application";
 
 static char *tdesc = "Hangs up the requested channel";
 
-static char *desc = "  SoftHangup(Technology/resource)\n"
-"Hangs up the requested channel.  Always returns 0\n";
+static char *desc = "  SoftHangup(Technology/resource|options)\n"
+"Hangs up the requested channel.  Always returns 0\n"
+"- 'options' may contain the following letter:\n"
+"     'a' : hang up all channels on a specified device instead of a single resource\n";
 
 static char *app = "SoftHangup";
 
@@ -42,18 +46,43 @@ static int softhangup_exec(struct ast_channel *chan, void *data)
 {
 	struct localuser *u;
 	struct ast_channel *c=NULL;
+	char *options, *cut, *cdata, *match;
+	char name[AST_CHANNEL_NAME] = "";
+	int all = 0;
+
 	if (!data) {
                 ast_log(LOG_WARNING, "SoftHangup requires an argument (Technology/resource)\n");
 		return 0;
 	}
+	
+	cdata = ast_strdupa(data);
+	match = strsep(&cdata, "|");
+	options = strsep(&cdata, "|");
+	all = options && strchr(options,'a');
 	LOCAL_USER_ADD(u);
-	c = ast_channel_walk(NULL);
+	c = ast_channel_walk_locked(NULL);
 	while (c) {
-		if (!strcasecmp(c->name, data)) {
-			ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
-			break;
+		strncpy(name, c->name, sizeof(name)-1);
+		ast_mutex_unlock(&c->lock);
+		/* XXX watch out, i think it is wrong to access c-> after unlocking! */
+		if (all) {
+			/* CAPI is set up like CAPI[foo/bar]/clcnt */ 
+			if (!strcmp(c->type,"CAPI")) 
+				cut = strrchr(name,'/');
+			/* Basically everything else is Foo/Bar-Z */
+			else
+				cut = strchr(name,'-');
+			/* Get rid of what we've cut */
+			if (cut)
+				*cut = 0;
 		}
-		c = ast_channel_walk(c);
+		if (!strcasecmp(name, match)) {
+			ast_log(LOG_WARNING, "Soft hanging %s up.\n",c->name);
+			ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
+			if(!all)
+				break;
+		}
+		c = ast_channel_walk_locked(c);
 	}
 	LOCAL_USER_REMOVE(u);
 

apps/app_sql_postgres.c

@@ -5,31 +5,35 @@
  * 
  * Copyright (C) 2002, Christos Ricudis
  *
- * Christos Ricudis <ricudis@paiko.gr>
+ * Christos Ricudis <ricudis@itc.auth.gr>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/linkedlists.h>
-#include <asterisk/chanvars.h>
-#include <asterisk/lock.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <pthread.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/linkedlists.h"
+#include "asterisk/chanvars.h"
+#include "asterisk/lock.h"
+
 #include "libpq-fe.h"
 
-
+#define EXTRA_LOG 0
 
 
 static char *tdesc = "Simple PostgreSQL Interface";
@@ -39,57 +43,67 @@ static char *app = "PGSQL";
 static char *synopsis = "Do several SQLy things";
 
 static char *descrip = 
-"  PGSQL():  Do several SQLy things\n";
+"PGSQL():  Do several SQLy things\n"
+"Syntax:\n"
+"  PGSQL(Connect var option-string)\n"
+"    Connects to a database.  Option string contains standard PostgreSQL\n"
+"    parameters like host=, dbname=, user=.  Connection identifer returned\n"
+"    in ${var}\n"
+"  PGSQL(Query var ${connection_identifier} query-string)\n"
+"    Executes standard SQL query contained in query-string using established\n"
+"    connection identified by ${connection_identifier}. Reseult of query is\n"
+"    is stored in ${var}.\n"
+"  PGSQL(Fetch statusvar ${result_identifier} var1 var2 ... varn)\n"
+"    Fetches a single row from a result set contained in ${result_identifier}.\n"
+"    Assigns returned fields to ${var1} ... ${varn}.  ${statusvar} is set TRUE\n"
+"    if additional rows exist in reseult set.\n"
+"  PGSQL(Clear ${result_identifier})\n"
+"    Frees memory and datastructures associated with result set.\n" 
+"  PGSQL(Disconnect ${connection_identifier})\n"
+"    Disconnects from named connection to PostgreSQL.\n" ;
 
 /*
 
 Syntax of SQL commands : 
 
-	Connect #var option-string
+	Connect var option-string
 	
 	Connects to a database using the option-string and stores the 
-	connection identifier in $var
+	connection identifier in ${var}
 	
 	
-	Query var connection-identifier query-string
+	Query var ${connection_identifier} query-string
 	
 	Submits query-string to database backend and stores the result
 	identifier in ${var}
 	
 	
-	Fetch statusvar result-identifier var1 var2 var3 ... varn
+	Fetch statusvar ${result_identifier} var1 var2 var3 ... varn
 	
 	Fetches a row from the query and stores end-of-table status in 
 	${statusvar} and columns in ${var1}..${varn}
 	
 	
-	Clear result-identifier
+	Clear ${result_identifier}
 
-	Clears data structures associated with result-identifier
+	Clears data structures associated with ${result_identifier}
 	
 	
-	Disconnect connection-identifier
+	Disconnect ${connection_identifier}
 	
 	Disconnects from named connection
 	
 	
 EXAMPLES OF USE : 
 
-(
- $2 = Connection Identifier
- $3 = Result Identifier
- $4 = Fetch Status Identifier (0 = no more rows)
- $5, $6 = Data variables
-)
-
-exten => s,2,PGSQL,"Connect connid host=localhost user=asterisk dbname=credit";
-exten => s,3,PGSQL,"Query resultid ${connid} SELECT username,credit FROM credit WHERE callerid=${callerid}";
-exten => s,4,PGSQL,"Fetch fetchid ${resultid} datavar1 datavar2";
-exten => s,5,GotoIf,"${fetchid}=1?s|6:s|8";
-exten => s,6,blablabla ${datavar1} ${datavar2}	(does blablabla, datavar1 = username, datavar2 = credit);
-exten => s,7,Goto,s|4
-exten => s,8,PGSQL,"Clear ${resultid}";
-exten => s,9,PGSQL,"Disconnect ${connid}";
+exten => s,2,PGSQL(Connect connid host=localhost user=asterisk dbname=credit)
+exten => s,3,PGSQL(Query resultid ${connid} SELECT username,credit FROM credit WHERE callerid=${CALLERIDNUM})
+exten => s,4,PGSQL(Fetch fetchid ${resultid} datavar1 datavar2)
+exten => s,5,GotoIf(${fetchid}?6:8)
+exten => s,6,Festival("User ${datavar1} currently has credit balance of ${datavar2} dollars.")	
+exten => s,7,Goto(s,4)
+exten => s,8,PGSQL(Clear ${resultid})
+exten => s,9,PGSQL(Disconnect ${connid})
 
 */
 
@@ -97,8 +111,6 @@ STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-extern void pbx_builtin_setvar_helper(struct ast_channel *chan, char *name, char *value); 
-
 #define AST_PGSQL_ID_DUMMY 0
 #define AST_PGSQL_ID_CONNID 1
 #define AST_PGSQL_ID_RESID 2
@@ -182,7 +194,7 @@ static int del_identifier(int identifier,int identifier_type) {
 		AST_LIST_TRAVERSE(headp,i,entries) {
 			if ((i->identifier==identifier) && 
 			    (i->identifier_type==identifier_type)) {
-				AST_LIST_REMOVE(headp,i,ast_PGSQL_id,entries);
+				AST_LIST_REMOVE(headp,i,entries);
 				free(i);
 				found=1;
 				break;
@@ -201,8 +213,8 @@ static int del_identifier(int identifier,int identifier_type) {
 
 static int aPGSQL_connect(struct ast_channel *chan, void *data) {
 	
-	char *s1,*s4;
-	char s[100];
+	char *s1;
+	char s[100] = "";
 	char *optionstring;
 	char *var;
 	int l;
@@ -215,9 +227,9 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
 	res=0;
 	l=strlen(data)+2;
 	s1=malloc(l);
-	strncpy(s1,data,l);
+	strncpy(s1, data, l -1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
 	var=strsep(&stringp," ");
 	optionstring=strsep(&stringp,"\n");
 		
@@ -229,8 +241,7 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
         } else {
         	ast_log(LOG_WARNING,"adding identifier\n");
 		id=add_identifier(AST_PGSQL_ID_CONNID,karoto);
-		s4=&s[0];
-		sprintf(s4,"%d",id);
+		snprintf(s, sizeof(s), "%d", id);
 		pbx_builtin_setvar_helper(chan,var,s);
 	}
  	
@@ -240,8 +251,9 @@ static int aPGSQL_connect(struct ast_channel *chan, void *data) {
 
 static int aPGSQL_query(struct ast_channel *chan, void *data) {
 	
-	char *s1,*s2,*s3,*s4,*s5;
-	char s[100];
+
+	char *s1,*s2,*s3,*s4;
+	char s[100] = "";
 	char *querystring;
 	char *var;
 	int l;
@@ -256,11 +268,11 @@ static int aPGSQL_query(struct ast_channel *chan, void *data) {
 	l=strlen(data)+2;
 	s1=malloc(l);
 	s2=malloc(l);
-	strcpy(s1,data);
+	strncpy(s1, data, l - 1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
 	s3=strsep(&stringp," ");
-	while (1) {	// ugly trick to make branches with break;
+	while (1) {	/* ugly trick to make branches with break; */
 		var=s3;
 		s4=strsep(&stringp," ");
 		id=atoi(s4);
@@ -285,21 +297,21 @@ static int aPGSQL_query(struct ast_channel *chan, void *data) {
 		}
 		nres=PQnfields(PGSQLres); 
 		id1=add_identifier(AST_PGSQL_ID_RESID,PGSQLres);
-		s5=&s[0];
-		sprintf(s5,"%d",id1);
+		snprintf(s, sizeof(s), "%d", id1);
 		pbx_builtin_setvar_helper(chan,var,s);
 	 	break;
 	}
 	
 	free(s1);
 	free(s2);
+
 	return(res);
 }
 
 
 static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
 	
-	char *s1,*s2,*s3,*s4,*s5,*s6,*s7;
+	char *s1,*s2,*fetchid_var,*s4,*s5,*s6,*s7;
 	char s[100];
 	char *var;
 	int l;
@@ -319,16 +331,16 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
 	s7=NULL;
 	s1=malloc(l);
 	s2=malloc(l);
-	strcpy(s1,data);
+	strncpy(s1, data, l - 1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
-	s3=strsep(&stringp," ");
-	while (1) {	// ugly trick to make branches with break;
-		var=s3; // fetchid
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
+	fetchid_var=strsep(&stringp," ");
+	while (1) {	/* ugly trick to make branches with break; */
+	  var=fetchid_var; /* fetchid */
 		fnd=0;
 		
 		AST_LIST_TRAVERSE(headp,variables,entries) {
-			if (strncasecmp(ast_var_name(variables),s3,strlen(s3))==0) {
+	    if (strncasecmp(ast_var_name(variables),fetchid_var,strlen(fetchid_var))==0) {
 	                        s7=ast_var_value(variables);
 	                        fnd=1;
                                 break;
@@ -337,24 +349,26 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
 		
 		if (fnd==0) { 
 			s7="0";
-			pbx_builtin_setvar_helper(chan,s3,s7);
+	    pbx_builtin_setvar_helper(chan,fetchid_var,s7);
 		}
 
 		s4=strsep(&stringp," ");
-		id=atoi(s4); // resultid
+		id=atoi(s4); /* resultid */
 		if ((PGSQLres=find_identifier(id,AST_PGSQL_ID_RESID))==NULL) {
 			ast_log(LOG_WARNING,"Invalid result identifier %d passed in aPGSQL_fetch\n",id);
 			res=-1;
 			break;
 		}
-		id=atoi(s7); //fetchid
+		id=atoi(s7); /*fetchid */
 		if ((lalares=find_identifier(id,AST_PGSQL_ID_FETCHID))==NULL) {
-			i=0;
+	    i=0;       /* fetching the very first row */
 		} else {
 			i=*lalares;
 			free(lalares);
-			del_identifier(id,AST_PGSQL_ID_FETCHID);
+	    del_identifier(id,AST_PGSQL_ID_FETCHID); /* will re-add it a bit later */
 		}
+
+	  if (i<PQntuples(PGSQLres)) {
 		nres=PQnfields(PGSQLres); 
 		ast_log(LOG_WARNING,"ast_PGSQL_fetch : nres = %d i = %d ;\n",nres,i);
 		for (j=0;j<nres;j++) {
@@ -363,7 +377,6 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
 				ast_log(LOG_WARNING,"ast_PGSQL_fetch : More tuples (%d) than variables (%d)\n",nres,j);
 				break;
 			}
-			
 			s6=PQgetvalue(PGSQLres,i,j);
 			if (s6==NULL) { 
 				ast_log(LOG_WARNING,"PWgetvalue(res,%d,%d) returned NULL in ast_PGSQL_fetch\n",i,j);
@@ -372,18 +385,16 @@ static int aPGSQL_fetch(struct ast_channel *chan, void *data) {
 			ast_log(LOG_WARNING,"===setting variable '%s' to '%s'\n",s5,s6);
 			pbx_builtin_setvar_helper(chan,s5,s6);
 		}
-		i++;
-		if (i<PQntuples(PGSQLres)) {
 			lalares=malloc(sizeof(int));
-			*lalares=i;
-			id1=add_identifier(AST_PGSQL_ID_FETCHID,lalares);
+	    *lalares = ++i; /* advance to the next row */
+	    id1 = add_identifier(AST_PGSQL_ID_FETCHID,lalares);
 		} else {
-			id1=0;
+	    ast_log(LOG_WARNING,"ast_PGSQL_fetch : EOF\n");
+	    id1 = 0; /* no more rows */
 		}
-		s5=&s[0];
-		sprintf(s5,"%d",id1);
-		ast_log(LOG_WARNING,"Setting var '%s' to value '%s'\n",s3,s);
-		pbx_builtin_setvar_helper(chan,s3,s);
+		snprintf(s, sizeof(s), "%d", id1);
+	  ast_log(LOG_WARNING,"Setting var '%s' to value '%s'\n",fetchid_var,s);
+	  pbx_builtin_setvar_helper(chan,fetchid_var,s);
 	 	break;
 	}
 	
@@ -403,9 +414,9 @@ static int aPGSQL_reset(struct ast_channel *chan, void *data) {
 	
 	l=strlen(data)+2;
 	s1=malloc(l);
-	strcpy(s1,data);
+	strncpy(s1, data, l - 1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
 	s3=strsep(&stringp," ");
 	id=atoi(s3);
 	if ((karoto=find_identifier(id,AST_PGSQL_ID_CONNID))==NULL) {
@@ -429,9 +440,9 @@ static int aPGSQL_clear(struct ast_channel *chan, void *data) {
 	
 	l=strlen(data)+2;
 	s1=malloc(l);
-	strcpy(s1,data);
+	strncpy(s1, data, l - 1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
 	s3=strsep(&stringp," ");
 	id=atoi(s3);
 	if ((karoto=find_identifier(id,AST_PGSQL_ID_RESID))==NULL) {
@@ -459,9 +470,9 @@ static int aPGSQL_disconnect(struct ast_channel *chan, void *data) {
 	
 	l=strlen(data)+2;
 	s1=malloc(l);
-	strcpy(s1,data);
+	strncpy(s1, data, l - 1);
 	stringp=s1;
-	strsep(&stringp," "); // eat the first token, we already know it :P 
+	strsep(&stringp," "); /* eat the first token, we already know it :P  */
 	s3=strsep(&stringp," ");
 	id=atoi(s3);
 	if ((karoto=find_identifier(id,AST_PGSQL_ID_CONNID))==NULL) {
@@ -487,6 +498,10 @@ static int PGSQL_exec(struct ast_channel *chan, void *data)
 	struct localuser *u;
 	int result;
 
+#if EXTRA_LOG
+	printf("PRSQL_exec: data=%s\n",(char*)data);
+#endif
+
 	if (!data) {
 		ast_log(LOG_WARNING, "APP_PGSQL requires an argument (see manual)\n");
 		return -1;

apps/app_striplsd.c

@@ -11,19 +11,21 @@
  * the GNU General Public License
  */
 
-#include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
+#include <sys/types.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
 
 static char *tdesc = "Strip trailing digits";
 
@@ -47,16 +49,27 @@ LOCAL_USER_DECL;
 
 static int striplsd_exec(struct ast_channel *chan, void *data)
 {
-  char newexten[AST_MAX_EXTENSION] = "";
-  if (!data || !atoi(data)) {
-    ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n");
-    return 0;
-  }
-  if (strlen(chan->exten) > atoi(data)) {
-    strncpy(newexten, chan->exten, strlen(chan->exten)-atoi(data));
-  }
-  strncpy(chan->exten, newexten, sizeof(chan->exten)-1);
-  return 0;
+	char newexten[AST_MAX_EXTENSION] = "";
+	int maxbytes = 0;
+	int stripcount = 0;
+	int extlen = strlen(chan->exten);
+
+	maxbytes = sizeof(newexten) - 1;
+	if (data) {
+		stripcount = atoi(data);
+	}
+	if (!stripcount) {
+		ast_log(LOG_DEBUG, "Ignoring, since number of digits to strip is 0\n");
+		return 0;
+	}
+	if (extlen > stripcount) {
+		if (extlen - stripcount <= maxbytes) {
+			maxbytes = extlen - stripcount;
+		}
+		strncpy(newexten, chan->exten, maxbytes);
+	}
+	strncpy(chan->exten, newexten, sizeof(chan->exten)-1);
+	return 0;
 }
 
 int unload_module(void)

apps/app_substring.c

@@ -12,23 +12,28 @@
  */
 
 #include <sys/types.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
-#include <asterisk/pbx.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-static char *tdesc = "Save substring digits in a given variable";
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/pbx.h"
+#include "asterisk/lock.h"
+
+static char *tdesc = "(Deprecated) Save substring digits in a given variable";
 
 static char *descrip =
+"  (Deprecated, use ${variable:a:b} instead)\n"
+"\n"
 "  SubString(variable=string_of_digits|count1|count2): Assigns the substring\n"
 "of string_of_digits to a given variable. Parameter count1 may be positive\n"
 "or negative. If it's positive then we skip the first count1 digits from the\n"
@@ -48,7 +53,7 @@ static char *descrip =
 
 static char *app = "SubString";
 
-static char *synopsis = "Save substring digits in a given variable";
+static char *synopsis = "(Deprecated) Save substring digits in a given variable";
 
 STANDARD_LOCAL_USER;
 
@@ -59,9 +64,10 @@ static int substring_exec(struct ast_channel *chan, void *data)
   char newexten[AST_MAX_EXTENSION] = "";
   char *count1, *count2;
   char *first, *second, *stringp;
+
   stringp=alloca(strlen(data)+1);
   ast_log(LOG_WARNING, "The use of Substring application is deprecated. Please use ${variable:a:b} instead\n");
-  strncpy(stringp,data,strlen(data)+1);
+  strncpy(stringp,data,strlen(data));
   if (strchr(stringp,'|')&&strchr(stringp,'=')) {
     int icount1,icount2;
     first=strsep(&stringp,"=");

apps/app_system.c

@@ -3,34 +3,42 @@
  *
  * Execute arbitrary system commands
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/app.h"
 
 static char *tdesc = "Generic System() application";
 
 static char *app = "System";
 
+static char *app2 = "TrySystem";
+
 static char *synopsis = "Execute a system command";
 
+static char *synopsis2 = "Try executing a system command";
+
 static char *descrip =
 "  System(command): Executes a command  by  using  system(). Returns -1 on\n"
 "failure to execute the specified command. If  the command itself executes\n"
@@ -38,29 +46,38 @@ static char *descrip =
 "priority of the current instance, then  the  channel  will  be  setup  to\n"
 "continue at that priority level.  Otherwise, System returns 0.\n";
 
+static char *descrip2 =
+"  TrySystem(command): Executes a command  by  using  system(). Returns 0\n"
+"on any situation. If  the command itself executes but is in error, and if\n"
+"there exists a priority n + 101, where 'n' is the priority of the current\n"
+"instance, then  the  channel  will  be  setup  to continue at that\n"
+"priority level.  Otherwise, System returns 0.\n";
+
 STANDARD_LOCAL_USER;
 
 LOCAL_USER_DECL;
 
-static int system_exec(struct ast_channel *chan, void *data)
+static int system_exec_helper(struct ast_channel *chan, void *data, int failmode)
 {
 	int res=0;
 	struct localuser *u;
 	if (!data) {
 		ast_log(LOG_WARNING, "System requires an argument(command)\n");
-		return -1;
+		return failmode;
 	}
 	LOCAL_USER_ADD(u);
 	/* Do our thing here */
-	res = system((char *)data);
-	if (res < 0) {
+	res = ast_safe_system((char *)data);
+	if ((res < 0) && (errno != ECHILD)) {
 		ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data);
-		res = -1;
+		res = failmode;
 	} else if (res == 127) {
 		ast_log(LOG_WARNING, "Unable to execute '%s'\n", (char *)data);
-		res = -1;
+		res = failmode;
 	} else {
-		if (res && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid)) 
+		if (res < 0)
+			res = 0;
+		if (res && ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) 
 			chan->priority+=100;
 		res = 0;
 	}
@@ -68,14 +85,26 @@ static int system_exec(struct ast_channel *chan, void *data)
 	return res;
 }
 
+static int system_exec(struct ast_channel *chan, void *data)
+{
+	return system_exec_helper(chan, data, -1);
+}
+
+static int trysystem_exec(struct ast_channel *chan, void *data)
+{
+	return system_exec_helper(chan, data, 0);
+}
+
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
+	ast_unregister_application(app2);
 	return ast_unregister_application(app);
 }
 
 int load_module(void)
 {
+	ast_register_application(app2, trysystem_exec, synopsis2, descrip2);
 	return ast_register_application(app, system_exec, synopsis, descrip);
 }
 

apps/app_talkdetect.c

@@ -0,0 +1,227 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Playback a file with audio detect
+ * 
+ * Copyright (C) 2004 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+ 
+#include <string.h>
+#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/translate.h"
+#include "asterisk/utils.h"
+#include "asterisk/dsp.h"
+
+static char *tdesc = "Playback with Talk Detection";
+
+static char *app = "BackgroundDetect";
+
+static char *synopsis = "Background a file with talk detect";
+
+static char *descrip = 
+"  BackgroundDetect(filename[|sil[|min|[max]]]):  Plays  back  a  given\n"
+"filename, waiting for interruption from a given digit (the digit must\n"
+"start the beginning of a valid extension, or it will be ignored).\n"
+"During the playback of the file, audio is monitored in the receive\n"
+"direction, and if a period of non-silence which is greater than 'min' ms\n"
+"yet less than 'max' ms is followed by silence for at least 'sil' ms then\n"
+"the audio playback is aborted and processing jumps to the 'talk' extension\n"
+"if available.  If unspecified, sil, min, and max default to 1000, 100, and\n"
+"infinity respectively.  Returns -1 on hangup, and 0 on successful playback\n"
+"completion with no exit conditions.\n";
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int background_detect_exec(struct ast_channel *chan, void *data)
+{
+	int res = 0;
+	struct localuser *u;
+	char tmp[256];
+	char *options;
+	char *stringp;
+	struct ast_frame *fr;
+	int notsilent=0;
+	struct timeval start = { 0, 0};
+	int sil = 1000;
+	int min = 100;
+	int max = -1;
+	int x;
+	int origrformat=0;
+	struct ast_dsp *dsp;
+	if (!data || ast_strlen_zero((char *)data)) {
+		ast_log(LOG_WARNING, "BackgroundDetect requires an argument (filename)\n");
+		return -1;
+	}
+	ast_copy_string(tmp, (char *)data, sizeof(tmp));
+	stringp=tmp;
+	strsep(&stringp, "|");
+	options = strsep(&stringp, "|");
+	if (options) {
+		if ((sscanf(options, "%d", &x) == 1) && (x > 0))
+			sil = x;
+		options = strsep(&stringp, "|");
+		if (options) {
+			if ((sscanf(options, "%d", &x) == 1) && (x > 0))
+				min = x;
+			options = strsep(&stringp, "|");
+			if (options) {
+				if ((sscanf(options, "%d", &x) == 1) && (x > 0))
+					max = x;
+			}
+		}
+	}
+	ast_log(LOG_DEBUG, "Preparing detect of '%s', sil=%d,min=%d,max=%d\n", 
+						tmp, sil, min, max);
+	LOCAL_USER_ADD(u);
+	if (chan->_state != AST_STATE_UP) {
+		/* Otherwise answer unless we're supposed to send this while on-hook */
+		res = ast_answer(chan);
+	}
+	if (!res) {
+		origrformat = chan->readformat;
+		if ((res = ast_set_read_format(chan, AST_FORMAT_SLINEAR))) 
+			ast_log(LOG_WARNING, "Unable to set read format to linear!\n");
+	}
+	if (!(dsp = ast_dsp_new())) {
+		ast_log(LOG_WARNING, "Unable to allocate DSP!\n");
+		res = -1;
+	}
+	if (!res) {
+		ast_stopstream(chan);
+		res = ast_streamfile(chan, tmp, chan->language);
+		if (!res) {
+			while(chan->stream) {
+				res = ast_sched_wait(chan->sched);
+				if ((res < 0) && !chan->timingfunc) {
+					res = 0;
+					break;
+				}
+				if (res < 0)
+					res = 1000;
+				res = ast_waitfor(chan, res);
+				if (res < 0) {
+					ast_log(LOG_WARNING, "Waitfor failed on %s\n", chan->name);
+					break;
+				} else if (res > 0) {
+					fr = ast_read(chan);
+					if (!fr) {
+						res = -1;
+						break;
+					} else if (fr->frametype == AST_FRAME_DTMF) {
+						char t[2];
+						t[0] = fr->subclass;
+						t[1] = '\0';
+						if (ast_canmatch_extension(chan, chan->context, t, 1, chan->cid.cid_num)) {
+							/* They entered a valid  extension, or might be anyhow */
+							res = fr->subclass;
+							ast_frfree(fr);
+							break;
+						}
+					} else if ((fr->frametype == AST_FRAME_VOICE) && (fr->subclass == AST_FORMAT_SLINEAR)) {
+						int totalsilence;
+						int ms;
+						res = ast_dsp_silence(dsp, fr, &totalsilence);
+						if (res && (totalsilence > sil)) {
+							/* We've been quiet a little while */
+							if (notsilent) {
+								/* We had heard some talking */
+								ms = ast_tvdiff_ms(ast_tvnow(), start);
+								ms -= sil;
+								if (ms < 0)
+									ms = 0;
+								if ((ms > min) && ((max < 0) || (ms < max))) {
+									char ms_str[10];
+									ast_log(LOG_DEBUG, "Found qualified token of %d ms\n", ms);
+
+									/* Save detected talk time (in milliseconds) */ 
+									sprintf(ms_str, "%d", ms );	
+									pbx_builtin_setvar_helper(chan, "TALK_DETECTED", ms_str);
+									
+									if (ast_exists_extension(chan, chan->context, "talk", 1, chan->cid.cid_num)) {
+										ast_copy_string(chan->exten, "talk", sizeof(chan->exten));
+										chan->priority = 0;
+									}
+									res = 0;
+									ast_frfree(fr);
+									break;
+								} else
+									ast_log(LOG_DEBUG, "Found unqualified token of %d ms\n", ms);
+								notsilent = 0;
+							}
+						} else {
+							if (!notsilent) {
+								/* Heard some audio, mark the begining of the token */
+								start = ast_tvnow();
+								ast_log(LOG_DEBUG, "Start of voice token!\n");
+								notsilent = 1;
+							}
+						}
+						
+					}
+					ast_frfree(fr);
+				}
+				ast_sched_runq(chan->sched);
+			}
+			ast_stopstream(chan);
+		} else {
+			ast_log(LOG_WARNING, "ast_streamfile failed on %s for %s\n", chan->name, (char *)data);
+			res = 0;
+		}
+	}
+	if (res > -1) {
+		if (origrformat && ast_set_read_format(chan, origrformat)) {
+			ast_log(LOG_WARNING, "Failed to restore read format for %s to %s\n", 
+				chan->name, ast_getformatname(origrformat));
+		}
+	}
+	if (dsp)
+		ast_dsp_free(dsp);
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	return ast_unregister_application(app);
+}
+
+int load_module(void)
+{
+	return ast_register_application(app, background_detect_exec, synopsis, descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key()
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_test.c

@@ -0,0 +1,506 @@
+/*
+ * Asterisk -- A telephony toolkit for Linux.
+ *
+ * Applications to test connection and produce report in text file
+ * 
+ * Copyright (C) 2004 - 2005, Digium, Inc.
+ *
+ * Mark Spencer <markster@digium.com>
+ * Russell Bryant <russelb@clemson.edu>
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+#include "asterisk/channel.h"
+#include "asterisk/options.h"
+#include "asterisk/module.h"
+#include "asterisk/logger.h"
+#include "asterisk/lock.h"
+#include "asterisk/app.h"
+#include "asterisk/pbx.h"
+#include "asterisk/utils.h"
+
+static char *tdesc = "Interface Test Application";
+
+static char *tests_descrip = 
+	 "TestServer(): Perform test server function and write call report.\n"
+	 "Results stored in /var/log/asterisk/testreports/<testid>-server.txt";
+static char *tests_app = "TestServer";
+static char *tests_synopsis = "Execute Interface Test Server";
+
+static char *testc_descrip = 
+	 "TestClient(testid): Executes test client with given testid.\n"
+	 "Results stored in /var/log/asterisk/testreports/<testid>-client.txt";
+
+static char *testc_app = "TestClient";
+static char *testc_synopsis = "Execute Interface Test Client";
+
+static int measurenoise(struct ast_channel *chan, int ms, char *who)
+{
+	int res=0;
+	int mssofar;
+	int noise=0;
+	int samples=0;
+	int x;
+	short *foo;
+	struct timeval start;
+	struct ast_frame *f;
+	int rformat;
+	rformat = chan->readformat;
+	if (ast_set_read_format(chan, AST_FORMAT_SLINEAR)) {
+		ast_log(LOG_NOTICE, "Unable to set to linear mode!\n");
+		return -1;
+	}
+	start = ast_tvnow();
+	for(;;) {
+		mssofar = ast_tvdiff_ms(ast_tvnow(), start);
+		if (mssofar > ms)
+			break;
+		res = ast_waitfor(chan, ms - mssofar);
+		if (res < 1)
+			break;
+		f = ast_read(chan);
+		if (!f) {
+			res = -1;
+			break;
+		}
+		if ((f->frametype == AST_FRAME_VOICE) && (f->subclass == AST_FORMAT_SLINEAR)) {
+			foo = (short *)f->data;
+			for (x=0;x<f->samples;x++) {
+				noise += abs(foo[x]);
+				samples++;
+			}
+		}
+	}
+
+	if (rformat) {
+		if (ast_set_read_format(chan, rformat)) {
+			ast_log(LOG_NOTICE, "Unable to restore original format!\n");
+			return -1;
+		}
+	}
+	if (res < 0)
+		return res;
+	if (!samples) {
+		ast_log(LOG_NOTICE, "No samples were received from the other side!\n");
+		return -1;
+	}
+	ast_log(LOG_DEBUG, "%s: Noise: %d, samples: %d, avg: %d\n", who, noise, samples, noise / samples);
+	return (noise / samples);
+}
+
+static int sendnoise(struct ast_channel *chan, int ms) 
+{
+	int res;
+	res = ast_tonepair_start(chan, 1537, 2195, ms, 8192);
+	if (!res) {
+		res = ast_waitfordigit(chan, ms);
+		ast_tonepair_stop(chan);
+	}
+	return res;	
+}
+
+STANDARD_LOCAL_USER;
+
+LOCAL_USER_DECL;
+
+static int testclient_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u;
+	int res = 0;
+	char *testid=data;
+	char fn[80];
+	char serverver[80];
+	FILE *f;
+	LOCAL_USER_ADD(u);
+	
+	/* Check for test id */
+	if (!testid || ast_strlen_zero(testid)) {
+		ast_log(LOG_WARNING, "TestClient requires an argument - the test id\n");
+		return -1;
+	}
+	
+	if (chan->_state != AST_STATE_UP)
+		res = ast_answer(chan);
+	
+	/* Wait a few just to be sure things get started */
+	res = ast_safe_sleep(chan, 3000);
+	/* Transmit client version */
+	if (!res)
+		res = ast_dtmf_stream(chan, NULL, "8378*1#", 0);
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Transmit client version\n");
+	
+	/* Read server version */
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Read server version\n");
+	if (!res) 
+		res = ast_app_getdata(chan, NULL, serverver, sizeof(serverver) - 1, 0);
+	if (res > 0)
+		res = 0;
+	if (option_debug)
+		ast_log(LOG_DEBUG, "server version: %s\n", serverver);
+		
+	if (res > 0)
+		res = 0;
+
+	if (!res)
+		res = ast_safe_sleep(chan, 1000);
+	/* Send test id */
+	if (!res) 
+		res = ast_dtmf_stream(chan, NULL, testid, 0);		
+	if (!res) 
+		res = ast_dtmf_stream(chan, NULL, "#", 0);		
+	if (option_debug)
+		ast_log(LOG_DEBUG, "send test identifier: %s\n", testid);
+
+	if ((res >=0) && (!ast_strlen_zero(testid))) {
+		/* Make the directory to hold the test results in case it's not there */
+		snprintf(fn, sizeof(fn), "%s/testresults", ast_config_AST_LOG_DIR);
+		mkdir(fn, 0777);
+		snprintf(fn, sizeof(fn), "%s/testresults/%s-client.txt", ast_config_AST_LOG_DIR, testid);
+		if ((f = fopen(fn, "w+"))) {
+			setlinebuf(f);
+			fprintf(f, "CLIENTCHAN:    %s\n", chan->name);
+			fprintf(f, "CLIENTTEST ID: %s\n", testid);
+			fprintf(f, "ANSWER:        PASS\n");
+			res = 0;
+			
+			if (!res) {
+				/* Step 1: Wait for "1" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 2.  Wait DTMF 1\n");
+				res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 1:   %s\n", (res != '1') ? "FAIL" : "PASS");
+				if (res == '1')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (!res)
+				res = ast_safe_sleep(chan, 1000);
+			if (!res) {
+				/* Step 2: Send "2" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 2.  Send DTMF 2\n");
+				res = ast_dtmf_stream(chan, NULL, "2", 0);
+				fprintf(f, "SEND DTMF 2:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 3: Wait one second */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 3.  Wait one second\n");
+				res = ast_safe_sleep(chan, 1000);
+				fprintf(f, "WAIT 1 SEC:    %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}			
+			if (!res) {
+				/* Step 4: Measure noise */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 4.  Measure noise\n");
+				res = measurenoise(chan, 5000, "TestClient");
+				fprintf(f, "MEASURENOISE:  %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res);
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 5: Wait for "4" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 5.  Wait DTMF 4\n");
+				res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 4:   %s\n", (res != '4') ? "FAIL" : "PASS");
+				if (res == '4')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (!res) {
+				/* Step 6: Transmit tone noise */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 6.  Transmit tone\n");
+				res = sendnoise(chan, 6000);
+				fprintf(f, "SENDTONE:      %s\n", (res < 0) ? "FAIL" : "PASS");
+			}
+			if (!res || (res == '5')) {
+				/* Step 7: Wait for "5" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 7.  Wait DTMF 5\n");
+				if (!res)
+					res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 5:   %s\n", (res != '5') ? "FAIL" : "PASS");
+				if (res == '5')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (!res) {
+				/* Step 8: Wait one second */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 8.  Wait one second\n");
+				res = ast_safe_sleep(chan, 1000);
+				fprintf(f, "WAIT 1 SEC:    %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 9: Measure noise */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 6.  Measure tone\n");
+				res = measurenoise(chan, 4000, "TestClient");
+				fprintf(f, "MEASURETONE:   %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res);
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 10: Send "7" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 7.  Send DTMF 7\n");
+				res = ast_dtmf_stream(chan, NULL, "7", 0);
+				fprintf(f, "SEND DTMF 7:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res =0;
+			}
+			if (!res) {
+				/* Step 11: Wait for "8" */
+				if (option_debug)
+					ast_log(LOG_DEBUG, "TestClient: 11.  Wait DTMF 8\n");
+				res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 8:   %s\n", (res != '8') ? "FAIL" : "PASS");
+				if (res == '8')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (option_debug && !res ) {
+				/* Step 12: Hangup! */
+				ast_log(LOG_DEBUG, "TestClient: 12.  Hangup\n");
+			}
+
+			if (option_debug)
+				ast_log(LOG_DEBUG, "-- TEST COMPLETE--\n");
+			fprintf(f, "-- END TEST--\n");
+			fclose(f);
+			res = -1;
+		} else
+			res = -1;
+	} else {
+		ast_log(LOG_NOTICE, "Did not read a test ID on '%s'\n", chan->name);
+		res = -1;
+	}
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+static int testserver_exec(struct ast_channel *chan, void *data)
+{
+	struct localuser *u;
+	int res = 0;
+	char testid[80]="";
+	char fn[80];
+	FILE *f;
+	LOCAL_USER_ADD(u);
+	if (chan->_state != AST_STATE_UP)
+		res = ast_answer(chan);
+	/* Read version */
+	if (option_debug)
+		ast_log(LOG_DEBUG, "Read client version\n");
+	if (!res) 
+		res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0);
+	if (res > 0)
+		res = 0;
+	if (option_debug) {
+		ast_log(LOG_DEBUG, "client version: %s\n", testid);
+		ast_log(LOG_DEBUG, "Transmit server version\n");
+	}
+	res = ast_safe_sleep(chan, 1000);
+	if (!res)
+		res = ast_dtmf_stream(chan, NULL, "8378*1#", 0);
+	if (res > 0)
+		res = 0;
+
+	if (!res) 
+		res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0);		
+	if (option_debug) 
+		ast_log(LOG_DEBUG, "read test identifier: %s\n", testid);
+	/* Check for sneakyness */
+	if (strchr(testid, '/'))
+		res = -1;
+	if ((res >=0) && (!ast_strlen_zero(testid))) {
+		/* Got a Test ID!  Whoo hoo! */
+		/* Make the directory to hold the test results in case it's not there */
+		snprintf(fn, sizeof(fn), "%s/testresults", ast_config_AST_LOG_DIR);
+		mkdir(fn, 0777);
+		snprintf(fn, sizeof(fn), "%s/testresults/%s-server.txt", ast_config_AST_LOG_DIR, testid);
+		if ((f = fopen(fn, "w+"))) {
+			setlinebuf(f);
+			fprintf(f, "SERVERCHAN:    %s\n", chan->name);
+			fprintf(f, "SERVERTEST ID: %s\n", testid);
+			fprintf(f, "ANSWER:        PASS\n");
+			ast_log(LOG_DEBUG, "Processing Test ID '%s'\n", testid);
+			res = ast_safe_sleep(chan, 1000);
+			if (!res) {
+				/* Step 1: Send "1" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 1.  Send DTMF 1\n");
+				res = ast_dtmf_stream(chan, NULL, "1", 0);
+				fprintf(f, "SEND DTMF 1:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 2: Wait for "2" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 2.  Wait DTMF 2\n");
+				res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 2:   %s\n", (res != '2') ? "FAIL" : "PASS");
+				if (res == '2')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (!res) {
+				/* Step 3: Measure noise */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 3.  Measure noise\n");
+				res = measurenoise(chan, 6000, "TestServer");
+				fprintf(f, "MEASURENOISE:  %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res);
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 4: Send "4" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 4.  Send DTMF 4\n");
+				res = ast_dtmf_stream(chan, NULL, "4", 0);
+				fprintf(f, "SEND DTMF 4:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+		
+			if (!res) {
+				/* Step 5: Wait one second */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 5.  Wait one second\n");
+				res = ast_safe_sleep(chan, 1000);
+				fprintf(f, "WAIT 1 SEC:    %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+		
+			if (!res) {
+				/* Step 6: Measure noise */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 6.  Measure tone\n");
+				res = measurenoise(chan, 4000, "TestServer");
+				fprintf(f, "MEASURETONE:   %s (%d)\n", (res < 0) ? "FAIL" : "PASS", res);
+				if (res > 0)
+					res = 0;
+			}
+
+			if (!res) {
+				/* Step 7: Send "5" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 7.  Send DTMF 5\n");
+				res = ast_dtmf_stream(chan, NULL, "5", 0);
+				fprintf(f, "SEND DTMF 5:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+
+			if (!res) {
+				/* Step 8: Transmit tone noise */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 8.  Transmit tone\n");
+				res = sendnoise(chan, 6000);
+				fprintf(f, "SENDTONE:      %s\n", (res < 0) ? "FAIL" : "PASS");
+			}
+		
+			if (!res || (res == '7')) {
+				/* Step 9: Wait for "7" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 9.  Wait DTMF 7\n");
+				if (!res)
+					res = ast_waitfordigit(chan, 3000);
+				fprintf(f, "WAIT DTMF 7:   %s\n", (res != '7') ? "FAIL" : "PASS");
+				if (res == '7')
+					res = 0;
+				else
+					res = -1;
+			}
+			if (!res)
+				res = ast_safe_sleep(chan, 1000);
+			if (!res) {
+				/* Step 10: Send "8" */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 10.  Send DTMF 8\n");
+				res = ast_dtmf_stream(chan, NULL, "8", 0);
+				fprintf(f, "SEND DTMF 8:   %s\n", (res < 0) ? "FAIL" : "PASS");
+				if (res > 0)
+					res = 0;
+			}
+			if (!res) {
+				/* Step 11: Wait for hangup to arrive! */
+				if (option_debug) 
+					ast_log(LOG_DEBUG, "TestServer: 11.  Waiting for hangup\n");
+				res = ast_safe_sleep(chan, 10000);
+				fprintf(f, "WAIT HANGUP:   %s\n", (res < 0) ? "PASS" : "FAIL");
+			}
+
+			ast_log(LOG_NOTICE, "-- TEST COMPLETE--\n");
+			fprintf(f, "-- END TEST--\n");
+			fclose(f);
+			res = -1;
+		} else
+			res = -1;
+	} else {
+		ast_log(LOG_NOTICE, "Did not read a test ID on '%s'\n", chan->name);
+		res = -1;
+	}
+	LOCAL_USER_REMOVE(u);
+	return res;
+}
+
+int unload_module(void)
+{
+	STANDARD_HANGUP_LOCALUSERS;
+	ast_unregister_application(testc_app);
+	return ast_unregister_application(tests_app);
+}
+
+int load_module(void)
+{
+	ast_register_application(testc_app, testclient_exec, testc_synopsis, testc_descrip);
+	return ast_register_application(tests_app, testserver_exec, tests_synopsis, tests_descrip);
+}
+
+char *description(void)
+{
+	return tdesc;
+}
+
+int usecount(void)
+{
+	int res;
+	STANDARD_USECOUNT(res);
+	return res;
+}
+
+char *key(void)
+{
+	return ASTERISK_GPL_KEY;
+}

apps/app_transfer.c

@@ -1,41 +1,53 @@
 /*
  * Asterisk -- A telephony toolkit for Linux.
  *
- * Time of day - Report the time of day
+ * Transfer a caller
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999 - 2005, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
 
-#include <asterisk/lock.h>
-#include <asterisk/file.h>
-#include <asterisk/logger.h>
-#include <asterisk/channel.h>
-#include <asterisk/pbx.h>
-#include <asterisk/module.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include <stdlib.h>
 
-#include <pthread.h>
+#include "asterisk.h"
 
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-static char *tdesc = "Transfer";
+#include "asterisk/lock.h"
+#include "asterisk/file.h"
+#include "asterisk/logger.h"
+#include "asterisk/channel.h"
+#include "asterisk/pbx.h"
+#include "asterisk/module.h"
+#include "asterisk/options.h"
 
-static char *app = "Transfer";
+static const char *tdesc = "Transfer";
 
-static char *synopsis = "Transfer caller to remote extension";
+static const char *app = "Transfer";
 
-static char *descrip = 
-"  Transfer(exten):  Requests the remote caller be transferred to\n"
-"a given extension. Returns -1 on hangup, or 0 on completion\n"
-"regardless of whether the transfer was successful.  If the transfer\n"
-"was *not* supported or successful and there exists a priority n + 101,\n"
+static const char *synopsis = "Transfer caller to remote extension";
+
+static const char *descrip = 
+"  Transfer([Tech/]dest):  Requests the remote caller be transfered\n"
+"to a given extension. If TECH (SIP, IAX2, LOCAL etc) is used, only\n"
+"an incoming call with the same channel technology will be transfered.\n"
+"Note that for SIP, if you transfer before call is setup, a 302 redirect\n"
+"SIP message will be returned to the caller.\n"
+"\nThe result of the application will be reported in the TRANSFERSTATUS\n"
+"channel variable:\n"
+"       SUCCESS       Transfer succeeded\n"
+"       FAILURE      Transfer failed\n"
+"       UNSUPPORTED  Transfer unsupported by channel driver\n"
+"Returns -1 on hangup, or 0 on completion regardless of whether the\n"
+"transfer was successful.\n\n"
+"Old depraciated behaviour: If the transfer was *not* supported or\n"
+"successful and there exists a priority n + 101,\n"
 "then that priority will be taken next.\n" ;
 
 STANDARD_LOCAL_USER;
@@ -44,30 +56,60 @@ LOCAL_USER_DECL;
 
 static int transfer_exec(struct ast_channel *chan, void *data)
 {
-	int res=0;
+	int res;
+	int len;
 	struct localuser *u;
-	if (!data || !strlen(data)) {
-		ast_log(LOG_WARNING, "Transfer requires an argument (destination)\n");
-		res = 1;
+	char *slash;
+	char *tech = NULL;
+	char *dest = data;
+	char *status;
+
+	if (!dest || ast_strlen_zero(dest)) {
+		ast_log(LOG_WARNING, "Transfer requires an argument ([Tech/]destination)\n");
+		pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
+		return 0;
 	}
+
+	if ((slash = strchr(dest, '/')) && (len = (slash - dest))) {
+		tech = dest;
+		dest = slash + 1;
+		/* Allow execution only if the Tech/destination agrees with the type of the channel */
+		if (strncasecmp(chan->type, tech, len)) {
+			pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
+			return 0;
+		}
+	}
+
+	/* Check if the channel supports transfer before we try it */
+	if (!chan->tech->transfer) {
+		pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "UNSUPPORTED");
+		return 0;
+	}
+
 	LOCAL_USER_ADD(u);
+
+	res = ast_transfer(chan, dest);
+
 	if (!res) {
-		res = ast_transfer(chan, data);
-	}
-	if (!res) {
-		/* Look for a "busy" place */
-		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->callerid))
-			chan->priority += 100;
-	}
-	if (res > 0)
+		status = "FAILURE";
+		if (option_priority_jumping)
+			ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
+	} else {
+		status = "SUCCESS";
 		res = 0;
+	}
+
+	pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", status);
+
 	LOCAL_USER_REMOVE(u);
+
 	return res;
 }
 
 int unload_module(void)
 {
 	STANDARD_HANGUP_LOCALUSERS;
+
 	return ast_unregister_application(app);
 }
 
@@ -78,13 +120,15 @@ int load_module(void)
 
 char *description(void)
 {
-	return tdesc;
+	return (char *) tdesc;
 }
 
 int usecount(void)
 {
 	int res;
+
 	STANDARD_USECOUNT(res);
+
 	return res;
 }