[asterisk-commits] oej: branch oej/pinelonely-meetme-single-user-hangup-trunk r326633 - in /team...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Jul 7 01:50:00 CDT 2011
Author: oej
Date: Thu Jul 7 01:49:45 2011
New Revision: 326633
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=326633
Log:
Resolve, reset
Added:
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/scripts/file.convert.sh
- copied unchanged from r326544, trunk/contrib/scripts/file.convert.sh
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/scripts/import-cdr-csv-mysql.pl
- copied unchanged from r326544, trunk/contrib/scripts/import-cdr-csv-mysql.pl
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/message.h
- copied unchanged from r326544, trunk/include/asterisk/message.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/message.c
- copied unchanged from r326544, trunk/main/message.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/tests/test_db.c
- copied unchanged from r326544, trunk/tests/test_db.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/tests/test_netsock2.c
- copied unchanged from r326544, trunk/tests/test_netsock2.c
Removed:
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_features.exports.in
Modified:
team/oej/pinelonely-meetme-single-user-hangup-trunk/ (props changed)
team/oej/pinelonely-meetme-single-user-hangup-trunk/CHANGES
team/oej/pinelonely-meetme-single-user-hangup-trunk/Makefile
team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE-1.8.txt
team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE.txt
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/app_mysql.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/cdr_mysql.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_mobile.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_ooh323.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/oochannels.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/ooh245.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/res_config_mysql.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_chanspy.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_confbridge.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_dial.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_directed_pickup.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_fax.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_meetme.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_privacy.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_queue.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_rpt.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_stack.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_userevent.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_voicemail.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/confbridge/conf_config_parser.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/confbridge/include/confbridge.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/autoconf/ast_check_pwlib.m4
team/oej/pinelonely-meetme-single-user-hangup-trunk/bridges/bridge_softmix.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/build_tools/prep_tarball
team/oej/pinelonely-meetme-single-user-hangup-trunk/cdr/cdr_radius.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/cdr/cdr_syslog.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/cel/cel_odbc.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/cel/cel_pgsql.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/cel/cel_radius.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_alsa.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_bridge.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_console.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_dahdi.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_gtalk.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_h323.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_iax2.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_jingle.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_local.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_mgcp.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_oss.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_sip.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_skinny.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_unistim.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/chan_usbradio.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/iax2-provision.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/misdn/isdn_lib.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/misdn_config.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sig_pri.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sig_pri.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sig_ss7.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sip/include/sip.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sip/reqresp_parser.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/channels/sip/sdp_crypto.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/codecs/codec_speex.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/cel.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/cel_pgsql.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/chan_dahdi.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/confbridge.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/extensions.lua.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/features.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/jabber.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/queuerules.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/queues.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/sip.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configs/sip_notify.conf.sample
team/oej/pinelonely-meetme-single-user-hangup-trunk/configure
team/oej/pinelonely-meetme-single-user-hangup-trunk/configure.ac
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/init.d/rc.debian.asterisk
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/realtime/mysql/meetme.sql
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/realtime/mysql/queue_log.sql
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/realtime/mysql/sipfriends.sql
team/oej/pinelonely-meetme-single-user-hangup-trunk/contrib/scripts/safe_asterisk
team/oej/pinelonely-meetme-single-user-hangup-trunk/formats/format_wav.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/funcs/func_aes.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/funcs/func_channel.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/funcs/func_jitterbuffer.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/funcs/func_speex.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/funcs/func_strings.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/_private.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/acl.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/astdb.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/autoconfig.h.in
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/bridging.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/channel.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/dnsmgr.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/dsp.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/event.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/features.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/frame.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/jabber.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/logger.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/netsock2.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/pbx.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/res_fax.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/rtp_engine.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/stringfields.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/include/asterisk/utils.h
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/app.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/asterisk.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/bridging.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/ccss.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/cdr.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/channel.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/db.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/dnsmgr.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/dsp.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/event.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/features.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/file.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/format_cap.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/frame.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/http.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/manager.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/netsock2.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/pbx.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/rtp_engine.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/srv.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/tcptls.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/main/utils.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/pbx/pbx_config.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/pbx/pbx_dundi.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/pbx/pbx_lua.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/Makefile
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_agi.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_calendar.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_config_curl.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_config_odbc.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_config_pgsql.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_config_sqlite.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_crypto.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_fax.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_fax_spandsp.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_http_post.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_jabber.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_musiconhold.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_odbc.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_rtp_asterisk.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/res/res_srtp.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/tests/test_astobj2.c
team/oej/pinelonely-meetme-single-user-hangup-trunk/tests/test_event.c
Propchange: team/oej/pinelonely-meetme-single-user-hangup-trunk/
------------------------------------------------------------------------------
automerge = http://www.codename-pineapple.org/
Propchange: team/oej/pinelonely-meetme-single-user-hangup-trunk/
------------------------------------------------------------------------------
--- branch-1.8-blocked (original)
+++ branch-1.8-blocked Thu Jul 7 01:49:45 2011
@@ -1,1 +1,1 @@
-/branches/1.8:299531,313436
+/branches/1.8:299531,313436,317858,317861,321335,321753,322585,323730
Propchange: team/oej/pinelonely-meetme-single-user-hangup-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Propchange: team/oej/pinelonely-meetme-single-user-hangup-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 7 01:49:45 2011
@@ -1,1 +1,1 @@
-/trunk:1-316396
+/trunk:1-326588
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/CHANGES?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/CHANGES (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/CHANGES Thu Jul 7 01:49:45 2011
@@ -12,9 +12,23 @@
--- Functionality changes from Asterisk 1.8 to Asterisk 1.10 -----------------
------------------------------------------------------------------------------
+Text Messaging
+--------------
+ * Asterisk now has protocol independent support for processing text messages
+ outside of a call. Messages are routed through the Asterisk dialplan.
+ SIP MESSAGE and XMPP are currently supported. There are options in
+ jabber.conf and sip.conf to allow enabling these features.
+ -> jabber.conf: see the "sendtodialplan" and "context" options.
+ -> sip.conf: see the "accept_outofcall_message", "auth_message_requests"
+ and "outofcall_message_context" options.
+ The MESSAGE() dialplan function and MessageSend() application have been
+ added to go along with this functionality. More detailed usage information
+ can be found on the Asterisk wiki (http://wiki.asterisk.org/).
+
Parking
-------
* parkedmusicclass can now be set for non-default parking lots.
+ * ParkedCall application can now specify a specific parkinglot.
Asterisk Manager Interface
--------------------------
@@ -26,6 +40,10 @@
* DAHDIShowChannels, SIPshowpeer, SIPpeers, and IAXpeers now contains a
Description field that is set by 'description' in the channel configuration
file.
+ * Added Uniqueid header to UserEvent.
+ * Added new action FilterAdd to control event filters for the current session.
+ This requires the system permission and uses the same filter syntax as
+ filters that can be defined in manager.conf
Asterisk HTTP Server
--------------------------
@@ -64,6 +82,11 @@
mixing audio at sample rates ranging from 8khz-96khz.
* CONFBRIDGE dialplan function capable of creating dynamic ConfBridge user
and bridge profiles on a channel.
+ * CONFBRIDGE_INFO dialplan function capable of retreiving information
+ about a conference such as locked status and number of parties, admins,
+ and marked users.
+ * Addition of video_mode option in confbridge.conf for adding video support
+ into a bridge profile.
Dialplan Variables
------------------
@@ -79,6 +102,10 @@
have the rx streams jitterbuffered before conference mixing occurs.
* Added DB_KEYS, which lists the next set of keys in the Asterisk database
hierarchy.
+ * Added STRREPLACE function. This function let's the user search a variable
+ for a given string to replace with another string as many times as the
+ user specifies or just throughout the whole string.
+ * Added option to CHANNEL(pickupgroup) allow reading and setting the pickupgroup of channel.
libpri channel driver (chan_dahdi) DAHDI changes
--------------------------
@@ -93,6 +120,8 @@
--------------------------
* Added setvar option to calendar.conf to allow setting channel variables on
notification channels.
+ * Added "calendar show types" CLI command to list registered calendar
+ connectors.
MixMonitor
--------------------------
@@ -113,6 +142,58 @@
* Added option "k" that will automatically close the conference when there's
only one person left when a user exits the conference.
+CEL
+--------------------------
+ * cel_pgsql now supports the 'extra' column for data added using the
+ CELGenUserEvent() application.
+
+pbx_lua
+--------------------------
+ * Support for defining hints has been added to pbx_lua. See the 'hints' table
+ in the sample extensions.lua file for syntax details.
+ * Applications that perform jumps in the dialplan such as Goto will now
+ execute properly. When pbx_lua detects that the context, extension, or
+ priority we are executing on has changed it will immediatly return control
+ to the asterisk PBX engine. Currently the engine cannot detect a Goto to
+ the priority after the currently executing priority.
+ * An autoservice is now started by default for pbx_lua channels. It can be
+ stopped and restarted using the autoservice_stop() and autoservice_start()
+ functions.
+
+res_fax
+--------------------------
+ * The ReceiveFAXStatus and SendFAXStatus manager events have been consolidated
+ into a FAXStatus event with an 'Operation' header that will be either
+ 'send', 'receive', and 'gateway'.
+ * T.38 gateway functionality has been added to res_fax (and res_fax_spandsp).
+ Set FAXOPT(gateway)=yes to enable this functionality on a channel. This
+ feature will handle converting a fax call between an audio T.30 fax terminal
+ and an IFP T.38 fax terminal.
+
+SIP Changes
+-----------
+ * Add T38 support for REJECTED state where T.38 Negotiation is explicitly rejected.
+
+Queue changes
+-------------
+ * Added general option negative_penalty_invalid default off. when set
+ members are seen as invalid/logged out when there penalty is negative.
+ for realtime members when set remove from queue will set penalty to -1.
+ * Added queue option autopausedelay when autopause is enabled it will be
+ delayed for this number of seconds since last successful call if there
+ was no prior call the agent will be autopaused immediately.
+ * Added member option ignorebusy this when set and ringinuse is not
+ will allow per member control of multiple calls as ringinuse does for
+ the Queue.
+
+Applications
+------------
+ * Added 'v' option to MeetMe to play voicemail greetings when a user joins/leaves
+ a MeetMe conference
+ * Added ability to include '@parkinglot' to ParkedCall extension in order to specify
+ a specific parkinglot on which to search the extension.
+
+>>>>>>> .merge-right.r326544
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------
------------------------------------------------------------------------------
@@ -286,8 +367,6 @@
notices a change.
* Voicemail now includes rdnis within msgXXXX.txt file.
* Added 'D' command to ExternalIVR full details in doc/externalivr.txt
- * Added 'v' option to MeetMe to play voicemail greetings when a user joins/leaves
- a MeetMe conference
Dialplan Functions
------------------
@@ -543,6 +622,8 @@
* Added a new eventfilter option per user to allow whitelisting and blacklisting
of events.
* Added optional parkinglot variable for park command.
+ * Added ConnectedLineNum and ConnectedLineName headers to AMI events/responses
+ if CallerIDNum and CallerIDName headers are also present.
Channel Event Logging
---------------------
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/Makefile?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/Makefile (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/Makefile Thu Jul 7 01:49:45 2011
@@ -545,7 +545,6 @@
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-csv"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cdr-custom"
- $(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-csv"
$(INSTALL) -d "$(DESTDIR)$(ASTLOGDIR)/cel-custom"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)"
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/documentation"
@@ -558,6 +557,7 @@
$(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http"
$(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8"
$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
+ $(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
bininstall: _all installdirs $(SUBDIRS_INSTALL)
$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
@@ -925,7 +925,7 @@
menuselect/makeopts: makeopts
+$(MAKE_MENUSELECT) makeopts
-menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure
+menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml build_tools/cflags-devmode.xml sounds/sounds.xml build_tools/embed_modules.xml utils/utils.xml agi/agi.xml configure makeopts
@echo "Generating input for menuselect ..."
@echo "<?xml version=\"1.0\"?>" > $@
@echo >> $@
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE-1.8.txt?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE-1.8.txt (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE-1.8.txt Thu Jul 7 01:49:45 2011
@@ -132,6 +132,14 @@
* The default value for the pedantic option in sip.conf has been changed
from "no" to "yes".
+
+* The ConnectedLineNum and ConnectedLineName headers were added to many AMI
+ events/responses if the CallerIDNum/CallerIDName headers were also present.
+ The addition of connected line support changes the behavior of the channel
+ caller ID somewhat. The channel caller ID value no longer time shares with
+ the connected line ID on outgoing call legs. The timing of some AMI
+ events/responses output the connected line ID as caller ID. These party ID's
+ are now separate.
From 1.6.1 to 1.6.2:
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE.txt?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE.txt (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/UPGRADE.txt Thu Jul 7 01:49:45 2011
@@ -21,6 +21,10 @@
From 1.8 to 1.10:
+cel_pgsql:
+ - This module now expects an 'extra' column in the database for data added
+ using the CELGenUserEvent() application.
+
ConfBridge
- ConfBridge's dialplan arguments have changed and are not
backwards compatible.
@@ -38,5 +42,17 @@
- The mohinterpret=passthrough setting is deprecated in favor of
moh_signaling=notify.
+pbx_lua:
+ - Execution no longer continues after applications that do dialplan jumps
+ (such as app.goto). Now when an application such as app.goto() is called,
+ control is returned back to the pbx engine and the current extension
+ function stops executing.
+ - the autoservice now defaults to being on by default
+ - autoservice_start() and autoservice_start() no longer return a value.
+
+Queue:
+ - Mark QUEUE_MEMBER_PENALTY Deprecated it never worked for realtime members
+ - QUEUE_MEMBER is now R/W supporting setting paused, ignorebusy and penalty.
+
===========================================================
===========================================================
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/app_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/app_mysql.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/app_mysql.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/app_mysql.c Thu Jul 7 01:49:45 2011
@@ -546,7 +546,10 @@
result = 0;
if (autoclear) {
- struct ast_datastore *mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
+ struct ast_datastore *mysql_store = NULL;
+
+ ast_channel_lock(chan);
+ mysql_store = ast_channel_datastore_find(chan, &mysql_ds_info, NULL);
if (!mysql_store) {
if (!(mysql_store = ast_datastore_alloc(&mysql_ds_info, NULL))) {
ast_log(LOG_WARNING, "Unable to allocate new datastore.\n");
@@ -555,6 +558,7 @@
ast_channel_datastore_add(chan, mysql_store);
}
}
+ ast_channel_unlock(chan);
}
ast_mutex_lock(&_mysql_mutex);
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/cdr_mysql.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/cdr_mysql.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/cdr_mysql.c Thu Jul 7 01:49:45 2011
@@ -325,7 +325,7 @@
ast_str_make_space(&escape, (valsz = strlen(value)) * 2 + 1);
mysql_real_escape_string(&mysql, ast_str_buffer(escape), value, valsz);
- ast_str_append(&sql1, 0, "%s", entry->name);
+ ast_str_append(&sql1, 0, "`%s`", entry->name);
ast_str_append(&sql2, 0, "'%s'", ast_str_buffer(escape));
}
}
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_mobile.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_mobile.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_mobile.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_mobile.c Thu Jul 7 01:49:45 2011
@@ -1185,7 +1185,7 @@
int res = AST_DEVICE_INVALID;
struct mbl_pvt *pvt;
- device = ast_strdupa(S_OR(data, ""));
+ device = ast_strdupa(S_OR((char *) data, ""));
ast_debug(1, "Checking device state for device %s\n", device);
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_ooh323.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_ooh323.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/chan_ooh323.c Thu Jul 7 01:49:45 2011
@@ -1044,6 +1044,7 @@
static int ooh323_answer(struct ast_channel *ast)
{
struct ooh323_pvt *p = ast->tech_pvt;
+ char *callToken = (char *)NULL;
if (gH323Debug)
ast_verbose("--- ooh323_answer\n");
@@ -1051,8 +1052,18 @@
if (p) {
ast_mutex_lock(&p->lock);
+ callToken = (p->callToken ? strdup(p->callToken) : NULL);
if (ast->_state != AST_STATE_UP) {
ast_channel_lock(ast);
+ if (!p->alertsent) {
+ if (gH323Debug) {
+ ast_debug(1, "Sending forced ringback for %s, res = %d\n",
+ callToken, ooManualRingback(callToken));
+ } else {
+ ooManualRingback(callToken);
+ }
+ p->alertsent = 1;
+ }
ast_setstate(ast, AST_STATE_UP);
if (option_debug)
ast_debug(1, "ooh323_answer(%s)\n", ast->name);
@@ -1220,6 +1231,7 @@
}
p->alertsent = 1;
}
+ p->alertsent = 1;
}
break;
case AST_CONTROL_SRCUPDATE:
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/oochannels.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/oochannels.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/oochannels.c Thu Jul 7 01:49:45 2011
@@ -682,10 +682,11 @@
if (0 != call->pH245Channel && 0 != call->pH245Channel->sock)
{
- if(call->pH245Channel->outQueue.count>0)
- {
- if(ooPDWrite(pfds, nfds, call->pH245Channel->sock))
- ooSendMsg(call, OOH245MSG);
+ if(ooPDWrite(pfds, nfds, call->pH245Channel->sock)) {
+ while (call->pH245Channel->outQueue.count>0) {
+ if (ooSendMsg(call, OOH245MSG) != OO_OK)
+ break;
+ }
}
}
else if(call->h245listener)
@@ -702,20 +703,23 @@
{
if(ooPDWrite(pfds, nfds, call->pH225Channel->sock))
{
- if(call->pH225Channel->outQueue.count>0)
+ while (call->pH225Channel->outQueue.count>0)
{
OOTRACEDBGC3("Sending H225 message (%s, %s)\n",
call->callType, call->callToken);
- ooSendMsg(call, OOQ931MSG);
+ if (ooSendMsg(call, OOQ931MSG) != OO_OK)
+ break;
}
if(call->pH245Channel &&
call->pH245Channel->outQueue.count>0 &&
- OO_TESTFLAG (call->flags, OO_M_TUNNELING))
- {
+ OO_TESTFLAG (call->flags, OO_M_TUNNELING)) {
+ while (call->pH245Channel->outQueue.count>0) {
OOTRACEDBGC3("H245 message needs to be tunneled. "
"(%s, %s)\n", call->callType,
call->callToken);
- ooSendMsg(call, OOH245MSG);
+ if (ooSendMsg(call, OOH245MSG) != OO_OK)
+ break;
+ }
}
}
}
@@ -1330,7 +1334,7 @@
{
OOTRACEDBGA3("Warning:Call marked for cleanup. Can not send message."
"(%s, %s)\n", call->callType, call->callToken);
- return OO_OK;
+ return OO_FAILED;
}
if(type == OOQ931MSG)
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/ooh245.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/ooh245.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/ooh323c/src/ooh245.c Thu Jul 7 01:49:45 2011
@@ -2126,6 +2126,8 @@
ooClearAllLogicalChannels(call);
}
ooSendEndSessionCommand(call);
+ if (call->callState < OO_CALL_CLEAR)
+ call->callState = OO_CALL_CLEAR;
}
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/res_config_mysql.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/res_config_mysql.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/res_config_mysql.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/addons/res_config_mysql.c Thu Jul 7 01:49:45 2011
@@ -398,7 +398,7 @@
} else if (ast_strlen_zero(row[i])) {
row[i] = " ";
}
- for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+ for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
if (prev) {
if ((prev->next = ast_variable_new(fields[i].name, decode_chunk(chunk), ""))) {
prev = prev->next;
@@ -524,7 +524,7 @@
for (i = 0; i < numFields; i++) {
if (ast_strlen_zero(row[i]))
continue;
- for (stringp = ast_strdupa(row[i]), chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
+ for (stringp = row[i], chunk = strsep(&stringp, ";"); chunk; chunk = strsep(&stringp, ";")) {
if (chunk && !ast_strlen_zero(decode_chunk(ast_strip(chunk)))) {
if (initfield && !strcmp(initfield, fields[i].name)) {
ast_category_rename(cat, chunk);
@@ -608,7 +608,7 @@
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "UPDATE %s SET %s = '%s'", tablename, newparam, ast_str_buffer(buf));
+ ast_str_set(&sql, 0, "UPDATE %s SET `%s` = '%s'", tablename, newparam, ast_str_buffer(buf));
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -625,7 +625,7 @@
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, ", %s = '%s'", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, ", `%s` = '%s'", newparam, ast_str_buffer(buf));
/* If the column length isn't long enough, give a chance to lengthen it. */
if (strncmp(column->type, "char", 4) == 0 || strncmp(column->type, "varchar", 7) == 0) {
@@ -635,7 +635,7 @@
va_end(ap);
ESCAPE_STRING(buf, lookup);
- ast_str_append(&sql, 0, " WHERE %s = '%s'", keyfield, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, " WHERE `%s` = '%s'", keyfield, ast_str_buffer(buf));
ast_debug(1, "MySQL RealTime: Update SQL: %s\n", ast_str_buffer(sql));
@@ -719,7 +719,7 @@
return -1;
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&where, 0, "%s %s='%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
+ ast_str_append(&where, 0, "%s `%s` = '%s'", first ? "" : " AND", newparam, ast_str_buffer(buf));
first = 0;
/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -744,7 +744,7 @@
}
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, "%s %s = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, "%s `%s` = '%s'", first ? "" : ",", newparam, ast_str_buffer(buf));
first = 0;
/* If the column length isn't long enough, give a chance to lengthen it. */
@@ -816,7 +816,7 @@
/* Create the first part of the query using the first parameter/value pairs we just extracted
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, newval);
- ast_str_set(&sql, 0, "INSERT INTO %s (%s", table, newparam);
+ ast_str_set(&sql, 0, "INSERT INTO %s (`%s`", table, newparam);
ast_str_set(&sql2, 0, ") VALUES ('%s'", ast_str_buffer(buf));
internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL);
@@ -828,7 +828,7 @@
ast_str_reset(buf);
}
if (internal_require(database, table, newparam, RQ_CHAR, ast_str_strlen(buf), SENTINEL) == 0) {
- ast_str_append(&sql, 0, ", %s", newparam);
+ ast_str_append(&sql, 0, ", `%s`", newparam);
ast_str_append(&sql2, 0, ", '%s'", ast_str_buffer(buf));
}
}
@@ -894,11 +894,11 @@
/* Create the first part of the query using the first parameter/value pairs we just extracted
If there is only 1 set, then we have our query. Otherwise, loop thru the list and concat */
ESCAPE_STRING(buf, lookup);
- ast_str_set(&sql, 0, "DELETE FROM %s WHERE %s = '%s'", table, keyfield, ast_str_buffer(buf));
+ ast_str_set(&sql, 0, "DELETE FROM %s WHERE `%s` = '%s'", table, keyfield, ast_str_buffer(buf));
while ((newparam = va_arg(ap, const char *))) {
newval = va_arg(ap, const char *);
ESCAPE_STRING(buf, newval);
- ast_str_append(&sql, 0, " AND %s = '%s'", newparam, ast_str_buffer(buf));
+ ast_str_append(&sql, 0, " AND `%s` = '%s'", newparam, ast_str_buffer(buf));
}
va_end(ap);
@@ -1074,7 +1074,7 @@
res = -1;
break;
}
- ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY %s %s", tablename, column->name, ast_str_buffer(typestr));
+ ast_str_set(&sql, 0, "ALTER TABLE %s MODIFY `%s` %s", tablename, column->name, ast_str_buffer(typestr));
if (!column->null) {
ast_str_append(&sql, 0, " NOT NULL");
}
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_chanspy.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_chanspy.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_chanspy.c Thu Jul 7 01:49:45 2011
@@ -404,6 +404,7 @@
struct ast_audiohook bridge_whisper_audiohook;
int fd;
int volfactor;
+ struct ast_flags flags;
};
struct spy_dtmf_options {
@@ -438,7 +439,7 @@
return -1;
}
- if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) {
+ if (ast_test_flag(&csth->flags, OPTION_READONLY)) {
/* Option 'o' was set, so don't mix channel audio */
f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, &format_slin);
} else {
@@ -539,7 +540,7 @@
spyer_name, name);
memset(&csth, 0, sizeof(csth));
- ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL);
+ ast_copy_flags(&csth.flags, flags, AST_FLAGS_ALL);
ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy", 0);
Modified: team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_confbridge.c?view=diff&rev=326633&r1=326632&r2=326633
==============================================================================
--- team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_confbridge.c (original)
+++ team/oej/pinelonely-meetme-single-user-hangup-trunk/apps/app_confbridge.c Thu Jul 7 01:49:45 2011
@@ -77,6 +77,11 @@
<description>
<para>Enters the user into a specified conference bridge. The user can exit the conference by hangup or DTMF menu option.</para>
</description>
+ <see-also>
+ <ref type="application">ConfBridge</ref>
+ <ref type="function">CONFBRIDGE</ref>
+ <ref type="function">CONFBRIDGE_INFO</ref>
+ </see-also>
</application>
<function name="CONFBRIDGE" language="en_US">
<synopsis>
@@ -104,6 +109,22 @@
<para>exten => 1,n,Set(CONFBRIDGE(user,admin)=yes)</para>
<para>exten => 1,n,Set(CONFBRIDGE(user,marked)=yes)</para>
<para>exten => 1,n,ConfBridge(1)</para>
+ </description>
+ </function>
+ <function name="CONFBRIDGE_INFO" language="en_US">
+ <synopsis>
+ Get information about a ConfBridge conference.
+ </synopsis>
+ <syntax>
[... 21951 lines stripped ...]
More information about the asterisk-commits
mailing list