[asterisk-commits] oej: branch oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk r3694...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jun 27 03:04:41 CDT 2012
Author: oej
Date: Wed Jun 27 03:04:33 2012
New Revision: 369421
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369421
Log:
Resetting branch
Added:
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/build_tools/find_missing_support_level
- copied unchanged from r369414, trunk/build_tools/find_missing_support_level
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/build_tools/get_documentation.py
- copied unchanged from r369414, trunk/build_tools/get_documentation.py
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/build_tools/post_process_documentation.py
- copied unchanged from r369414, trunk/build_tools/post_process_documentation.py
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_sip.exports.in
- copied unchanged from r369414, trunk/channels/chan_sip.exports.in
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/funcs/func_presencestate.c
- copied unchanged from r369414, trunk/funcs/func_presencestate.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/presencestate.h
- copied unchanged from r369414, trunk/include/asterisk/presencestate.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/sip_api.h
- copied unchanged from r369414, trunk/include/asterisk/sip_api.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/adsi.c
- copied unchanged from r369414, trunk/main/adsi.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/presencestate.c
- copied unchanged from r369414, trunk/main/presencestate.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/tests/test_voicemail_api.c
- copied unchanged from r369414, trunk/tests/test_voicemail_api.c
Modified:
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/ (props changed)
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/CHANGES
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/Makefile
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/UPGRADE.txt
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/chan_ooh323.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooCalls.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooq931.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_celgenuserevent.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_chanspy.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_confbridge.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_dial.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_directory.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_externalivr.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_followme.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_meetme.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_mixmonitor.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_queue.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_skel.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_stack.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_system.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_userevent.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_voicemail.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/confbridge/conf_config_parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/build_tools/make_version
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_agent.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_dahdi.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_iax2.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_local.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_misdn.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_sip.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_skinny.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/chan_unistim.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/console_board.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/console_gui.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/console_video.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/iax2-parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/iax2-provision.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/misdn/ie.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/misdn/isdn_lib.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/misdn/isdn_msg_parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/misdn/portinfo.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/misdn_config.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sig_analog.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sig_pri.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sig_ss7.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/config_parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/dialplan_functions.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/include/sip.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/reqresp_parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/sdp_crypto.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/security_events.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/srtp.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/sip/utils.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/vcodecs.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/channels/vgrabbers.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/configure
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/configure.ac
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/doc/appdocsxml.dtd
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/funcs/func_realtime.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/funcs/func_volume.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/adsi.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/app.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/callerid.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/channel.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/config.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/config_options.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/event_defs.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/file.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/frame.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/logger.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/manager.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/message.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/netsock2.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/pbx.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/strings.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/include/asterisk/xmldoc.h
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/Makefile
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/abstract_jb.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/acl.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/alaw.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/aoc.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/app.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/asterisk.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/astfd.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/astmm.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/astobj2.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/audiohook.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/autochan.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/autoservice.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/bridging.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/callerid.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/ccss.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/cdr.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/cel.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/channel.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/channel_internal_api.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/chanvars.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/cli.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/config.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/config_options.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/data.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/datastore.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/db.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/devicestate.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/dial.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/dns.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/dnsmgr.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/dsp.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/enum.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/event.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/features.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/file.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/fixedjitterbuf.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/format_cap.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/format_pref.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/frame.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/framehook.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/fskmodem.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/fskmodem_float.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/fskmodem_int.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/hashtab.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/heap.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/image.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/indications.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/io.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/jitterbuf.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/libasteriskssl.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/loader.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/lock.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/logger.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/manager.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/message.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/netsock.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/pbx.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/plc.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/privacy.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/say.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/sched.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/security_events.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/slinfactory.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/srv.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/stdtime/localtime.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/strcompat.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/strings.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/stun.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/syslog.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/taskprocessor.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/tcptls.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/tdd.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/term.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/test.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/threadstorage.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/timing.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/translate.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/udptl.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/ulaw.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/utils.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/xml.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/main/xmldoc.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/pbx/dundi-parser.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/pbx/pbx_config.c
team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/tests/test_config.c
Propchange: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/
('svnmerge-integrated' removed)
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/CHANGES?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/CHANGES (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/CHANGES Wed Jun 27 03:04:33 2012
@@ -11,6 +11,14 @@
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 10 to Asterisk 11 --------------------
------------------------------------------------------------------------------
+
+Build System
+----
+ * A new make target, 'full', has been added to the Makefile. This performs
+ the same compilation actions as make all, but will also scan the entirety of
+ each source file for documentation. This option is needed to generate AMI
+ event documentation. Note that your system must have Python in order for
+ this make target to succeed.
Core
----
@@ -31,6 +39,13 @@
* The minimum DTMF duration can now be configured in asterisk.conf
as "mindtmfduration". The default value is (as before) set to 80 ms.
(previously it was only available in source code)
+ * Each logging destination and console now have an independent notion of the
+ current verbosity level. Logger.conf now allows an optional argument to
+ the 'verbose' specifier, indicating the level of verbosity sent to that
+ particular logging destination. Additionally, remote consoles now each
+ have their own verbosity level. The command 'core set verbose' will now set
+ a separate level for each remote console without affecting any other
+ console.
CLI Changes
-------------------
@@ -193,6 +208,15 @@
behavior to hanging up a single channel is unchanged, but if you pass a regex,
the manager will send you a list of channels back that were hung up.
+ * Support for IPv6 addresses has been added.
+
+ * AMI Events can now be documented in the Asterisk source. Two new CLI
+ commands have been added to display information about AMI events at run time:
+ manager show events, which shows a list of all known and documented AMI
+ events, and manager show event [event name], which shows detail information
+ about a specific AMI event. Note that AMI event documentation is only
+ generated when Asterisk is compiled using 'make full'.
+
FAX changes
-----------
* FAXOPT(faxdetect) will enable a generic fax detect framehook for dialplan
@@ -202,16 +226,6 @@
-------------
* Allow the built in variables ${NUMBER}, ${IPADDR} and ${SECRET} to be
used within the dynamic weight attribute when specifying a mapping.
-
-Core changes
-------------
- * Each logging destination and console now have an independent notion of the
- current verbosity level. Logger.conf now allows an optional argument to
- the 'verbose' specifier, indicating the level of verbosity sent to that
- particular logging destination. Additionally, remote consoles now each
- have their own verbosity level. The command 'core set verbose' will now set
- a separate level for each remote console without affecting any other
- console.
Dialplan functions
------------------
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/Makefile?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/Makefile (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/Makefile Wed Jun 27 03:04:33 2012
@@ -96,6 +96,7 @@
export WGET_EXTRA_ARGS
export LDCONFIG
export LDCONFIG_FLAGS
+export PYTHON
# 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
@@ -315,12 +316,28 @@
@echo " + $(mK) install +"
@echo " +-------------------------------------------+"
+full: _cleantest_all_full
+ @echo " +--------- Asterisk Build Complete ---------+"
+ @echo " + Asterisk has successfully been built, and +"
+ @echo " + can be installed by running: +"
+ @echo " + +"
+ @echo " + $(mK) install +"
+ @echo " +-------------------------------------------+"
+
+
# For parallel builds, we must call cleantest *before* running the
# other dependencies on _all.
_cleantest_all: cleantest
@$(MAKE) _all
+# For parallel builds, we must call cleantest *before* running the
+# other dependencies on _all.
+_cleantest_all_full: cleantest
+ @$(MAKE) _all_full
+
_all: makeopts $(SUBDIRS) doc/core-en_US.xml $(ADDL_TARGETS)
+
+_all_full: makeopts $(SUBDIRS) doc/full-en_US.xml $(ADDL_TARGETS)
makeopts: configure
@echo "****"
@@ -413,6 +430,8 @@
rm -f defaults.h
rm -f include/asterisk/build.h
rm -f main/version.c
+ rm -f doc/core-en_US.xml
+ rm -f doc/full-en_US.xml
@$(MAKE) -C menuselect clean
cp -f .cleancount .lastclean
@@ -464,6 +483,27 @@
done
@echo
@echo "</docs>" >> $@
+
+doc/full-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
+ifeq ($(PYTHON),:)
+ @echo "--------------------------------------------------------------------------"
+ @echo "--- Please install python to build full documentation ---"
+ @echo "--------------------------------------------------------------------------"
+else
+ @printf "Building Documentation For: "
+ @echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $@
+ @echo "<!DOCTYPE docs SYSTEM \"appdocsxml.dtd\">" >> $@
+ @echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
+ @for x in $(MOD_SUBDIRS); do \
+ printf "$$x " ; \
+ for i in $$x/*.c; do \
+ $(PYTHON) build_tools/get_documentation.py < $$i >> $@ ; \
+ done ; \
+ done
+ @echo
+ @echo "</docs>" >> $@
+ @$(PYTHON) build_tools/post_process_documentation.py -i $@ -o "doc/core-en_US.xml"
+endif
validate-docs: doc/core-en_US.xml
ifeq ($(XMLSTARLET)$(XMLLINT),::)
@@ -497,40 +537,23 @@
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
+ "$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
+ "$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
+ "$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
+ "$(ASTLOGDIR)" "$(ASTLOGDIR)/cdr-csv" "$(ASTLOGDIR)/cdr-custom" \
+ "$(ASTLOGDIR)/cel-custom" "$(ASTDATADIR)" "$(ASTDATADIR)/documentation" \
+ "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
+ "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
+ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)"
installdirs:
- $(INSTALL) -d "$(DESTDIR)$(ASTLIBDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTMODDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp"
- $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail"
- $(INSTALL) -d "$(DESTDIR)$(ASTHEADERDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTHEADERDIR)/doxygen"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation/thirdparty"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/firmware"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/firmware/iax"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/images"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/keys"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/phoneprov"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/sounds"
- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/moh"
- $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
- $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
- $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
+ @for i in $(INSTALLDIRS); do \
+ if [ ! -z "$${i}" -a ! -d "$(DESTDIR)$${i}" ]; then \
+ $(INSTALL) -d "$(DESTDIR)$${i}"; \
+ fi; \
+ done
main-bininstall:
+ at DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/UPGRADE.txt?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/UPGRADE.txt (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/UPGRADE.txt Wed Jun 27 03:04:33 2012
@@ -25,6 +25,11 @@
Parking:
- The comebacktoorigin setting must now be set per parking lot. The setting in
the general section will not be applied automatically to each parking lot.
+ - The BLINDTRANSFER channel variable is deleted from a channel when it is
+ bridged to prevent subtle bugs in the parking feature. The channel
+ variable is used by Asterisk internally for the Park application to work
+ properly. If you were using it for your own purposes, copy it to your
+ own channel variable before the channel is bridged.
res_ais:
- Users of res_ais in versions of Asterisk prior to Asterisk 11 must change
@@ -96,6 +101,10 @@
should be vastly improved. The HANGUPCAUSE hash should now be used instead
of SIP_CAUSE. Because of this, the storesipcause option in sip.conf is also
deprecated.
+ - The sip paramater for Originating Line Information (oli, isup-oli, and
+ ss7-oli) is now parsed out of the From header and copied into the channel's
+ ANI2 information field. This is readable from the CALLERID(ani2) dialplan
+ function.
chan_unistim
- Due to massive update in chan_unistim phone keys functions and on-screen
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/chan_ooh323.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/chan_ooh323.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/chan_ooh323.c Wed Jun 27 03:04:33 2012
@@ -1151,6 +1151,8 @@
if (p) {
ast_mutex_lock(&p->lock);
+
+ p->lastrtptx = time(NULL);
if (f->frametype == AST_FRAME_MODEM) {
ast_debug(1, "Send UDPTL %d/%d len %d for %s\n",
@@ -3735,6 +3737,24 @@
h323_next = h323->next;
/* TODO: Need to add rtptimeout keepalive support */
+
+ if (h323->rtp && h323->rtptimeout && h323->lastrtptx &&
+ h323->lastrtptx + h323->rtptimeout < t) {
+ ast_rtp_instance_sendcng(h323->rtp, 0);
+ h323->lastrtptx = time(NULL);
+ }
+
+ if (h323->rtp && h323->owner && h323->rtptimeout &&
+ h323->lastrtprx &&
+ h323->lastrtprx + h323->rtptimeout < t) {
+ if (!ast_channel_trylock(h323->owner)) {
+ ast_softhangup_nolock(h323->owner, AST_SOFTHANGUP_DEV);
+ ast_log(LOG_NOTICE, "Disconnecting call '%s' for lack of RTP activity in %ld seconds\n", ast_channel_name(h323->owner), (long) (t - h323->lastrtprx));
+ ast_channel_unlock(h323->owner);
+ }
+
+ }
+
if (ast_test_flag(h323, H323_NEEDDESTROY)) {
ooh323_destroy (h323);
} /* else if (ast_test_flag(h323, H323_NEEDSTART) && h323->owner) {
@@ -4610,12 +4630,14 @@
switch (ast_channel_fdno(ast)) {
case 0:
f = ast_rtp_instance_read(p->rtp, 0); /* RTP Audio */
+ p->lastrtprx = time(NULL);
break;
case 1:
f = ast_rtp_instance_read(p->rtp, 1); /* RTCP Control Channel */
break;
case 2:
f = ast_rtp_instance_read(p->vrtp, 0); /* RTP Video */
+ p->lastrtprx = time(NULL);
break;
case 3:
f = ast_rtp_instance_read(p->vrtp, 1); /* RTCP Control Channel for video */
@@ -4626,6 +4648,7 @@
ast_debug(1, "Got UDPTL %d/%d len %d for %s\n",
f->frametype, f->subclass.integer, f->datalen, ast_channel_name(ast));
}
+ p->lastrtprx = time(NULL);
break;
default:
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooCalls.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooCalls.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooCalls.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooCalls.c Wed Jun 27 03:04:33 2012
@@ -265,14 +265,13 @@
int ooRemoveCallFromList (OOH323CallData *call)
{
- if(!call)
+ if(!call || !gH323ep.callList)
return OO_OK;
ast_mutex_lock(&callListLock);
OOTRACEINFO3("Removing call %lx: %s\n", call, call->callToken);
- if (!gH323ep.callList) return OO_OK;
if(call == gH323ep.callList)
{
if(!call->next)
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooq931.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooq931.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooq931.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/addons/ooh323c/src/ooq931.c Wed Jun 27 03:04:33 2012
@@ -2373,7 +2373,7 @@
else
OO_CLRFLAG(call->flags, OO_M_TUNNELING);
- if(opts->disableGk)
+ if(opts->disableGk || gH323ep.gkClient == NULL)
OO_SETFLAG(call->flags, OO_M_DISABLEGK);
else
OO_CLRFLAG(call->flags, OO_M_DISABLEGK);
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_celgenuserevent.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_celgenuserevent.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_celgenuserevent.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_celgenuserevent.c Wed Jun 27 03:04:33 2012
@@ -22,6 +22,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_chanspy.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_chanspy.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_chanspy.c Wed Jun 27 03:04:33 2012
@@ -539,6 +539,16 @@
ast_channel_unlock(spyee_autochan->chan);
ast_verb(2, "Spying on channel %s\n", name);
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a channel has started spying on another channel.</synopsis>
+ <see-also>
+ <ref type="application">ChanSpy</ref>
+ <ref type="application">ExtenSpy</ref>
+ <ref type="managerEvent">ChanSpyStop</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
ast_manager_event_multichan(EVENT_FLAG_CALL, "ChanSpyStart", 2, chans,
"SpyerChannel: %s\r\n"
"SpyeeChannel: %s\r\n",
@@ -727,6 +737,14 @@
}
ast_verb(2, "Done Spying on channel %s\n", name);
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a channel has stopped spying on another channel.</synopsis>
+ <see-also>
+ <ref type="managerEvent">ChanSpyStart</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
ast_manager_event(chan, EVENT_FLAG_CALL, "ChanSpyStop", "SpyeeChannel: %s\r\n", name);
return running;
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_confbridge.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_confbridge.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_confbridge.c Wed Jun 27 03:04:33 2012
@@ -529,16 +529,53 @@
static void send_conf_start_event(const char *conf_name)
{
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a conference starts.</synopsis>
+ <syntax>
+ <parameter name="Conference">
+ <para>The name of the Confbridge conference.</para>
+ </parameter>
+ </syntax>
+ <see-also>
+ <ref type="managerEvent">ConfbridgeEnd</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
manager_event(EVENT_FLAG_CALL, "ConfbridgeStart", "Conference: %s\r\n", conf_name);
}
static void send_conf_end_event(const char *conf_name)
{
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a conference ends.</synopsis>
+ <syntax>
+ <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
+ </syntax>
+ <see-also>
+ <ref type="managerEvent">ConfbridgeStart</ref>
+ <ref type="application">ConfBridge</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
manager_event(EVENT_FLAG_CALL, "ConfbridgeEnd", "Conference: %s\r\n", conf_name);
}
static void send_join_event(struct ast_channel *chan, const char *conf_name)
{
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a channel joins a Confbridge conference.</synopsis>
+ <syntax>
+ <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
+ </syntax>
+ <see-also>
+ <ref type="managerEvent">ConfbridgeLeave</ref>
+ <ref type="application">ConfBridge</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeJoin",
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
@@ -555,6 +592,17 @@
static void send_leave_event(struct ast_channel *chan, const char *conf_name)
{
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a channel leaves a Confbridge conference.</synopsis>
+ <syntax>
+ <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
+ </syntax>
+ <see-also>
+ <ref type="managerEvent">ConfbridgeJoin</ref>
+ </see-also>
+ </managerEventInstance>
+ ***/
ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeLeave",
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
@@ -1242,6 +1290,20 @@
}
/* notify AMI someone is has either started or stopped talking */
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a conference participant has started or stopped talking.</synopsis>
+ <syntax>
+ <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
+ <parameter name="TalkingStatus">
+ <enumlist>
+ <enum name="on"/>
+ <enum name="off"/>
+ </enumlist>
+ </parameter>
+ </syntax>
+ </managerEventInstance>
+ ***/
ast_manager_event(bridge_channel->chan, EVENT_FLAG_CALL, "ConfbridgeTalking",
"Channel: %s\r\n"
"Uniqueid: %s\r\n"
Modified: team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_dial.c?view=diff&rev=369421&r1=369420&r2=369421
==============================================================================
--- team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_dial.c (original)
+++ team/oej/appleraisin-being-able-to-store-astdb-in-realtime-trunk/apps/app_dial.c Wed Jun 27 03:04:33 2012
@@ -133,8 +133,7 @@
<para>Reset the call detail record (CDR) for this call.</para>
</option>
<option name="c">
- <para>If the Dial() application cancels this call, always set the flag to tell the channel
- driver that the call is answered elsewhere.</para>
+ <para>If the Dial() application cancels this call, always set HANGUPCAUSE to 'answered elsewhere'</para>
</option>
<option name="d">
<para>Allow the calling user to dial a 1 digit extension while waiting for
@@ -727,8 +726,6 @@
/* Hangup any existing lines we have open */
if (outgoing->chan && (outgoing->chan != exception)) {
if (answered_elsewhere) {
- /* The flag is used for local channel inheritance and stuff */
- ast_set_flag(ast_channel_flags(outgoing->chan), AST_FLAG_ANSWERED_ELSEWHERE);
/* This is for the channel drivers */
ast_channel_hangupcause_set(outgoing->chan, AST_CAUSE_ANSWERED_ELSEWHERE);
}
@@ -823,6 +820,20 @@
static void senddialevent(struct ast_channel *src, struct ast_channel *dst, const char *dialstring)
{
struct ast_channel *chans[] = { src, dst };
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a dial action has started.</synopsis>
+ <syntax>
+ <parameter name="SubEvent">
+ <enumlist>
+ <enum name="Begin"/>
+ <enum name="End"/>
+ </enumlist>
+ <para>A sub event type, specifying whether the dial action has begun or ended.</para>
+ </parameter>
+ </syntax>
+ </managerEventInstance>
+ ***/
ast_manager_event_multichan(EVENT_FLAG_CALL, "Dial", 2, chans,
"SubEvent: Begin\r\n"
"Channel: %s\r\n"
@@ -845,6 +856,16 @@
static void senddialendevent(struct ast_channel *src, const char *dialstatus)
{
+ /*** DOCUMENTATION
+ <managerEventInstance>
+ <synopsis>Raised when a dial action has ended.</synopsis>
+ <syntax>
+ <parameter name="DialStatus">
+ <para>The value of the <variable>DIALSTATUS</variable> channel variable.</para>
+ </parameter>
+ </syntax>
+ </managerEventInstance>
+ ***/
ast_manager_event(src, EVENT_FLAG_CALL, "Dial",
"SubEvent: End\r\n"
"Channel: %s\r\n"
@@ -2283,7 +2304,7 @@
if (ast_test_flag64(&opts, OPT_PREDIAL_CALLER)
[... 18431 lines stripped ...]
More information about the asterisk-commits
mailing list