[svn-commits] oej: branch oej/manager-check-trunk r277104 - in /team/oej/manager-check-trun...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jul 16 08:41:15 CDT 2010
Author: oej
Date: Fri Jul 16 08:40:59 2010
New Revision: 277104
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277104
Log:
resolve conflict, fix some reviewboard stuff in the middle of all this mess
Added:
team/oej/manager-check-trunk/doc/building_queues.txt
- copied unchanged from r242186, trunk/doc/building_queues.txt
team/oej/manager-check-trunk/doc/lang/vietnamese.ods
- copied unchanged from r242186, trunk/doc/lang/vietnamese.ods
team/oej/manager-check-trunk/include/asterisk/test.h
- copied unchanged from r242186, trunk/include/asterisk/test.h
team/oej/manager-check-trunk/main/asterisk.dynamics
- copied unchanged from r242186, trunk/main/asterisk.dynamics
team/oej/manager-check-trunk/main/test.c
- copied unchanged from r242186, trunk/main/test.c
team/oej/manager-check-trunk/tests/test_ast_format_str_reduce.c
- copied unchanged from r242186, trunk/tests/test_ast_format_str_reduce.c
Modified:
team/oej/manager-check-trunk/ (props changed)
team/oej/manager-check-trunk/CHANGES
team/oej/manager-check-trunk/Makefile
team/oej/manager-check-trunk/Makefile.rules
team/oej/manager-check-trunk/UPGRADE.txt
team/oej/manager-check-trunk/addons/cdr_mysql.c
team/oej/manager-check-trunk/addons/chan_mobile.c
team/oej/manager-check-trunk/addons/chan_ooh323.c
team/oej/manager-check-trunk/addons/chan_ooh323.h
team/oej/manager-check-trunk/addons/format_mp3.c
team/oej/manager-check-trunk/addons/ooh323c/src/ooCalls.c
team/oej/manager-check-trunk/addons/ooh323c/src/oochannels.c
team/oej/manager-check-trunk/addons/ooh323c/src/ooh245.c
team/oej/manager-check-trunk/addons/ooh323c/src/ooh323.c
team/oej/manager-check-trunk/addons/ooh323c/src/ooq931.c
team/oej/manager-check-trunk/addons/ooh323c/src/ooq931.h
team/oej/manager-check-trunk/addons/ooh323cDriver.c
team/oej/manager-check-trunk/addons/ooh323cDriver.h
team/oej/manager-check-trunk/addons/res_config_mysql.c
team/oej/manager-check-trunk/apps/app_amd.c
team/oej/manager-check-trunk/apps/app_chanspy.c
team/oej/manager-check-trunk/apps/app_dial.c
team/oej/manager-check-trunk/apps/app_directed_pickup.c
team/oej/manager-check-trunk/apps/app_directory.c
team/oej/manager-check-trunk/apps/app_externalivr.c
team/oej/manager-check-trunk/apps/app_fax.c
team/oej/manager-check-trunk/apps/app_followme.c
team/oej/manager-check-trunk/apps/app_jack.c
team/oej/manager-check-trunk/apps/app_meetme.c
team/oej/manager-check-trunk/apps/app_minivm.c
team/oej/manager-check-trunk/apps/app_mixmonitor.c
team/oej/manager-check-trunk/apps/app_mp3.c
team/oej/manager-check-trunk/apps/app_osplookup.c
team/oej/manager-check-trunk/apps/app_page.c
team/oej/manager-check-trunk/apps/app_queue.c
team/oej/manager-check-trunk/apps/app_readexten.c
team/oej/manager-check-trunk/apps/app_record.c
team/oej/manager-check-trunk/apps/app_sendtext.c
team/oej/manager-check-trunk/apps/app_stack.c
team/oej/manager-check-trunk/apps/app_voicemail.c
team/oej/manager-check-trunk/apps/app_waitforring.c
team/oej/manager-check-trunk/apps/app_waitforsilence.c
team/oej/manager-check-trunk/build_tools/cflags-devmode.xml
team/oej/manager-check-trunk/build_tools/make_version_c
team/oej/manager-check-trunk/build_tools/make_version_h
team/oej/manager-check-trunk/cdr/cdr_adaptive_odbc.c
team/oej/manager-check-trunk/cdr/cdr_tds.c
team/oej/manager-check-trunk/cel/cel_adaptive_odbc.c
team/oej/manager-check-trunk/cel/cel_tds.c
team/oej/manager-check-trunk/channels/chan_agent.c
team/oej/manager-check-trunk/channels/chan_dahdi.c
team/oej/manager-check-trunk/channels/chan_h323.c
team/oej/manager-check-trunk/channels/chan_iax2.c
team/oej/manager-check-trunk/channels/chan_local.c
team/oej/manager-check-trunk/channels/chan_mgcp.c
team/oej/manager-check-trunk/channels/chan_misdn.c
team/oej/manager-check-trunk/channels/chan_phone.c
team/oej/manager-check-trunk/channels/chan_sip.c
team/oej/manager-check-trunk/channels/chan_skinny.c
team/oej/manager-check-trunk/channels/chan_unistim.c
team/oej/manager-check-trunk/channels/chan_vpb.cc
team/oej/manager-check-trunk/channels/sig_analog.c
team/oej/manager-check-trunk/channels/sig_analog.h
team/oej/manager-check-trunk/channels/sig_pri.c
team/oej/manager-check-trunk/channels/sig_pri.h
team/oej/manager-check-trunk/configs/cdr_mysql.conf.sample
team/oej/manager-check-trunk/configs/extensions.conf.sample
team/oej/manager-check-trunk/configs/iax.conf.sample
team/oej/manager-check-trunk/configs/jabber.conf.sample
team/oej/manager-check-trunk/configs/manager.conf.sample
team/oej/manager-check-trunk/configs/osp.conf.sample
team/oej/manager-check-trunk/configs/queues.conf.sample
team/oej/manager-check-trunk/configs/sip.conf.sample
team/oej/manager-check-trunk/configs/voicemail.conf.sample
team/oej/manager-check-trunk/configure
team/oej/manager-check-trunk/configure.ac
team/oej/manager-check-trunk/contrib/init.d/rc.archlinux.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.debian.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.gentoo.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.mandriva.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.redhat.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.slackware.asterisk
team/oej/manager-check-trunk/contrib/init.d/rc.suse.asterisk
team/oej/manager-check-trunk/contrib/scripts/safe_asterisk
team/oej/manager-check-trunk/contrib/upstart/asterisk.upstart-0.3.9
team/oej/manager-check-trunk/contrib/upstart/asterisk.user.conf
team/oej/manager-check-trunk/contrib/valgrind.supp
team/oej/manager-check-trunk/doc/CODING-GUIDELINES
team/oej/manager-check-trunk/doc/asterisk.sgml
team/oej/manager-check-trunk/doc/externalivr.txt
team/oej/manager-check-trunk/doc/janitor-projects.txt
team/oej/manager-check-trunk/doc/tex/channelvariables.tex
team/oej/manager-check-trunk/doc/tex/imapstorage.tex
team/oej/manager-check-trunk/formats/format_g723.c
team/oej/manager-check-trunk/formats/format_g726.c
team/oej/manager-check-trunk/formats/format_g729.c
team/oej/manager-check-trunk/formats/format_gsm.c
team/oej/manager-check-trunk/formats/format_h263.c
team/oej/manager-check-trunk/formats/format_h264.c
team/oej/manager-check-trunk/formats/format_ilbc.c
team/oej/manager-check-trunk/formats/format_jpeg.c
team/oej/manager-check-trunk/formats/format_ogg_vorbis.c
team/oej/manager-check-trunk/formats/format_pcm.c
team/oej/manager-check-trunk/formats/format_siren14.c
team/oej/manager-check-trunk/formats/format_siren7.c
team/oej/manager-check-trunk/formats/format_sln.c
team/oej/manager-check-trunk/formats/format_sln16.c
team/oej/manager-check-trunk/formats/format_vox.c
team/oej/manager-check-trunk/formats/format_wav.c
team/oej/manager-check-trunk/formats/format_wav_gsm.c
team/oej/manager-check-trunk/funcs/func_cdr.c
team/oej/manager-check-trunk/funcs/func_groupcount.c
team/oej/manager-check-trunk/funcs/func_lock.c
team/oej/manager-check-trunk/funcs/func_math.c
team/oej/manager-check-trunk/funcs/func_strings.c
team/oej/manager-check-trunk/include/asterisk/_private.h
team/oej/manager-check-trunk/include/asterisk/app.h
team/oej/manager-check-trunk/include/asterisk/astmm.h
team/oej/manager-check-trunk/include/asterisk/astobj2.h
team/oej/manager-check-trunk/include/asterisk/audiohook.h
team/oej/manager-check-trunk/include/asterisk/autoconfig.h.in
team/oej/manager-check-trunk/include/asterisk/callerid.h
team/oej/manager-check-trunk/include/asterisk/cdr.h
team/oej/manager-check-trunk/include/asterisk/cel.h
team/oej/manager-check-trunk/include/asterisk/channel.h
team/oej/manager-check-trunk/include/asterisk/compat.h
team/oej/manager-check-trunk/include/asterisk/doxygen/commits.h
team/oej/manager-check-trunk/include/asterisk/doxyref.h
team/oej/manager-check-trunk/include/asterisk/event.h
team/oej/manager-check-trunk/include/asterisk/file.h
team/oej/manager-check-trunk/include/asterisk/http.h
team/oej/manager-check-trunk/include/asterisk/jabber.h
team/oej/manager-check-trunk/include/asterisk/logger.h
team/oej/manager-check-trunk/include/asterisk/manager.h
team/oej/manager-check-trunk/include/asterisk/mod_format.h
team/oej/manager-check-trunk/include/asterisk/pbx.h
team/oej/manager-check-trunk/include/asterisk/rtp_engine.h
team/oej/manager-check-trunk/include/asterisk/security_events.h
team/oej/manager-check-trunk/include/asterisk/srv.h
team/oej/manager-check-trunk/include/asterisk/stringfields.h
team/oej/manager-check-trunk/include/asterisk/strings.h
team/oej/manager-check-trunk/include/asterisk/syslog.h
team/oej/manager-check-trunk/include/asterisk/threadstorage.h
team/oej/manager-check-trunk/include/asterisk/time.h
team/oej/manager-check-trunk/include/asterisk/udptl.h
team/oej/manager-check-trunk/include/asterisk/unaligned.h
team/oej/manager-check-trunk/main/Makefile
team/oej/manager-check-trunk/main/acl.c
team/oej/manager-check-trunk/main/app.c
team/oej/manager-check-trunk/main/ast_expr2.c
team/oej/manager-check-trunk/main/ast_expr2.fl
team/oej/manager-check-trunk/main/ast_expr2.y
team/oej/manager-check-trunk/main/ast_expr2f.c
team/oej/manager-check-trunk/main/asterisk.c
team/oej/manager-check-trunk/main/astobj2.c
team/oej/manager-check-trunk/main/audiohook.c
team/oej/manager-check-trunk/main/callerid.c
team/oej/manager-check-trunk/main/cdr.c
team/oej/manager-check-trunk/main/channel.c
team/oej/manager-check-trunk/main/cli.c
team/oej/manager-check-trunk/main/config.c
team/oej/manager-check-trunk/main/dsp.c
team/oej/manager-check-trunk/main/enum.c
team/oej/manager-check-trunk/main/event.c
team/oej/manager-check-trunk/main/features.c
team/oej/manager-check-trunk/main/file.c
team/oej/manager-check-trunk/main/frame.c
team/oej/manager-check-trunk/main/manager.c
team/oej/manager-check-trunk/main/pbx.c
team/oej/manager-check-trunk/main/poll.c
team/oej/manager-check-trunk/main/rtp_engine.c
team/oej/manager-check-trunk/main/say.c
team/oej/manager-check-trunk/main/srv.c
team/oej/manager-check-trunk/main/strcompat.c
team/oej/manager-check-trunk/main/timing.c
team/oej/manager-check-trunk/main/udptl.c
team/oej/manager-check-trunk/main/utils.c
team/oej/manager-check-trunk/pbx/pbx_config.c
team/oej/manager-check-trunk/pbx/pbx_dundi.c
team/oej/manager-check-trunk/pbx/pbx_lua.c
team/oej/manager-check-trunk/res/res_adsi.c
team/oej/manager-check-trunk/res/res_agi.c
team/oej/manager-check-trunk/res/res_calendar_caldav.c
team/oej/manager-check-trunk/res/res_calendar_exchange.c
team/oej/manager-check-trunk/res/res_calendar_icalendar.c
team/oej/manager-check-trunk/res/res_clialiases.c
team/oej/manager-check-trunk/res/res_config_ldap.c
team/oej/manager-check-trunk/res/res_jabber.c
team/oej/manager-check-trunk/res/res_monitor.c
team/oej/manager-check-trunk/res/res_musiconhold.c
team/oej/manager-check-trunk/res/res_phoneprov.c
team/oej/manager-check-trunk/res/res_pktccops.c
team/oej/manager-check-trunk/res/res_rtp_asterisk.c
team/oej/manager-check-trunk/res/res_smdi.c
team/oej/manager-check-trunk/res/res_timing_timerfd.c
team/oej/manager-check-trunk/sounds/Makefile
team/oej/manager-check-trunk/tests/test_heap.c
team/oej/manager-check-trunk/tests/test_sched.c
team/oej/manager-check-trunk/tests/test_skel.c
team/oej/manager-check-trunk/utils/ael_main.c
team/oej/manager-check-trunk/utils/astcanary.c
Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 16 08:40:59 2010
@@ -1,1 +1,1 @@
-/trunk:1-230077
+/trunk:1-242225
Modified: team/oej/manager-check-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/CHANGES?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/CHANGES (original)
+++ team/oej/manager-check-trunk/CHANGES Fri Jul 16 08:40:59 2010
@@ -72,6 +72,13 @@
Applications
------------
+ * Added "ready" option to QUEUE_MEMBER counting to count free agents who's wrap-up
+ timeout has expired.
+ * Added 'R' option to app_queue. This option stops moh and indicates ringing
+ to the caller when an Agent's phone is ringing. This can be used to indicate
+ to the caller that their call is about to be picked up, which is nice when
+ one has been on hold for an extened period of time.
+ * Added .m3u support for Mp3Player application.
* Added progress option to the app_dial D() option. When progress DTMF is
present, those values are sent immediately upon receiving a PROGRESS message
regardless if the call has been answered or not.
@@ -81,12 +88,16 @@
announcements or macros are executed.
* Modified app_dial to set answertime when the called channel answers even if
the called channel hangs up during playback of an announcement.
+ * Modified app_dial 'r' option to support an additional parameter to play an
+ indication tone from indications.conf
* Added c() option to app_chanspy. This option allows custom DTMF to be set
to cycle through the next available channel. By default this is still '*'.
* Added x() option to app_chanspy. This option allows DTMF to be set to
exit the application.
* The Voicemail application has been improved to automatically ignore messages
that only contain silence.
+ * If you set maxmsg to 0 in voicemail.conf, Voicemail will consider the
+ associated mailbox(es) to be greetings-only.
* The ChanSpy application now has the 'S' option, which makes the application
automatically exit once it hits a point where no more channels are available
to spy on.
@@ -101,6 +112,25 @@
configuration for more information.
* The ChanIsAvail application now exposes the returned cause code using a separate
variable, AVAILCAUSECODE, instead of overwriting the device state in AVAILSTATUS.
+ * Added 'd' option to app_followme. This option disables the "Please hold"
+ announcement.
+ * Added 'y' option to app_record. This option enables a mode where any DTMF digit
+ received will terminate recording.
+ * Voicemail now supports per mailbox settings for folders when using IMAP storage.
+ Previously the folder could only be set per context, but has now been extended
+ using the imapfolder option.
+ * Voicemail now allows the pager date format to be specified separately from the
+ email date format.
+ * New applications JabberJoin, JabberLeave, and JabberSendGroup have been added
+ to allow joining, leaving, and sending text to group chats.
+ * MeetMe has a new option 'G' to play an announcement before joining a conference.
+ * Page has a new option 'A(x)' which will playback an announcement simultaneously
+ to all paged phones (and optionally excluding the caller's one using the new
+ option 'n') before the call is bridged.
+ * The 'f' option to Dial has been augmented to take an optional argument. If no
+ argument is provided, the 'f' option works as it always has. If an argument is
+ provided, then the connected party information of all outgoing channels created
+ during the Dial will be set to the argument passed to the 'f' option.
Dialplan Functions
------------------
@@ -146,8 +176,16 @@
mode=multirow. If rowlimit is set, then additional rows may be retrieved
from the same query by using the name of the function which retrieved the
first row as an argument to ODBC_FETCH().
- * Added JABBER_RECEIVE, which permits receiving XMPP messages from the
- dialplan. This function returns the content of the received message.
+ * Added JABBER_RECEIVE, which permits receiving XMPP messages from the
+ dialplan. This function returns the content of the received message.
+ * Added REPLACE, which searches a given variable name for a set of characters,
+ then either replaces them with a single character or deletes them.
+ * Added PASSTHRU, which literally passes the same argument back as its return
+ value. The intent is to be able to use a literal string argument to
+ functions that currently require a variable name as an argument.
+ * HASH-associated variables now can be inherited across channel creation, by
+ prefixing the name of the hash at assignment with the appropriate number of
+ underscores, just like variables.
Dialplan Variables
------------------
@@ -157,6 +195,9 @@
Queue changes
-------------
+ * A new config option, penaltymemberslimit, has been added to queues.conf.
+ When set this option will disregard penalty settings when a queue has too
+ few members.
* A new option, 'I' has been added to both app_queue and app_dial.
By setting this option, Asterisk will not update the caller with
connected line changes or redirecting party changes when they occur.
@@ -277,6 +318,12 @@
but options with the 'tls' prefix are preferred.
* Added a MuteAudio AMI action for muting inbound and/or outbound audio
in a channel. (res_mutestream.so)
+ * The configuration file manager.conf now supports a channelvars option, which
+ specifies a list of channel variables to include in each channel-oriented
+ event.
+ * The redirect command now has new parameters ExtraContext, ExtraExtension,
+ and ExtraPriority to allow redirecting the second channel to a different
+ location than the first.
Channel Event Logging
---------------------
@@ -290,7 +337,7 @@
CDR
---
- * 'linkedid' and 'peeraccount' are new CDR fields available to CDR officianados.
+ * 'linkedid' and 'peeraccount' are new CDR fields available to CDR aficionados.
linkedid is based on uniqueID, but spreads to other channels as transfers, dials,
etc are performed. Thus the peices of CDR can be grouped into multilegged sets.
* Multiple files and formats can now be specified in cdr_custom.conf.
@@ -327,12 +374,21 @@
Miscellaneous
-------------
+ * The transmit_silence_during_record option in asterisk.conf.sample has been removed.
+ Now, in order to enable transmitting silence during record the transmit_silence
+ option should be used. transmit_silence_during_record remains a valid option, but
+ defaults to the behavior of the transmit_silence option.
+ * Addition of the Unit Test Framework API for managing registration and execution
+ of unit tests with the purpose of verifying the operation of C functions.
* SendText is now implemented in chan_gtalk and chan_jingle. It will simply send
XMPP text messages to the remote JID.
* Modules.conf has a new option - "require" - that marks a module as critical for
the execution of Asterisk.
If one of the required modules fail to load, Asterisk will exit with a return
- code set to 2.
+ code set to 2.
+ * An 'X' option has been added to the asterisk application which enables #exec support.
+ This allows #exec to be used in asterisk.conf.
+ * jabber.conf supports a new option auth_policy that toggles auto user registration.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
@@ -343,17 +399,12 @@
* Added support for SUBSCRIBE/NOTIFY with dialog-info based call pickups.
Snom phones use this for call pickup of extensions that the phone is
subscribed to.
- * Added support for subscribing to a voice mailbox on a remote server and
- making the new/old message count available to local devices.
* Added support for setting the domain in the URI for caller of an
outbound call by using the SIPFROMDOMAIN channel variable.
* Added a new configuration option "remotesecret" for authentication to
remote services. For backwards compatibility, "secret" still has the
same function as before, but now you can configure both a remote secret and a
local secret for mutual authentication.
- * Added a new 'faxdetect=yes|no' configuration option to sip.conf. When this
- option is enabled, a SIP channel will go to the fax extension (if it exists)
- after T38 is negotiated. This option is disabled by default.
* If the channel variable ATTENDED_TRANSFER_COMPLETE_SOUND is set,
the sound will be played to the target of an attended transfer
* Added two new configuration options, "qualifygap" and "qualifypeers", which allow
@@ -420,9 +471,8 @@
and FIELDQTY dialplan functions, which also manage lists.
* Added REALTIME_FIELD and REALTIME_HASH, which should aid users in better
obtaining realtime data from the dialplan.
- * Added LOCAL_PEEK, which I have no idea how to use, but Leif Madsen wanted it.
- Russell says it's, like, a scope resolution function for LOCAL variables.
- Totally. Hopefully, that means more to you than it does to me.
+ * Added LOCAL_PEEK, which allows access to variables in any stack frame within
+ a subroutine when using the GoSub() and Return() applications.
* Added AUDIOHOOK_INHERIT. For information on its use, please see the output
of "core show function AUDIOHOOK_INHERIT" from the CLI
* Added AES_ENCRYPT. For information on its use, please see the output
@@ -433,8 +483,6 @@
Applications
------------
- * DAHDISendCallreroutingFacility parameters are now comma-separated,
- instead of the old pipe.
* Scheduled meetme conferences may now have their end times extended by
using MeetMeAdmin.
* app_authenticate now gives the ability to select a prompt other than
@@ -454,9 +502,6 @@
-------------
* The Asterisk CLI has a new command, "channel redirect", which is similar in
operation to the AMI Redirect action.
- * res_jabber: autoprune has been disabled by default, to avoid misconfiguration
- that would end up being interpreted as a bug once Asterisk started removing
- the contacts from a user list.
* extensions.conf now allows you to use keyword "same" to define an extension
without actually specifying an extension. It uses exactly the same pattern
as previously used on the last "exten" line. For example:
@@ -862,6 +907,10 @@
SIP changes
-----------
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf. When this
+ option is enabled, Asterisk will watch for a CNG tone in the incoming audio
+ for a received call. If it is detected, the channel will jump to the
+ 'fax' extension in the dialplan.
* Improved NAT and STUN support.
chan_sip now can use port numbers in bindaddr, externip and externhost
options, as well as contact a STUN server to detect its external address
@@ -1276,6 +1325,11 @@
* If app_stack is loaded, GOSUB is a native AGI command that may be used to
invoke subroutines in the dialplan. Note that calling EXEC with Gosub
does not behave as expected; the native command needs to be used, instead.
+ * Added the ability to perform SRV lookups on fast AGI calls. To use this
+ feature, simply use hagi: instead of agi: as the protocol portion
+ of the URI parameter to the AGI function call in your dial plan. Also note
+ that specifying a port number in the AGI URI will disable SRV lookups,
+ even if you use the hagi: protocol.
Logger changes
--------------
Modified: team/oej/manager-check-trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/Makefile?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/Makefile (original)
+++ team/oej/manager-check-trunk/Makefile Fri Jul 16 08:40:59 2010
@@ -305,8 +305,11 @@
ifneq ($(findstring darwin,$(OSARCH)),)
_ASTCFLAGS+=-D__Darwin__
- SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace /usr/lib/bundle1.o
- _ASTLDFLAGS+= -L/usr/local/lib
+ SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
+ ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6)
+ SOLINK+=/usr/lib/bundle1.o
+ endif
+ _ASTLDFLAGS+=-L/usr/local/lib
else
# These are used for all but Darwin
SOLINK=-shared
@@ -371,6 +374,7 @@
@exit 1
menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ menuselect/menuselect --check-deps $@
menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
@@ -594,7 +598,7 @@
fi
$(SUBDIRS_INSTALL):
- @DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" $(SUBMAKE) -C $(@:-install=) 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)))
@@ -727,9 +731,12 @@
echo ";maxfiles = 1000 ; Maximum amount of openfiles" ; \
echo ";minmemfree = 1 ; in MBs, Asterisk stops accepting new calls if the amount of free memory falls below this watermark" ; \
echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
- echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \
- echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \
- echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \
+ echo ";record_cache_dir = /tmp ; Specify cache directory (used in conjunction with cache_record_files)" ; \
+ echo ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is" ; \
+ echo " ; being generated. Note that the silence internally is generated in raw signed linear format." ; \
+ echo " ; This means that it must be transcoded into the native format of the channel before it can be sent" ; \
+ echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a" ; \
+ echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \
echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
echo ";runuser = asterisk ; The user to run as" ; \
echo ";rungroup = asterisk ; The group to run as" ; \
@@ -816,10 +823,12 @@
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)|;' > $(DESTDIR)/etc/rc.d/init.d/asterisk ;\
chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk;\
+ if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /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)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
+ if [ ! -f /etc/default/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /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)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
@@ -828,10 +837,12 @@
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)|;' > $(DESTDIR)/etc/rc.d/init.d/asterisk ;\
chmod 755 $(DESTDIR)/etc/rc.d/init.d/asterisk;\
+ if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /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)|;' > $(DESTDIR)/etc/init.d/asterisk ;\
chmod 755 $(DESTDIR)/etc/init.d/asterisk;\
+ if [ ! -f /etc/sysconfig/asterisk ]; then install -m 644 contrib/init.d/etc_default_asterisk /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)|;' > $(DESTDIR)/etc/rc.d/asterisk ;\
@@ -856,7 +867,7 @@
@cmp -s .cleancount .lastclean || $(MAKE) clean
$(SUBDIRS_UNINSTALL):
- @$(SUBMAKE) -C $(@:-uninstall=) uninstall
+ +@$(SUBMAKE) -C $(@:-uninstall=) uninstall
_uninstall: $(SUBDIRS_UNINSTALL)
rm -f $(DESTDIR)$(MODULES_DIR)/*
@@ -914,14 +925,14 @@
echo "'make menuselect'."; \
fi
-cmenuselect: menuselect/cmenuselect menuselect-tree
- - at menuselect/cmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-
-gmenuselect: menuselect/gmenuselect menuselect-tree
- - at menuselect/gmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
-
-nmenuselect: menuselect/nmenuselect menuselect-tree
- - at menuselect/nmenuselect menuselect.makeopts $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+cmenuselect: menuselect/cmenuselect menuselect-tree menuselect.makeopts
+ - at menuselect/cmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+gmenuselect: menuselect/gmenuselect menuselect-tree menuselect.makeopts
+ - at menuselect/gmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
+
+nmenuselect: menuselect/nmenuselect menuselect-tree menuselect.makeopts
+ - at menuselect/nmenuselect menuselect.makeopts && (echo "menuselect changes saved!"; rm -f channels/h323/Makefile.ast main/asterisk) || echo "menuselect changes NOT saved!"
# options for make in menuselect/
MAKE_MENUSELECT=CC="$(HOST_CC)" CXX="$(CXX)" LD="" AR="" RANLIB="" CFLAGS="" $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
Modified: team/oej/manager-check-trunk/Makefile.rules
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/Makefile.rules?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/Makefile.rules (original)
+++ team/oej/manager-check-trunk/Makefile.rules Fri Jul 16 08:40:59 2010
@@ -49,7 +49,10 @@
CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(_ASTCFLAGS) $(ASTCFLAGS))
ifeq ($(GNU_LD),1)
-SO_SUPPRESS_SYMBOLS=-Wl,--version-script,$(if $(wildcard $(subst .so,.exports,$@)),$(subst .so,.exports,$@),$(ASTTOPDIR)/default.exports)
+SO_SUPPRESS_SYMBOLS=-Wl,--version-script,$(if $(wildcard $(subst .so,.exports,$@)),$(subst .so,.exports,$@),$(ASTTOPDIR)/default.exports),--warn-common
+ifneq ($(wildcard $(subst .so,.dynamics,$@)),)
+SO_SUPPRESS_SYMBOLS+=-Wl,--dynamic-list,$(subst .so,.dynamics,$@)
+endif
endif
CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS) $(ASTLDFLAGS)
Modified: team/oej/manager-check-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/UPGRADE.txt?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/UPGRADE.txt (original)
+++ team/oej/manager-check-trunk/UPGRADE.txt Fri Jul 16 08:40:59 2010
@@ -61,7 +61,17 @@
is written to expect AVAILSTATUS to contain the cause code it needs to be
changed to use AVAILCAUSECODE.
+* ExternalIVR will now send Z events for invalid or missing files, T events
+ now include the interrupted file and bugs in argument parsing have been
+ fixed so there may be arguments specified in incorrect ways that were
+ working that will no longer work.
+ Please see doc/externalivr.txt for details.
+
From 1.6.1 to 1.6.2:
+
+* SIP no longer sends the 183 progress message for early media by
+ default. Applications requiring early media should use the
+ progress() dialplan app to generate the progress message.
* The firmware for the IAXy has been removed from Asterisk. It can be
downloaded from http://downloads.digium.com/pub/iaxy/. To have Asterisk
@@ -141,6 +151,13 @@
specific localizations. Additionally, "mx" should be changed to "es_MX",
Georgian was incorrectly specified as "ge" but should be "ka", and Czech is
"cs", not "cz".
+
+* DAHDISendCallreroutingFacility() parameters are now comma-separated,
+ instead of the old pipe.
+
+* res_jabber: autoprune has been disabled by default, to avoid misconfiguration
+ that would end up being interpreted as a bug once Asterisk started removing
+ the contacts from a user list.
From 1.6.0.1 to 1.6.1:
Modified: team/oej/manager-check-trunk/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/addons/cdr_mysql.c?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/addons/cdr_mysql.c (original)
+++ team/oej/manager-check-trunk/addons/cdr_mysql.c Fri Jul 16 08:40:59 2010
@@ -66,7 +66,7 @@
static const char name[] = "mysql";
static const char config[] = "cdr_mysql.conf";
-static struct ast_str *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *dbsock = NULL, *dbtable = NULL, *dbcharset = NULL;
+static struct ast_str *hostname = NULL, *dbname = NULL, *dbuser = NULL, *password = NULL, *dbsock = NULL, *dbtable = NULL, *dbcharset = NULL, *cdrzone = NULL;
static struct ast_str *ssl_ca = NULL, *ssl_cert = NULL, *ssl_key = NULL;
@@ -247,7 +247,7 @@
struct timeval tv = ast_tvnow();
struct ast_tm tm;
char timestr[128];
- ast_localtime(&tv, &tm, NULL);
+ ast_localtime(&tv, &tm, ast_str_strlen(cdrzone) ? ast_str_buffer(cdrzone) : NULL);
ast_strftime(timestr, sizeof(timestr), "%Y-%m-%d %T", &tm);
ast_cdr_setvar(cdr, "calldate", timestr, 0);
cdrname = "calldate";
@@ -444,6 +444,15 @@
res |= my_load_config_number(cfg, "global", "port", &dbport, 0);
res |= my_load_config_number(cfg, "global", "timeout", &timeout, 0);
res |= my_load_config_string(cfg, "global", "compat", &compat, "no");
+ res |= my_load_config_string(cfg, "global", "cdrzone", &cdrzone, "");
+ if (ast_str_strlen(cdrzone) == 0) {
+ for (; var; var = var->next) {
+ if (!strcasecmp(var->name, "usegmtime") && ast_true(var->value)) {
+ ast_str_set(&cdrzone, 0, "UTC");
+ }
+ }
+ }
+
if (ast_true(ast_str_buffer(compat))) {
calldate_compat = 1;
} else {
@@ -475,6 +484,7 @@
ast_debug(1, "Got dbname of %s\n", ast_str_buffer(dbname));
ast_debug(1, "Got password of %s\n", ast_str_buffer(password));
ast_debug(1, "%sunning in calldate compatibility mode\n", calldate_compat ? "R" : "Not r");
+ ast_debug(1, "Dates and times are localized to %s\n", S_OR(ast_str_buffer(cdrzone), "local timezone"));
if (dbcharset) {
ast_debug(1, "Got DB charset of %s\n", ast_str_buffer(dbcharset));
Modified: team/oej/manager-check-trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/addons/chan_mobile.c?view=diff&rev=277104&r1=277103&r2=277104
==============================================================================
--- team/oej/manager-check-trunk/addons/chan_mobile.c (original)
+++ team/oej/manager-check-trunk/addons/chan_mobile.c Fri Jul 16 08:40:59 2010
@@ -212,6 +212,7 @@
static int mbl_queue_control(struct mbl_pvt *pvt, enum ast_control_frame_type control);
static int mbl_queue_hangup(struct mbl_pvt *pvt);
static int mbl_ast_hangup(struct mbl_pvt *pvt);
+static int mbl_has_service(struct mbl_pvt *pvt);
static int rfcomm_connect(bdaddr_t src, bdaddr_t dst, int remote_channel);
static int rfcomm_write(int rsock, char *buf);
@@ -270,6 +271,10 @@
#define HFP_CIND_CALLSETUP_INCOMING 1
#define HFP_CIND_CALLSETUP_OUTGOING 2
#define HFP_CIND_CALLSETUP_ALERTING 3
+
+/* service indicator values */
+#define HFP_CIND_SERVICE_NONE 0
+#define HFP_CIND_SERVICE_AVAILABLE 1
/*!
* \brief This struct holds HFP features that we support.
@@ -468,7 +473,7 @@
char bdaddr[18];
char group[6];
-#define FORMAT1 "%-15.15s %-17.17s %-5.5s %-15.15s %-9.9s %-5.5s %-3.3s\n"
+#define FORMAT1 "%-15.15s %-17.17s %-5.5s %-15.15s %-9.9s %-10.10s %-3.3s\n"
switch (cmd) {
case CLI_INIT:
@@ -496,7 +501,7 @@
group,
pvt->adapter->id,
pvt->connected ? "Yes" : "No",
- (!pvt->connected) ? "None" : (pvt->owner) ? "Busy" : (pvt->outgoing_sms || pvt->incoming_sms) ? "SMS" : "Free",
+ (!pvt->connected) ? "None" : (pvt->owner) ? "Busy" : (pvt->outgoing_sms || pvt->incoming_sms) ? "SMS" : (mbl_has_service(pvt)) ? "Free" : "No Service",
(pvt->has_sms) ? "Yes" : "No"
);
ast_mutex_unlock(&pvt->lock);
@@ -901,6 +906,10 @@
AST_RWLIST_RDLOCK(&devices);
AST_RWLIST_TRAVERSE(&devices, pvt, entry) {
if (group > -1 && pvt->group == group && pvt->connected && !pvt->owner) {
+ if (!mbl_has_service(pvt)) {
+ continue;
+ }
+
break;
} else if (!strcmp(pvt->id, dest_dev)) {
break;
@@ -1200,6 +1209,9 @@
res = AST_DEVICE_INUSE;
else
res = AST_DEVICE_NOT_INUSE;
+
+ if (!mbl_has_service(pvt))
+ res = AST_DEVICE_UNAVAILABLE;
}
ast_mutex_unlock(&pvt->lock);
@@ -1326,6 +1338,30 @@
return res;
}
+/*!
+ * \brief Check if a mobile device has service.
+ * \param pvt a mbl_pvt struct
+ * \retval 1 this device has service
+ * \retval 0 no service
+ *
[... 23032 lines stripped ...]
More information about the svn-commits
mailing list