[svn-commits] irroot: branch irroot/app_queue_skill r333566 - in /team/irroot/app_queue_ski...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sun Aug 28 09:32:54 CDT 2011
Author: irroot
Date: Sun Aug 28 09:32:40 2011
New Revision: 333566
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333566
Log:
Resolve conflicts enable auto merge
Modified:
team/irroot/app_queue_skill/ (props changed)
team/irroot/app_queue_skill/CHANGES
team/irroot/app_queue_skill/Makefile
team/irroot/app_queue_skill/UPGRADE.txt
team/irroot/app_queue_skill/addons/chan_ooh323.c
team/irroot/app_queue_skill/addons/ooh323c/src/ooGkClient.c
team/irroot/app_queue_skill/addons/ooh323c/src/ooLogChan.c
team/irroot/app_queue_skill/addons/ooh323c/src/ooq931.c
team/irroot/app_queue_skill/agi/Makefile
team/irroot/app_queue_skill/apps/app_confbridge.c
team/irroot/app_queue_skill/apps/app_dial.c
team/irroot/app_queue_skill/apps/app_meetme.c
team/irroot/app_queue_skill/apps/app_parkandannounce.c
team/irroot/app_queue_skill/apps/app_queue.c
team/irroot/app_queue_skill/apps/app_voicemail.c
team/irroot/app_queue_skill/cel/cel_odbc.c (props changed)
team/irroot/app_queue_skill/channels/chan_iax2.c
team/irroot/app_queue_skill/channels/chan_local.c
team/irroot/app_queue_skill/channels/chan_sip.c
team/irroot/app_queue_skill/channels/chan_vpb.cc
team/irroot/app_queue_skill/channels/sig_pri.c
team/irroot/app_queue_skill/channels/sip/include/sip.h
team/irroot/app_queue_skill/configs/cdr.conf.sample
team/irroot/app_queue_skill/configs/cel_odbc.conf.sample (props changed)
team/irroot/app_queue_skill/configs/chan_dahdi.conf.sample
team/irroot/app_queue_skill/configs/features.conf.sample
team/irroot/app_queue_skill/configs/manager.conf.sample
team/irroot/app_queue_skill/configs/queues.conf.sample
team/irroot/app_queue_skill/configs/sip.conf.sample
team/irroot/app_queue_skill/configure
team/irroot/app_queue_skill/configure.ac
team/irroot/app_queue_skill/doc/asterisk.8
team/irroot/app_queue_skill/doc/asterisk.sgml
team/irroot/app_queue_skill/funcs/func_enum.c
team/irroot/app_queue_skill/funcs/func_shell.c
team/irroot/app_queue_skill/include/asterisk/autoconfig.h.in
team/irroot/app_queue_skill/include/asterisk/cdr.h
team/irroot/app_queue_skill/include/asterisk/manager.h
team/irroot/app_queue_skill/include/asterisk/res_fax.h
team/irroot/app_queue_skill/include/asterisk/test.h
team/irroot/app_queue_skill/main/app.c
team/irroot/app_queue_skill/main/asterisk.c
team/irroot/app_queue_skill/main/cdr.c
team/irroot/app_queue_skill/main/channel.c
team/irroot/app_queue_skill/main/config.c
team/irroot/app_queue_skill/main/enum.c
team/irroot/app_queue_skill/main/features.c
team/irroot/app_queue_skill/main/file.c
team/irroot/app_queue_skill/main/logger.c
team/irroot/app_queue_skill/main/manager.c
team/irroot/app_queue_skill/main/netsock2.c
team/irroot/app_queue_skill/main/pbx.c
team/irroot/app_queue_skill/main/rtp_engine.c
team/irroot/app_queue_skill/main/test.c
team/irroot/app_queue_skill/res/res_config_ldap.c
team/irroot/app_queue_skill/res/res_config_odbc.c
team/irroot/app_queue_skill/res/res_config_pgsql.c
team/irroot/app_queue_skill/res/res_fax.c
team/irroot/app_queue_skill/res/res_jabber.c
team/irroot/app_queue_skill/res/res_musiconhold.c
team/irroot/app_queue_skill/res/res_timing_timerfd.c
team/irroot/app_queue_skill/sounds/Makefile (contents, props changed)
team/irroot/app_queue_skill/tests/test_acl.c
team/irroot/app_queue_skill/tests/test_amihooks.c
team/irroot/app_queue_skill/tests/test_aoc.c
team/irroot/app_queue_skill/tests/test_app.c
team/irroot/app_queue_skill/tests/test_ast_format_str_reduce.c
team/irroot/app_queue_skill/tests/test_astobj2.c
team/irroot/app_queue_skill/tests/test_devicestate.c
team/irroot/app_queue_skill/tests/test_dlinklists.c
team/irroot/app_queue_skill/tests/test_event.c
team/irroot/app_queue_skill/tests/test_expr.c
team/irroot/app_queue_skill/tests/test_func_file.c
team/irroot/app_queue_skill/tests/test_gosub.c
team/irroot/app_queue_skill/tests/test_heap.c
team/irroot/app_queue_skill/tests/test_locale.c
team/irroot/app_queue_skill/tests/test_logger.c
team/irroot/app_queue_skill/tests/test_pbx.c
team/irroot/app_queue_skill/tests/test_poll.c
team/irroot/app_queue_skill/tests/test_sched.c
team/irroot/app_queue_skill/tests/test_security_events.c
team/irroot/app_queue_skill/tests/test_skel.c
team/irroot/app_queue_skill/tests/test_stringfields.c
team/irroot/app_queue_skill/tests/test_strings.c
team/irroot/app_queue_skill/tests/test_substitution.c
team/irroot/app_queue_skill/tests/test_time.c
team/irroot/app_queue_skill/tests/test_utils.c
team/irroot/app_queue_skill/utils/Makefile
Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.
Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
svn:mergeinfo = /trunk:322065-333565
Propchange: team/irroot/app_queue_skill/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-333439
Modified: team/irroot/app_queue_skill/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/CHANGES?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/CHANGES (original)
+++ team/irroot/app_queue_skill/CHANGES Sun Aug 28 09:32:40 2011
@@ -7,6 +7,22 @@
=== and the other UPGRADE files for older releases.
===
==============================================================================
+
+------------------------------------------------------------------------------
+--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
+------------------------------------------------------------------------------
+
+SIP Changes
+-----------
+ * Asterisk will no longer substitute CID number for CID name into display
+ name field if CID number exists without a CID name. This change improves
+ compatibility with certain device features such as Avaya IP500's directory
+ lookup service.
+
+Chan_local changes
+------------------
+ * Added a manager event "LocalBridge" for local channel call bridges between
+ the two pseudo-channels created.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.8 to Asterisk 10 -------------------
@@ -28,7 +44,6 @@
Parking
-------
* parkedmusicclass can now be set for non-default parking lots.
- * ParkedCall application can now specify a specific parkinglot.
Asterisk Manager Interface
--------------------------
@@ -44,6 +59,10 @@
* Added new action FilterAdd to control event filters for the current session.
This requires the system permission and uses the same filter syntax as
filters that can be defined in manager.conf
+ * The Unlink event is now a Bridge event with Bridgestatus: Unlink. Previous
+ versions had some instances of the event converted, but others were left
+ as-is. All Unlink events should now be converted to Bridge events. The AMI
+ protocol version number was incremented to 1.2 as a result of this change.
Asterisk HTTP Server
--------------------------
@@ -70,6 +89,7 @@
--------------------------
* The filter option in cdr_adaptive_odbc now supports negating the argument,
thus allowing records which do NOT match the specified filter.
+ * Added ability to log CONGESTION calls to CDR
CODECS
--------------------------
@@ -145,6 +165,11 @@
compatability for a FollowMe call with certain dialplan apps, options, and
functions.
+Meetme
+--------------------------
+ * Added option "k" that will automatically close the conference when there's
+ only one person left when a user exits the conference.
+
CEL
--------------------------
* cel_pgsql now supports the 'extra' column for data added using the
@@ -193,8 +218,6 @@
------------
* Added 'v' option to MeetMe to play voicemail greetings when a user joins/leaves
a MeetMe conference
- * Added ability to include '@parkinglot' to ParkedCall extension in order to specify
- a specific parkinglot on which to search the extension.
Asterisk Database
-----------------
@@ -244,7 +267,9 @@
and enables symmetric RTP support.
* Slave SIP channels now set HASH(SIP_CAUSE,<slave-channel-name>) on each
response. This permits the master channel to know how each channel dialled
- in a multi-channel setup resolved in an individual way.
+ in a multi-channel setup resolved in an individual way. This carries a
+ performance penalty and can be disabled in sip.conf using the
+ 'storesipcause' option.
* Added 'externtcpport' and 'externtlsport' options to allow custom port
configuration for the externip and externhost options when tcp or tls is used.
* Added support for message body (stored in content variable) to SIP NOTIFY message
@@ -382,6 +407,7 @@
notices a change.
* Voicemail now includes rdnis within msgXXXX.txt file.
* Added 'D' command to ExternalIVR full details in doc/externalivr.txt
+ * ParkedCall and Park can now specify the parking lot to use.
Dialplan Functions
------------------
@@ -462,6 +488,8 @@
* Added PARKINGDYNAMIC which represents the template parkinglot defined in
features.conf that should be the base for dynamic parkinglots.
* Added PARKINGDYNCONTEXT which tells what context a newly created dynamic
+ parkinglot should have.
+ * Added PARKINGDYNEXTEN which tells what parking exten a newly created dynamic
parkinglot should have.
* Added PARKINGDYNPOS which holds what parking positions a dynamic parkinglot
should have.
Modified: team/irroot/app_queue_skill/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/Makefile?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/Makefile (original)
+++ team/irroot/app_queue_skill/Makefile Sun Aug 28 09:32:40 2011
@@ -155,8 +155,8 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
+MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
+OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
# Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
OPTIONS=
@@ -461,15 +461,15 @@
rm -f build_tools/menuselect-deps
datafiles: _all doc/core-en_US.xml
- CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig $(DESTDIR)$(libdir)/pkgconfig;
+ CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
# 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.
for x in static-http/*; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+ $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
done
- $(INSTALL) -m 644 doc/core-en_US.xml $(DESTDIR)$(ASTDATADIR)/static-http;
+ $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
if [ -d doc/tex/asterisk ] ; then \
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
for n in doc/tex/asterisk/* ; do \
@@ -477,7 +477,7 @@
done \
fi
for x in images/*.jpg; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+ $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \
done
$(MAKE) -C sounds install
@@ -526,7 +526,7 @@
fi
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
-OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
installdirs:
$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
@@ -555,42 +555,43 @@
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
+ $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
bininstall: _all installdirs $(SUBDIRS_INSTALL)
- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
- $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk -a ! -f /sbin/launchd ]; then \
+ $(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
+ $(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
+ $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
+ $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
+ if [ ! -f "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" -a ! -f /sbin/launchd ]; then \
cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;s|__ASTERISK_LOG_DIR__|$(ASTLOGDIR)|;' > contrib/scripts/safe.tmp ; \
- $(INSTALL) -m 755 contrib/scripts/safe.tmp $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ; \
+ $(INSTALL) -m 755 contrib/scripts/safe.tmp "$(DESTDIR)$(ASTSBINDIR)/safe_asterisk" ; \
rm -f contrib/scripts/safe.tmp ; \
fi
- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- $(INSTALL) -m 644 include/asterisk/doxygen/*.h $(DESTDIR)$(ASTHEADERDIR)/doxygen
+ $(INSTALL) -m 644 include/asterisk.h "$(DESTDIR)$(includedir)"
+ $(INSTALL) -m 644 include/asterisk/*.h "$(DESTDIR)$(ASTHEADERDIR)"
+ $(INSTALL) -m 644 include/asterisk/doxygen/*.h "$(DESTDIR)$(ASTHEADERDIR)/doxygen"
if [ -n "$(OLDHEADERS)" ]; then \
- rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- fi
-
- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ for h in $(OLDHEADERS); do rm -f "$(DESTDIR)$(ASTHEADERDIR)/$$h"; done \
+ fi
+
+ $(INSTALL) -m 644 doc/core-*.xml "$(DESTDIR)$(ASTDATADIR)/documentation"
+ $(INSTALL) -m 644 doc/appdocsxml.dtd "$(DESTDIR)$(ASTDATADIR)/documentation"
+ $(INSTALL) -m 644 doc/asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
+ $(INSTALL) -m 644 contrib/scripts/astgenkey.8 "$(DESTDIR)$(ASTMANDIR)/man8"
+ $(INSTALL) -m 644 contrib/scripts/autosupport.8 "$(DESTDIR)$(ASTMANDIR)/man8"
+ $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 "$(DESTDIR)$(ASTMANDIR)/man8"
if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
fi
$(SUBDIRS_INSTALL):
+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) install
NEWMODS:=$(foreach d,$(MOD_SUBDIRS),$(notdir $(wildcard $(d)/*.so)))
-OLDMODS=$(filter-out $(NEWMODS),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
+OLDMODS=$(filter-out $(NEWMODS) $(notdir $(DESTDIR)$(MODULES_DIR)),$(notdir $(wildcard $(DESTDIR)$(MODULES_DIR)/*.so)))
oldmodcheck:
@if [ -n "$(OLDMODS)" ]; then \
@@ -619,7 +620,7 @@
install: badshell bininstall datafiles
@if [ -x /usr/sbin/asterisk-post-install ]; then \
- /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
@echo " +---- Asterisk Installation Complete -------+"
@echo " + +"
@@ -651,35 +652,35 @@
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
- $(INSTALL) -d $(DESTDIR)$(ASTETCDIR)
+ $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
@for x in configs/*.adsi; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
- if [ -f $${dst} ] ; then \
+ if [ -f "$${dst}" ] ; then \
echo "Overwriting $$x" ; \
else \
echo "Installing $$x" ; \
fi ; \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
done
samples: adsi
@echo Installing other config files...
@for x in configs/*.sample; do \
dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
- if [ -f $${dst} ]; then \
+ if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $${dst} $$x ; then \
+ if cmp -s "$${dst}" "$$x" ; then \
echo "Config file $$x is unchanged"; \
continue; \
fi ; \
- mv -f $${dst} $${dst}.old ; \
+ mv -f "$${dst}" "$${dst}.old" ; \
else \
echo "Skipping config file $$x"; \
continue; \
fi ;\
fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 $$x $${dst} ;\
+ $(INSTALL) -m 644 "$$x" "$${dst}" ;\
done
if [ "$(OVERWRITE)" = "y" ]; then \
echo "Updating asterisk.conf" ; \
@@ -693,38 +694,38 @@
-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
- $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \
- $(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \
- rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \
+ "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
+ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
fi ; \
- $(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
+ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
+ build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
@for x in phoneprov/*; do \
dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
- if [ -f $${dst} ]; then \
+ if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $${dst} $$x ; then \
+ if cmp -s "$${dst}" "$$x" ; then \
echo "Config file $$x is unchanged"; \
continue; \
fi ; \
- mv -f $${dst} $${dst}.old ; \
+ mv -f "$${dst}" "$${dst}.old" ; \
else \
echo "Skipping config file $$x"; \
continue; \
fi ;\
fi ; \
echo "Installing file $$x"; \
- $(INSTALL) -m 644 $$x $${dst} ;\
+ $(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 )
- @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- $(INSTALL) -m 4755 contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
- $(INSTALL) -d $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ @[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+ @[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+ $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
+ $(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+ $(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
done
@echo " +--------- Asterisk Web Voicemail ----------+"
@echo " + +"
@@ -749,75 +750,75 @@
echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen -
install-logrotate:
- if [ ! -d $(ASTETCDIR)/../logrotate.d ]; then \
- $(INSTALL) -d $(ASTETCDIR)/../logrotate.d ; \
+ if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
+ $(INSTALL) -d "$(DESTDIR)$(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
+ $(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
rm -f contrib/scripts/asterisk.logrotate.tmp
config:
@if [ "${OSARCH}" = "linux-gnu" ]; then \
if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
cat contrib/init.d/rc.redhat.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/init.d/asterisk ; \
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
rm -f contrib/init.d/rc.asterisk.tmp ; \
- if [ ! -f $(DESTDIR)/etc/sysconfig/asterisk ] ; then \
- $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
+ if [ ! -f "$(DESTDIR)/etc/sysconfig/asterisk" ] ; then \
+ $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
fi ; \
if [ -z "$(DESTDIR)" ] ; then \
/sbin/chkconfig --add asterisk ; \
fi ; \
elif [ -f /etc/debian_version ] ; then \
cat contrib/init.d/rc.debian.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ; \
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
rm -f contrib/init.d/rc.asterisk.tmp ; \
- if [ ! -f $(DESTDIR)/etc/default/asterisk ] ; then \
- $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/default/asterisk ; \
+ if [ ! -f "$(DESTDIR)/etc/default/asterisk" ] ; then \
+ $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/default/asterisk" ; \
fi ; \
if [ -z "$(DESTDIR)" ] ; then \
/usr/sbin/update-rc.d asterisk defaults 50 91 ; \
fi ; \
elif [ -f /etc/gentoo-release ] ; then \
cat contrib/init.d/rc.gentoo.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ; \
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ; \
rm -f contrib/init.d/rc.asterisk.tmp ; \
if [ -z "$(DESTDIR)" ] ; then \
/sbin/rc-update add asterisk default ; \
fi ; \
elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ] ; then \
cat contrib/init.d/rc.mandriva.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/init.d/asterisk ; \
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/init.d/asterisk" ; \
rm -f contrib/init.d/rc.asterisk.tmp ; \
if [ ! -f /etc/sysconfig/asterisk ] ; then \
- $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
+ $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
fi ; \
if [ -z "$(DESTDIR)" ] ; then \
/sbin/chkconfig --add asterisk ; \
fi ; \
elif [ -f /etc/SuSE-release -o -f /etc/novell-release ] ; then \
cat contrib/init.d/rc.suse.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/init.d/asterisk ;\
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/init.d/asterisk" ;\
rm -f contrib/init.d/rc.asterisk.tmp ; \
if [ ! -f /etc/sysconfig/asterisk ] ; then \
- $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk $(DESTDIR)/etc/sysconfig/asterisk ; \
+ $(INSTALL) -m 644 contrib/init.d/etc_default_asterisk "$(DESTDIR)/etc/sysconfig/asterisk" ; \
fi ; \
if [ -z "$(DESTDIR)" ] ; then \
/sbin/chkconfig --add asterisk ; \
fi ; \
elif [ -f /etc/arch-release -o -f /etc/arch-release ] ; then \
cat contrib/init.d/rc.archlinux.asterisk | sed 's|__ASTERISK_ETC_DIR__|$(ASTETCDIR)|;s|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/init.d/rc.asterisk.tmp ; \
- $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp $(DESTDIR)/etc/rc.d/asterisk ; \
+ $(INSTALL) -m 755 contrib/init.d/rc.asterisk.tmp "$(DESTDIR)/etc/rc.d/asterisk" ; \
rm -f contrib/init.d/rc.asterisk.tmp ; \
- elif [ -d $(DESTDIR)/Library/LaunchDaemons ]; then \
- if [ ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist ]; then \
+ elif [ -d "$(DESTDIR)/Library/LaunchDaemons" ]; then \
+ if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist" ]; then \
sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.asterisk.plist > asterisk.plist ; \
- $(INSTALL) -m 644 asterisk.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist; \
+ $(INSTALL) -m 644 asterisk.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.asterisk.plist"; \
rm -f asterisk.plist; \
fi; \
- if [ ! -f $(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist ]; then \
+ if [ ! -f "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist" ]; then \
sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;' < contrib/init.d/org.asterisk.muted.plist > muted.plist ; \
- $(INSTALL) -m 644 muted.plist $(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist; \
+ $(INSTALL) -m 644 muted.plist "$(DESTDIR)/Library/LaunchDaemons/org.asterisk.muted.plist"; \
rm -f muted.plist; \
fi; \
elif [ -f /etc/slackware-version ]; then \
@@ -844,16 +845,16 @@
+@$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL)
- rm -f $(DESTDIR)$(MODULES_DIR)/*
- rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
- rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
- rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
- rm -rf $(DESTDIR)$(ASTHEADERDIR)
- rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
- rm -f $(DESTDIR)$(ASTMANDIR)/man8/asterisk.8
- rm -f $(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8
- rm -f $(DESTDIR)$(ASTMANDIR)/man8/autosupport.8
- rm -f $(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8
+ rm -f "$(DESTDIR)$(MODULES_DIR)/"*
+ rm -f "$(DESTDIR)$(ASTSBINDIR)/"*asterisk*
+ rm -f "$(DESTDIR)$(ASTSBINDIR)/astgenkey"
+ rm -f "$(DESTDIR)$(ASTSBINDIR)/autosupport"
+ rm -rf "$(DESTDIR)$(ASTHEADERDIR)"
+ rm -rf "$(DESTDIR)$(ASTDATADIR)/firmware"
+ rm -f "$(DESTDIR)$(ASTMANDIR)/man8/asterisk.8"
+ rm -f "$(DESTDIR)$(ASTMANDIR)/man8/astgenkey.8"
+ rm -f "$(DESTDIR)$(ASTMANDIR)/man8/autosupport.8"
+ rm -f "$(DESTDIR)$(ASTMANDIR)/man8/safe_asterisk.8"
$(MAKE) -C sounds uninstall
uninstall: _uninstall
@@ -871,12 +872,12 @@
@echo " +-------------------------------------------+"
uninstall-all: _uninstall
- rm -rf $(DESTDIR)$(ASTLIBDIR)
- rm -rf $(DESTDIR)$(ASTVARLIBDIR)
- rm -rf $(DESTDIR)$(ASTDATADIR)
- rm -rf $(DESTDIR)$(ASTSPOOLDIR)
- rm -rf $(DESTDIR)$(ASTETCDIR)
- rm -rf $(DESTDIR)$(ASTLOGDIR)
+ rm -rf "$(DESTDIR)$(ASTLIBDIR)"
+ rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
+ rm -rf "$(DESTDIR)$(ASTDATADIR)"
+ rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
+ rm -rf "$(DESTDIR)$(ASTETCDIR)"
+ rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
Modified: team/irroot/app_queue_skill/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/UPGRADE.txt?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/UPGRADE.txt (original)
+++ team/irroot/app_queue_skill/UPGRADE.txt Sun Aug 28 09:32:40 2011
@@ -22,7 +22,10 @@
From 10 to 12:
-* No significant changes as of yet.
+func_enum:
+ - ENUM query functions now return a count of -1 on lookup error to
+ differentiate between a failed query and a successful query with 0 results
+ matching the specified type.
From 1.8 to 10:
@@ -72,6 +75,12 @@
astdb.sqlite3 exists, astdb2sqlite3 will be compiled automatically. Asterisk will
convert an existing astdb to the SQLite3 version automatically at runtime.
+Manager:
+ - The AMI protocol version was incremented to 1.2 as a result of changing two
+ instances of the Unlink event to Bridge events. This change was documented
+ as part of the AMI 1.1 update, but two Unlink events were inadvertently left
+ unchanged.
+
Module Support Level
- All modules in the addons, apps, bridge, cdr, cel, channels, codecs,
formats, funcs, pbx, and res have been updated to include MODULEINFO data
@@ -82,5 +91,10 @@
Deprecated modules are now marked to not build by default and must be explicitly
enabled in menuselect.
+chan_sip:
+ - Setting of HASH(SIP_CAUSE,<slave-channel-name>) on channels is now disabled
+ by default. It can be enabled using the 'storesipcause' option. This feature
+ has a significant performance penalty.
+
===========================================================
===========================================================
Modified: team/irroot/app_queue_skill/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/addons/chan_ooh323.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/addons/chan_ooh323.c (original)
+++ team/irroot/app_queue_skill/addons/chan_ooh323.c Sun Aug 28 09:32:40 2011
@@ -1122,6 +1122,9 @@
ast_debug(1, "ooh323_answer(%s)\n", ast->name);
ast_channel_unlock(ast);
ooAnswerCall(p->callToken);
+ }
+ if (callToken) {
+ free(callToken);
}
ast_mutex_unlock(&p->lock);
}
Modified: team/irroot/app_queue_skill/addons/ooh323c/src/ooGkClient.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/addons/ooh323c/src/ooGkClient.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/addons/ooh323c/src/ooGkClient.c (original)
+++ team/irroot/app_queue_skill/addons/ooh323c/src/ooGkClient.c Sun Aug 28 09:32:40 2011
@@ -1947,8 +1947,11 @@
ipAddress->ip.data[1],
ipAddress->ip.data[2],
ipAddress->ip.data[3]);
- if(strcmp(ip, "0.0.0.0"))
+ if(strcmp(ip, "0.0.0.0")) {
+/* fix this when gk client will adopt to work with IPv6 */
+ pCallAdmInfo->call->versionIP = 4;
strcpy(pCallAdmInfo->call->remoteIP, ip);
+ }
pCallAdmInfo->call->remotePort = ipAddress->port;
/* Update call model */
if(pAdmissionConfirm->callModel.t == T_H225CallModel_direct)
@@ -1997,13 +2000,13 @@
pCallAdmInfo->call->callToken);
pCallAdmInfo->call->callState = OO_CALL_CONNECTING;
- ast_cond_signal(&pCallAdmInfo->call->gkWait);
/* ooH323CallAdmitted( pCallAdmInfo->call); */
dListRemove(&pGkClient->callsPendingList, pNode);
dListAppend(&pGkClient->ctxt, &pGkClient->callsAdmittedList,
pNode->data);
memFreePtr(&pGkClient->ctxt, pNode);
+ ast_cond_signal(&pCallAdmInfo->call->gkWait);
return OO_OK;
break;
}
Modified: team/irroot/app_queue_skill/addons/ooh323c/src/ooLogChan.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/addons/ooh323c/src/ooLogChan.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/addons/ooh323c/src/ooLogChan.c (original)
+++ team/irroot/app_queue_skill/addons/ooh323c/src/ooLogChan.c Sun Aug 28 09:32:40 2011
@@ -284,7 +284,7 @@
call->callType, call->callToken);
pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo);
- if(!pLogicalChannel)
+ do { if(!pLogicalChannel)
{
OOTRACEWARN4("Logical Channel %d doesn't exist, in clearLogicalChannel."
" (%s, %s)\n",
@@ -326,6 +326,7 @@
ooRemoveLogicalChannel(call, channelNo);/* TODO: efficiency - This causes re-search of
of logical channel in the list. Can be
easily improved.*/
+ } while ((pLogicalChannel = ooFindLogicalChannelByLogicalChannelNo(call,channelNo)));
return OO_OK;
}
Modified: team/irroot/app_queue_skill/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/addons/ooh323c/src/ooq931.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/addons/ooh323c/src/ooq931.c (original)
+++ team/irroot/app_queue_skill/addons/ooh323c/src/ooq931.c Sun Aug 28 09:32:40 2011
@@ -3624,7 +3624,8 @@
return OO_OK;
}
- if (!ast_parse_arg(dest, PARSE_ADDR, &tmpaddr)) {
+ /* parse direct IP dest */
+ if ((strchr(dest, ':') || strchr(dest,'[') || strchr(dest,'.')) && !ast_parse_arg(dest, PARSE_ADDR, &tmpaddr)) {
if(strlen(dest)+7>len)
{
OOTRACEERR1("Error:Insufficient buffer space for parsed ip - "
Modified: team/irroot/app_queue_skill/agi/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/agi/Makefile?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/agi/Makefile (original)
+++ team/irroot/app_queue_skill/agi/Makefile Sun Aug 28 09:32:40 2011
@@ -40,11 +40,11 @@
eagi-sphinx-test: eagi-sphinx-test.o
install: all
- $(INSTALL) -d $(DESTDIR)$(AGI_DIR)
- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+ $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
+ for x in $(AGIS); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(AGI_DIR)" ; done
uninstall:
- for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
+ for x in $(AGIS); do rm -f "$(DESTDIR)$(AGI_DIR)/$$x" ; done
clean:
rm -f *.so *.o look eagi-test eagi-sphinx-test
Modified: team/irroot/app_queue_skill/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/apps/app_confbridge.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/apps/app_confbridge.c (original)
+++ team/irroot/app_queue_skill/apps/app_confbridge.c Sun Aug 28 09:32:40 2011
@@ -2623,14 +2623,14 @@
return -1;
}
if (!ao2_container_count(conference_bridges)) {
- ast_log(LOG_ERROR, "No active conferences.\n");
- return -1;
+ snprintf(buf, len, "0");
+ return 0;
}
ast_copy_string(tmp.name, args.confno, sizeof(tmp.name));
bridge = ao2_find(conference_bridges, &tmp, OBJ_POINTER);
if (!bridge) {
- ast_log(LOG_ERROR, "Conference '%s' not found.\n", args.confno);
- return -1;
+ snprintf(buf, len, "0");
+ return 0;
}
/* get the correct count for the type requested */
@@ -2654,9 +2654,7 @@
} else if (!strncasecmp(args.type, "locked", 6)) {
count = bridge->locked;
} else {
- ao2_unlock(bridge);
- ao2_ref(bridge, -1);
- return -1;
+ ast_log(LOG_ERROR, "Invalid keyword.\n");
}
snprintf(buf, len, "%d", count);
ao2_unlock(bridge);
Modified: team/irroot/app_queue_skill/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/apps/app_dial.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/apps/app_dial.c (original)
+++ team/irroot/app_queue_skill/apps/app_dial.c Sun Aug 28 09:32:40 2011
@@ -553,18 +553,19 @@
OPT_CALLEE_GOSUB = (1 << 28),
OPT_CALLEE_MIXMONITOR = (1 << 29),
OPT_CALLER_MIXMONITOR = (1 << 30),
- OPT_CALLER_ANSWER = (1 << 31),
};
-#define DIAL_STILLGOING (1 << 31)
-#define DIAL_NOFORWARDHTML ((uint64_t)1 << 32) /* flags are now 64 bits, so keep it up! */
-#define DIAL_CALLERID_ABSENT ((uint64_t)1 << 33) /* TRUE if caller id is not available for connected line. */
-#define OPT_CANCEL_ELSEWHERE ((uint64_t)1 << 34)
-#define OPT_PEER_H ((uint64_t)1 << 35)
-#define OPT_CALLEE_GO_ON ((uint64_t)1 << 36)
-#define OPT_CANCEL_TIMEOUT ((uint64_t)1 << 37)
-#define OPT_FORCE_CID_TAG ((uint64_t)1 << 38)
-#define OPT_FORCE_CID_PRES ((uint64_t)1 << 39)
+/* flags are now 64 bits, so keep it up! */
+#define DIAL_STILLGOING (1LLU << 31)
+#define DIAL_NOFORWARDHTML (1LLU << 32)
+#define DIAL_CALLERID_ABSENT (1LLU << 33) /* TRUE if caller id is not available for connected line. */
+#define OPT_CANCEL_ELSEWHERE (1LLU << 34)
+#define OPT_PEER_H (1LLU << 35)
+#define OPT_CALLEE_GO_ON (1LLU << 36)
+#define OPT_CANCEL_TIMEOUT (1LLU << 37)
+#define OPT_FORCE_CID_TAG (1LLU << 38)
+#define OPT_FORCE_CID_PRES (1LLU << 39)
+#define OPT_CALLER_ANSWER (1LLU << 40)
enum {
OPT_ARG_ANNOUNCE = 0,
Modified: team/irroot/app_queue_skill/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/apps/app_meetme.c?view=diff&rev=333566&r1=333565&r2=333566
==============================================================================
--- team/irroot/app_queue_skill/apps/app_meetme.c (original)
+++ team/irroot/app_queue_skill/apps/app_meetme.c Sun Aug 28 09:32:40 2011
@@ -625,14 +625,14 @@
CONFFLAG_KICK_CONTINUE = (1 << 28),
CONFFLAG_DURATION_STOP = (1 << 29),
CONFFLAG_DURATION_LIMIT = (1 << 30),
- /*! Do not write any audio to this channel until the state is up. */
- CONFFLAG_NO_AUDIO_UNTIL_UP = (1 << 31),
};
/* These flags are defined separately because we ran out of bits that an enum can be used to represent.
- If you add new flags, be sure to do it in the same way that CONFFLAG_INTROMSG is. */
-#define CONFFLAG_INTROMSG ((uint64_t)1 << 32) /*!< If set play an intro announcement at start of conference */
-#define CONFFLAG_INTROUSER_VMREC ((uint64_t)1 << 33)
+ If you add new flags, be sure to do it in the same way that these are. */
+/*! Do not write any audio to this channel until the state is up. */
+#define CONFFLAG_NO_AUDIO_UNTIL_UP (1ULL << 31)
+#define CONFFLAG_INTROMSG (1ULL << 32) /*!< If set play an intro announcement at start of conference */
+#define CONFFLAG_INTROUSER_VMREC (1ULL << 33)
enum {
OPT_ARG_WAITMARKED = 0,
Modified: team/irroot/app_queue_skill/apps/app_parkandannounce.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/app_queue_skill/apps/app_parkandannounce.c?view=diff&rev=333566&r1=333565&r2=333566
[... 11537 lines stripped ...]
More information about the svn-commits
mailing list