[asterisk-commits] moy: branch moy/mfcr2 r159896 - in /team/moy/mfcr2: ./ agi/ apps/ autoconf/ b...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Sun Nov 30 16:45:43 CST 2008
Author: moy
Date: Sun Nov 30 16:45:41 2008
New Revision: 159896
URL: http://svn.digium.com/view/asterisk?view=rev&rev=159896
Log:
merged changes from trunk rev 159895
Added:
team/moy/mfcr2/UPGRADE-1.6.txt
- copied unchanged from r159895, trunk/UPGRADE-1.6.txt
team/moy/mfcr2/contrib/init.d/rc.archlinux.asterisk
- copied unchanged from r159895, trunk/contrib/init.d/rc.archlinux.asterisk
team/moy/mfcr2/funcs/func_sprintf.c
- copied unchanged from r159895, trunk/funcs/func_sprintf.c
team/moy/mfcr2/include/asterisk/optional_api.h
- copied unchanged from r159895, trunk/include/asterisk/optional_api.h
team/moy/mfcr2/res/res_timing_timerfd.c
- copied unchanged from r159895, trunk/res/res_timing_timerfd.c
Modified:
team/moy/mfcr2/ (props changed)
team/moy/mfcr2/CHANGES
team/moy/mfcr2/Makefile
team/moy/mfcr2/Makefile.moddir_rules
team/moy/mfcr2/Makefile.rules
team/moy/mfcr2/README
team/moy/mfcr2/UPGRADE-1.2.txt
team/moy/mfcr2/UPGRADE-1.4.txt
team/moy/mfcr2/UPGRADE.txt (contents, props changed)
team/moy/mfcr2/agi/Makefile
team/moy/mfcr2/apps/app_dial.c
team/moy/mfcr2/apps/app_festival.c
team/moy/mfcr2/apps/app_followme.c
team/moy/mfcr2/apps/app_meetme.c
team/moy/mfcr2/apps/app_minivm.c
team/moy/mfcr2/apps/app_queue.c
team/moy/mfcr2/apps/app_readexten.c
team/moy/mfcr2/apps/app_rpt.c
team/moy/mfcr2/apps/app_stack.c
team/moy/mfcr2/apps/app_voicemail.c
team/moy/mfcr2/autoconf/ast_gcc_attribute.m4
team/moy/mfcr2/build_tools/make_buildopts_h
team/moy/mfcr2/build_tools/make_version
team/moy/mfcr2/build_tools/menuselect-deps.in
team/moy/mfcr2/cdr/Makefile
team/moy/mfcr2/cdr/cdr_adaptive_odbc.c
team/moy/mfcr2/cdr/cdr_csv.c
team/moy/mfcr2/cdr/cdr_custom.c
team/moy/mfcr2/cdr/cdr_manager.c
team/moy/mfcr2/cdr/cdr_odbc.c
team/moy/mfcr2/cdr/cdr_pgsql.c
team/moy/mfcr2/cdr/cdr_radius.c
team/moy/mfcr2/cdr/cdr_sqlite.c
team/moy/mfcr2/cdr/cdr_sqlite3_custom.c
team/moy/mfcr2/cdr/cdr_tds.c
team/moy/mfcr2/channels/ (props changed)
team/moy/mfcr2/channels/chan_agent.c
team/moy/mfcr2/channels/chan_console.c
team/moy/mfcr2/channels/chan_dahdi.c
team/moy/mfcr2/channels/chan_iax2.c
team/moy/mfcr2/channels/chan_local.c
team/moy/mfcr2/channels/chan_misdn.c
team/moy/mfcr2/channels/chan_sip.c
team/moy/mfcr2/channels/chan_skinny.c
team/moy/mfcr2/channels/chan_usbradio.c
team/moy/mfcr2/channels/chan_vpb.cc
team/moy/mfcr2/channels/iax2-provision.c
team/moy/mfcr2/channels/misdn/ (props changed)
team/moy/mfcr2/channels/misdn/Makefile
team/moy/mfcr2/channels/misdn/ie.c
team/moy/mfcr2/channels/misdn_config.c
team/moy/mfcr2/channels/xpmr/xpmr.c
team/moy/mfcr2/codecs/gsm/Makefile
team/moy/mfcr2/codecs/gsm/src/ (props changed)
team/moy/mfcr2/configs/cdr_adaptive_odbc.conf.sample
team/moy/mfcr2/configs/chan_dahdi.conf.sample
team/moy/mfcr2/configs/sip.conf.sample
team/moy/mfcr2/configure
team/moy/mfcr2/configure.ac
team/moy/mfcr2/contrib/asterisk-ng-doxygen
team/moy/mfcr2/funcs/Makefile
team/moy/mfcr2/funcs/func_dialgroup.c
team/moy/mfcr2/funcs/func_realtime.c
team/moy/mfcr2/funcs/func_strings.c
team/moy/mfcr2/include/asterisk/agi.h
team/moy/mfcr2/include/asterisk/astmm.h
team/moy/mfcr2/include/asterisk/astobj2.h
team/moy/mfcr2/include/asterisk/autoconfig.h.in
team/moy/mfcr2/include/asterisk/channel.h
team/moy/mfcr2/include/asterisk/cli.h
team/moy/mfcr2/include/asterisk/compat.h
team/moy/mfcr2/include/asterisk/config.h
team/moy/mfcr2/include/asterisk/devicestate.h
team/moy/mfcr2/include/asterisk/dlinkedlists.h
team/moy/mfcr2/include/asterisk/dsp.h
team/moy/mfcr2/include/asterisk/dundi.h
team/moy/mfcr2/include/asterisk/enum.h
team/moy/mfcr2/include/asterisk/file.h
team/moy/mfcr2/include/asterisk/frame.h
team/moy/mfcr2/include/asterisk/linkedlists.h
team/moy/mfcr2/include/asterisk/lock.h
team/moy/mfcr2/include/asterisk/logger.h
team/moy/mfcr2/include/asterisk/manager.h
team/moy/mfcr2/include/asterisk/module.h
team/moy/mfcr2/include/asterisk/res_odbc.h
team/moy/mfcr2/include/asterisk/stringfields.h
team/moy/mfcr2/include/asterisk/strings.h
team/moy/mfcr2/include/asterisk/utils.h
team/moy/mfcr2/include/jitterbuf.h
team/moy/mfcr2/main/Makefile
team/moy/mfcr2/main/ast_expr2.c
team/moy/mfcr2/main/astmm.c
team/moy/mfcr2/main/astobj2.c
team/moy/mfcr2/main/cdr.c
team/moy/mfcr2/main/config.c
team/moy/mfcr2/main/db1-ast/Makefile
team/moy/mfcr2/main/db1-ast/btree/ (props changed)
team/moy/mfcr2/main/db1-ast/db/ (props changed)
team/moy/mfcr2/main/db1-ast/hash/ (props changed)
team/moy/mfcr2/main/db1-ast/mpool/ (props changed)
team/moy/mfcr2/main/db1-ast/recno/ (props changed)
team/moy/mfcr2/main/dns.c
team/moy/mfcr2/main/dsp.c
team/moy/mfcr2/main/event.c
team/moy/mfcr2/main/features.c
team/moy/mfcr2/main/file.c
team/moy/mfcr2/main/frame.c
team/moy/mfcr2/main/logger.c
team/moy/mfcr2/main/manager.c
team/moy/mfcr2/main/pbx.c
team/moy/mfcr2/main/srv.c
team/moy/mfcr2/main/stdtime/ (props changed)
team/moy/mfcr2/main/stdtime/Makefile
team/moy/mfcr2/main/taskprocessor.c
team/moy/mfcr2/main/udptl.c
team/moy/mfcr2/main/utils.c
team/moy/mfcr2/main/xmldoc.c
team/moy/mfcr2/makeopts.in
team/moy/mfcr2/pbx/Makefile
team/moy/mfcr2/pbx/ael/ (props changed)
team/moy/mfcr2/pbx/pbx_dundi.c
team/moy/mfcr2/pbx/pbx_realtime.c
team/moy/mfcr2/res/Makefile
team/moy/mfcr2/res/ael/ (props changed)
team/moy/mfcr2/res/ael/pval.c
team/moy/mfcr2/res/ais/ (props changed)
team/moy/mfcr2/res/ais/evt.c
team/moy/mfcr2/res/res_agi.c
team/moy/mfcr2/res/res_clialiases.c
team/moy/mfcr2/res/res_config_sqlite.c
team/moy/mfcr2/res/res_jabber.c
team/moy/mfcr2/res/res_musiconhold.c
team/moy/mfcr2/res/res_phoneprov.c
team/moy/mfcr2/res/res_timing_dahdi.c
team/moy/mfcr2/res/res_timing_pthread.c
team/moy/mfcr2/res/snmp/ (props changed)
team/moy/mfcr2/utils/Makefile
team/moy/mfcr2/utils/astman.c
team/moy/mfcr2/utils/check_expr.c
team/moy/mfcr2/utils/conf2ael.c
team/moy/mfcr2/utils/extconf.c
team/moy/mfcr2/utils/frame.c
team/moy/mfcr2/utils/hashtest2.c
Propchange: team/moy/mfcr2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/moy/mfcr2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Modified: team/moy/mfcr2/CHANGES
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/CHANGES?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/CHANGES (original)
+++ team/moy/mfcr2/CHANGES Sun Nov 30 16:45:41 2008
@@ -1,3 +1,13 @@
+======================================================================
+===
+=== This file documents the new and/or enhanced functionality added in
+=== the Asterisk versions listed below. This file does NOT include
+=== changes in behavior that would not be backwards compatible with
+=== previous versions; for that information see the UPGRADE.txt file
+=== and the other UPGRADE files for older releases.
+===
+======================================================================
+
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
------------------------------------------------------------------------------
@@ -22,6 +32,11 @@
Please have a look at configs/skinny.conf.sample and change your skinny.conf
accordingly.
+DAHDI Changes
+-------------
+ * The UK option waitfordialtone has been added for use with BT analog
+ lines.
+
Dialplan Functions
------------------
* Added a new dialplan function, CURLOPT, which permits setting various
@@ -35,6 +50,8 @@
* Added a new dialplan function, LISTFILTER, which permits removing elements
from a set list, by name. Uses the same general syntax as the existing CUT
and FIELDQTY dialplan functions, which also manage lists.
+ * Added REALTIME_FIELD and REALTIME_HASH, which should aid users in better
+ obtaining realtime data from the dialplan.
Applications
------------
@@ -60,6 +77,21 @@
which are interpreted as relative to the astvarlibdir setting in asterisk.conf.
* All deprecated CLI commands are removed from the sourcecode. They are now handled
by the new clialiases module. See cli_aliases.conf.sample file.
+
+Asterisk Manager Interface
+--------------------------
+ * When using the AMI over HTTP, you can now include a 'SuppressEvents' header (with
+ a non-empty value) in your request. If you do this, any pending AMI events will
+ *not* be included in the response to your request as they would normally, but
+ will be left in the event queue for the next request you make to retrieve. For
+ some applications, this will allow you to guarantee that you will only see
+ events in responses to 'WaitEvent' actions, and can better know when to expect them.
+ To know whether the Asterisk server supports this header or not, your client can
+ inspect the first response back from the server to see if it includes this header:
+
+ Pragma: SuppressEvents
+
+ If this is included, the server supports event suppression.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.0 to Asterisk 1.6.1 -------------
@@ -931,3 +963,11 @@
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.
+
+Timer Changes
+--------------------
+* In addition to timing from DAHDI, there is a new timing module called
+ res_timing_timerfd. In order to use this, you must be running Linux with
+ a kernel version 2.6.25 or newer as well as glibc 2.8 or newer. The configure
+ script will be able to tell if you have the requirements. From menuselect, select
+ res_timing_timerfd from the Resource Modules menu.
Modified: team/moy/mfcr2/Makefile
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/Makefile?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/Makefile (original)
+++ team/moy/mfcr2/Makefile Sun Nov 30 16:45:41 2008
@@ -92,6 +92,7 @@
export AWK
export GREP
export ID
+export MD5
# even though we could use '-include makeopts' here, use a wildcard
# lookup anyway, so that make won't try to build makeopts if it doesn't
@@ -236,7 +237,13 @@
ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror -Wunused -Wundef $(AST_DECLARATION_AFTER_STATEMENT) -Wmissing-format-attribute -Wformat-security #-Wformat=2
+ ASTCFLAGS+=-Werror
+ ASTCFLAGS+=-Wunused
+ ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+ ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+ ASTCFLAGS+=-Wundef
+ ASTCFLAGS+=-Wmissing-format-attribute
+ ASTCFLAGS+=-Wformat=2
endif
ifneq ($(findstring BSD,$(OSARCH)),)
@@ -565,8 +572,8 @@
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 doc/core-*.xml $(ASTDATADIR)/documentation
- $(INSTALL) -m 644 doc/appdocsxml.dtd $(ASTVARLIBDIR)/documentation
+ $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+ $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTVARLIBDIR)/documentation
$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
$(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -811,6 +818,8 @@
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; \
if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
+ elif [ -f /etc/arch-release -o -f /etc/arch-release ]; then \
+ $(INSTALL) -m 755 contrib/init.d/rc.archlinux.asterisk $(DESTDIR)/etc/rc.d/asterisk; \
elif [ -f /etc/slackware-version ]; then \
echo "Slackware is not currently supported, although an init script does exist for it." \
else \
Modified: team/moy/mfcr2/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/Makefile.moddir_rules?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/Makefile.moddir_rules (original)
+++ team/moy/mfcr2/Makefile.moddir_rules Sun Nov 30 16:45:41 2008
@@ -110,8 +110,8 @@
@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
clean::
- rm -f *.so *.o *.oo *.eo
- rm -f .*.o.d .*.oo.d
+ rm -f *.so *.o *.oo *.eo *.i *.ii
+ rm -f .*.d
rm -f *.s *.i
rm -f modules.link
@@ -124,7 +124,6 @@
dist-clean::
rm -f .*.moduleinfo .moduleinfo
rm -f .*.makeopts .makeopts
- rm -f .*.d
.%.moduleinfo: %.c
@echo "<member name=\"$*\" displayname=\"$(shell $(GREP) -e AST_MODULE_INFO $< | head -n 1 | cut -d '"' -f 2)\" remove_on_change=\"$(SUBDIR)/$*.o $(SUBDIR)/$*.so\">" > $@
Modified: team/moy/mfcr2/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/Makefile.rules?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/Makefile.rules (original)
+++ team/moy/mfcr2/Makefile.rules Sun Nov 30 16:45:41 2008
@@ -3,7 +3,7 @@
#
# Makefile rules
#
-# Copyright (C) 2006, Digium, Inc.
+# Copyright (C) 2006-2008, Digium, Inc.
#
# Kevin P. Fleming <kpfleming at digium.com>
#
@@ -11,7 +11,6 @@
# the GNU General Public License
#
-# Rules for various build phases.
# Each command is preceded by a short comment on what to do.
# Prefixing one or the other with @\# or @ or nothing makes the desired
# behaviour. ECHO_PREFIX prefixes the comment, CMD_PREFIX prefixes the command.
@@ -20,16 +19,23 @@
.PHONY: dist-clean
+# If 'make' decides to create intermediate files to satisfy a build requirement
+# (like producing a .i from a .c), we want to keep them, so tell make to keep
+# all intermediate files
+.SECONDARY:
+
# extra cflags to build dependencies. Recursively expanded.
-MAKE_DEPS= -MD -MT $@ -MF .$(subst /,_,$@).d -MP
+MAKE_DEPS=-MD -MT $@ -MF .$(subst /,_,$@).d -MP
ifeq ($(NOISY_BUILD),)
ECHO_PREFIX=@
CMD_PREFIX=@
else
- ECHO_PREFIX=@\#
+ ECHO_PREFIX=@\#
CMD_PREFIX=
endif
+
+OPTIMIZE?=-O6
ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
# More GSM codec optimization
@@ -38,30 +44,67 @@
# ppro's, etc, as well as the AMD K6 and K7.
#K6OPT=-DK6OPT
- OPTIMIZE?=-O6
ASTCFLAGS+=$(OPTIMIZE)
endif
-# build rules for various targets
+# shortcuts for common combinations of flags; these must be recursively expanded so that
+# per-target settings will be applied
+CC_CFLAGS=$(PTHREAD_CFLAGS) $(ASTCFLAGS)
+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS))
+CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK)
+CC_LIBS=$(PTHREAD_LIBS) $(LIBS)
+CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
+
+# determine whether to double-compile so that the optimizer can report code path problems
+# this is only done when developer mode and DONT_OPTIMIZE are both enabled
+# in that case, we run the preprocessor to produce a .i or .ii file from the source
+# code, then compile once with optimizer enabled (and the output to /dev/null),
+# and if that doesn't fail then compile again with optimizer disabled
+ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))$(AST_DEVMODE),DONT_OPTIMIZEyes)
+COMPILE_DOUBLE=yes
+endif
+
+%.o: %.s
+ $(ECHO_PREFIX) echo " [AS] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
+
%.o: %.i
$(ECHO_PREFIX) echo " [CCi] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+ifeq ($(COMPILE_DOUBLE),yes)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+endif
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
+ifneq ($(COMPILE_DOUBLE),yes)
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+endif
%.i: %.c
$(ECHO_PREFIX) echo " [CPP] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -E $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -E $< $(CC_CFLAGS) $(MAKE_DEPS)
-%.o: %.s
- $(ECHO_PREFIX) echo " [AS] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(PTHREAD_CFLAGS) $(ASTCFLAGS) $(MAKE_DEPS)
+%.oo: %.ii
+ $(ECHO_PREFIX) echo " [CXXi] $< -> $@"
+ifeq ($(COMPILE_DOUBLE),yes)
+ $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE)
+endif
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
+ifneq ($(COMPILE_DOUBLE),yes)
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS)) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+endif
+
+%.ii: %.cc
+ $(ECHO_PREFIX) echo " [CPP] $< -> $@"
+ $(CMD_PREFIX) $(CXX) -o $@ -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
%.c: %.y
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
@@ -73,11 +116,11 @@
%.so: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
%.so: %.oo
$(ECHO_PREFIX) echo " [LDXX] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $^ $(PTHREAD_LIBS) $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(CXX_LDFLAGS_SO) $^ $(CXX_LIBS)
%.eo: %.o
$(ECHO_PREFIX) echo " [EMBED] $< -> $@"
@@ -93,6 +136,6 @@
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(PTHREAD_LIBS) $(LIBS)
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $^ $(CXX_LIBS)
dist-clean:: clean
Modified: team/moy/mfcr2/README
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/README?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/README (original)
+++ team/moy/mfcr2/README Sun Nov 30 16:45:41 2008
@@ -276,7 +276,7 @@
If this release of Asterisk was downloaded from a tarball, then some
additional documentation should have been included.
* doc/tex/asterisk.pdf --- PDF version of the documentation
- * doc/tex/asterisk/index.html --- HTML version of the documentation
+ * doc/tex/asterisk/index.html --- HTML version of the documentation
Finally, you may wish to visit the web site and join the mailing list if
you're interested in getting more information.
Modified: team/moy/mfcr2/UPGRADE-1.2.txt
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/UPGRADE-1.2.txt?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/UPGRADE-1.2.txt (original)
+++ team/moy/mfcr2/UPGRADE-1.2.txt Sun Nov 30 16:45:41 2008
@@ -1,10 +1,17 @@
=========================================================
+===
=== Information for upgrading from Asterisk 1.0 to 1.2
===
+=== This file documents all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
===
-=== UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
-=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt -- Upgrade info for 1.4 to 1.6
=========================================================
Compiling:
Modified: team/moy/mfcr2/UPGRADE-1.4.txt
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/UPGRADE-1.4.txt?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/UPGRADE-1.4.txt (original)
+++ team/moy/mfcr2/UPGRADE-1.4.txt Sun Nov 30 16:45:41 2008
@@ -1,10 +1,19 @@
=========================================================
+===
=== Information for upgrading from Asterisk 1.2 to 1.4
===
+=== These files document all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
===
=== UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
-=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt -- Upgrade info for 1.4 to 1.6
+===
=========================================================
Build Process (configure script):
Modified: team/moy/mfcr2/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/UPGRADE.txt?view=diff&rev=159896&r1=159895&r2=159896
==============================================================================
--- team/moy/mfcr2/UPGRADE.txt (original)
+++ team/moy/mfcr2/UPGRADE.txt Sun Nov 30 16:45:41 2008
@@ -1,262 +1,62 @@
-=========================================================
-=== Information for upgrading from Asterisk 1.4 to 1.6
+===========================================================
===
+=== Information for upgrading between Asterisk 1.6 versions
+===
+=== These files document all the changes that MUST be taken
+=== into account when upgrading between the Asterisk
+=== versions listed below. These changes may require that
+=== you modify your configuration files, dialplan or (in
+=== some cases) source code if you have your own Asterisk
+=== modules or patches. These files also includes advance
+=== notice of any functionality that has been marked as
+=== 'deprecated' and may be removed in a future release,
+=== along with the suggested replacement functionality.
===
=== UPGRADE-1.2.txt -- Upgrade info for 1.0 to 1.2
=== UPGRADE-1.4.txt -- Upgrade info for 1.2 to 1.4
-=== UPGRADE.txt -- Upgrade info for 1.4 to 1.6
-=========================================================
+=== UPGRADE-1.6.txt -- Upgrade info for 1.4 to 1.6
+===
+===========================================================
-AEL:
+From 1.6.0.1 to 1.6.1:
-* Macros are now implemented underneath with the Gosub() application.
- Heaven Help You if you wrote code depending on any aspect of this!
- Previous to 1.6, macros were implemented with the Macro() app, which
- provided a nice feature of auto-returning. The compiler will do its
- best to insert a Return() app call at the end of your macro if you did
- not include it, but really, you should make sure that all execution
- paths within your macros end in "return;".
+* The ast_agi_register_multiple() and ast_agi_unregister_multiple()
+ API calls were added in 1.6.0, so that modules that provide multiple
+ AGI commands could register/unregister them all with a single
+ step. However, these API calls were not implemented properly, and did
+ not allow the caller to know whether registration or unregistration
+ succeeded or failed. They have been redefined to now return success
+ or failure, but this means any code using these functions will need
+ be recompiled after upgrading to a version of Asterisk containing
+ these changes. In addition, the source code using these functions
+ should be reviewed to ensure it can properly react to failure
+ of registration or unregistration of its API commands.
-* The conf2ael program is 'introduced' in this release; it is in a rather
- crude state, but deemed useful for making a first pass at converting
- extensions.conf code into AEL. More intelligence will come with time.
+* The ast_agi_fdprintf() API call has been renamed to ast_agi_send()
+ to better match what it really does, and the argument order has been
+ changed to be consistent with other API calls that perform similar
+ operations.
-Core:
+From 1.6.0.x to 1.6.1:
-* The 'languageprefix' option in asterisk.conf is now deprecated, and
- the default sound file layout for non-English sounds is the 'new
- style' layout introduced in Asterisk 1.4 (and used by the automatic
- sound file installer in the Makefile).
-
-* The ast_expr2 stuff has been modified to handle floating-point numbers.
- Numbers of the format D.D are now acceptable input for the expr parser,
- Where D is a string of base-10 digits. All math is now done in "long double",
- if it is available on your compiler/architecture. This was half-way between
- a bug-fix (because the MATH func returns fp by default), and an enhancement.
- Also, for those counting on, or needing, integer operations, a series of
- 'functions' were also added to the expr language, to allow several styles
- of rounding/truncation, along with a set of common floating point operations,
- like sin, cos, tan, log, pow, etc. The ability to call external functions
- like CDR(), etc. was also added, without having to use the ${...} notation.
-
-* The delimiter passed to applications has been changed to the comma (','), as
- that is what people are used to using within extensions.conf. If you are
- using realtime extensions, you will need to translate your existing dialplan
- to use this separator. To use a literal comma, you need merely to escape it
- with a backslash ('\'). Another possible side effect is that you may need to
- remove the obscene level of backslashing that was necessary for the dialplan
- to work correctly in 1.4 and previous versions. This should make writing
- dialplans less painful in the future, albeit with the pain of a one-time
- conversion. If you would like to avoid this conversion immediately, set
- pbx_realtime=1.4 in the [compat] section of asterisk.conf. After
- transitioning, set pbx_realtime=1.6 in the same section.
-
-* For the same purpose as above, you may set res_agi=1.4 in the [compat]
- section of asterisk.conf to continue to use the '|' delimiter in the EXEC
- arguments of AGI applications. After converting to use the ',' delimiter,
- change this option to res_agi=1.6.
-
-* The logger.conf option 'rotatetimestamp' has been deprecated in favor of
- 'rotatestrategy'. This new option supports a 'rotate' strategy that more
- closely mimics the system logger in terms of file rotation.
-
-* 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
+* The following core commands dealing with dialplan have 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.
-
-* The logical value of spaces immediately preceding a standalone 0 previously
- evaluated to true. It now evaluates to false. This has confused a good
- many people in the past (typically because they failed to realize the space
- had any significance). Since this violates the Principle of Least Surprise,
- it has been changed.
-
-* The default console now will use colors according to the default background
- color, instead of forcing the background color to black. If you are using a
- light colored background for your console, you may wish to use the option
- flag '-W' to present better color choices for the various messages. However,
- if you'd prefer the old method of forcing colors to white text on a black
- background, the compatiblity option -B is provided for this purpose.
-
-Voicemail:
-
-* The voicemail configuration values 'maxmessage' and 'minmessage' have
- been changed to 'maxsecs' and 'minsecs' to clarify their purpose and
- to make them more distinguishable from 'maxmsgs', which sets folder
- size. The old variables will continue to work in this version, albeit
- with a deprecation warning.
-
-* If you use any interface for modifying voicemail aside from the built in
- dialplan applications, then the option "pollmailboxes" *must* be set in
- voicemail.conf for message waiting indication (MWI) to work properly. This
- is because Voicemail notification is now event based instead of polling
- based. The channel drivers are no longer responsible for constantly manually
- checking mailboxes for changes so that they can send MWI information to users.
- Examples of situations that would require this option are web interfaces to
- voicemail or an email client in the case of using IMAP storage.
-
-* The externnotify script should accept an additional (last) parameter
- containing the number of urgent messages in the INBOX.
-
-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.
-
-* ChannelRedirect() will not terminate the channel that fails to do a
- channelredirect as it has done previously. Instead CHANNELREDIRECT_STATUS
- will reflect if the attempt was successful of not.
-
-* SetCallerPres() has been replaced with the CALLERPRES() dialplan function
- and is now deprecated.
-
-* DISA()'s fifth argument is now an options argument. If you have previously
- used 'NOANSWER' in this argument, you'll need to convert that to the new
- option 'n'.
-
-* Macro() is now deprecated. If you need subroutines, you should use the
- Gosub()/Return() applications. To replace MacroExclusive(), we have
- introduced dialplan functions LOCK(), TRYLOCK(), and UNLOCK(). You may use
- these functions in any location where you desire to ensure that only one
- channel is executing that path at any one time. The Macro() applications
- are deprecated for performance reasons. However, since Macro() has been
- around for a long time and so many dialplans depend heavily on it, for the
- sake of backwards compatibility it will not be removed . It is also worth
- noting that using both Macro() and GoSub() at the same time is _heavily_
- discouraged.
-
-* Read() now sets a READSTATUS variable on exit. It does NOT automatically
- return -1 (and hangup) anymore on error. If you want to hangup on error,
- you need to do so explicitly in your dialplan.
-
-* Privacy() no longer uses privacy.conf, so any options must be specified
- directly in the application arguments.
-
-* MusicOnHold application now has duration parameter which allows specifying
- timeout in seconds.
-
-* WaitMusicOnHold application is now deprecated in favor of extended MusicOnHold.
-
-* SetMusicOnHold is now deprecated. You should use Set(CHANNEL(musicclass)=...)
- instead.
+* In the dialplan expression parser, the logical value of spaces
+ immediately preceding a standalone 0 previously evaluated to
+ true. It now evaluates to false. This has confused a good many
+ people in the past (typically because they failed to realize the
+ space had any significance). Since this violates the Principle of
+ Least Surprise, it has been changed.
* While app_directory has always relied on having a voicemail.conf or users.conf file
correctly set up, it now is dependent on app_voicemail being compiled as well.
-* The arguments in ExecIf changed a bit, to be more like other applications.
- The syntax is now ExecIf(<cond>?appiftrue(args):appiffalse(args)).
-
-* The behavior of the Set application now depends upon a compatibility option,
- set in asterisk.conf. To use the old 1.4 behavior, which allowed Set to take
- multiple key/value pairs, set app_set=1.4 in [compat] in asterisk.conf. To
- use the new behavior, which permits variables to be set with embedded commas,
- set app_set=1.6 in [compat] in asterisk.conf. Note that you can have both
- behaviors at the same time, if you switch to using MSet if you want the old
- behavior.
-
-Dialplan Functions:
-
-* QUEUE_MEMBER_COUNT() has been deprecated in favor of the QUEUE_MEMBER() function. For
- more information, issue a "show function QUEUE_MEMBER" from the CLI.
-
-CDR:
-
-* The cdr_sqlite module has been marked as deprecated in favor of
- cdr_sqlite3_custom. It will potentially be removed from the tree
- after Asterisk 1.6 is released.
-
-* The cdr_odbc module now uses res_odbc to manage its connections. The
- username and password parameters in cdr_odbc.conf, therefore, are no
- longer used. The dsn parameter now points to an entry in res_odbc.conf.
-
-* The uniqueid field in the core Asterisk structure has been changed from a
- maximum 31 character field to a 149 character field, to account for all
- possible values the systemname prefix could be. In the past, if the
- systemname was too long, the uniqueid would have been truncated.
-
-* The cdr_tds module now supports all versions of FreeTDS that contain
- the db-lib frontend. It will also now log the userfield variable if
- the target database table contains a column for it.
-
-Formats:
-
-* format_wav: The GAIN preprocessor definition and source code that used it
- is removed. This change was made in response to user complaints of
- choppiness or the clipping of loud signal peaks. To increase the volume
- of voicemail messages, use the 'volgain' option in voicemail.conf
-
-Channel Drivers:
-
-* SIP: a small upgrade to support the "Record" button on the SNOM360,
- which sends a sip INFO message with a "Record: on" or "Record: off"
- header. If Asterisk is set up (via features.conf) to accept "One Touch Monitor"
- requests (by default, via '*1'), then the user-configured dialpad sequence
- is generated, and recording can be started and stopped via this button. The
- file names and formats are all controlled via the normal mechanisms. If the
- user has not configured the automon feature, the normal "415 Unsupported media type"
- is returned, and nothing is done.
-
-* SIP: The "call-limit" option is marked as deprecated. It still works in this version of
- Asterisk, but will be removed in the following version. Please use the groupcount functions
- in the dialplan to enforce call limits. The "limitonpeer" configuration option is
- now renamed to "counteronpeer".
-
-* SIP: The "username" option is now renamed to "defaultuser" to match "defaultip".
- These are used only before registration to call a peer with the uri
- sip:defaultuser at defaultip
- The "username" setting still work, but is deprecated and will not work in
- the next version of Asterisk.
-
* SIP: All of the functionality in SIPCHANINFO() has been implemented in CHANNEL(),
and you should start using that function instead for retrieving information about
the channel in a technology-agnostic way.
-
-* chan_local.c: the comma delimiter inside the channel name has been changed to a
- semicolon, in order to make the Local channel driver compatible with the comma
- delimiter change in applications.
-
-* H323: The "tos" setting has changed name to "tos_audio" and "cos" to "cos_audio"
- to be compatible with settings in sip.conf. The "tos" and "cos" configuration
- is deprecated and will stop working in the next release of Asterisk.
-
-* Console: A new console channel driver, chan_console, has been added to Asterisk.
- This new module can not be loaded at the same time as chan_alsa or chan_oss. The
- default modules.conf only loads one of them (chan_oss by default). So, unless you
- have modified your modules.conf to not use the autoload option, then you will need
- to modify modules.conf to add another "noload" line to ensure that only one of
- these three modules gets loaded.
-
-* DAHDI: The chan_zap module that supported PSTN interfaces using
- Zaptel has been renamed to chan_dahdi, and only supports the DAHDI
- telephony driver package for PSTN interfaces. See the
- Zaptel-to-DAHDI.txt file for more details on this transition.
-
-* DAHDI: The "msdstrip" option has been deprecated, as it provides no value over
- the method of stripping digits in the dialplan using variable substring syntax.
-
-Configuration:
-
-* pbx_dundi.c: tos parameter changed to use new values. Old values like lowdelay,
- lowcost and other is not acceptable now. Look into qos.tex for description of
- this parameter.
-
-* 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
@@ -265,48 +65,38 @@
to differentiate your variable from the append operator. This potential
conflict is unlikely, but is documented here to be thorough.
-* skinny.conf now has seperate sections for lines and devices.
+* The "Join" event from app_queue now uses the CallerIDNum header instead of
+ the CallerID header to indicate the CallerID number.
+
+From 1.6.1 to 1.6.2:
+
+* The default console now will use colors according to the default background
+ color, instead of forcing the background color to black. If you are using a
+ light colored background for your console, you may wish to use the option
+ flag '-W' to present better color choices for the various messages. However,
+ if you'd prefer the old method of forcing colors to white text on a black
+ background, the compatibility option -B is provided for this purpose.
+
+* SendImage() no longer hangs up the channel on transmission error or on
+ any other 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
[... 8691 lines stripped ...]
More information about the asterisk-commits
mailing list