[asterisk-commits] kharwell: branch kharwell/pimp_sip_state r389641 - in /team/kharwell/pimp_sip...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 23 17:10:48 CDT 2013
Author: kharwell
Date: Thu May 23 17:10:39 2013
New Revision: 389641
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389641
Log:
Multiple revisions 389255,389312,389358,389381,389407,389429,389457,389497,389535
........
r389255 | root | 2013-05-20 13:18:01 -0500 (Mon, 20 May 2013) | 24 lines
Multiple revisions 389246-389247,389251
........
r389246 | qwell | 2013-05-20 12:44:41 -0500 (Mon, 20 May 2013) | 8 lines
Add doxygen.log to svn:ignore property.
........
Merged revisions 389244 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 389245 from http://svn.asterisk.org/svn/asterisk/branches/11
........
r389247 | rmudgett | 2013-05-20 12:53:24 -0500 (Mon, 20 May 2013) | 1 line
Fixup svn:keywords in all *.c and *.h files.
........
r389251 | rmudgett | 2013-05-20 13:03:22 -0500 (Mon, 20 May 2013) | 1 line
Fixup svn:keywords in all *.c and *.h files.
........
Merged revisions 389246-389247,389251 from file:///srv/subversion/repos/asterisk/trunk
........
r389312 | root | 2013-05-20 15:17:55 -0500 (Mon, 20 May 2013) | 10 lines
Set the AST_CDR_FLAG_ORIGINATED flag on originated channel's CDRs
This may alleviate some of the CDR woes with originated channels, as CDRs
do like to know when a channel was originated. Eventually this will get
converted to be a channel flag, so its location is still good to know
post the great CDR shakeup of 2013.
........
Merged revisions 389306 from file:///srv/subversion/repos/asterisk/trunk
........
r389358 | root | 2013-05-21 10:18:03 -0500 (Tue, 21 May 2013) | 5 lines
Fixed some extra field assertion when the event WebSocket is connected
........
Merged revisions 389343 from file:///srv/subversion/repos/asterisk/trunk
........
r389381 | root | 2013-05-21 13:18:21 -0500 (Tue, 21 May 2013) | 13 lines
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
........
Merged revisions 389378 from file:///srv/subversion/repos/asterisk/trunk
........
r389407 | root | 2013-05-21 14:17:55 -0500 (Tue, 21 May 2013) | 14 lines
Raise the ConfBridgeMute/Unmute events when a CLI or AMI action triggers the change
New in 12 are the ConfBridgeMute/Unmute events, which are triggered when a user
changes their mute/unmute state. This was typically triggered when a user hit a
DTMF key that triggered the mute/unmute menu handler. Forgotten in this is when an
AMI action or CLI command triggers the mute/unmute. This patch now raises the
events in those situations as well.
(closes issue ASTERISK-21802)
Reported by: Birger "WIMPy" Harzenetter
........
Merged revisions 389402 from file:///srv/subversion/repos/asterisk/trunk
........
r389429 | root | 2013-05-21 16:17:54 -0500 (Tue, 21 May 2013) | 8 lines
Conditional out more app_queue logging that needs to be reworked.
Fixes crash because app_queue was unconditionally freeing a datastore that
was still on a channel.
........
Merged revisions 389426 from file:///srv/subversion/repos/asterisk/trunk
........
r389457 | root | 2013-05-21 18:17:54 -0500 (Tue, 21 May 2013) | 5 lines
Fix destruction order assert for stasis_bridging
........
Merged revisions 389454 from file:///srv/subversion/repos/asterisk/trunk
........
r389497 | root | 2013-05-22 13:18:20 -0500 (Wed, 22 May 2013) | 1 line
automerge cancel
........
r389535 | file | 2013-05-22 16:45:28 -0500 (Wed, 22 May 2013) | 8 lines
Remove limitation preventing different accept type handlers of the same event being registered individually.
This change causes res_sip_pubsub to only register an event type once with the pjsip event subscription core.
Further registrations simply cause the accept types to be added to the global Accept header. This all works
because all subscriptions flow through res_sip_pubsub and it ultimately delegates to the implementation.
Review: https://reviewboard.asterisk.org/r/2547/
........
Merged revisions 389255,389312,389358,389381,389407,389429,389457,389497,389535 from http://svn.asterisk.org/svn/asterisk/team/group/pimp_my_sip
Added:
team/kharwell/pimp_sip_state/apps/app_bridgewait.c
- copied unchanged from r389535, team/group/pimp_my_sip/apps/app_bridgewait.c
team/kharwell/pimp_sip_state/apps/confbridge/conf_chan_announce.c
- copied unchanged from r389535, team/group/pimp_my_sip/apps/confbridge/conf_chan_announce.c
team/kharwell/pimp_sip_state/apps/confbridge/conf_chan_record.c
- copied unchanged from r389535, team/group/pimp_my_sip/apps/confbridge/conf_chan_record.c
team/kharwell/pimp_sip_state/apps/confbridge/confbridge_manager.c
- copied unchanged from r389535, team/group/pimp_my_sip/apps/confbridge/confbridge_manager.c
team/kharwell/pimp_sip_state/bridges/bridge_builtin_interval_features.c
- copied unchanged from r389535, team/group/pimp_my_sip/bridges/bridge_builtin_interval_features.c
team/kharwell/pimp_sip_state/bridges/bridge_holding.c
- copied unchanged from r389535, team/group/pimp_my_sip/bridges/bridge_holding.c
team/kharwell/pimp_sip_state/bridges/bridge_native_rtp.c
- copied unchanged from r389535, team/group/pimp_my_sip/bridges/bridge_native_rtp.c
team/kharwell/pimp_sip_state/configs/res_parking.conf.sample
- copied unchanged from r389535, team/group/pimp_my_sip/configs/res_parking.conf.sample
team/kharwell/pimp_sip_state/include/asterisk/bridging_basic.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/bridging_basic.h
team/kharwell/pimp_sip_state/include/asterisk/bridging_roles.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/bridging_roles.h
team/kharwell/pimp_sip_state/include/asterisk/core_local.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/core_local.h
team/kharwell/pimp_sip_state/include/asterisk/core_unreal.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/core_unreal.h
team/kharwell/pimp_sip_state/include/asterisk/parking.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/parking.h
team/kharwell/pimp_sip_state/include/asterisk/stasis_bridging.h
- copied unchanged from r389535, team/group/pimp_my_sip/include/asterisk/stasis_bridging.h
team/kharwell/pimp_sip_state/main/bridging_basic.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/bridging_basic.c
team/kharwell/pimp_sip_state/main/bridging_roles.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/bridging_roles.c
team/kharwell/pimp_sip_state/main/core_local.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/core_local.c
team/kharwell/pimp_sip_state/main/core_unreal.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/core_unreal.c
team/kharwell/pimp_sip_state/main/manager_bridging.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/manager_bridging.c
team/kharwell/pimp_sip_state/main/parking.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/parking.c
team/kharwell/pimp_sip_state/main/stasis_bridging.c
- copied unchanged from r389535, team/group/pimp_my_sip/main/stasis_bridging.c
team/kharwell/pimp_sip_state/res/parking/ (props changed)
- copied from r389535, team/group/pimp_my_sip/res/parking/
team/kharwell/pimp_sip_state/res/res_parking.c
- copied unchanged from r389535, team/group/pimp_my_sip/res/res_parking.c
Removed:
team/kharwell/pimp_sip_state/apps/app_parkandannounce.c
team/kharwell/pimp_sip_state/bridges/bridge_multiplexed.c
team/kharwell/pimp_sip_state/channels/chan_bridge.c
team/kharwell/pimp_sip_state/channels/chan_local.c
Modified:
team/kharwell/pimp_sip_state/ (props changed)
team/kharwell/pimp_sip_state/CHANGES
team/kharwell/pimp_sip_state/UPGRADE.txt
team/kharwell/pimp_sip_state/addons/chan_ooh323.c
team/kharwell/pimp_sip_state/apps/app_celgenuserevent.c (props changed)
team/kharwell/pimp_sip_state/apps/app_channelredirect.c
team/kharwell/pimp_sip_state/apps/app_chanspy.c
team/kharwell/pimp_sip_state/apps/app_confbridge.c
team/kharwell/pimp_sip_state/apps/app_dial.c
team/kharwell/pimp_sip_state/apps/app_dumpchan.c
team/kharwell/pimp_sip_state/apps/app_followme.c
team/kharwell/pimp_sip_state/apps/app_mixmonitor.c
team/kharwell/pimp_sip_state/apps/app_morsecode.c (props changed)
team/kharwell/pimp_sip_state/apps/app_queue.c
team/kharwell/pimp_sip_state/apps/app_setcallerid.c (props changed)
team/kharwell/pimp_sip_state/apps/app_stasis.c (props changed)
team/kharwell/pimp_sip_state/apps/app_userevent.c
team/kharwell/pimp_sip_state/apps/app_waituntil.c (props changed)
team/kharwell/pimp_sip_state/apps/confbridge/conf_config_parser.c
team/kharwell/pimp_sip_state/apps/confbridge/include/confbridge.h
team/kharwell/pimp_sip_state/bridges/bridge_builtin_features.c
team/kharwell/pimp_sip_state/bridges/bridge_simple.c
team/kharwell/pimp_sip_state/bridges/bridge_softmix.c
team/kharwell/pimp_sip_state/cel/cel_custom.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_manager.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_odbc.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_pgsql.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_radius.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_sqlite3_custom.c (props changed)
team/kharwell/pimp_sip_state/cel/cel_tds.c (props changed)
team/kharwell/pimp_sip_state/channels/chan_agent.c
team/kharwell/pimp_sip_state/channels/chan_dahdi.c
team/kharwell/pimp_sip_state/channels/chan_gulp.c
team/kharwell/pimp_sip_state/channels/chan_h323.c
team/kharwell/pimp_sip_state/channels/chan_iax2.c
team/kharwell/pimp_sip_state/channels/chan_jingle.c
team/kharwell/pimp_sip_state/channels/chan_mgcp.c
team/kharwell/pimp_sip_state/channels/chan_misdn.c
team/kharwell/pimp_sip_state/channels/chan_motif.c
team/kharwell/pimp_sip_state/channels/chan_sip.c
team/kharwell/pimp_sip_state/channels/chan_skinny.c
team/kharwell/pimp_sip_state/channels/chan_unistim.c
team/kharwell/pimp_sip_state/channels/chan_vpb.cc
team/kharwell/pimp_sip_state/channels/sip/dialplan_functions.c (props changed)
team/kharwell/pimp_sip_state/channels/sip/include/dialog.h (props changed)
team/kharwell/pimp_sip_state/channels/sip/include/dialplan_functions.h (props changed)
team/kharwell/pimp_sip_state/channels/sip/include/globals.h (props changed)
team/kharwell/pimp_sip_state/codecs/codec_dahdi.c (props changed)
team/kharwell/pimp_sip_state/configs/features.conf.sample
team/kharwell/pimp_sip_state/contrib/utils/eagi_proxy.c (props changed)
team/kharwell/pimp_sip_state/formats/format_h264.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_channel.c (contents, props changed)
team/kharwell/pimp_sip_state/funcs/func_dialgroup.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_frame_trace.c
team/kharwell/pimp_sip_state/funcs/func_iconv.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_jitterbuffer.c
team/kharwell/pimp_sip_state/funcs/func_odbc.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_rand.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_realtime.c (props changed)
team/kharwell/pimp_sip_state/funcs/func_version.c (props changed)
team/kharwell/pimp_sip_state/include/asterisk/_private.h
team/kharwell/pimp_sip_state/include/asterisk/abstract_jb.h
team/kharwell/pimp_sip_state/include/asterisk/ael_structs.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/bridging.h
team/kharwell/pimp_sip_state/include/asterisk/bridging_features.h
team/kharwell/pimp_sip_state/include/asterisk/bridging_technology.h
team/kharwell/pimp_sip_state/include/asterisk/ccss.h
team/kharwell/pimp_sip_state/include/asterisk/cel.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/channel.h
team/kharwell/pimp_sip_state/include/asterisk/config_options.h
team/kharwell/pimp_sip_state/include/asterisk/event.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/event_defs.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/frame.h
team/kharwell/pimp_sip_state/include/asterisk/frame_defs.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/framehook.h
team/kharwell/pimp_sip_state/include/asterisk/hashtab.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/json.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/manager.h
team/kharwell/pimp_sip_state/include/asterisk/paths.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/pktccops.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/res_srtp.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/rtp_engine.h
team/kharwell/pimp_sip_state/include/asterisk/sha1.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/smdi.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/stasis.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/stasis_app.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/stasis_http.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/stasis_message_router.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/stringfields.h (props changed)
team/kharwell/pimp_sip_state/include/asterisk/udptl.h (props changed)
team/kharwell/pimp_sip_state/main/abstract_jb.c
team/kharwell/pimp_sip_state/main/asterisk.c
team/kharwell/pimp_sip_state/main/bridging.c
team/kharwell/pimp_sip_state/main/cel.c (props changed)
team/kharwell/pimp_sip_state/main/channel.c
team/kharwell/pimp_sip_state/main/channel_internal_api.c
team/kharwell/pimp_sip_state/main/cli.c
team/kharwell/pimp_sip_state/main/config_options.c
team/kharwell/pimp_sip_state/main/event.c (props changed)
team/kharwell/pimp_sip_state/main/features.c
team/kharwell/pimp_sip_state/main/frame.c
team/kharwell/pimp_sip_state/main/hashtab.c (props changed)
team/kharwell/pimp_sip_state/main/json.c (props changed)
team/kharwell/pimp_sip_state/main/manager.c
team/kharwell/pimp_sip_state/main/manager_channels.c (contents, props changed)
team/kharwell/pimp_sip_state/main/pbx.c
team/kharwell/pimp_sip_state/main/rtp_engine.c
team/kharwell/pimp_sip_state/main/sha1.c (props changed)
team/kharwell/pimp_sip_state/main/stasis.c (props changed)
team/kharwell/pimp_sip_state/main/stasis_cache.c (props changed)
team/kharwell/pimp_sip_state/main/stasis_channels.c
team/kharwell/pimp_sip_state/main/stasis_message.c (props changed)
team/kharwell/pimp_sip_state/main/stasis_message_router.c (props changed)
team/kharwell/pimp_sip_state/main/strings.c
team/kharwell/pimp_sip_state/main/threadstorage.c (props changed)
team/kharwell/pimp_sip_state/main/udptl.c (props changed)
team/kharwell/pimp_sip_state/pbx/pbx_lua.c (props changed)
team/kharwell/pimp_sip_state/res/Makefile
team/kharwell/pimp_sip_state/res/ael/ael.tab.c (props changed)
team/kharwell/pimp_sip_state/res/ael/ael.tab.h (props changed)
team/kharwell/pimp_sip_state/res/ael/ael_lex.c (props changed)
team/kharwell/pimp_sip_state/res/ael/pval.c (props changed)
team/kharwell/pimp_sip_state/res/res_ael_share.c (props changed)
team/kharwell/pimp_sip_state/res/res_clioriginate.c (props changed)
team/kharwell/pimp_sip_state/res/res_curl.c (props changed)
team/kharwell/pimp_sip_state/res/res_pktccops.c (props changed)
team/kharwell/pimp_sip_state/res/res_sip_pubsub.c
team/kharwell/pimp_sip_state/res/res_smdi.c (props changed)
team/kharwell/pimp_sip_state/res/res_srtp.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_asterisk.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_bridges.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_channels.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_endpoints.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_events.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_http_recordings.c (props changed)
team/kharwell/pimp_sip_state/res/res_stasis_json_events.c
team/kharwell/pimp_sip_state/res/res_stasis_json_events.exports.in
team/kharwell/pimp_sip_state/res/res_stasis_websocket.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_asterisk.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_asterisk.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_bridges.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_bridges.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_channels.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_channels.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_endpoints.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_endpoints.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_events.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_events.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_recordings.c (props changed)
team/kharwell/pimp_sip_state/res/stasis_http/resource_recordings.h (props changed)
team/kharwell/pimp_sip_state/res/stasis_json/resource_events.h
team/kharwell/pimp_sip_state/rest-api-templates/res_stasis_json_resource.c.mustache
team/kharwell/pimp_sip_state/rest-api-templates/stasis_json_resource.h.mustache
team/kharwell/pimp_sip_state/rest-api/api-docs/events.json
team/kharwell/pimp_sip_state/tests/test_astobj2_thrash.c (props changed)
team/kharwell/pimp_sip_state/tests/test_dlinklists.c (props changed)
team/kharwell/pimp_sip_state/tests/test_gosub.c (props changed)
team/kharwell/pimp_sip_state/tests/test_hashtab_thrash.c (props changed)
team/kharwell/pimp_sip_state/tests/test_json.c (props changed)
team/kharwell/pimp_sip_state/tests/test_res_stasis.c (props changed)
team/kharwell/pimp_sip_state/tests/test_stasis.c (props changed)
team/kharwell/pimp_sip_state/tests/test_stasis_http.c (props changed)
team/kharwell/pimp_sip_state/tests/test_time.c (props changed)
team/kharwell/pimp_sip_state/tests/test_xml_escape.c (props changed)
team/kharwell/pimp_sip_state/utils/ael_main.c (props changed)
team/kharwell/pimp_sip_state/utils/refcounter.c (props changed)
Propchange: team/kharwell/pimp_sip_state/
------------------------------------------------------------------------------
automerge = *
Propchange: team/kharwell/pimp_sip_state/
------------------------------------------------------------------------------
--- pimp_sip_state-integrated (original)
+++ pimp_sip_state-integrated Thu May 23 17:10:39 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-389238
+/team/group/pimp_my_sip:1-389640
Propchange: team/kharwell/pimp_sip_state/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu May 23 17:10:39 2013
@@ -12,6 +12,7 @@
config.log
config.status
defaults.h
+doxygen.log
makeopts
makeopts.embed_rules
menuselect-tree
Modified: team/kharwell/pimp_sip_state/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/CHANGES?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/CHANGES (original)
+++ team/kharwell/pimp_sip_state/CHANGES Thu May 23 17:10:39 2013
@@ -50,6 +50,19 @@
* The AMI event 'UserEvent' from app_userevent now contains the channel state
fields. The channel state fields will come before the body fields.
+ * The AMI events 'ParkedCall', 'ParkedCallTimeOut', 'ParkedCallGiveUp', and
+ 'UnParkedCall' have changed significantly in the new res_parking module.
+ First, channel snapshot data is included for both the parker and the parkee
+ in lieu of the "From" and "Channel" fields. They follow standard channel
+ snapshot format but each field is suffixed with 'Parker' or 'Parkee'
+ depending on which side it applies to. The 'Exten' field is replaced with
+ 'ParkingSpace' since the registration of extensions as for parking spaces
+ is no longer mandatory.
+
+ * The AMI event 'Parkinglot' (response to 'Parkinglots' command) in a similar
+ fashion has changed the field names 'StartExten' and 'StopExten' to
+ 'StartSpace' and 'StopSpace' respectively.
+
* The deprecated use of | (pipe) as a separator in the channelvars setting in
manager.conf has been removed.
@@ -59,8 +72,23 @@
event, the various ChanVariable fields will contain a suffix that specifies
which channel they correspond to.
+ * The AMI 'Status' response event to the AMI Status action replaces the
+ BridgedChannel and BridgedUniqueid headers with the BridgeID header to
+ indicate what bridge the channel is currently in.
+
Channel Drivers
------------------
+ * When a channel driver is configured to enable jiterbuffers, they are now
+ applied unconditionally when a channel joins a bridge. If a jitterbuffer
+ is already set for that channel when it enters, such as by the JITTERBUFFER
+ function, then the existing jitterbuffer will be used and the one set by
+ the channel driver will not be applied.
+
+chan_local
+------------------
+ * The /b option is removed.
+
+ * chan_local moved into the system core and is no longer a loadable module.
chan_mobile
------------------
@@ -86,12 +114,18 @@
* Add support for automixmonitor to the BRIDGE_FEATURES channel variable.
- * PARKINGSLOT and PARKEDLOT channel variables will now be set for a parked
- channel even when comebactoorigin=yes
+ * Parking has been pulled from core and placed into a separate module called
+ res_parking. See Parking changes below for more details.
* You can now have the settings for a channel updated using the FEATURE()
and FEATUREMAP() functions inherited to child channels by setting
FEATURE(inherit)=yes.
+
+Functions
+------------------
+ * JITTERBUFFER now accepts an argument of 'disabled' which can be used
+ to remove jitterbuffers previously set on a channel with JITTERBUFFER.
+ The value of this setting is ignored when disabled is used for the argument.
Logging
-------------------
@@ -109,6 +143,51 @@
of audio samples in a voice frame will experience significant quality problems
if a denoiser is attached to the channel; this option gives them the ability
to remove the denoiser without having to unload func_speex.
+
+Parking
+-------------------
+ * Parking is now implemented as a module instead of as core functionality.
+ The preferred way to configure parking is now through res_parking.conf while
+ configuration through features.conf is not currently supported.
+
+ * Parked calls are now placed in bridges. This is a largely architectural change,
+ but it could have some implications in allowing for new parked call retrieval
+ methods and the contents of parking lots will be visible though certain bridge
+ commands.
+
+ * The order of arguments for the new parking applications are different from the
+ old ones to be more intuitive. Timeout and return context/exten/priority are now
+ implemented as options. parking_lot_name is now the first parameter. See the
+ application documentation for Park, ParkedCall, and ParkAndAnnounce for more
+ in-depth information as well as syntax.
+
+ * Extensions are no longer automatically created in the dialplan to park calls,
+ pickup parked calls, etc by default.
+
+ * adsipark is no longer supported under the new parking model
+
+ * The PARKINGSLOT channel variable has been deprecated in favor of PARKING_SPACE
+ to match the naming scheme of the new system.
+
+ * PARKING_SPACE and PARKEDLOT channel variables will now be set for a parked
+ channel even when comebactoorigin=yes
+
+ * New CLI command 'parking show' allows you to inspect the currently in use
+ parking lots. 'parking show <parkinglot>' will also show the parked calls
+ in that specific parking lot.
+
+ * The CLI command 'parkedcalls' is now deprecated in favor of
+ 'parking show <parkinglot>'.
+
+ * The AMI command 'ParkedCalls' will now accept a 'ParkingLot' argument which
+ can be used to get a list of parked calls only for a specific parking lot.
+
+ * The ParkAndAnnounce application is now provided through res_parking instead
+ of through the separate app_parkandannounce module.
+
+ * ParkAndAnnounce will no longer go to the next position in dialplan on timeout
+ by default. Instead, it will follow the timeout rules of the parking lot. The
+ old behavior can be reproduced by using the 'c' option.
Queue
-------------------
Modified: team/kharwell/pimp_sip_state/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/UPGRADE.txt?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/UPGRADE.txt (original)
+++ team/kharwell/pimp_sip_state/UPGRADE.txt Thu May 23 17:10:39 2013
@@ -69,6 +69,9 @@
pauses dialing for one second.
- The default for inband_on_proceeding has changed to no.
+chan_local:
+ - The /b option is removed.
+
Dialplan:
- All channel and global variable names are evaluated in a case-sensitive manner.
In previous versions of Asterisk, variables created and evaluated in the
@@ -80,6 +83,18 @@
- BRIDGE_FEATURES channel variable is now casesensitive for feature letter codes.
Uppercase variants apply them to the calling party while lowercase variants
apply them to the called party.
+
+Features:
+ - The features.conf [applicationmap] <FeatureName> ActivatedBy option is
+ no longer honored. The feature is activated by which channel
+ DYNAMIC_FEATURES includes the feature is on. Use predial to set different
+ values of DYNAMIC_FEATURES on the channels
+
+Parking:
+ - The arguments for the Park, ParkedCall, and ParkAndAnnounce applications have
+ been modified significantly. See the application documents for specific details.
+ Also parking lot configuration is now done in res_parking.conf instead of
+ features.conf
From 10 to 11:
Modified: team/kharwell/pimp_sip_state/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/addons/chan_ooh323.c?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/addons/chan_ooh323.c (original)
+++ team/kharwell/pimp_sip_state/addons/chan_ooh323.c Thu May 23 17:10:39 2013
@@ -117,7 +117,6 @@
.fixup = ooh323_fixup,
.send_html = 0,
.queryoption = ooh323_queryoption,
- .bridge = ast_rtp_instance_bridge, /* XXX chan unlocked ? */
.early_bridge = ast_rtp_instance_early_bridge,
.func_channel_read = function_ooh323_read,
.func_channel_write = function_ooh323_write,
Propchange: team/kharwell/pimp_sip_state/apps/app_celgenuserevent.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu May 23 17:10:39 2013
@@ -1,1 +1,1 @@
-Author Id Date Revision
+Author Date Id Revision
Modified: team/kharwell/pimp_sip_state/apps/app_channelredirect.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/apps/app_channelredirect.c?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/apps/app_channelredirect.c (original)
+++ team/kharwell/pimp_sip_state/apps/app_channelredirect.c Thu May 23 17:10:39 2013
@@ -96,10 +96,6 @@
return 0;
}
- if (ast_channel_pbx(chan2)) {
- ast_set_flag(ast_channel_flags(chan2), AST_FLAG_BRIDGE_HANGUP_DONT); /* don't let the after-bridge code run the h-exten */
- }
-
res = ast_async_parseable_goto(chan2, args.label);
chan2 = ast_channel_unref(chan2);
Modified: team/kharwell/pimp_sip_state/apps/app_chanspy.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/apps/app_chanspy.c?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/apps/app_chanspy.c (original)
+++ team/kharwell/pimp_sip_state/apps/app_chanspy.c Thu May 23 17:10:39 2013
@@ -482,15 +482,18 @@
static int start_spying(struct ast_autochan *autochan, const char *spychan_name, struct ast_audiohook *audiohook)
{
int res = 0;
- struct ast_channel *peer = NULL;
ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan_name, ast_channel_name(autochan->chan));
ast_set_flag(audiohook, AST_AUDIOHOOK_TRIGGER_SYNC | AST_AUDIOHOOK_SMALL_QUEUE);
res = ast_audiohook_attach(autochan->chan, audiohook);
- if (!res && ast_test_flag(ast_channel_flags(autochan->chan), AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(autochan->chan))) {
- ast_softhangup(peer, AST_SOFTHANGUP_UNBRIDGE);
+ if (!res) {
+ ast_channel_lock(autochan->chan);
+ if (ast_channel_is_bridged(autochan->chan)) {
+ ast_softhangup_nolock(autochan->chan, AST_SOFTHANGUP_UNBRIDGE);
+ }
+ ast_channel_unlock(autochan->chan);
}
return res;
}
Modified: team/kharwell/pimp_sip_state/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/kharwell/pimp_sip_state/apps/app_confbridge.c?view=diff&rev=389641&r1=389640&r2=389641
==============================================================================
--- team/kharwell/pimp_sip_state/apps/app_confbridge.c (original)
+++ team/kharwell/pimp_sip_state/apps/app_confbridge.c Thu May 23 17:10:39 2013
@@ -67,6 +67,9 @@
#include "asterisk/paths.h"
#include "asterisk/manager.h"
#include "asterisk/test.h"
+#include "asterisk/stasis.h"
+#include "asterisk/stasis_bridging.h"
+#include "asterisk/json.h"
/*** DOCUMENTATION
<application name="ConfBridge" language="en_US">
@@ -303,7 +306,7 @@
};
/*! \brief Container to hold all conference bridges in progress */
-static struct ao2_container *conference_bridges;
+struct ao2_container *conference_bridges;
static void leave_conference(struct confbridge_user *user);
static int play_sound_number(struct confbridge_conference *conference, int say_number);
@@ -412,221 +415,77 @@
return "";
}
-static void send_conf_start_event(const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a conference starts.</synopsis>
- <syntax>
- <parameter name="Conference">
- <para>The name of the Confbridge conference.</para>
- </parameter>
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeEnd</ref>
- <ref type="application">ConfBridge</ref>
- </see-also>
- </managerEventInstance>
- ***/
- manager_event(EVENT_FLAG_CALL, "ConfbridgeStart", "Conference: %s\r\n", conf_name);
-}
-
-static void send_conf_end_event(const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a conference ends.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeStart</ref>
- </see-also>
- </managerEventInstance>
- ***/
- manager_event(EVENT_FLAG_CALL, "ConfbridgeEnd", "Conference: %s\r\n", conf_name);
-}
-
-static void send_join_event(struct ast_channel *chan, const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a channel joins a Confbridge conference.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeLeave</ref>
- <ref type="application">ConfBridge</ref>
- </see-also>
- </managerEventInstance>
- ***/
- ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeJoin",
- "Channel: %s\r\n"
- "Uniqueid: %s\r\n"
- "Conference: %s\r\n"
- "CallerIDnum: %s\r\n"
- "CallerIDname: %s\r\n",
- ast_channel_name(chan),
- ast_channel_uniqueid(chan),
- conf_name,
- S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, "<unknown>"),
- S_COR(ast_channel_caller(chan)->id.name.valid, ast_channel_caller(chan)->id.name.str, "<unknown>")
- );
-}
-
-static void send_leave_event(struct ast_channel *chan, const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a channel leaves a Confbridge conference.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeJoin</ref>
- </see-also>
- </managerEventInstance>
- ***/
- ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeLeave",
- "Channel: %s\r\n"
- "Uniqueid: %s\r\n"
- "Conference: %s\r\n"
- "CallerIDnum: %s\r\n"
- "CallerIDname: %s\r\n",
- ast_channel_name(chan),
- ast_channel_uniqueid(chan),
- conf_name,
- S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, "<unknown>"),
- S_COR(ast_channel_caller(chan)->id.name.valid, ast_channel_caller(chan)->id.name.str, "<unknown>")
- );
-}
-
-static void send_start_record_event(const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a conference recording starts.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeStopRecord</ref>
- <ref type="application">ConfBridge</ref>
- </see-also>
- </managerEventInstance>
- ***/
-
- manager_event(EVENT_FLAG_CALL, "ConfbridgeStartRecord", "Conference: %s\r\n", conf_name);
-}
-
-static void send_stop_record_event(const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a conference recording stops.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeStartRecord</ref>
- </see-also>
- </managerEventInstance>
- ***/
- manager_event(EVENT_FLAG_CALL, "ConfbridgeStopRecord", "Conference: %s\r\n", conf_name);
-}
-
-static void send_mute_event(struct ast_channel *chan, const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a Confbridge participant mutes.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeUnmute</ref>
- <ref type="application">ConfBridge</ref>
- </see-also>
- </managerEventInstance>
- ***/
- ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeMute",
- "Channel: %s\r\n"
- "Uniqueid: %s\r\n"
- "Conference: %s\r\n"
- "CallerIDnum: %s\r\n"
- "CallerIDname: %s\r\n",
- ast_channel_name(chan),
- ast_channel_uniqueid(chan),
- conf_name,
- S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, "<unknown>"),
- S_COR(ast_channel_caller(chan)->id.name.valid, ast_channel_caller(chan)->id.name.str, "<unknown>")
- );
-}
-
-static void send_unmute_event(struct ast_channel *chan, const char *conf_name)
-{
- /*** DOCUMENTATION
- <managerEventInstance>
- <synopsis>Raised when a Confbridge participant unmutes.</synopsis>
- <syntax>
- <xi:include xpointer="xpointer(/docs/managerEvent[@name='ConfbridgeStart']/managerEventInstance/syntax/parameter[@name='Conference'])" />
- </syntax>
- <see-also>
- <ref type="managerEvent">ConfbridgeMute</ref>
- </see-also>
- </managerEventInstance>
- ***/
- ast_manager_event(chan, EVENT_FLAG_CALL, "ConfbridgeUnmute",
- "Channel: %s\r\n"
- "Uniqueid: %s\r\n"
- "Conference: %s\r\n"
- "CallerIDnum: %s\r\n"
- "CallerIDname: %s\r\n",
- ast_channel_name(chan),
- ast_channel_uniqueid(chan),
- conf_name,
- S_COR(ast_channel_caller(chan)->id.number.valid, ast_channel_caller(chan)->id.number.str, "<unknown>"),
- S_COR(ast_channel_caller(chan)->id.name.valid, ast_channel_caller(chan)->id.name.str, "<unknown>")
- );
-}
-
-
-static struct ast_frame *rec_read(struct ast_channel *ast)
-{
- return &ast_null_frame;
-}
-static int rec_write(struct ast_channel *ast, struct ast_frame *f)
-{
- return 0;
-}
-static struct ast_channel *rec_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause);
-static struct ast_channel_tech record_tech = {
- .type = "ConfBridgeRec",
- .description = "Conference Bridge Recording Channel",
- .requester = rec_request,
- .read = rec_read,
- .write = rec_write,
-};
-static struct ast_channel *rec_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause)
-{
- struct ast_channel *tmp;
- struct ast_format fmt;
- const char *conf_name = data;
- if (!(tmp = ast_channel_alloc(1, AST_STATE_UP, 0, 0, "", "", "", NULL, 0,
- "ConfBridgeRecorder/conf-%s-uid-%d",
- conf_name,
- (int) ast_random()))) {
- return NULL;
- }
- ast_format_set(&fmt, AST_FORMAT_SLINEAR, 0);
- ast_channel_tech_set(tmp, &record_tech);
- ast_format_cap_add_all(ast_channel_nativeformats(tmp));
- ast_format_copy(ast_channel_writeformat(tmp), &fmt);
- ast_format_copy(ast_channel_rawwriteformat(tmp), &fmt);
- ast_format_copy(ast_channel_readformat(tmp), &fmt);
- ast_format_copy(ast_channel_rawreadformat(tmp), &fmt);
- return tmp;
+static void send_conf_stasis(struct confbridge_conference *conference, struct ast_channel *chan, const char *type, struct ast_json *extras, int channel_topic)
+{
+ RAII_VAR(struct stasis_message *, msg, NULL, ao2_cleanup);
+ RAII_VAR(struct ast_json *, json_object, NULL, ast_json_unref);
+
+ json_object = ast_json_pack("{s: s, s: s}",
+ "type", type,
+ "conference", conference->name);
+
+ if (!json_object) {
+ return;
+ }
+
+ if (extras) {
+ ast_json_object_update(json_object, extras);
+ }
+
+ msg = ast_bridge_blob_create(confbridge_message_type(),
+ conference->bridge,
+ chan,
+ json_object);
+ if (!msg) {
+ return;
+ }
+
+ if (channel_topic) {
+ stasis_publish(ast_channel_topic(chan), msg);
+ } else {
+ stasis_publish(ast_bridge_topic(conference->bridge), msg);
+ }
+
+}
+
+static void send_conf_start_event(struct confbridge_conference *conference)
+{
[... 19707 lines stripped ...]
More information about the asterisk-commits
mailing list