[svn-commits] oej: branch oej/bug8824-temp r136004 - in /team/oej/bug8824-temp: ./ apps/ bu...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Aug 6 08:21:49 CDT 2008
Author: oej
Date: Wed Aug 6 08:21:48 2008
New Revision: 136004
URL: http://svn.digium.com/view/asterisk?view=rev&rev=136004
Log:
Update to current trunk, resolve conflicts in chan_iax2.c and chan_skinny.c (please check)
Added:
team/oej/bug8824-temp/contrib/init.d/rc.mandriva.asterisk
- copied unchanged from r135950, trunk/contrib/init.d/rc.mandriva.asterisk
team/oej/bug8824-temp/contrib/init.d/rc.mandriva.zaptel
- copied unchanged from r135950, trunk/contrib/init.d/rc.mandriva.zaptel
team/oej/bug8824-temp/contrib/scripts/asterisk.logrotate
- copied unchanged from r135950, trunk/contrib/scripts/asterisk.logrotate
team/oej/bug8824-temp/doc/hoard.txt
- copied unchanged from r135950, trunk/doc/hoard.txt
team/oej/bug8824-temp/doc/realtimetext.txt
- copied unchanged from r135950, trunk/doc/realtimetext.txt
team/oej/bug8824-temp/doc/sip-retransmit.txt
- copied unchanged from r135950, trunk/doc/sip-retransmit.txt
team/oej/bug8824-temp/include/asterisk/datastore.h
- copied unchanged from r135950, trunk/include/asterisk/datastore.h
team/oej/bug8824-temp/include/asterisk/fskmodem_float.h
- copied unchanged from r135950, trunk/include/asterisk/fskmodem_float.h
team/oej/bug8824-temp/include/asterisk/fskmodem_int.h
- copied unchanged from r135950, trunk/include/asterisk/fskmodem_int.h
team/oej/bug8824-temp/main/datastore.c
- copied unchanged from r135950, trunk/main/datastore.c
team/oej/bug8824-temp/main/editline/makelist.in
- copied unchanged from r135950, trunk/main/editline/makelist.in
team/oej/bug8824-temp/main/fskmodem_float.c
- copied unchanged from r135950, trunk/main/fskmodem_float.c
team/oej/bug8824-temp/main/fskmodem_int.c
- copied unchanged from r135950, trunk/main/fskmodem_int.c
Removed:
team/oej/bug8824-temp/contrib/init.d/rc.mandrake.asterisk
team/oej/bug8824-temp/contrib/init.d/rc.mandrake.zaptel
team/oej/bug8824-temp/include/asterisk/dlfcn-compat.h
team/oej/bug8824-temp/include/asterisk/libresample.h
team/oej/bug8824-temp/main/dlfcn.c
team/oej/bug8824-temp/main/editline/makelist
team/oej/bug8824-temp/main/libresample/
Modified:
team/oej/bug8824-temp/ (props changed)
team/oej/bug8824-temp/CHANGES
team/oej/bug8824-temp/LICENSE
team/oej/bug8824-temp/Makefile
team/oej/bug8824-temp/UPGRADE.txt
team/oej/bug8824-temp/acinclude.m4
team/oej/bug8824-temp/apps/app_adsiprog.c
team/oej/bug8824-temp/apps/app_chanspy.c
team/oej/bug8824-temp/apps/app_dahdibarge.c
team/oej/bug8824-temp/apps/app_dahdiras.c
team/oej/bug8824-temp/apps/app_dahdiscan.c
team/oej/bug8824-temp/apps/app_dial.c
team/oej/bug8824-temp/apps/app_fax.c
team/oej/bug8824-temp/apps/app_ices.c
team/oej/bug8824-temp/apps/app_image.c
team/oej/bug8824-temp/apps/app_jack.c
team/oej/bug8824-temp/apps/app_meetme.c
team/oej/bug8824-temp/apps/app_milliwatt.c
team/oej/bug8824-temp/apps/app_minivm.c
team/oej/bug8824-temp/apps/app_parkandannounce.c
team/oej/bug8824-temp/apps/app_queue.c
team/oej/bug8824-temp/apps/app_rpt.c
team/oej/bug8824-temp/apps/app_senddtmf.c
team/oej/bug8824-temp/apps/app_sendtext.c
team/oej/bug8824-temp/apps/app_speech_utils.c
team/oej/bug8824-temp/apps/app_stack.c
team/oej/bug8824-temp/apps/app_voicemail.c
team/oej/bug8824-temp/build_tools/cflags.xml
team/oej/bug8824-temp/build_tools/make_version
team/oej/bug8824-temp/build_tools/menuselect-deps.in
team/oej/bug8824-temp/build_tools/prep_tarball
team/oej/bug8824-temp/cdr/cdr_radius.c
team/oej/bug8824-temp/channels/chan_agent.c
team/oej/bug8824-temp/channels/chan_console.c
team/oej/bug8824-temp/channels/chan_dahdi.c
team/oej/bug8824-temp/channels/chan_gtalk.c
team/oej/bug8824-temp/channels/chan_iax2.c
team/oej/bug8824-temp/channels/chan_jingle.c
team/oej/bug8824-temp/channels/chan_mgcp.c
team/oej/bug8824-temp/channels/chan_sip.c
team/oej/bug8824-temp/channels/chan_skinny.c
team/oej/bug8824-temp/channels/chan_unistim.c
team/oej/bug8824-temp/channels/console_video.c
team/oej/bug8824-temp/channels/h323/ast_h323.cxx
team/oej/bug8824-temp/channels/iax2-parser.c
team/oej/bug8824-temp/channels/iax2-provision.c
team/oej/bug8824-temp/channels/iax2.h
team/oej/bug8824-temp/channels/misdn/isdn_lib.c
team/oej/bug8824-temp/channels/vgrabbers.c
team/oej/bug8824-temp/codecs/codec_dahdi.c
team/oej/bug8824-temp/codecs/codec_g722.c
team/oej/bug8824-temp/codecs/codec_resample.c
team/oej/bug8824-temp/configs/chan_dahdi.conf.sample
team/oej/bug8824-temp/configs/extensions.conf.sample
team/oej/bug8824-temp/configs/features.conf.sample
team/oej/bug8824-temp/configs/gtalk.conf.sample
team/oej/bug8824-temp/configs/iax.conf.sample
team/oej/bug8824-temp/configs/jingle.conf.sample
team/oej/bug8824-temp/configs/manager.conf.sample
team/oej/bug8824-temp/configs/sip.conf.sample
team/oej/bug8824-temp/configs/skinny.conf.sample
team/oej/bug8824-temp/configs/voicemail.conf.sample
team/oej/bug8824-temp/configure
team/oej/bug8824-temp/configure.ac
team/oej/bug8824-temp/contrib/scripts/asterisk.ldif
team/oej/bug8824-temp/contrib/scripts/autosupport
team/oej/bug8824-temp/contrib/scripts/safe_asterisk
team/oej/bug8824-temp/contrib/utils/zones2indications.c
team/oej/bug8824-temp/doc/lang/hebrew.ods
team/oej/bug8824-temp/doc/osp.txt
team/oej/bug8824-temp/doc/ss7.txt
team/oej/bug8824-temp/doc/tex/Makefile
team/oej/bug8824-temp/doc/tex/app-sms.tex
team/oej/bug8824-temp/doc/tex/asterisk.tex
team/oej/bug8824-temp/doc/tex/cliprompt.tex
team/oej/bug8824-temp/doc/tex/extensions.tex
team/oej/bug8824-temp/doc/tex/queuelog.tex
team/oej/bug8824-temp/formats/format_pcm.c
team/oej/bug8824-temp/funcs/func_config.c
team/oej/bug8824-temp/funcs/func_curl.c
team/oej/bug8824-temp/funcs/func_enum.c
team/oej/bug8824-temp/funcs/func_global.c
team/oej/bug8824-temp/funcs/func_lock.c
team/oej/bug8824-temp/funcs/func_odbc.c
team/oej/bug8824-temp/funcs/func_speex.c
team/oej/bug8824-temp/funcs/func_sysinfo.c
team/oej/bug8824-temp/funcs/func_volume.c
team/oej/bug8824-temp/include/asterisk/abstract_jb.h
team/oej/bug8824-temp/include/asterisk/astobj.h
team/oej/bug8824-temp/include/asterisk/autoconfig.h.in
team/oej/bug8824-temp/include/asterisk/causes.h
team/oej/bug8824-temp/include/asterisk/cdr.h
team/oej/bug8824-temp/include/asterisk/channel.h
team/oej/bug8824-temp/include/asterisk/config.h
team/oej/bug8824-temp/include/asterisk/devicestate.h
team/oej/bug8824-temp/include/asterisk/doxyref.h
team/oej/bug8824-temp/include/asterisk/fskmodem.h
team/oej/bug8824-temp/include/asterisk/http.h
team/oej/bug8824-temp/include/asterisk/lock.h
team/oej/bug8824-temp/include/asterisk/manager.h
team/oej/bug8824-temp/include/asterisk/module.h
team/oej/bug8824-temp/include/asterisk/options.h
team/oej/bug8824-temp/include/asterisk/pbx.h
team/oej/bug8824-temp/include/asterisk/res_odbc.h
team/oej/bug8824-temp/include/asterisk/sched.h
team/oej/bug8824-temp/include/asterisk/stringfields.h
team/oej/bug8824-temp/include/asterisk/threadstorage.h
team/oej/bug8824-temp/include/asterisk/utils.h
team/oej/bug8824-temp/main/Makefile
team/oej/bug8824-temp/main/abstract_jb.c
team/oej/bug8824-temp/main/acl.c
team/oej/bug8824-temp/main/app.c
team/oej/bug8824-temp/main/asterisk.c
team/oej/bug8824-temp/main/astmm.c
team/oej/bug8824-temp/main/audiohook.c
team/oej/bug8824-temp/main/callerid.c
team/oej/bug8824-temp/main/cdr.c
team/oej/bug8824-temp/main/channel.c
team/oej/bug8824-temp/main/cli.c
team/oej/bug8824-temp/main/config.c
team/oej/bug8824-temp/main/devicestate.c
team/oej/bug8824-temp/main/dns.c
team/oej/bug8824-temp/main/dnsmgr.c
team/oej/bug8824-temp/main/dsp.c
team/oej/bug8824-temp/main/editline/ (props changed)
team/oej/bug8824-temp/main/editline/Makefile.in
team/oej/bug8824-temp/main/editline/configure
team/oej/bug8824-temp/main/editline/configure.in
team/oej/bug8824-temp/main/features.c
team/oej/bug8824-temp/main/fixedjitterbuf.h
team/oej/bug8824-temp/main/frame.c
team/oej/bug8824-temp/main/fskmodem.c
team/oej/bug8824-temp/main/hashtab.c
team/oej/bug8824-temp/main/http.c
team/oej/bug8824-temp/main/loader.c
team/oej/bug8824-temp/main/logger.c
team/oej/bug8824-temp/main/manager.c
team/oej/bug8824-temp/main/pbx.c
team/oej/bug8824-temp/main/rtp.c
team/oej/bug8824-temp/main/say.c
team/oej/bug8824-temp/main/sched.c
team/oej/bug8824-temp/main/srv.c
team/oej/bug8824-temp/main/tdd.c
team/oej/bug8824-temp/main/threadstorage.c
team/oej/bug8824-temp/main/translate.c
team/oej/bug8824-temp/main/utils.c
team/oej/bug8824-temp/makeopts.in
team/oej/bug8824-temp/pbx/dundi-parser.c
team/oej/bug8824-temp/pbx/pbx_config.c
team/oej/bug8824-temp/pbx/pbx_dundi.c
team/oej/bug8824-temp/pbx/pbx_lua.c
team/oej/bug8824-temp/pbx/pbx_realtime.c
team/oej/bug8824-temp/res/Makefile
team/oej/bug8824-temp/res/ael/pval.c
team/oej/bug8824-temp/res/res_agi.c
team/oej/bug8824-temp/res/res_config_ldap.c
team/oej/bug8824-temp/res/res_config_odbc.c
team/oej/bug8824-temp/res/res_config_pgsql.c
team/oej/bug8824-temp/res/res_config_sqlite.c
team/oej/bug8824-temp/res/res_http_post.c
team/oej/bug8824-temp/res/res_limit.c
team/oej/bug8824-temp/res/res_odbc.c
team/oej/bug8824-temp/res/res_smdi.c
team/oej/bug8824-temp/sample.call
team/oej/bug8824-temp/sounds/Makefile
team/oej/bug8824-temp/utils/astman.c
Propchange: team/oej/bug8824-temp/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/bug8824-temp/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/bug8824-temp/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/bug8824-temp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 6 08:21:48 2008
@@ -1,1 +1,1 @@
-/trunk:1-128340
+/trunk:1-136002
Modified: team/oej/bug8824-temp/CHANGES
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/CHANGES?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/CHANGES (original)
+++ team/oej/bug8824-temp/CHANGES Wed Aug 6 08:21:48 2008
@@ -35,9 +35,9 @@
* CHANNEL() now has options for the maximum, minimum, and standard or normal
deviation of jitter, rtt, and loss for a call using chan_sip.
-Zaptel channel driver (chan_zap) Changes
+DAHDI channel driver (chan_dahdi) Changes
----------------------------------------
- * Channels can now be configured using named sections in zapata.conf, just
+ * Channels can now be configured using named sections in chan_dahdi.conf, just
like other channel drivers, including the use of templates.
* The default for pridialplan has changed from 'national' to 'unknown'.
@@ -102,11 +102,13 @@
* The Dial() application no longer copies the language used by the caller to the callee's
channel. If you desire for the caller's channel's language to be used for file playback
to the callee, then the file specified may be prepended with "${CHANNEL(language)}/" .
+ * SendImage() no longer hangs up the channel on error; instead, it sets the
+ status variable SENDIMAGESTATUS to one of 'SUCCESS', 'FAILURE', or
+ 'UNSUPPORTED'. This change makes SendImage() more consistent with other
+ applications.
SIP Changes
-----------
- * The ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using setvar to cause a given
- audio file to be played upon completion of an attended transfer.
* Added DNS manager support to registrations for peers referencing peer entries.
DNS manager runs in the background which allows DNS lookups to be run asynchronously
as well as periodically updating the IP address. These properties allow for
@@ -127,10 +129,18 @@
* 'sip show peers' and 'sip show users' display their entries sorted in
alphabetical order, as opposed to the order they were in, in the config
file or database.
+ * Videosupport now supports an additional option, "always", which always sets
+ up video RTP ports, even on clients that don't support it. This helps with
+ callfiles and certain transfers to ensure that if two video phones are
+ connected, they will always share video feeds.
IAX Changes
-----------
* Existing DNS manager lookups extended to check for SRV records.
+ * IAX2 encryption support has been improved to support periodic key rotation
+ within a call for enhanced security. The option "keyrotate" has been
+ provided to disable this functionality to preserve backwards compatibility
+ with older versions of IAX2 that do not support key rotation.
CLI Changes
-----------
@@ -142,6 +152,11 @@
A new API call was added so trunk will now have to be compiled against
a versions of libpri and libss7 that have them or it will not know that
these libraries exist.
+ * The commands "core show globals", "core set global" and "core set chanvar" has
+ been deprecated in favor of the more semanticly correct "dialplan show globals",
+ "dialplan set chanvar" and "dialplan set global".
+ * New CLI command "dialplan show chanvar" to list all variables associated
+ with a given channel.
DNS manager changes
-------------------
@@ -166,6 +181,28 @@
* A new configuration option, "timeoutpriority" has been added. Please see the section labeled
"QUEUE TIMING OPTIONS" in configs/queues.conf.sample for a detailed explanation of the option
as well as an explanation about timeout options in general
+
+Realtime changes
+----------------
+ * Several (ODBC, Postgres, MySQL, SQLite) realtime drivers have been given
+ adaptive capabilities. What this means in practical terms is that if your
+ realtime table lacks critical fields, Asterisk will now emit warnings to
+ that effect. Also, some of the realtime drivers have the ability (if
+ configured) to automatically add those columns to the table with the
+ correct type and length.
+
+Miscellaneous
+-------------
+ * The channel variable ATTENDED_TRANSFER_COMPLETE_SOUND can now be set using
+ the 'setvar' option to cause a given audio file to be played upon completion
+ of an attended transfer. Currently it works for DAHDI, IAX2, SIP, and
+ Skinny channels only.
+ * You can now compile Asterisk against the Hoard Memory Allocator, see doc/hoard.txt
+ for more information.
+ * Config file variables may now be appended to, by using the '+=' append
+ operator. This is most helpful when working with long SQL queries in
+ func_odbc.conf, as the queries no longer need to be specified on a single
+ line.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.4.X to Asterisk 1.6.0 -------------
@@ -389,28 +426,28 @@
default to their old hard-coded values ('#' and '*' respectively) so this should
not break any existing agent installations.
-Zaptel channel driver (chan_zap) Changes
+DAHDI channel driver (chan_dahdi) Changes
----------------------------------------
- * SS7 support in chan_zap (via libss7 library)
+ * SS7 support (via libss7 library)
* In India, some carriers transmit CID via dtmf. Some code has been added
that will handle some situations. The cidstart=polarity_IN choice has been added for
those carriers that transmit CID via dtmf after a polarity change.
* CID matching information is now shown when doing 'dialplan show'.
- * Added zap show version CLI command to chan_zap.
- * Added setvar support to zapata.conf channel entries.
+ * Added dahdi show version CLI command.
+ * Added setvar support to chan_dahdi.conf channel entries.
* Added two new options: mwimonitor and mwimonitornotify. These options allow
you to enable MWI monitoring on FXO lines. When the MWI state changes,
the script specified in the mwimonitornotify option is executed. An internal
event indicating the new state of the mailbox is also generated, so that
the normal MWI facilities in Asterisk work as usual.
* Added signalling type 'auto', which attempts to use the same signalling type
- for a channel as configured in Zaptel. This is primarily designed for analog
+ for a channel as configured in DAHDI. This is primarily designed for analog
ports, but will also work for digital ports that are configured for FXS or FXO
- signalling types. This mode is also the default now, so if your zapata.conf
+ signalling types. This mode is also the default now, so if your chan_dahdi.conf
does not specify signalling for a channel (which is unlikely as the sample
configuration file has always recommended specifying it for every channel) then
the 'auto' mode will be used for that channel if possible.
- * Added a 'zap set dnd' command to allow CLI control of the Do-Not-Disturb
+ * Added a 'dahdi set dnd' command to allow CLI control of the Do-Not-Disturb
state for a channel; also ensured that the DNDState Manager event is
emitted no matter how the DND state is set or cleared.
@@ -805,3 +842,9 @@
as a backtrace of the stack which led to the lock calls.
* users.conf now sports an optional alternateexts property, which permits
allocation of additional extensions which will reach the specified user.
+ * A new option for the configure script, --enable-internal-poll, has been added
+ for use with systems which may have a buggy implementation of the poll system
+ call. If you notice odd behavior such as the CLI being unresponsive on remote
+ consoles, you may want to try using this option. This option is enabled by default
+ on Darwin systems since it is known that the Darwin poll() implementation has
+ odd issues.
Modified: team/oej/bug8824-temp/LICENSE
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/LICENSE?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/LICENSE (original)
+++ team/oej/bug8824-temp/LICENSE Wed Aug 6 08:21:48 2008
@@ -31,8 +31,8 @@
GPL'd products (although if you've written a module for Asterisk we
would strongly encourage you to make the same exception that we do).
-Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323 and distribute the resulting binary files.
+Specific permission is also granted to link Asterisk with OpenSSL, OpenH323
+and/or the UW IMAP Toolkit and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
@@ -60,7 +60,7 @@
+1.877.344.4861 (via telephone in the USA)
+1.256.428.6000 (via telephone outside the USA)
+1.256.864.0464 (via FAX inside or outside the USA)
-IAX2/misery.digium.com/6000 (via IAX2)
+IAX2/pbx.digium.com (via IAX2)
licensing at digium.com (via email)
Digium, Inc.
Modified: team/oej/bug8824-temp/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/Makefile?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/Makefile (original)
+++ team/oej/bug8824-temp/Makefile Wed Aug 6 08:21:48 2008
@@ -221,10 +221,16 @@
endif
ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
-ASTCFLAGS+=-pipe
-endif
-
-ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-pipe
+ endif
+endif
+
+ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
+ ASTCFLAGS+=-Wall
+endif
+
+ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ASTCFLAGS+=-include $(ASTTOPDIR)/include/asterisk/autoconfig.h
@@ -237,8 +243,10 @@
ASTLDFLAGS+=-L/usr/local/lib
endif
-ifneq ($(PROC),ultrasparc)
- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ifeq ($(findstring -march,$(ASTCFLAGS)),)
+ ifneq ($(PROC),ultrasparc)
+ ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
endif
ifeq ($(PROC),ppc)
@@ -404,12 +412,12 @@
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-main/version.c:
+main/version.c: FORCE
@build_tools/make_version_c > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
-include/asterisk/version.h:
+include/asterisk/version.h: FORCE
@build_tools/make_version_h > $@.tmp
@cmp -s $@.tmp $@ || mv $@.tmp $@
@rm -f $@.tmp
@@ -457,10 +465,6 @@
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
- mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
- for x in phoneprov/*; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/phoneprov ; \
- done
mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
for x in static-http/*; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
@@ -699,6 +703,24 @@
fi
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
+ @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+ @for x in phoneprov/*; do \
+ dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
+ if [ -f $${dst} ]; then \
+ if [ "$(OVERWRITE)" = "y" ]; then \
+ if cmp -s $${dst} $$x ; then \
+ echo "Config file $$x is unchanged"; \
+ continue; \
+ fi ; \
+ mv -f $${dst} $${dst}.old ; \
+ else \
+ echo "Skipping config file $$x"; \
+ continue; \
+ fi ;\
+ fi ; \
+ echo "Installing file $$x"; \
+ $(INSTALL) -m 644 $$x $${dst} ;\
+ done
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@@ -743,6 +765,14 @@
progdocs:
(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
+
+install-logrotate:
+ if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
+ mkdir $(ASTETCDIR)/../logrotate.d ; \
+ fi
+ sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
+ install -m 0644 contrib/scripts/asterisk.logrotate.tmp $(ASTETCDIR)/../logrotate.d/asterisk
+ rm -f contrib/scripts/asterisk.logrotate.tmp
config:
@if [ "${OSARCH}" = "linux-gnu" ]; then \
@@ -756,7 +786,7 @@
$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
- $(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
+ $(INSTALL) -m 755 contrib/init.d/rc.mandriva.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
$(INSTALL) -m 755 contrib/init.d/rc.suse.asterisk $(DESTDIR)/etc/init.d/asterisk; \
@@ -885,4 +915,7 @@
asterisk.pdf:
$(MAKE) -C doc/tex asterisk.pdf
-.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell main/version.c include/asterisk/version.h installdirs
+.PHONY: menuselect menuselect.makeopts main sounds clean dist-clean distclean all prereqs cleantest uninstall _uninstall uninstall-all pdf dont-optimize $(SUBDIRS_INSTALL) $(SUBDIRS_DIST_CLEAN) $(SUBDIRS_CLEAN) $(SUBDIRS_UNINSTALL) $(SUBDIRS) $(MOD_SUBDIRS_EMBED_LDSCRIPT) $(MOD_SUBDIRS_EMBED_LDFLAGS) $(MOD_SUBDIRS_EMBED_LIBS) badshell installdirs
+
+FORCE:
+
Modified: team/oej/bug8824-temp/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/UPGRADE.txt?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/UPGRADE.txt (original)
+++ team/oej/bug8824-temp/UPGRADE.txt Wed Aug 6 08:21:48 2008
@@ -63,6 +63,11 @@
* The concise versions of various CLI commands are now deprecated. We recommend
using the manager interface (AMI) for application integration with Asterisk.
+* The following core commands dealing with dialplan has been deprecated: 'core
+ show globals', 'core set global' and 'core set chanvar'. Use the equivalent
+ 'dialplan show globals', 'dialplan set global' and 'dialplan set chanvar'
+ instead.
+
* The silencethreshold used for various applications is now settable via a
centralized config option in dsp.conf.
@@ -92,6 +97,13 @@
Applications:
+* SendImage() no longer hangs up the channel on transmission error or on
+ another type of error; in those cases, a FAILURE status is stored in
+ SENDIMAGESTATUS and dialplan execution continues. The possible return values
+ stored in SENDIMAGESTATUS are: SUCCESS, FAILURE, and UNSUPPORTED. ('OK' has
+ been replaced with 'SUCCESS', and 'NOSUPPORT' has been replaced with
+ 'UNSUPPORTED'). This change makes the SendImage application more consistent
+ with other applications.
* ChanIsAvail() now has a 't' option, which allows the specified device
to be queried for state without consulting the channel drivers. This
performs mostly a 'ChanExists' sort of function.
@@ -214,6 +226,13 @@
* queues.conf: the queue-lessthan sound file option is no longer available, and the
queue-round-seconds option no longer takes '1' as a valid parameter.
+* If you have any third party modules which use a config file variable whose
+ name ends in a '+', please note that the append capability added to this
+ version may now conflict with that variable naming scheme. An easy
+ workaround is to ensure that a space occurs between the '+' and the '=',
+ to differentiate your variable from the append operator. This potential
+ conflict is unlikely, but is documented here to be thorough.
+
Manager:
* Manager has been upgraded to version 1.1 with a lot of changes.
Modified: team/oej/bug8824-temp/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/acinclude.m4?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/acinclude.m4 (original)
+++ team/oej/bug8824-temp/acinclude.m4 Wed Aug 6 08:21:48 2008
@@ -128,11 +128,15 @@
# Check if a given expression will compile using a certain header.
-# AST_C_COMPILE_CHECK([package], [expression], [header file], [version])
+# AST_C_COMPILE_CHECK([package], [expression], [header file], [version], [description])
AC_DEFUN([AST_C_COMPILE_CHECK],
[
if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
- AC_MSG_CHECKING([if "$2" compiles using $3])
+ if test "x$5" != "x"; then
+ AC_MSG_CHECKING([for $5])
+ else
+ AC_MSG_CHECKING([if "$2" compiles using $3])
+ fi
saved_cppflags="${CPPFLAGS}"
if test "x${$1_DIR}" != "x"; then
$1_INCLUDE="-I${$1_DIR}/include"
Modified: team/oej/bug8824-temp/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_adsiprog.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_adsiprog.c (original)
+++ team/oej/bug8824-temp/apps/app_adsiprog.c Wed Aug 6 08:21:48 2008
@@ -515,7 +515,7 @@
{
int x;
- for (x = 0; x < sizeof(events) / sizeof(events[0]); x++) {
+ for (x = 0; x < ARRAY_LEN(events); x++) {
if (!strcasecmp(events[x].name, name))
return events[x].id;
}
@@ -527,7 +527,7 @@
{
int x;
- for (x = 0; x <sizeof(justify) / sizeof(justify[0]); x++) {
+ for (x = 0; x < ARRAY_LEN(justify); x++) {
if (!strcasecmp(justify[x].name, name))
return justify[x].id;
}
@@ -935,7 +935,7 @@
int x, res;
char *unused;
- for (x = 0; x < sizeof(kcmds) / sizeof(kcmds[0]); x++) {
+ for (x = 0; x < ARRAY_LEN(kcmds); x++) {
if ((kcmds[x].id > -1) && !strcasecmp(kcmds[x].name, code)) {
if (kcmds[x].add_args) {
res = kcmds[x].add_args(key->retstr + key->retstrlen,
@@ -964,7 +964,7 @@
int x, res, max = sub->id ? MAX_SUB_LEN : MAX_MAIN_LEN;
char *unused;
- for (x = 0; x < sizeof(opcmds) / sizeof(opcmds[0]); x++) {
+ for (x = 0; x < ARRAY_LEN(opcmds); x++) {
if ((opcmds[x].id > -1) && !strcasecmp(opcmds[x].name, code)) {
if (opcmds[x].add_args) {
res = opcmds[x].add_args(sub->data + sub->datalen,
Modified: team/oej/bug8824-temp/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_chanspy.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_chanspy.c (original)
+++ team/oej/bug8824-temp/apps/app_chanspy.c Wed Aug 6 08:21:48 2008
@@ -218,7 +218,7 @@
AST_APP_OPTION('d', OPTION_DTMF_SWITCH_MODES),
});
-int next_unique_id_to_use = 0;
+static int next_unique_id_to_use = 0;
struct chanspy_translation_helper {
/* spy data */
@@ -560,7 +560,7 @@
/* chanspy_ds->chan is NULL after this call */
chanspy_ds_destroy(datastore->data);
datastore->data = NULL;
- ast_channel_datastore_free(datastore);
+ ast_datastore_free(datastore);
}
ast_channel_unlock(chan);
}
@@ -576,7 +576,7 @@
ast_mutex_lock(&chanspy_ds->lock);
- if (!(datastore = ast_channel_datastore_alloc(&chanspy_ds_info, chanspy_ds->unique_id))) {
+ if (!(datastore = ast_datastore_alloc(&chanspy_ds_info, chanspy_ds->unique_id))) {
ast_mutex_unlock(&chanspy_ds->lock);
chanspy_ds = chanspy_ds_free(chanspy_ds);
ast_channel_unlock(chan);
@@ -595,7 +595,7 @@
const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
{
struct ast_channel *next;
- char channel_name[AST_CHANNEL_NAME];
+ const size_t pseudo_len = strlen("DAHDI/pseudo");
redo:
if (!ast_strlen_zero(spec))
@@ -608,8 +608,8 @@
if (!next)
return NULL;
- snprintf(channel_name, AST_CHANNEL_NAME, "%s/pseudo", dahdi_chan_name);
- if (!strncmp(next->name, channel_name, 10)) {
+ if (!strncmp(next->name, "DAHDI/pseudo", pseudo_len)) {
+ last = next;
ast_channel_unlock(next);
goto redo;
} else if (next == chan) {
@@ -754,12 +754,12 @@
if (mygroup) {
dup_mygroup = ast_strdupa(mygroup);
num_mygroups = ast_app_separate_args(dup_mygroup, ':', mygroups,
- sizeof(mygroups) / sizeof(mygroups[0]));
+ ARRAY_LEN(mygroups));
if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) {
dup_group = ast_strdupa(group);
num_groups = ast_app_separate_args(dup_group, ':', groups,
- sizeof(groups) / sizeof(groups[0]));
+ ARRAY_LEN(groups));
}
for (y = 0; y < num_mygroups; y++) {
Modified: team/oej/bug8824-temp/apps/app_dahdibarge.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_dahdibarge.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_dahdibarge.c (original)
+++ team/oej/bug8824-temp/apps/app_dahdibarge.c Wed Aug 6 08:21:48 2008
@@ -53,7 +53,6 @@
#include "asterisk/utils.h"
static char *app = "DAHDIBarge";
-static char *deprecated_app = "ZapBarge";
static char *synopsis = "Barge in (monitor) DAHDI channel";
@@ -100,7 +99,7 @@
int origfd;
int ret = -1;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
@@ -287,12 +286,6 @@
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -300,7 +293,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/oej/bug8824-temp/apps/app_dahdiras.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_dahdiras.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_dahdiras.c (original)
+++ team/oej/bug8824-temp/apps/app_dahdiras.c Wed Aug 6 08:21:48 2008
@@ -53,7 +53,6 @@
#include "asterisk/app.h"
static char *app = "DAHDIRAS";
-static char *deprecated_app = "ZapRAS";
static char *synopsis = "Executes DAHDI ISDN RAS application";
@@ -181,7 +180,7 @@
{
int res=-1;
char *args;
- DAHDI_PARAMS dahdip;
+ struct dahdi_params dahdip;
if (!data)
data = "";
@@ -212,12 +211,6 @@
return res;
}
-static int dahdiras_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return dahdiras_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -225,7 +218,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, dahdiras_exec_warn, synopsis, descrip);
return ((ast_register_application(app, dahdiras_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/oej/bug8824-temp/apps/app_dahdiscan.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_dahdiscan.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_dahdiscan.c (original)
+++ team/oej/bug8824-temp/apps/app_dahdiscan.c Wed Aug 6 08:21:48 2008
@@ -53,7 +53,6 @@
#include "asterisk/options.h"
static char *app = "DAHDIScan";
-static char *deprecated_app = "ZapScan";
static char *synopsis = "Scan DAHDI channels to monitor calls";
@@ -68,7 +67,7 @@
static struct ast_channel *get_dahdi_channel_locked(int num) {
char name[80];
- snprintf(name, sizeof(name), "%s/%d-1", dahdi_chan_name, num);
+ snprintf(name, sizeof(name), "DAHDI/%d-1", num);
return ast_get_channel_by_name_locked(name);
}
@@ -109,7 +108,7 @@
char input[4];
int ic = 0;
- DAHDI_BUFFERINFO bi;
+ struct dahdi_bufferinfo bi;
char __buf[CONF_SIZE + AST_FRIENDLY_OFFSET];
char *buf = __buf + AST_FRIENDLY_OFFSET;
@@ -357,12 +356,6 @@
return res;
}
-static int conf_exec_warn(struct ast_channel *chan, void *data)
-{
- ast_log(LOG_WARNING, "Use of the command %s is deprecated, please use %s instead.\n", deprecated_app, app);
- return conf_exec(chan, data);
-}
-
static int unload_module(void)
{
return ast_unregister_application(app);
@@ -370,7 +363,6 @@
static int load_module(void)
{
- ast_register_application(deprecated_app, conf_exec_warn, synopsis, descrip);
return ((ast_register_application(app, conf_exec, synopsis, descrip)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
}
Modified: team/oej/bug8824-temp/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/bug8824-temp/apps/app_dial.c?view=diff&rev=136004&r1=136003&r2=136004
==============================================================================
--- team/oej/bug8824-temp/apps/app_dial.c (original)
+++ team/oej/bug8824-temp/apps/app_dial.c Wed Aug 6 08:21:48 2008
@@ -329,9 +329,10 @@
AST_APP_OPTION('X', OPT_CALLER_MIXMONITOR),
END_OPTIONS );
-#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag64(flags, OPT_CALLEE_HANGUP | \
+#define CAN_EARLY_BRIDGE(flags,chan,peer) (!ast_test_flag64(flags, OPT_CALLEE_HANGUP | \
OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
- OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
+ OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK) && \
+ !chan->audiohooks && !peer->audiohooks)
/*
* The list of active channels
@@ -389,6 +390,7 @@
num->congestion++;
break;
+ case AST_CAUSE_NO_ROUTE_DESTINATION:
case AST_CAUSE_UNREGISTERED:
if (cdr)
ast_cdr_failed(cdr);
@@ -659,6 +661,10 @@
if (!single && !ast_test_flag64(peerflags, OPT_IGNORE_CONNECTEDLINE) && !ast_test_flag64(o, DIAL_NOCONNECTEDLINE))
ast_connectedline_update(in, c->cid.cid_num, c->cid.cid_name, c->cid.cid_pres);
peer = c;
+ if (peer->cdr) {
+ peer->cdr->answer = ast_tvnow();
+ peer->cdr->disposition = AST_CDR_ANSWERED;
+ }
ast_copy_flags64(peerflags, o,
OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
@@ -668,7 +674,7 @@
DIAL_NOFORWARDHTML);
ast_string_field_set(c, dialcontext, "");
ast_copy_string(c->exten, "", sizeof(c->exten));
- if (CAN_EARLY_BRIDGE(peerflags))
+ if (CAN_EARLY_BRIDGE(peerflags, in, peer))
/* Setup early bridge if appropriate */
ast_channel_early_bridge(in, peer);
}
@@ -695,7 +701,7 @@
case AST_CONTROL_RINGING:
ast_verb(3, "%s is ringing\n", c->name);
/* Setup early media if appropriate */
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_channel_early_bridge(in, c);
if (!(pa->sentringing) && !ast_test_flag64(outgoing, OPT_MUSICBACK)) {
ast_indicate(in, AST_CONTROL_RINGING);
@@ -705,7 +711,7 @@
case AST_CONTROL_PROGRESS:
ast_verb(3, "%s is making progress passing it to %s\n", c->name, in->name);
/* Setup early media if appropriate */
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_channel_early_bridge(in, c);
if (!ast_test_flag64(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROGRESS);
@@ -728,7 +734,7 @@
break;
case AST_CONTROL_PROCEEDING:
ast_verb(3, "%s is proceeding passing it to %s\n", c->name, in->name);
- if (single && CAN_EARLY_BRIDGE(peerflags))
+ if (single && CAN_EARLY_BRIDGE(peerflags, in, c))
ast_channel_early_bridge(in, c);
if (!ast_test_flag64(outgoing, OPT_RINGBACK))
ast_indicate(in, AST_CONTROL_PROCEEDING);
@@ -1352,7 +1358,7 @@
ast_copy_flags64(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_CALLER_HANGUP | OPT_IGNORE_FORWARDING | OPT_IGNORE_CONNECTEDLINE | OPT_FORCE_CALLERID);
/* Create datastore for channel dial features for caller */
- if (!(ds_caller_features = ast_channel_datastore_alloc(&dial_features_info, NULL))) {
+ if (!(ds_caller_features = ast_datastore_alloc(&dial_features_info, NULL))) {
[... 17839 lines stripped ...]
More information about the svn-commits
mailing list