[svn-commits] russell: branch russell/events r89700 - in /team/russell/events: ./ agi/ apps...

Tue Nov 27 13:33:28 CST 2007

Author: russell
Date: Tue Nov 27 13:33:26 2007
New Revision: 89700

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89700
Log:
resolve, reset

Added:
    team/russell/events/funcs/func_sysinfo.c
      - copied unchanged from r89698, trunk/funcs/func_sysinfo.c
    team/russell/events/include/asterisk/_private.h
      - copied unchanged from r89698, trunk/include/asterisk/_private.h
    team/russell/events/include/asterisk/mod_format.h
      - copied unchanged from r89698, trunk/include/asterisk/mod_format.h
    team/russell/events/include/asterisk/network.h
      - copied unchanged from r89698, trunk/include/asterisk/network.h
    team/russell/events/main/cygload.c
      - copied unchanged from r89698, trunk/main/cygload.c
Removed:
    team/russell/events/channels/gentone-ulaw.c
Modified:
    team/russell/events/   (props changed)
    team/russell/events/CHANGES
    team/russell/events/Makefile
    team/russell/events/Makefile.moddir_rules
    team/russell/events/Makefile.rules
    team/russell/events/UPGRADE.txt
    team/russell/events/acinclude.m4
    team/russell/events/agi/Makefile
    team/russell/events/agi/eagi-test.c
    team/russell/events/apps/Makefile
    team/russell/events/apps/app_adsiprog.c
    team/russell/events/apps/app_alarmreceiver.c
    team/russell/events/apps/app_amd.c
    team/russell/events/apps/app_authenticate.c
    team/russell/events/apps/app_cdr.c
    team/russell/events/apps/app_chanisavail.c
    team/russell/events/apps/app_channelredirect.c
    team/russell/events/apps/app_chanspy.c
    team/russell/events/apps/app_controlplayback.c
    team/russell/events/apps/app_db.c
    team/russell/events/apps/app_dial.c
    team/russell/events/apps/app_dictate.c
    team/russell/events/apps/app_directed_pickup.c
    team/russell/events/apps/app_directory.c
    team/russell/events/apps/app_disa.c
    team/russell/events/apps/app_dumpchan.c
    team/russell/events/apps/app_echo.c
    team/russell/events/apps/app_exec.c
    team/russell/events/apps/app_externalivr.c
    team/russell/events/apps/app_festival.c
    team/russell/events/apps/app_flash.c
    team/russell/events/apps/app_followme.c
    team/russell/events/apps/app_forkcdr.c
    team/russell/events/apps/app_getcpeid.c
    team/russell/events/apps/app_ices.c
    team/russell/events/apps/app_image.c
    team/russell/events/apps/app_ivrdemo.c
    team/russell/events/apps/app_macro.c
    team/russell/events/apps/app_meetme.c
    team/russell/events/apps/app_milliwatt.c
    team/russell/events/apps/app_minivm.c
    team/russell/events/apps/app_mixmonitor.c
    team/russell/events/apps/app_morsecode.c
    team/russell/events/apps/app_mp3.c
    team/russell/events/apps/app_nbscat.c
    team/russell/events/apps/app_osplookup.c
    team/russell/events/apps/app_page.c
    team/russell/events/apps/app_parkandannounce.c
    team/russell/events/apps/app_playback.c
    team/russell/events/apps/app_privacy.c
    team/russell/events/apps/app_queue.c
    team/russell/events/apps/app_read.c
    team/russell/events/apps/app_readexten.c
    team/russell/events/apps/app_readfile.c
    team/russell/events/apps/app_record.c
    team/russell/events/apps/app_rpt.c
    team/russell/events/apps/app_sayunixtime.c
    team/russell/events/apps/app_senddtmf.c
    team/russell/events/apps/app_sendtext.c
    team/russell/events/apps/app_setcallerid.c
    team/russell/events/apps/app_skel.c
    team/russell/events/apps/app_sms.c
    team/russell/events/apps/app_softhangup.c
    team/russell/events/apps/app_speech_utils.c
    team/russell/events/apps/app_stack.c
    team/russell/events/apps/app_system.c
    team/russell/events/apps/app_talkdetect.c
    team/russell/events/apps/app_test.c
    team/russell/events/apps/app_transfer.c
    team/russell/events/apps/app_url.c
    team/russell/events/apps/app_userevent.c
    team/russell/events/apps/app_verbose.c
    team/russell/events/apps/app_voicemail.c
    team/russell/events/apps/app_waitforring.c
    team/russell/events/apps/app_waitforsilence.c
    team/russell/events/apps/app_while.c
    team/russell/events/apps/app_zapateller.c
    team/russell/events/apps/app_zapbarge.c
    team/russell/events/apps/app_zapras.c
    team/russell/events/apps/app_zapscan.c
    team/russell/events/build_tools/make_buildopts_h
    team/russell/events/build_tools/strip_nonapi
    team/russell/events/cdr/cdr_adaptive_odbc.c
    team/russell/events/cdr/cdr_csv.c
    team/russell/events/cdr/cdr_custom.c
    team/russell/events/cdr/cdr_manager.c
    team/russell/events/cdr/cdr_odbc.c
    team/russell/events/cdr/cdr_pgsql.c
    team/russell/events/cdr/cdr_radius.c
    team/russell/events/cdr/cdr_sqlite.c
    team/russell/events/cdr/cdr_sqlite3_custom.c
    team/russell/events/cdr/cdr_tds.c
    team/russell/events/channels/Makefile
    team/russell/events/channels/chan_agent.c
    team/russell/events/channels/chan_alsa.c
    team/russell/events/channels/chan_features.c
    team/russell/events/channels/chan_gtalk.c
    team/russell/events/channels/chan_h323.c
    team/russell/events/channels/chan_iax2.c
    team/russell/events/channels/chan_jingle.c
    team/russell/events/channels/chan_local.c
    team/russell/events/channels/chan_mgcp.c
    team/russell/events/channels/chan_misdn.c
    team/russell/events/channels/chan_nbs.c
    team/russell/events/channels/chan_oss.c
    team/russell/events/channels/chan_phone.c
    team/russell/events/channels/chan_sip.c
    team/russell/events/channels/chan_skinny.c
    team/russell/events/channels/chan_unistim.c
    team/russell/events/channels/chan_usbradio.c
    team/russell/events/channels/chan_vpb.cc
    team/russell/events/channels/chan_zap.c
    team/russell/events/channels/h323/ast_h323.cxx
    team/russell/events/channels/iax2-parser.c
    team/russell/events/channels/iax2-provision.c
    team/russell/events/channels/misdn/isdn_lib.c
    team/russell/events/channels/misdn_config.c
    team/russell/events/codecs/codec_a_mu.c
    team/russell/events/codecs/codec_adpcm.c
    team/russell/events/codecs/codec_alaw.c
    team/russell/events/codecs/codec_g722.c
    team/russell/events/codecs/codec_g726.c
    team/russell/events/codecs/codec_gsm.c
    team/russell/events/codecs/codec_ilbc.c
    team/russell/events/codecs/codec_lpc10.c
    team/russell/events/codecs/codec_speex.c
    team/russell/events/codecs/codec_ulaw.c
    team/russell/events/codecs/codec_zap.c
    team/russell/events/configs/agents.conf.sample
    team/russell/events/configs/cdr.conf.sample
    team/russell/events/configs/extensions.conf.sample
    team/russell/events/configs/res_odbc.conf.sample
    team/russell/events/configs/sip.conf.sample
    team/russell/events/configs/voicemail.conf.sample
    team/russell/events/configure.ac
    team/russell/events/doc/CODING-GUIDELINES
    team/russell/events/doc/osp.txt
    team/russell/events/doc/tex/localchannel.tex
    team/russell/events/doc/tex/queues-with-callback-members.tex
    team/russell/events/formats/format_g723.c
    team/russell/events/formats/format_g726.c
    team/russell/events/formats/format_g729.c
    team/russell/events/formats/format_gsm.c
    team/russell/events/formats/format_h263.c
    team/russell/events/formats/format_h264.c
    team/russell/events/formats/format_ilbc.c
    team/russell/events/formats/format_jpeg.c
    team/russell/events/formats/format_ogg_vorbis.c
    team/russell/events/formats/format_pcm.c
    team/russell/events/formats/format_sln.c
    team/russell/events/formats/format_vox.c
    team/russell/events/formats/format_wav.c
    team/russell/events/formats/format_wav_gsm.c
    team/russell/events/funcs/func_base64.c
    team/russell/events/funcs/func_blacklist.c
    team/russell/events/funcs/func_callerid.c
    team/russell/events/funcs/func_cdr.c
    team/russell/events/funcs/func_channel.c
    team/russell/events/funcs/func_curl.c
    team/russell/events/funcs/func_cut.c
    team/russell/events/funcs/func_db.c
    team/russell/events/funcs/func_devstate.c
    team/russell/events/funcs/func_dialgroup.c
    team/russell/events/funcs/func_enum.c
    team/russell/events/funcs/func_env.c
    team/russell/events/funcs/func_extstate.c
    team/russell/events/funcs/func_global.c
    team/russell/events/funcs/func_groupcount.c
    team/russell/events/funcs/func_iconv.c
    team/russell/events/funcs/func_lock.c
    team/russell/events/funcs/func_logic.c
    team/russell/events/funcs/func_math.c
    team/russell/events/funcs/func_md5.c
    team/russell/events/funcs/func_module.c
    team/russell/events/funcs/func_odbc.c
    team/russell/events/funcs/func_rand.c
    team/russell/events/funcs/func_realtime.c
    team/russell/events/funcs/func_sha1.c
    team/russell/events/funcs/func_shell.c
    team/russell/events/funcs/func_strings.c
    team/russell/events/funcs/func_timeout.c
    team/russell/events/funcs/func_uri.c
    team/russell/events/funcs/func_version.c
    team/russell/events/funcs/func_vmcount.c
    team/russell/events/funcs/func_volume.c
    team/russell/events/include/asterisk.h
    team/russell/events/include/asterisk/abstract_jb.h
    team/russell/events/include/asterisk/acl.h
    team/russell/events/include/asterisk/ael_structs.h
    team/russell/events/include/asterisk/app.h
    team/russell/events/include/asterisk/astmm.h
    team/russell/events/include/asterisk/astobj.h
    team/russell/events/include/asterisk/audiohook.h
    team/russell/events/include/asterisk/cdr.h
    team/russell/events/include/asterisk/channel.h
    team/russell/events/include/asterisk/cli.h
    team/russell/events/include/asterisk/compat.h
    team/russell/events/include/asterisk/config.h
    team/russell/events/include/asterisk/dnsmgr.h
    team/russell/events/include/asterisk/doxyref.h
    team/russell/events/include/asterisk/endian.h
    team/russell/events/include/asterisk/file.h
    team/russell/events/include/asterisk/frame.h
    team/russell/events/include/asterisk/hashtab.h
    team/russell/events/include/asterisk/image.h
    team/russell/events/include/asterisk/io.h
    team/russell/events/include/asterisk/lock.h
    team/russell/events/include/asterisk/logger.h
    team/russell/events/include/asterisk/manager.h
    team/russell/events/include/asterisk/md5.h
    team/russell/events/include/asterisk/module.h
    team/russell/events/include/asterisk/netsock.h
    team/russell/events/include/asterisk/paths.h
    team/russell/events/include/asterisk/pbx.h
    team/russell/events/include/asterisk/plc.h
    team/russell/events/include/asterisk/res_odbc.h
    team/russell/events/include/asterisk/rtp.h
    team/russell/events/include/asterisk/sha1.h
    team/russell/events/include/asterisk/slinfactory.h
    team/russell/events/include/asterisk/stringfields.h
    team/russell/events/include/asterisk/strings.h
    team/russell/events/include/asterisk/time.h
    team/russell/events/include/asterisk/udptl.h
    team/russell/events/include/asterisk/utils.h
    team/russell/events/main/Makefile
    team/russell/events/main/abstract_jb.c
    team/russell/events/main/acl.c
    team/russell/events/main/adsistub.c
    team/russell/events/main/alaw.c
    team/russell/events/main/app.c
    team/russell/events/main/asterisk.c
    team/russell/events/main/astmm.c
    team/russell/events/main/astobj2.c
    team/russell/events/main/audiohook.c
    team/russell/events/main/autoservice.c
    team/russell/events/main/callerid.c
    team/russell/events/main/cdr.c
    team/russell/events/main/channel.c
    team/russell/events/main/chanvars.c
    team/russell/events/main/cli.c
    team/russell/events/main/config.c
    team/russell/events/main/cryptostub.c
    team/russell/events/main/db.c
    team/russell/events/main/devicestate.c
    team/russell/events/main/dial.c
    team/russell/events/main/dlfcn.c
    team/russell/events/main/dns.c
    team/russell/events/main/dnsmgr.c
    team/russell/events/main/dsp.c
    team/russell/events/main/enum.c
    team/russell/events/main/event.c
    team/russell/events/main/file.c
    team/russell/events/main/fixedjitterbuf.c
    team/russell/events/main/frame.c
    team/russell/events/main/fskmodem.c
    team/russell/events/main/hashtab.c
    team/russell/events/main/http.c
    team/russell/events/main/image.c
    team/russell/events/main/indications.c
    team/russell/events/main/io.c
    team/russell/events/main/jitterbuf.c
    team/russell/events/main/loader.c
    team/russell/events/main/logger.c
    team/russell/events/main/manager.c
    team/russell/events/main/md5.c
    team/russell/events/main/minimime/mm.h
    team/russell/events/main/netsock.c
    team/russell/events/main/pbx.c
    team/russell/events/main/plc.c
    team/russell/events/main/privacy.c
    team/russell/events/main/rtp.c
    team/russell/events/main/say.c
    team/russell/events/main/sched.c
    team/russell/events/main/sha1.c
    team/russell/events/main/slinfactory.c
    team/russell/events/main/srv.c
    team/russell/events/main/stdtime/localtime.c
    team/russell/events/main/strcompat.c
    team/russell/events/main/tdd.c
    team/russell/events/main/term.c
    team/russell/events/main/threadstorage.c
    team/russell/events/main/translate.c
    team/russell/events/main/udptl.c
    team/russell/events/main/ulaw.c
    team/russell/events/main/utils.c
    team/russell/events/makeopts.in
    team/russell/events/pbx/Makefile
    team/russell/events/pbx/ael/ael-test/ael-test19/extensions.ael
    team/russell/events/pbx/ael/ael-test/ael-test3/extensions.ael
    team/russell/events/pbx/ael/ael-test/ael-test7/extensions.ael
    team/russell/events/pbx/ael/ael-test/ael-vtest13/extensions.ael
    team/russell/events/pbx/ael/ael-test/ref.ael-ntest10
    team/russell/events/pbx/ael/ael-test/ref.ael-ntest12
    team/russell/events/pbx/ael/ael-test/ref.ael-ntest22
    team/russell/events/pbx/ael/ael-test/ref.ael-ntest9
    team/russell/events/pbx/ael/ael-test/ref.ael-test1
    team/russell/events/pbx/ael/ael-test/ref.ael-test11
    team/russell/events/pbx/ael/ael-test/ref.ael-test14
    team/russell/events/pbx/ael/ael-test/ref.ael-test15
    team/russell/events/pbx/ael/ael-test/ref.ael-test16
    team/russell/events/pbx/ael/ael-test/ref.ael-test18
    team/russell/events/pbx/ael/ael-test/ref.ael-test19
    team/russell/events/pbx/ael/ael-test/ref.ael-test2
    team/russell/events/pbx/ael/ael-test/ref.ael-test20
    team/russell/events/pbx/ael/ael-test/ref.ael-test3
    team/russell/events/pbx/ael/ael-test/ref.ael-test4
    team/russell/events/pbx/ael/ael-test/ref.ael-test5
    team/russell/events/pbx/ael/ael-test/ref.ael-test6
    team/russell/events/pbx/ael/ael-test/ref.ael-test7
    team/russell/events/pbx/ael/ael-test/ref.ael-test8
    team/russell/events/pbx/ael/ael-test/ref.ael-vtest13
    team/russell/events/pbx/dundi-parser.c
    team/russell/events/pbx/dundi-parser.h
    team/russell/events/pbx/pbx_ael.c
    team/russell/events/pbx/pbx_config.c
    team/russell/events/pbx/pbx_dundi.c
    team/russell/events/pbx/pbx_gtkconsole.c
    team/russell/events/pbx/pbx_loopback.c
    team/russell/events/pbx/pbx_lua.c
    team/russell/events/pbx/pbx_realtime.c
    team/russell/events/pbx/pbx_spool.c
    team/russell/events/res/Makefile
    team/russell/events/res/ael/ael.flex
    team/russell/events/res/ael/ael.tab.c
    team/russell/events/res/ael/ael.y
    team/russell/events/res/ael/ael_lex.c
    team/russell/events/res/ael/pval.c
    team/russell/events/res/res_adsi.c
    team/russell/events/res/res_ael_share.c
    team/russell/events/res/res_agi.c
    team/russell/events/res/res_clioriginate.c
    team/russell/events/res/res_config_odbc.c
    team/russell/events/res/res_config_pgsql.c
    team/russell/events/res/res_config_sqlite.c
    team/russell/events/res/res_convert.c
    team/russell/events/res/res_crypto.c
    team/russell/events/res/res_features.c
    team/russell/events/res/res_indications.c
    team/russell/events/res/res_jabber.c
    team/russell/events/res/res_limit.c
    team/russell/events/res/res_monitor.c
    team/russell/events/res/res_musiconhold.c
    team/russell/events/res/res_odbc.c
    team/russell/events/res/res_realtime.c
    team/russell/events/res/res_smdi.c
    team/russell/events/res/res_snmp.c
    team/russell/events/res/res_speech.c
    team/russell/events/utils/Makefile
    team/russell/events/utils/ael_main.c
    team/russell/events/utils/check_expr.c
    team/russell/events/utils/conf2ael.c
    team/russell/events/utils/extconf.c
    team/russell/events/utils/hashtest.c
    team/russell/events/utils/hashtest2.c
    team/russell/events/utils/smsq.c

Propchange: team/russell/events/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/events/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/russell/events/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/events/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 27 13:33:26 2007
@@ -1,1 +1,1 @@
-/trunk:1-89210
+/trunk:1-89699

Modified: team/russell/events/CHANGES
URL: http://svn.digium.com/view/asterisk/team/russell/events/CHANGES?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/CHANGES (original)
+++ team/russell/events/CHANGES Tue Nov 27 13:33:26 2007
@@ -44,6 +44,7 @@
     of devices or the name associated with a hint.
   * Added EXTENSION_STATE() dialplan function which allows retrieving the state
     of any extension.
+  * Added SYSINFO() dialplan function which allows retrieval of system information
 
 CLI Changes
 -----------
@@ -51,6 +52,10 @@
   * Added 'core show channels count' CLI command.
   * Added the ability to set the core debug and verbose values on a per-file basis.
   * Added 'queue pause member' and 'queue unpause member' CLI commands
+  * Ability to set process limits ("ulimit") without restarting Asterisk
+  * Enhanced "agi debug" to print the channel name as a prefix to the debug
+     output to make debugging on busy systems much easier.
+  * New CLI commands "dialplan set extenpatternmatching true/false"
 
 SIP changes
 -----------
@@ -67,8 +72,9 @@
      since they where replaced by "mohsuggest" and "mohinterpret" in version 1.4
   * The "localmask" setting was removed in version 1.2 and the reminder about it
      being removed is now also removed.
-  * A new option "busy-level" for setting a level of calls where asterisk reports
-     a device as busy, to separate it from call-limit
+  * A new option "busylevel" for setting a level of calls where asterisk reports
+     a device as busy, to separate it from call-limit. This value is also added
+     to the SIP_PEER dialplan function.
   * A new realtime family called "sipregs" is now supported to store SIP registration
      data. If this family is defined, "sippeers" will be used for configuration and
      "sipregs" for registrations. If it's not defined, "sippeers" will be used for
@@ -84,8 +90,11 @@
   * SIP now adds a header to the CANCEL if the call was answered by another phone
      in the same dial command, or if the new c option in dial() is used.
   * The new default is that 100 Trying is not sent on REGISTER attempts as the RFC specifically
-     states it is not needed. For phones, however, that do require it the registertrying option
+     states it is not needed. For phones, however, that do require it the "registertrying" option
      has been added so it can be enabled. 
+  * A new option called "callcounter" (global/peer/user level) enables call counters needed
+    for better status reports needed for queues and SIP subscriptions. (Call-Limit was previously
+    used to enable this functionality).
 
 IAX2 changes
 ------------
@@ -97,6 +106,7 @@
 Skinny changes
 -------------
   * Added skinny show device, skinny show line, and skinny show settings CLI commands.
+  * Proper codec support in chan_skinny.
 
 DUNDi changes
 -------------
@@ -194,6 +204,29 @@
      This extends the concise capabilities of this CLI command to include
      listing all conferences, instead of an addition to the other sub commands
      for the "meetme" command.
+  * Added the ability to specify the music on hold class used to play into the
+     conference when there is only one member and the M option is used.
+
+Other Dialplan Application Changes
+----------------------------------
+  * Argument support for Gosub application
+  * From the to-do lists: straighten out the app timeout args:
+     Wait() app now really does 0.3 seconds- was truncating arg to an int.
+     WaitExten() same as Wait().
+     Congestion() - Now takes floating pt. argument.
+     Busy() - now takes floating pt. argument.
+     Read() - timeout now can be floating pt.
+     WaitForRing() now takes floating pt timeout arg.
+     SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
+  * Added 's' option to Page application.
+  * Added 'E' and 'V' commands to ExternalIVR.
+  * Added 'o' and 'X' options to Chanspy.
+  * Added a new dialplan application, Bridge, which allows you to bridge the
+     calling channel to any other active channel on the system.
+  * Added the ability to specify a music on hold class to play instead of ringing
+     for the SLATrunk application.
+  * The Read application no longer exits the dialplan on error.  Instead, it sets
+     READSTATUS to ERROR, which you can catch and handle separately.
 
 Music On Hold Changes
 ---------------------
@@ -255,6 +288,9 @@
      features.conf.  This means that features can be written a single time, and
      then mapped into groups of features for different key mappings or easier
      access control.
+  * Updated the ParkedCall application to allow you to not specify a parking
+     extension.  If you don't specify a parking space to pick up, it will grab
+     the first one available.
 
 Language Support Changes
 ------------------------
@@ -264,37 +300,27 @@
 Miscellaneous 
 -------------
   * Added the bindaddr option to gtalk.conf.
-  * Argument support for Gosub application
-  * Ability to set process limits without restarting Asterisk
-  * Proper codec support in chan_skinny.
   * Ability to use libcap to set high ToS bits when non-root
      on Linux. If configure is unable to find libcap then you
      can use --with-cap to specify the path.
-  * Added rotatetimestamp option to logger.conf which will use
-     the time to name the logger files instead of sequence number.
+  * Added rotatestrategy option to logger.conf, along with two new options:
+     "timestamp" which will use the time to name the logger files instead of
+     sequence number; and "rotate", which rotates the names of the logfiles,
+     similar to the way syslog rotates files.
+  * Added exec_after_rotate option to logger.conf, which allows a system
+     command to be run after rotation.  This is primarily useful with
+     rotatestrategry=rotate, to allow a limit on the number of logfiles kept
+     and to ensure that the oldest log file gets deleted.
   * Added Masquerade manager event for when a masquerade happens between
      two channels.
-  * From the to-do lists: straighten out the app timeout args:
-     Wait() app now really does 0.3 seconds- was truncating arg to an int.
-     WaitExten() same as Wait().
-     Congestion() - Now takes floating pt. argument.
-     Busy() - now takes floating pt. argument.
-     Read() - timeout now can be floating pt.
-     WaitForRing() now takes floating pt timeout arg.
-     SpeechBackground() -- clarified in the docstrings that the timeout is an integer seconds.
   * Added maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
   * Added the jittertargetextra configuration option.
   * Added G729 passthrough support to chan_phone for Sigma Designs boards.
-  * Added 's' option to Page application.
-  * Added 'E' and 'V' commands to ExternalIVR.
-  * Added 'o' and 'X' options to Chanspy.
   * Added a new CDR module, cdr_sqlite3_custom.
   * The cdr_manager module has a [mappings] feature, like cdr_custom,
     to add fields to the manager event from the CDR variables.
   * Added a new realtime configuration module, res_config_sqlite
-  * Added a new dialplan application, Bridge, which allows you to bridge the
-     calling channel to any other active channel on the system.
   * Added support for setting the CoS for VLAN traffic (802.1p).  See the sample
      configuration files for the IP channel drivers.  The new option is "cos".
      This information is also documented in doc/qos.tex, or the IP Quality of Service
@@ -314,8 +340,15 @@
      It allows you to configure a prefix for auto-monitor recordings.
   * Added support for writing and running your dialplan in lua.  See
      configs/extensions.lua.sample for examples of how to do this.
- * Added a new channel driver, chan_unistim.  See doc/unistim.txt and
-    configs/unistim.conf.sample for details.  This new channel driver allows
-    you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
- * Enhanced "agi debug" to print the channel name as a prefix to the debug
-    output to make debugging on busy systems much easier.
+  * Added a new channel driver, chan_unistim.  See doc/unistim.txt and
+     configs/unistim.conf.sample for details.  This new channel driver allows
+     you to use Nortel i2002, i2004, and i2050 phones with Asterisk.
+  * A new extension pattern matching algorithm, based on a trie, is introduced
+    here, that could noticeably speed up mid-sized to large dialplans.
+    It is NOT used by default, as duplicating the behaviour of the old pattern
+    matcher is still under development. A config file option, in extensions.conf,
+    in the [general] section, called "extenpatternmatchingnew", is by default
+    set to false; setting that to true will force the use of the new algorithm.
+    Also, the cli commands "dialplan set extenpatternmatchingnew true/false" can
+    be used to switch the algorithms at run time.
+

Modified: team/russell/events/Makefile
URL: http://svn.digium.com/view/asterisk/team/russell/events/Makefile?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/Makefile (original)
+++ team/russell/events/Makefile Tue Nov 27 13:33:26 2007
@@ -251,7 +251,7 @@
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
 
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr funcs main res
 OTHER_SUBDIRS:=utils agi
 SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
 SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -293,6 +293,9 @@
 	mK=" make"
 endif
 
+# comment to print directories during submakes
+PRINT_DIR?= --no-print-directory
+
 all: _all
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, and +"  
@@ -301,7 +304,7 @@
 	@echo " +               $(mK) install               +"  
 	@echo " +-------------------------------------------+"  
 
-_all: cleantest $(SUBDIRS)
+_all: cleantest makeopts $(SUBDIRS)
 
 makeopts: configure
 	@echo "****"
@@ -314,34 +317,46 @@
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
 $(MOD_SUBDIRS_EMBED_LDSCRIPT):
-	@echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+	@echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LDFLAGS):
-	@echo "EMBED_LDFLAGS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+	@echo "EMBED_LDFLAGS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
 
 $(MOD_SUBDIRS_EMBED_LIBS):
-	@echo "EMBED_LIBS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+	@echo "EMBED_LIBS+="`$(MAKE) --quiet $(PRINT_DIR) -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
 
 makeopts.embed_rules: menuselect.makeopts
 	@echo "Generating embedded module rules ..."
 	@rm -f $@
-	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDSCRIPT)
-	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
-	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
+	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LDFLAGS)
+	@$(MAKE) $(PRINT_DIR) $(MOD_SUBDIRS_EMBED_LIBS)
 
 $(SUBDIRS): include/asterisk/version.h include/asterisk/build.h include/asterisk/buildopts.h defaults.h makeopts.embed_rules
 
-# ensure that all module subdirectories are processed before 'main' during
-# a parallel build, since if there are modules selected to be embedded the
-# directories containing them must be completed before the main Asterisk
-# binary can be built
+ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+    # Non-windows:
+    # ensure that all module subdirectories are processed before 'main' during
+    # a parallel build, since if there are modules selected to be embedded the
+    # directories containing them must be completed before the main Asterisk
+    # binary can be built
 main: $(filter-out main,$(MOD_SUBDIRS))
+else
+    # Windows: we need to build main (i.e. the asterisk dll) first,
+    # followed by res, followed by the other directories, because
+    # dll symbols must be resolved during linking and not at runtime.
+D1:= $(filter-out main,$(MOD_SUBDIRS))
+D1:= $(filter-out res,$(D1))
+
+$(D1): res
+res:	main
+endif
 
 $(MOD_SUBDIRS):
-	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+	@ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 $(OTHER_SUBDIRS):
-	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) --no-print-directory --no-builtin-rules -C $@ SUBDIR=$@ all
+	@ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(MAKE) $(PRINT_DIR) --no-builtin-rules -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
@@ -372,10 +387,10 @@
 	@rm -f $@.tmp
 
 $(SUBDIRS_CLEAN):
-	@$(MAKE) --no-print-directory -C $(@:-clean=) clean
+	@$(MAKE) $(PRINT_DIR) -C $(@:-clean=) clean
 
 $(SUBDIRS_DIST_CLEAN):
-	@$(MAKE) --no-print-directory -C $(@:-dist-clean=) dist-clean
+	@$(MAKE) $(PRINT_DIR) -C $(@:-dist-clean=) dist-clean
 
 clean: $(SUBDIRS_CLEAN)
 	rm -f defaults.h
@@ -668,11 +683,11 @@
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/debian_version ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.debian.asterisk $(DESTDIR)/etc/init.d/asterisk; \
-			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 10 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
+			if [ -z "$(DESTDIR)" ]; then /usr/sbin/update-rc.d asterisk start 50 2 3 4 5 . stop 91 2 3 4 5 .; fi; \
 		elif [ -f /etc/gentoo-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.gentoo.asterisk $(DESTDIR)/etc/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/rc-update add asterisk default; fi; \
-		elif [ -f /etc/mandrake-release ]; then \
+		elif [ -f /etc/mandrake-release -o -f /etc/mandriva-release ]; then \
 			$(INSTALL) -m 755 contrib/init.d/rc.mandrake.asterisk $(DESTDIR)/etc/rc.d/init.d/asterisk; \
 			if [ -z "$(DESTDIR)" ]; then /sbin/chkconfig --add asterisk; fi; \
 		elif [ -f /etc/SuSE-release -o -f /etc/novell-release ]; then \
@@ -698,7 +713,7 @@
 	@cmp -s .cleancount .lastclean || $(MAKE) clean
 
 $(SUBDIRS_UNINSTALL):
-	@$(MAKE) --no-print-directory -C $(@:-uninstall=) uninstall
+	@$(MAKE) $(PRINT_DIR) -C $(@:-uninstall=) uninstall
 
 _uninstall: $(SUBDIRS_UNINSTALL)
 	rm -f $(DESTDIR)$(MODULES_DIR)/*

Modified: team/russell/events/Makefile.moddir_rules
URL: http://svn.digium.com/view/asterisk/team/russell/events/Makefile.moddir_rules?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/Makefile.moddir_rules (original)
+++ team/russell/events/Makefile.moddir_rules Tue Nov 27 13:33:26 2007
@@ -43,8 +43,12 @@
 $(addsuffix .oo,$(CC_MODS)) $(addsuffix .o,$(C_MODS)):	\
 	ASTCFLAGS+= -DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
 
+ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
+   # don't define -fPIC on mingw32 and cygwin, it is the default
+   $(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+endif
+
 # For loadable modules, pass _LIB and _LDFLAGS from menuselect.
-$(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
 $(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
 $(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
 
@@ -54,12 +58,17 @@
 $(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
 
 modules.link: $(addsuffix .eo,$(filter $(EMBEDDED_MODS),$(C_MODS)))
-modules.link: $(addsuffix .eoo,$(filter $(EMBEDDED_MODS),$(CC_MODS)))
 
 .PHONY: clean uninstall _all
 
 ifneq ($(LOADABLE_MODS),)
 _all: $(LOADABLE_MODS:%=%.so)
+ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+  # linker options and extra libraries for cygwin
+  SOLINK=-Wl,--out-implib=lib$@.a -shared
+  LIBS+=-L../main -lasterisk -L../res $($@_LIBS)
+  # additional libraries in res/
+endif
 endif
 
 ifneq ($(EMBEDDED_MODS),)
@@ -80,11 +89,11 @@
 
 modules.link:
 	@rm -f $@
-	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
-	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo %.eoo,$^)); do echo "INPUT (../$${file})" >> $@; done
+	@for file in $(patsubst %,$(SUBDIR)/%,$(filter %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
+	@for file in $(patsubst %,$(SUBDIR)/%,$(filter-out %.eo,$^)); do echo "INPUT (../$${file})" >> $@; done
 
 clean::
-	rm -f *.so *.o *.oo *.eo *.eoo
+	rm -f *.so *.o *.oo *.eo
 	rm -f .*.o.d .*.oo.d
 	rm -f *.s *.i
 	rm -f modules.link

Modified: team/russell/events/Makefile.rules
URL: http://svn.digium.com/view/asterisk/team/russell/events/Makefile.rules?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/Makefile.rules (original)
+++ team/russell/events/Makefile.rules Tue Nov 27 13:33:26 2007
@@ -85,7 +85,7 @@
 	$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<
 	$(CMD_PREFIX) rm -f .$@.ld
 
-%.eoo: %.o
+%.eo: %.oo
 	$(ECHO_PREFIX) echo "   [EMBED] $< -> $@"
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/make_linker_eo_script $* > .$@.ld
 	$(CMD_PREFIX) $(LD) -r -T .$@.ld -o $@ $<

Modified: team/russell/events/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/russell/events/UPGRADE.txt?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/UPGRADE.txt (original)
+++ team/russell/events/UPGRADE.txt Tue Nov 27 13:33:26 2007
@@ -47,6 +47,9 @@
   '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.
+
 Voicemail:
 
 * The voicemail configuration values 'maxmessage' and 'minmessage' have
@@ -78,6 +81,9 @@
   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.
+* 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.
 
 Dialplan Functions:
 
@@ -98,19 +104,23 @@
 
 * 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 increasing the volume
+  choppiness or the clipping of loud signal peaks.  To increase the volume
   of voicemail messages, use the 'volgain' option in voicemail.conf
 
 Channel Drivers:
 
-* chan_sip.c: a small upgrade to support the "Record" button on the SNOM360,
+* 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"
+  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".
 
 * 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

Modified: team/russell/events/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/russell/events/acinclude.m4?view=diff&rev=89700&r1=89699&r2=89700
==============================================================================
--- team/russell/events/acinclude.m4 (original)
+++ team/russell/events/acinclude.m4 Tue Nov 27 13:33:26 2007
@@ -1,3 +1,7 @@
+# Various support functions for configure.ac in asterisk
+#
+
+# Helper function to check for gcc attributes.
 # AST_GCC_ATTRIBUTE([attribute name])
 
 AC_DEFUN([AST_GCC_ATTRIBUTE],
@@ -11,35 +15,43 @@
 	AC_MSG_RESULT(no))
 ])
 
-# AST_EXT_LIB_SETUP([package symbol name], [package friendly name], [package option name], [additional help text])
+# Helper function to setup variables for a package.
+# $1 -> the package name. Used in configure.ac and also as a prefix
+#	for the variables ($1_DIR, $1_INCLUDE, $1_LIB) in makeopts
+# $3 ->	option name, used in --with-$3 or --without-$3 when calling configure.
+# $2 and $4 are just text describing the package (short and long form)
+
+# AST_EXT_LIB_SETUP([package], [short description], [configure option name], [long description])
 
 AC_DEFUN([AST_EXT_LIB_SETUP],
 [
-$1_DESCRIP="$2"
-$1_OPTION="$3"
-AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),[
-case ${withval} in
-     n|no)
-     USE_$1=no
-     ;;
-     y|ye|yes)
-     ac_mandatory_list="${ac_mandatory_list} $1"
-     ;;
-     *)
-     $1_DIR="${withval}"
-     ac_mandatory_list="${ac_mandatory_list} $1"
-     ;;
-esac
-])
-PBX_$1=0
-AC_SUBST([$1_LIB])
-AC_SUBST([$1_INCLUDE])
-AC_SUBST([$1_DIR])
-AC_SUBST([PBX_$1])
+    $1_DESCRIP="$2"
+    $1_OPTION="$3"
+    AC_ARG_WITH([$3], AC_HELP_STRING([--with-$3=PATH],[use $2 files in PATH $4]),
+    [
+	case ${withval} in
+	n|no)
+	USE_$1=no
+	;;
+	y|ye|yes)

[... 23073 lines stripped ...]

