[asterisk-commits] branch oej/t38passthrough r18749 - in /team/oej/t38passthrough: ./ apps/ cdr/...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Sun Apr 9 21:50:36 MST 2006 

Author: oej
Date: Sun Apr  9 23:48:19 2006
New Revision: 18749

URL: http://svn.digium.com/view/asterisk?rev=18749&view=rev
Log:
Reset resolve commit

Modified:
    team/oej/t38passthrough/   (props changed)
    team/oej/t38passthrough/Makefile
    team/oej/t38passthrough/UPGRADE.txt
    team/oej/t38passthrough/apps/Makefile
    team/oej/t38passthrough/apps/app_adsiprog.c
    team/oej/t38passthrough/apps/app_alarmreceiver.c
    team/oej/t38passthrough/apps/app_amd.c
    team/oej/t38passthrough/apps/app_authenticate.c
    team/oej/t38passthrough/apps/app_cdr.c
    team/oej/t38passthrough/apps/app_chanisavail.c
    team/oej/t38passthrough/apps/app_channelredirect.c
    team/oej/t38passthrough/apps/app_chanspy.c
    team/oej/t38passthrough/apps/app_controlplayback.c
    team/oej/t38passthrough/apps/app_db.c
    team/oej/t38passthrough/apps/app_dial.c
    team/oej/t38passthrough/apps/app_dictate.c
    team/oej/t38passthrough/apps/app_directed_pickup.c
    team/oej/t38passthrough/apps/app_directory.c
    team/oej/t38passthrough/apps/app_disa.c
    team/oej/t38passthrough/apps/app_dumpchan.c
    team/oej/t38passthrough/apps/app_echo.c
    team/oej/t38passthrough/apps/app_exec.c
    team/oej/t38passthrough/apps/app_externalivr.c
    team/oej/t38passthrough/apps/app_festival.c
    team/oej/t38passthrough/apps/app_flash.c
    team/oej/t38passthrough/apps/app_forkcdr.c
    team/oej/t38passthrough/apps/app_getcpeid.c
    team/oej/t38passthrough/apps/app_hasnewvoicemail.c
    team/oej/t38passthrough/apps/app_ices.c
    team/oej/t38passthrough/apps/app_image.c
    team/oej/t38passthrough/apps/app_ivrdemo.c
    team/oej/t38passthrough/apps/app_lookupblacklist.c
    team/oej/t38passthrough/apps/app_lookupcidname.c
    team/oej/t38passthrough/apps/app_macro.c
    team/oej/t38passthrough/apps/app_meetme.c
    team/oej/t38passthrough/apps/app_milliwatt.c
    team/oej/t38passthrough/apps/app_mixmonitor.c
    team/oej/t38passthrough/apps/app_morsecode.c
    team/oej/t38passthrough/apps/app_mp3.c
    team/oej/t38passthrough/apps/app_nbscat.c
    team/oej/t38passthrough/apps/app_osplookup.c
    team/oej/t38passthrough/apps/app_page.c
    team/oej/t38passthrough/apps/app_parkandannounce.c
    team/oej/t38passthrough/apps/app_playback.c
    team/oej/t38passthrough/apps/app_privacy.c
    team/oej/t38passthrough/apps/app_queue.c
    team/oej/t38passthrough/apps/app_random.c
    team/oej/t38passthrough/apps/app_read.c
    team/oej/t38passthrough/apps/app_readfile.c
    team/oej/t38passthrough/apps/app_realtime.c
    team/oej/t38passthrough/apps/app_record.c
    team/oej/t38passthrough/apps/app_rpt.c
    team/oej/t38passthrough/apps/app_sayunixtime.c
    team/oej/t38passthrough/apps/app_senddtmf.c
    team/oej/t38passthrough/apps/app_sendtext.c
    team/oej/t38passthrough/apps/app_setcallerid.c
    team/oej/t38passthrough/apps/app_setcdruserfield.c
    team/oej/t38passthrough/apps/app_settransfercapability.c
    team/oej/t38passthrough/apps/app_skel.c
    team/oej/t38passthrough/apps/app_sms.c
    team/oej/t38passthrough/apps/app_softhangup.c
    team/oej/t38passthrough/apps/app_stack.c
    team/oej/t38passthrough/apps/app_system.c
    team/oej/t38passthrough/apps/app_talkdetect.c
    team/oej/t38passthrough/apps/app_test.c
    team/oej/t38passthrough/apps/app_transfer.c
    team/oej/t38passthrough/apps/app_url.c
    team/oej/t38passthrough/apps/app_userevent.c
    team/oej/t38passthrough/apps/app_verbose.c
    team/oej/t38passthrough/apps/app_voicemail.c
    team/oej/t38passthrough/apps/app_waitforring.c
    team/oej/t38passthrough/apps/app_waitforsilence.c
    team/oej/t38passthrough/apps/app_while.c
    team/oej/t38passthrough/apps/app_zapateller.c
    team/oej/t38passthrough/apps/app_zapbarge.c
    team/oej/t38passthrough/apps/app_zapras.c
    team/oej/t38passthrough/apps/app_zapscan.c
    team/oej/t38passthrough/cdr.c
    team/oej/t38passthrough/cdr/cdr_csv.c
    team/oej/t38passthrough/cdr/cdr_custom.c
    team/oej/t38passthrough/cdr/cdr_manager.c
    team/oej/t38passthrough/cdr/cdr_odbc.c
    team/oej/t38passthrough/cdr/cdr_pgsql.c
    team/oej/t38passthrough/cdr/cdr_sqlite.c
    team/oej/t38passthrough/cdr/cdr_tds.c
    team/oej/t38passthrough/channel.c
    team/oej/t38passthrough/channels/chan_agent.c
    team/oej/t38passthrough/channels/chan_alsa.c
    team/oej/t38passthrough/channels/chan_features.c
    team/oej/t38passthrough/channels/chan_h323.c
    team/oej/t38passthrough/channels/chan_iax2.c
    team/oej/t38passthrough/channels/chan_local.c
    team/oej/t38passthrough/channels/chan_mgcp.c
    team/oej/t38passthrough/channels/chan_misdn.c
    team/oej/t38passthrough/channels/chan_nbs.c
    team/oej/t38passthrough/channels/chan_oss.c
    team/oej/t38passthrough/channels/chan_phone.c
    team/oej/t38passthrough/channels/chan_sip.c
    team/oej/t38passthrough/channels/chan_skinny.c
    team/oej/t38passthrough/channels/chan_vpb.c
    team/oej/t38passthrough/channels/chan_zap.c
    team/oej/t38passthrough/codecs/codec_a_mu.c
    team/oej/t38passthrough/codecs/codec_adpcm.c
    team/oej/t38passthrough/codecs/codec_alaw.c
    team/oej/t38passthrough/codecs/codec_g723_1.c
    team/oej/t38passthrough/codecs/codec_g726.c
    team/oej/t38passthrough/codecs/codec_gsm.c
    team/oej/t38passthrough/codecs/codec_ilbc.c
    team/oej/t38passthrough/codecs/codec_lpc10.c
    team/oej/t38passthrough/codecs/codec_speex.c
    team/oej/t38passthrough/codecs/codec_ulaw.c
    team/oej/t38passthrough/config.c
    team/oej/t38passthrough/configs/extensions.conf.sample
    team/oej/t38passthrough/configs/iax.conf.sample
    team/oej/t38passthrough/configs/meetme.conf.sample
    team/oej/t38passthrough/configs/mgcp.conf.sample
    team/oej/t38passthrough/configs/osp.conf.sample
    team/oej/t38passthrough/configs/queues.conf.sample
    team/oej/t38passthrough/configs/sip.conf.sample
    team/oej/t38passthrough/configs/skinny.conf.sample
    team/oej/t38passthrough/configs/voicemail.conf.sample
    team/oej/t38passthrough/doc/channelvariables.txt
    team/oej/t38passthrough/file.c
    team/oej/t38passthrough/formats/Makefile
    team/oej/t38passthrough/formats/format_g723.c
    team/oej/t38passthrough/formats/format_g726.c
    team/oej/t38passthrough/formats/format_g729.c
    team/oej/t38passthrough/formats/format_gsm.c
    team/oej/t38passthrough/formats/format_h263.c
    team/oej/t38passthrough/formats/format_h264.c
    team/oej/t38passthrough/formats/format_ilbc.c
    team/oej/t38passthrough/formats/format_jpeg.c
    team/oej/t38passthrough/formats/format_ogg_vorbis.c
    team/oej/t38passthrough/formats/format_pcm.c
    team/oej/t38passthrough/formats/format_sln.c
    team/oej/t38passthrough/formats/format_vox.c
    team/oej/t38passthrough/formats/format_wav.c
    team/oej/t38passthrough/formats/format_wav_gsm.c
    team/oej/t38passthrough/funcs/func_base64.c
    team/oej/t38passthrough/funcs/func_callerid.c
    team/oej/t38passthrough/funcs/func_cdr.c
    team/oej/t38passthrough/funcs/func_channel.c
    team/oej/t38passthrough/funcs/func_curl.c
    team/oej/t38passthrough/funcs/func_cut.c
    team/oej/t38passthrough/funcs/func_db.c
    team/oej/t38passthrough/funcs/func_enum.c
    team/oej/t38passthrough/funcs/func_env.c
    team/oej/t38passthrough/funcs/func_groupcount.c
    team/oej/t38passthrough/funcs/func_language.c
    team/oej/t38passthrough/funcs/func_logic.c
    team/oej/t38passthrough/funcs/func_math.c
    team/oej/t38passthrough/funcs/func_md5.c
    team/oej/t38passthrough/funcs/func_moh.c
    team/oej/t38passthrough/funcs/func_odbc.c
    team/oej/t38passthrough/funcs/func_rand.c
    team/oej/t38passthrough/funcs/func_sha1.c
    team/oej/t38passthrough/funcs/func_strings.c
    team/oej/t38passthrough/funcs/func_timeout.c
    team/oej/t38passthrough/funcs/func_uri.c
    team/oej/t38passthrough/http.c
    team/oej/t38passthrough/include/asterisk/astosp.h
    team/oej/t38passthrough/include/asterisk/module.h
    team/oej/t38passthrough/include/asterisk/translate.h
    team/oej/t38passthrough/loader.c
    team/oej/t38passthrough/pbx.c
    team/oej/t38passthrough/pbx/pbx_ael.c
    team/oej/t38passthrough/pbx/pbx_config.c
    team/oej/t38passthrough/pbx/pbx_dundi.c
    team/oej/t38passthrough/pbx/pbx_gtkconsole.c
    team/oej/t38passthrough/pbx/pbx_loopback.c
    team/oej/t38passthrough/pbx/pbx_realtime.c
    team/oej/t38passthrough/pbx/pbx_spool.c
    team/oej/t38passthrough/res/res_adsi.c
    team/oej/t38passthrough/res/res_agi.c
    team/oej/t38passthrough/res/res_clioriginate.c
    team/oej/t38passthrough/res/res_config_odbc.c
    team/oej/t38passthrough/res/res_config_pgsql.c
    team/oej/t38passthrough/res/res_convert.c
    team/oej/t38passthrough/res/res_crypto.c
    team/oej/t38passthrough/res/res_features.c
    team/oej/t38passthrough/res/res_indications.c
    team/oej/t38passthrough/res/res_monitor.c
    team/oej/t38passthrough/res/res_musiconhold.c
    team/oej/t38passthrough/res/res_odbc.c
    team/oej/t38passthrough/res/res_osp.c
    team/oej/t38passthrough/res/res_smdi.c
    team/oej/t38passthrough/res/res_snmp.c
    team/oej/t38passthrough/sched.c
    team/oej/t38passthrough/translate.c

Propchange: team/oej/t38passthrough/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/t38passthrough/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/t38passthrough/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr  9 23:48:19 2006
@@ -1,1 +1,1 @@
-/trunk:1-17791
+/trunk:1-18636

Modified: team/oej/t38passthrough/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/Makefile?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/Makefile (original)
+++ team/oej/t38passthrough/Makefile Sun Apr  9 23:48:19 2006
@@ -15,23 +15,33 @@
 
 # Create OPTIONS variable
 OPTIONS=
+
 # If cross compiling, define these to suit
-# CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-# CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-# CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+#CROSS_ARCH=Linux
+#CROSS_PROC=arm
+#SUB_PROC=xscale # or maverick
+
+# Pentium Pro Optimize
+#PROC=i686
+
+# Pentium & VIA processors optimize
+#PROC=i586
+
+#PROC=k6
+#PROC=ppc
+
 CC=$(CROSS_COMPILE)gcc
 HOST_CC=gcc
-# CROSS_ARCH=Linux
-# CROSS_PROC=arm
-# SUB_PROC=xscale # or maverick
 
 ifeq ($(CROSS_COMPILE),)
   OSARCH=$(shell uname -s)
-  OSREV=$(shell uname -r)
-  MARCH=$(shell uname -m)
+  PROC?=$(shell uname -m)
 else
   OSARCH=$(CROSS_ARCH)
-  OSREV=$(CROSS_REV)
+  PROC=$(CROSS_PROC)
 endif
 
 PWD=$(shell pwd)
@@ -40,13 +50,13 @@
 MAKETOPLEVEL?=$(MAKELEVEL)
 
 ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
-######### More GSM codec optimization
-######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-######### which support MMX instructions.  This should be newer pentiums,
-######### ppro's, etc, as well as the AMD K6 and K7.  
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions.  This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.  
 #K6OPT  = -DK6OPT
 
-#Tell gcc to optimize the code
+# Tell gcc to optimize the code
 OPTIMIZE+=-O6
 else
   # Stack backtraces, while useful for debugging, are incompatible with optimizations
@@ -55,14 +65,13 @@
   endif
 endif
 
-#Overwite config files on "make samples"
+# Overwite config files on "make samples"
 OVERWRITE=y
 
-#Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
 DEBUG=-g3 #-pg
 
-#Set NOCRYPTO to yes if you do not want to have crypto support or 
-#dependencies
+# Set NOCRYPTO to yes if you do not want to have crypto support or dependencies
 #NOCRYPTO=yes
 
 # If you are running a radio application, define RADIO_RELAX so that the DTMF
@@ -71,14 +80,11 @@
 
 # If you don't have a lot of memory (e.g. embedded Asterisk), define LOW_MEMORY
 # to reduce the size of certain static buffers
-
 #ifneq ($(CROSS_COMPILE),)
 #OPTIONS += -DLOW_MEMORY
 #endif
 
-#
 # Asterisk SMDI integration
-#
 WITH_SMDI = 1
 
 # Optional debugging parameters
@@ -102,7 +108,7 @@
 # Files are copied here temporarily during the install process
 # For example, make DESTDIR=/tmp/asterisk woud put things in
 # /tmp/asterisk/etc/asterisk
-# XXX watch out, put no spaces or comments after the value
+# !!! Watch out, put no spaces or comments after the value !!!
 DESTDIR?=
 #DESTDIR?=/tmp/asterisk
 
@@ -118,57 +124,64 @@
 # Don't use together with -DBUSYDETECT_TONEONLY
 BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
 
-ifneq ($(OSARCH),SunOS)
+# Define standard directories for various platforms
+# These apply if they are not redefined in asterisk.conf 
+ifeq ($(OSARCH),SunOS)
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
+  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
+  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
+  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
+else
+ifeq ($(OSARCH),FreeBSD)
+  PREFIX?=/usr/local
+  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
+  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+else
+  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
   ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
   ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
   ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
   ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
   ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
   ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
   ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
   ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-else
-  ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib
-  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib
-  ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/opt/asterisk/spool
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/opt/asterisk/log
-  ASTHEADERDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/opt/asterisk/run
-  ASTMANDIR=$(INSTALL_PREFIX)/opt/asterisk/usr/share/man
-  MODULES_DIR=$(ASTLIBDIR)/modules
-  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-endif
+endif
+endif
+
+# Asterisk.conf is located in ASTETCDIR or by using the -C flag
+# when starting Asterisk
+ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+MODULES_DIR=$(ASTLIBDIR)/modules
+AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+
+# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
+HTTP_DOCSDIR=/var/www/html
+# Determine by a grep 'ScriptAlias' of your Apache httpd.conf file
+HTTP_CGIDIR=/var/www/cgi-bin
 
 ASTCFLAGS=
 
 # Define this to use files larger than 2GB (useful for sound files longer than 37 hours and logfiles)
 ASTCFLAGS+=-D_FILE_OFFSET_BITS=64
 
-# Pentium Pro Optimize
-#PROC=i686
-
-# Pentium & VIA processors optimize
-#PROC=i586
-
-#PROC=k6
-#PROC=ppc
-
-#Uncomment this to use the older DSP routines
+# Uncomment this to use the older DSP routines
 #ASTCFLAGS+=-DOLD_DSP_ROUTINES
-
-# Determine by a grep 'DocumentRoot' of your httpd.conf file
-HTTP_DOCSDIR=/var/www/html
-# Determine by a grep 'ScriptAlias' of your httpd.conf file
-HTTP_CGIDIR=/var/www/cgi-bin
 
 # 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
@@ -185,12 +198,6 @@
 endif
 
 ifeq ($(OSARCH),Linux)
-  ifeq ($(CROSS_COMPILE),)
-    PROC?=$(shell uname -m)
-  else
-    PROC=$(CROSS_PROC)
-  endif
-
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
@@ -244,7 +251,6 @@
 ASTOBJ=-o asterisk
 
 ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  PROC=$(shell uname -m)
   ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
 endif
 
@@ -272,22 +278,6 @@
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
   MPG123TARG=freebsd
-
-  # XXX FreeBSD paths
-  PREFIX?=/usr/local
-  ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
-  ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
-  ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
-  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-  ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
-  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-  ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
-  ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
-  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-  ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-  # XXX end FreeBSD paths
-
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
@@ -312,7 +302,6 @@
   ASTLINK=
   LIBS+=-lpthread -lncurses -lm -lresolv
   ASTSBINDIR=$(MODULES_DIR)
-  PROC=$(shell uname -m)
 endif
 
 ifndef WITHOUT_ZAPTEL
@@ -399,12 +388,12 @@
   ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
   # Mac on Intel CoreDuo does not need poll compatibility layer
-  ifneq ($(MARCH),i386)
+  ifneq ($(PROC),i386)
     OBJS+=poll.o
     ASTCFLAGS+=-DPOLLCOMPAT
   endif
 else
-#These are used for all but Darwin
+# These are used for all but Darwin
   ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
   ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -965,11 +954,9 @@
 	@echo " +            $(MAKE) uninstall-all             +"  
 	@echo " +-------------------------------------------+"  
 
-
 uninstall-all: _uninstall
 	rm -rf $(DESTDIR)$(ASTLIBDIR)
 	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
 	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
 	rm -rf $(DESTDIR)$(ASTETCDIR)
 	rm -rf $(DESTDIR)$(ASTLOGDIR)
-

Modified: team/oej/t38passthrough/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/UPGRADE.txt?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/UPGRADE.txt (original)
+++ team/oej/t38passthrough/UPGRADE.txt Sun Apr  9 23:48:19 2006
@@ -29,6 +29,8 @@
   "noanswer" will not work.  Use s or n.  Also there is a new feature i, for
   using indication tones, so typing in skip would give you unexpected results.
 
+* OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
+
 Variables:
 
 * The builtin variables ${CALLERID}, ${CALLERIDNAME}, ${CALLERIDNUM},
@@ -39,6 +41,10 @@
 
 * The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now 
   adjustable from cdr.conf, instead of recompiling.
+
+* OSP applications exports several new variables, ${OSPINHANDLE},
+  ${OSPOUTHANDLE}, ${OSPINTOKEN}, ${OSPOUTTOKEN}, ${OSPCALLING},
+  ${OSPINTIMELIMIT}, and ${OSPOUTTIMELIMIT}
 
 Functions:
 
@@ -66,6 +72,10 @@
 
 * The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
 
+* OSP support code is removed from SIP channel to OSP applications. ospauth 
+  option in sip.conf is removed to osp.conf as authpolicy. allowguest option
+  in sip.conf cannot be set as osp anymore. 
+
 Installation:
 
 * On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf

Modified: team/oej/t38passthrough/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/Makefile?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/Makefile (original)
+++ team/oej/t38passthrough/apps/Makefile Sun Apr  9 23:48:19 2006
@@ -59,7 +59,7 @@
 	rm -f .depend
 
 clean: clean-depend
-	rm -f *.so *.o look
+	rm -f *.so *.o
 
 %.so : %.o
 	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -75,14 +75,10 @@
 
 uninstall:
 
-look:	look.c
-	$(CC) -pipe -O6 -g look.c -o look -lncurses
-
 ifeq (SunOS,$(shell uname))
 app_chanspy.so: app_chanspy.o
 	$(CC) $(SOLINK) -o $@ $< -lrt
 endif
-
 
 ifneq ($(wildcard .depend),)
  include .depend

Modified: team/oej/t38passthrough/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_adsiprog.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_adsiprog.c (original)
+++ team/oej/t38passthrough/apps/app_adsiprog.c Sun Apr  9 23:48:19 2006
@@ -1586,7 +1586,7 @@
 	return ast_register_application(app, adsi_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -1598,7 +1598,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_alarmreceiver.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_alarmreceiver.c (original)
+++ team/oej/t38passthrough/apps/app_alarmreceiver.c Sun Apr  9 23:48:19 2006
@@ -837,7 +837,7 @@
 	return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -849,7 +849,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_amd.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_amd.c (original)
+++ team/oej/t38passthrough/apps/app_amd.c Sun Apr  9 23:48:19 2006
@@ -91,7 +91,7 @@
 
 static void isAnsweringMachine(struct ast_channel *chan, void *data)
 {
-	int res = 0;
+	int res = 0, ret = 0;
 
 	struct ast_frame *f = NULL;
 
@@ -136,8 +136,8 @@
 			     AST_APP_ARG(argMaximumNumberOfWords);
 			     AST_APP_ARG(argSilenceThreshold);
 	);
-
-	ast_verbose(VERBOSE_PREFIX_3 "AMD: %s %s %s (Fmt: %d)\n", chan->name ,chan->cid.cid_ani, chan->cid.cid_rdnis, chan->readformat);
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "AMD: %s %s %s (Fmt: %d)\n", chan->name ,chan->cid.cid_ani, chan->cid.cid_rdnis, chan->readformat);
 
 	/* Lets parse the arguments. */
 	if (ast_strlen_zero(data)) {
@@ -180,8 +180,9 @@
 	}
 
 	/* Now we're ready to roll! */
-
-	ast_verbose(VERBOSE_PREFIX_3 "AMD: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
+	
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "AMD: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
 		"totalAnalysisTime [%d] minimumWordLength [%d] betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] \n",
 				initialSilence, greeting, afterGreetingSilence, totalAnalysisTime,
 				minimumWordLength, betweenWordsSilence, maximumNumberOfWords, silenceThreshold );
@@ -204,42 +205,45 @@
 	}
 	ast_dsp_set_threshold(silenceDetector, silenceThreshold );
 
-	while (ast_waitfor(chan, -1) > -1)
+	while ((ret = ast_waitfor(chan, totalAnalysisTime)))
 	{
-		f = ast_read(chan);
-		if (!f ) {
-			/* No Frame: Called Party Must Have Dropped */
-			ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
-			ast_log(LOG_DEBUG, "Got hangup\n");
+		if (ret < 0 || !(f = ast_read(chan))) {
+			/* No Frame OR Error on ast_waitfor : Called Party Must Have Dropped */
+			if (option_verbose > 2)
+				ast_verbose(VERBOSE_PREFIX_3 "AMD: HANGUP\n");
+			if (option_debug)
+				ast_log(LOG_DEBUG, "Got hangup\n");
 			strcpy(amdStatus , "HANGUP" );
 			strcpy(amdCause , "" );
 			break;
 		}
-		framelength = (ast_codec_get_samples(f) / 8);
-		iTotalTime += framelength;
-		if (iTotalTime >= totalAnalysisTime ) {
-			ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
-			ast_frfree(f);
-			strcpy(amdStatus , "NOTSURE" );
-			sprintf(amdCause , "TOOLONG-%d", iTotalTime );
-			break;
-		}
 		if (f->frametype == AST_FRAME_VOICE ) {
+			framelength = (ast_codec_get_samples(f) / DEFAULT_SAMPLES_PER_MS);
+			iTotalTime += framelength;
+			if (iTotalTime >= totalAnalysisTime ) {
+				if (option_verbose > 2)	
+					ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
+				ast_frfree(f);
+				strcpy(amdStatus , "NOTSURE" );
+				sprintf(amdCause , "TOOLONG-%d", iTotalTime );
+				break;
+			}
 			dspsilence = 0;
 			ast_dsp_silence(silenceDetector, f, &dspsilence);
 			if (dspsilence ) {
 				silenceDuration = dspsilence;
-				/* ast_verbose(VERBOSE_PREFIX_3 "AMD: %d SILENCE: silenceDuration:%d afterGreetingSilence:%d inGreeting:%d\n", currentState, silenceDuration, afterGreetingSilence, inGreeting ); */
 				if (silenceDuration >= betweenWordsSilence ) {
 					if (currentState != STATE_IN_SILENCE ) {
 						previousState = currentState;
-						ast_verbose(VERBOSE_PREFIX_3 "AMD: Changed state to STATE_IN_SILENCE\n");
+						if (option_verbose > 2)
+							ast_verbose(VERBOSE_PREFIX_3 "AMD: Changed state to STATE_IN_SILENCE\n");
 					}
 					currentState  = STATE_IN_SILENCE;
 					consecutiveVoiceDuration = 0;
 				}
 				if (inInitialSilence == 1  && silenceDuration >= initialSilence ) {
-					ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: silenceDuration:%d initialSilence:%d\n",
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: silenceDuration:%d initialSilence:%d\n",
 							silenceDuration, initialSilence );
 					ast_frfree(f);
 					strcpy(amdStatus , "MACHINE" );
@@ -248,7 +252,8 @@
 				}
 
 				if (silenceDuration >= afterGreetingSilence  &&  inGreeting == 1 ) {
-					ast_verbose(VERBOSE_PREFIX_3 "AMD: HUMAN: silenceDuration:%d afterGreetingSilence:%d\n",
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "AMD: HUMAN: silenceDuration:%d afterGreetingSilence:%d\n",
 							silenceDuration, afterGreetingSilence );
 					ast_frfree(f);
 					strcpy(amdStatus , "HUMAN" );
@@ -258,21 +263,22 @@
 			} else {
 				consecutiveVoiceDuration += framelength;
 				voiceDuration += framelength;
-				/* ast_verbose(VERBOSE_PREFIX_3 "AMD: %d VOICE: ConsecutiveVoice:%d voiceDuration:%d inGreeting:%d\n", currentState, consecutiveVoiceDuration, voiceDuration, inGreeting ); */
 
 				/* If I have enough consecutive voice to say that I am in a Word, I can only increment the
 					number of words if my previous state was Silence, which means that I moved into a word. */
 				if (consecutiveVoiceDuration >= minimumWordLength ) {
 					if (currentState == STATE_IN_SILENCE ) {
 						iWordsCount++;
-						ast_verbose(VERBOSE_PREFIX_3 "AMD: Word detected. iWordsCount:%d\n", iWordsCount );
+						if (option_verbose > 2)
+							ast_verbose(VERBOSE_PREFIX_3 "AMD: Word detected. iWordsCount:%d\n", iWordsCount );
 						previousState = currentState;
 						currentState = STATE_IN_WORD;
 					}
 				}
 
 				if (iWordsCount >= maximumNumberOfWords ) {
-					ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: iWordsCount:%d\n", iWordsCount );
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: iWordsCount:%d\n", iWordsCount );
 					ast_frfree(f);
 					strcpy(amdStatus , "MACHINE" );
 					sprintf(amdCause , "MAXWORDS-%d-%d", iWordsCount, maximumNumberOfWords );
@@ -280,9 +286,9 @@
 				}
 
 				if (inGreeting == 1  &&  voiceDuration >= greeting ) {
-					ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: voiceDuration:%d greeting:%d\n",
-							voiceDuration, greeting );
-					ast_frfree(f);
+					if (option_verbose > 2)
+					ast_verbose(VERBOSE_PREFIX_3 "AMD: ANSWERING MACHINE: voiceDuration:%d greeting:%d\n", voiceDuration, greeting);
+					 ast_frfree(f);
 					strcpy(amdStatus , "MACHINE" );
 					sprintf(amdCause , "LONGGREETING-%d-%d", voiceDuration, greeting );
 					break;
@@ -296,12 +302,19 @@
 		}
 		ast_frfree(f);
 	}
+	if (!ret) {
+		/* It took too long to get a frame back. Giving up. */
+		if (option_verbose > 2)
+			ast_verbose(VERBOSE_PREFIX_3 "AMD: Channel [%s]. Too long...\n", chan->name );
+		strcpy(amdStatus , "NOTSURE" );
+		sprintf(amdCause , "TOOLONG-%d", iTotalTime );
+	}
 
 	pbx_builtin_setvar_helper(chan , "AMDSTATUS" , amdStatus );
 	pbx_builtin_setvar_helper(chan , "AMDCAUSE" , amdCause );
 
 	/* If We Started With A Valid Read Format, Return To It... */
-	if (readFormat) {
+	if (readFormat && chan->_state == AST_STATE_UP) {
 		res = ast_set_read_format(chan, readFormat );
 		if (res)
 			ast_log(LOG_WARNING, "AMD: Unable to restore read format on '%s'\n", chan->name);
@@ -371,7 +384,8 @@
 	}
 	ast_config_destroy(cfg);
 
-	ast_verbose(VERBOSE_PREFIX_3 "AMD defaults: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
+	if (option_verbose > 2)
+		ast_verbose(VERBOSE_PREFIX_3 "AMD defaults: initialSilence [%d] greeting [%d] afterGreetingSilence [%d] "
 		"totalAnalysisTime [%d] minimumWordLength [%d] betweenWordsSilence [%d] maximumNumberOfWords [%d] silenceThreshold [%d] \n",
 				dfltInitialSilence, dfltGreeting, dfltAfterGreetingSilence, dfltTotalAnalysisTime,
 				dfltMinimumWordLength, dfltBetweenWordsSilence, dfltMaximumNumberOfWords, dfltSilenceThreshold );
@@ -397,7 +411,7 @@
 	return 0;
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -409,7 +423,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_authenticate.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_authenticate.c (original)
+++ team/oej/t38passthrough/apps/app_authenticate.c Sun Apr  9 23:48:19 2006
@@ -252,7 +252,7 @@
 	return ast_register_application(app, auth_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -264,7 +264,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_cdr.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_cdr.c (original)
+++ team/oej/t38passthrough/apps/app_cdr.c Sun Apr  9 23:48:19 2006
@@ -28,6 +28,8 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
+#define STATIC_MODULE
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -35,9 +37,6 @@
 #include "asterisk/channel.h"
 #include "asterisk/module.h"
 #include "asterisk/pbx.h"
-
-
-static char *tdesc = "Tell Asterisk to not maintain a CDR for the current call";
 
 static char *nocdr_descrip = 
 "  NoCDR(): This application will tell Asterisk not to maintain a CDR for the\n"
@@ -64,7 +63,7 @@
 	return 0;
 }
 
-int unload_module(void)
+STATIC_MODULE int unload_module(void)
 {
 	int res;
 
@@ -75,24 +74,26 @@
 	return res;
 }
 
-int load_module(void)
+STATIC_MODULE int load_module(void)
 {
 	return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
 }
 
-char *description(void)
+STATIC_MODULE const char *description(void)
 {
-	return tdesc;
+	return "Tell Asterisk to not maintain a CDR for the current call";
 }
 
-int usecount(void)
+STATIC_MODULE int usecount(void)
 {
 	int res;
 	STANDARD_USECOUNT(res);
 	return res;
 }
 
-char *key()
+STATIC_MODULE const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/t38passthrough/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_chanisavail.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_chanisavail.c (original)
+++ team/oej/t38passthrough/apps/app_chanisavail.c Sun Apr  9 23:48:19 2006
@@ -173,7 +173,7 @@
 	return ast_register_application(app, chanavail_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -185,7 +185,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_channelredirect.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_channelredirect.c (original)
+++ team/oej/t38passthrough/apps/app_channelredirect.c Sun Apr  9 23:48:19 2006
@@ -137,7 +137,7 @@
 	return ast_register_application(app, asyncgoto_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -151,7 +151,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_chanspy.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_chanspy.c (original)
+++ team/oej/t38passthrough/apps/app_chanspy.c Sun Apr  9 23:48:19 2006
@@ -570,7 +570,7 @@
 	return ast_register_application(app, chanspy_exec, synopsis, desc);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return (char *) synopsis;
 }
@@ -582,7 +582,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_controlplayback.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_controlplayback.c (original)
+++ team/oej/t38passthrough/apps/app_controlplayback.c Sun Apr  9 23:48:19 2006
@@ -172,7 +172,7 @@
 	return ast_register_application(app, controlplayback_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return (char *) tdesc;
 }
@@ -185,7 +185,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_db.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_db.c (original)
+++ team/oej/t38passthrough/apps/app_db.c Sun Apr  9 23:48:19 2006
@@ -167,7 +167,7 @@
 	return retval;
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -179,7 +179,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_dial.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_dial.c (original)
+++ team/oej/t38passthrough/apps/app_dial.c Sun Apr  9 23:48:19 2006
@@ -1189,10 +1189,6 @@
 	}
 	if (peer) {
 		time(&answer_time);
-#ifdef OSP_SUPPORT
-		/* Once call is answered, ditch the OSP Handle */
-		pbx_builtin_setvar_helper(chan, "_OSPHANDLE", "");
-#endif
 		strcpy(status, "ANSWER");
 		/* Ah ha!  Someone answered within the desired timeframe.  Of course after this
 		   we will always return with -1 so that it is hung up properly after the 
@@ -1742,7 +1738,7 @@
 	return res;
 }
 
-STATIC_MODULE char *description(void)
+STATIC_MODULE const char *description(void)
 {
 	return tdesc;
 }
@@ -1754,7 +1750,7 @@
 	return res;
 }
 
-STATIC_MODULE char *key(void)
+STATIC_MODULE const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_dictate.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_dictate.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_dictate.c (original)
+++ team/oej/t38passthrough/apps/app_dictate.c Sun Apr  9 23:48:19 2006
@@ -352,7 +352,7 @@
 	return ast_register_application(app, dictate_exec, synopsis, desc);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -364,7 +364,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_directed_pickup.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_directed_pickup.c (original)
+++ team/oej/t38passthrough/apps/app_directed_pickup.c Sun Apr  9 23:48:19 2006
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2005, Joshua Colp
  *
- * Joshua Colp <jcolp at asterlink.com>
+ * Joshua Colp <jcolp at digium.com>
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -150,7 +150,7 @@
 	return ast_register_application(app, pickup_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return (char *) tdesc;
 }
@@ -164,7 +164,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/oej/t38passthrough/apps/app_directory.c?rev=18749&r1=18748&r2=18749&view=diff
==============================================================================
--- team/oej/t38passthrough/apps/app_directory.c (original)
+++ team/oej/t38passthrough/apps/app_directory.c Sun Apr  9 23:48:19 2006
@@ -505,7 +505,7 @@
 	return ast_register_application(app, directory_exec, synopsis, descrip);
 }
 
-char *description(void)
+const char *description(void)
 {
 	return tdesc;
 }
@@ -517,7 +517,7 @@
 	return res;
 }
 
-char *key()
+const char *key()
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/t38passthrough/apps/app_disa.c

[... 17389 lines stripped ...]

More information about the asterisk-commits mailing list