2001-12-27 11:07:33 +00:00
/*
2005-09-14 20:46:50 +00:00
* Asterisk - - An open source telephony toolkit .
2001-12-27 11:07:33 +00:00
*
2006-01-05 09:12:33 +00:00
* Copyright ( C ) 1999 - 2006 , Digium , Inc .
2001-12-27 11:07:33 +00:00
*
2004-08-31 13:32:11 +00:00
* Mark Spencer < markster @ digium . com >
2001-12-27 11:07:33 +00:00
*
2005-09-14 20:46:50 +00:00
* See http : //www.asterisk.org for more information about
* the Asterisk project . Please do not directly contact
* any of the maintainers of this project for assistance ;
* the project provides a web site , mailing lists and IRC
* channels for your use .
*
2001-12-27 11:07:33 +00:00
* This program is free software , distributed under the terms of
2005-09-14 20:46:50 +00:00
* the GNU General Public License Version 2. See the LICENSE file
* at the top of the source tree .
*/
2005-10-24 20:12:06 +00:00
/*! \file
2005-09-14 20:46:50 +00:00
*
2006-01-19 22:09:18 +00:00
* \ brief Routines implementing call features as call pickup , parking and transfer
2005-12-30 21:18:06 +00:00
*
* \ author Mark Spencer < markster @ digium . com >
2001-12-27 11:07:33 +00:00
*/
2008-01-22 17:41:57 +00:00
/*** MODULEINFO
< depend > chan_local < / depend >
* * */
2006-06-07 18:54:56 +00:00
# include "asterisk.h"
ASTERISK_FILE_VERSION ( __FILE__ , " $Revision$ " )
2005-06-06 22:12:19 +00:00
# include <pthread.h>
# include <stdlib.h>
# include <errno.h>
# include <unistd.h>
# include <string.h>
# include <stdlib.h>
# include <stdio.h>
# include <sys/time.h>
# include <sys/signal.h>
# include <netinet/in.h>
2005-04-21 06:02:45 +00:00
# include "asterisk/lock.h"
# include "asterisk/file.h"
# include "asterisk/logger.h"
# include "asterisk/channel.h"
# include "asterisk/pbx.h"
# include "asterisk/options.h"
2005-06-23 22:12:01 +00:00
# include "asterisk/causes.h"
2005-04-21 06:02:45 +00:00
# include "asterisk/module.h"
# include "asterisk/translate.h"
# include "asterisk/app.h"
# include "asterisk/say.h"
# include "asterisk/features.h"
# include "asterisk/musiconhold.h"
# include "asterisk/config.h"
# include "asterisk/cli.h"
# include "asterisk/manager.h"
# include "asterisk/utils.h"
# include "asterisk/adsi.h"
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
# include "asterisk/devicestate.h"
2005-11-08 04:02:35 +00:00
# include "asterisk/monitor.h"
2008-06-11 23:47:23 +00:00
# include "asterisk/global_datastores.h"
2001-12-27 11:07:33 +00:00
2003-02-02 19:37:23 +00:00
# define DEFAULT_PARK_TIME 45000
2004-08-01 01:38:15 +00:00
# define DEFAULT_TRANSFER_DIGIT_TIMEOUT 3000
2009-02-26 21:27:32 +00:00
# define DEFAULT_FEATURE_DIGIT_TIMEOUT 1000
2006-05-23 18:23:05 +00:00
# define DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER 15000
2003-02-02 19:37:23 +00:00
2005-06-23 22:12:01 +00:00
# define AST_MAX_WATCHERS 256
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
# define MAX_DIAL_FEATURE_OPTIONS 30
2005-06-23 22:12:01 +00:00
2009-02-03 21:57:01 +00:00
# define FEATURE_RETURN_HANGUP -1
# define FEATURE_RETURN_SUCCESSBREAK 0
# define FEATURE_RETURN_PASSDIGITS 21
# define FEATURE_RETURN_STOREDIGITS 22
# define FEATURE_RETURN_SUCCESS 23
# define FEATURE_RETURN_KEEPTRYING 24
# define FEATURE_RETURN_PARKFAILED 25
2006-08-07 04:15:52 +00:00
enum {
AST_FEATURE_FLAG_NEEDSDTMF = ( 1 < < 0 ) ,
AST_FEATURE_FLAG_ONPEER = ( 1 < < 1 ) ,
AST_FEATURE_FLAG_ONSELF = ( 1 < < 2 ) ,
AST_FEATURE_FLAG_BYCALLEE = ( 1 < < 3 ) ,
AST_FEATURE_FLAG_BYCALLER = ( 1 < < 4 ) ,
AST_FEATURE_FLAG_BYBOTH = ( 3 < < 3 ) ,
} ;
2001-12-27 11:07:33 +00:00
static char * parkedcall = " ParkedCall " ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
static int parkaddhints = 0 ; /*!< Add parking hints automatically */
2006-06-21 07:49:29 +00:00
static int parkingtime = DEFAULT_PARK_TIME ; /*!< No more than 45 seconds parked before you do something with them */
static char parking_con [ AST_MAX_EXTENSION ] ; /*!< Context for which parking is made accessible */
static char parking_con_dial [ AST_MAX_EXTENSION ] ; /*!< Context for dialback for parking (KLUDGE) */
static char parking_ext [ AST_MAX_EXTENSION ] ; /*!< Extension you type to park the call */
static char pickup_ext [ AST_MAX_EXTENSION ] ; /*!< Call pickup extension */
2006-07-19 20:44:39 +00:00
static char parkmohclass [ MAX_MUSICCLASS ] ; /*!< Music class used for parking */
2006-06-21 07:49:29 +00:00
static int parking_start ; /*!< First available extension for parking */
static int parking_stop ; /*!< Last available extension for parking */
2008-10-23 16:04:42 +00:00
static int parkedcalltransfers ; /*!< Who can REDIRECT after picking up a parked a call */
2009-01-31 00:15:09 +00:00
static int parkedcallreparking ; /*!< Who can PARKCALL after picking up a parked call */
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
static int parkedcallhangup ; /*!< Who can DISCONNECT after picking up a parked call */
static int parkedcallrecording ; /*!< Who can AUTOMON after picking up a parked call */
2008-10-23 16:04:42 +00:00
2006-06-21 07:49:29 +00:00
static char courtesytone [ 256 ] ; /*!< Courtesy tone */
static int parkedplay = 0 ; /*!< Who to play the courtesy tone to */
static char xfersound [ 256 ] ; /*!< Call transfer sound */
static char xferfailsound [ 256 ] ; /*!< Call transfer failure sound */
2001-12-27 11:07:33 +00:00
2005-10-13 23:58:33 +00:00
static int parking_offset ;
static int parkfindnext ;
2005-04-27 03:58:40 +00:00
2005-10-13 23:58:33 +00:00
static int adsipark ;
2004-09-15 19:49:33 +00:00
2005-10-13 23:58:33 +00:00
static int transferdigittimeout ;
static int featuredigittimeout ;
2004-08-01 01:38:15 +00:00
2006-05-23 18:23:05 +00:00
static int atxfernoanswertimeout ;
2006-06-21 07:49:29 +00:00
static char * registrar = " res_features " ; /*!< Registrar for operations */
2001-12-27 11:07:33 +00:00
2006-01-09 09:07:58 +00:00
/* module and CLI command definitions */
2001-12-27 11:07:33 +00:00
static char * synopsis = " Answer a parked call " ;
static char * descrip = " ParkedCall(exten): "
2004-12-28 23:49:46 +00:00
" Used to connect to a parked call. This application is always \n "
2001-12-27 11:07:33 +00:00
" registered internally and does not need to be explicitly added \n "
" into the dialplan, although you should include the 'parkedcalls' \n "
" context. \n " ;
2008-10-03 20:44:22 +00:00
static char * parkcall = PARK_APP_NAME ;
2004-08-03 06:31:20 +00:00
static char * synopsis2 = " Park yourself " ;
2006-04-10 17:32:29 +00:00
static char * descrip2 = " Park(): "
2004-08-03 06:31:20 +00:00
" Used to park yourself (typically in combination with a supervised \n "
2004-12-28 23:49:46 +00:00
" transfer to know the parking space). This application is always \n "
2004-08-03 06:31:20 +00:00
" registered internally and does not need to be explicitly added \n "
" into the dialplan, although you should include the 'parkedcalls' \n "
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
" context (or the context specified in features.conf). \n \n "
" If you set the PARKINGEXTEN variable to an extension in your \n "
" parking context, park() will park the call on that extension, unless \n "
" it already exists. In that case, execution will continue at next \n "
" priority. \n " ;
2004-08-03 06:31:20 +00:00
2006-01-09 09:07:58 +00:00
static struct ast_app * monitor_app = NULL ;
static int monitor_ok = 1 ;
2004-09-17 03:49:57 +00:00
2001-12-27 11:07:33 +00:00
struct parkeduser {
2006-06-21 07:49:29 +00:00
struct ast_channel * chan ; /*!< Parking channel */
struct timeval start ; /*!< Time the parking started */
int parkingnum ; /*!< Parking lot */
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
char parkingexten [ AST_MAX_EXTENSION ] ; /*!< If set beforehand, parking extension used for this call */
2006-06-21 07:49:29 +00:00
char context [ AST_MAX_CONTEXT ] ; /*!< Where to go if our parking time expires */
2001-12-27 11:07:33 +00:00
char exten [ AST_MAX_EXTENSION ] ;
int priority ;
2006-06-21 07:49:29 +00:00
int parkingtime ; /*!< Maximum length in parking lot before return */
2004-08-03 06:31:20 +00:00
int notquiteyet ;
2004-12-09 22:39:14 +00:00
char peername [ 1024 ] ;
2005-03-17 21:52:57 +00:00
unsigned char moh_trys ;
2001-12-27 11:07:33 +00:00
struct parkeduser * next ;
} ;
static struct parkeduser * parkinglot ;
2006-04-17 04:31:21 +00:00
AST_MUTEX_DEFINE_STATIC ( parking_lock ) ; /*!< protects all static variables above */
2001-12-27 11:07:33 +00:00
static pthread_t parking_thread ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
struct ast_dial_features {
struct ast_flags features_caller ;
struct ast_flags features_callee ;
int is_caller ;
} ;
static void * dial_features_duplicate ( void * data )
{
struct ast_dial_features * df = data , * df_copy ;
if ( ! ( df_copy = ast_calloc ( 1 , sizeof ( * df ) ) ) ) {
return NULL ;
}
memcpy ( df_copy , df , sizeof ( * df ) ) ;
return df_copy ;
}
static void dial_features_destroy ( void * data )
{
struct ast_dial_features * df = data ;
if ( df ) {
ast_free ( df ) ;
}
}
const struct ast_datastore_info dial_features_info = {
. type = " dial-features " ,
. destroy = dial_features_destroy ,
. duplicate = dial_features_duplicate ,
} ;
2001-12-27 11:07:33 +00:00
char * ast_parking_ext ( void )
{
return parking_ext ;
}
2003-04-09 04:00:43 +00:00
char * ast_pickup_ext ( void )
{
return pickup_ext ;
}
2005-01-05 19:56:47 +00:00
struct ast_bridge_thread_obj
{
struct ast_bridge_config bconfig ;
struct ast_channel * chan ;
struct ast_channel * peer ;
} ;
2006-04-17 04:31:21 +00:00
/*! \brief store context, priority and extension */
static void set_c_e_p ( struct ast_channel * chan , const char * context , const char * ext , int pri )
2006-04-16 18:49:46 +00:00
{
2006-04-17 04:31:21 +00:00
ast_copy_string ( chan - > context , context , sizeof ( chan - > context ) ) ;
2006-04-16 18:49:46 +00:00
ast_copy_string ( chan - > exten , ext , sizeof ( chan - > exten ) ) ;
chan - > priority = pri ;
}
2005-04-22 02:55:14 +00:00
static void check_goto_on_transfer ( struct ast_channel * chan )
{
struct ast_channel * xferchan ;
2005-12-03 19:25:33 +00:00
const char * val = pbx_builtin_getvar_helper ( chan , " GOTO_ON_BLINDXFR " ) ;
char * x , * goto_on_transfer ;
struct ast_frame * f ;
2005-04-22 02:55:14 +00:00
2006-05-10 13:22:15 +00:00
if ( ast_strlen_zero ( val ) )
return ;
goto_on_transfer = ast_strdupa ( val ) ;
2008-11-29 16:58:29 +00:00
if ( ! ( xferchan = ast_channel_alloc ( 0 , AST_STATE_DOWN , 0 , 0 , " " , " " , " " , 0 , " %s " , chan - > name ) ) )
2006-05-10 13:22:15 +00:00
return ;
for ( x = goto_on_transfer ; x & & * x ; x + + ) {
if ( * x = = ' ^ ' )
* x = ' | ' ;
}
/* Make formats okay */
xferchan - > readformat = chan - > readformat ;
xferchan - > writeformat = chan - > writeformat ;
ast_channel_masquerade ( xferchan , chan ) ;
ast_parseable_goto ( xferchan , goto_on_transfer ) ;
xferchan - > _state = AST_STATE_UP ;
ast_clear_flag ( xferchan , AST_FLAGS_ALL ) ;
xferchan - > _softhangup = 0 ;
if ( ( f = ast_read ( xferchan ) ) ) {
ast_frfree ( f ) ;
f = NULL ;
ast_pbx_start ( xferchan ) ;
} else {
ast_hangup ( xferchan ) ;
2005-04-22 02:55:14 +00:00
}
}
2008-02-27 17:26:55 +00:00
static struct ast_channel * ast_feature_request_and_dial ( struct ast_channel * caller , const char * type , int format , void * data , int timeout , int * outstate , const char * cid_num , const char * cid_name , const char * language ) ;
2005-06-23 22:12:01 +00:00
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
static void * ast_bridge_call_thread ( void * data )
2005-01-05 19:56:47 +00:00
{
struct ast_bridge_thread_obj * tobj = data ;
2005-11-06 21:00:35 +00:00
2005-01-05 19:56:47 +00:00
tobj - > chan - > appl = " Transferred Call " ;
2006-04-14 23:20:29 +00:00
tobj - > chan - > data = tobj - > peer - > name ;
2005-01-05 19:56:47 +00:00
tobj - > peer - > appl = " Transferred Call " ;
2006-04-14 23:20:29 +00:00
tobj - > peer - > data = tobj - > chan - > name ;
2005-01-05 19:56:47 +00:00
ast_bridge_call ( tobj - > peer , tobj - > chan , & tobj - > bconfig ) ;
ast_hangup ( tobj - > chan ) ;
ast_hangup ( tobj - > peer ) ;
2006-04-17 04:31:21 +00:00
bzero ( tobj , sizeof ( * tobj ) ) ; /*! \todo XXX for safety */
2005-01-05 19:56:47 +00:00
free ( tobj ) ;
return NULL ;
}
static void ast_bridge_call_thread_launch ( void * data )
{
pthread_t thread ;
pthread_attr_t attr ;
2005-11-09 00:16:08 +00:00
struct sched_param sched ;
2005-01-05 19:56:47 +00:00
2005-11-09 00:16:08 +00:00
pthread_attr_init ( & attr ) ;
2005-01-05 19:56:47 +00:00
pthread_attr_setdetachstate ( & attr , PTHREAD_CREATE_DETACHED ) ;
2005-11-09 00:16:08 +00:00
ast_pthread_create ( & thread , & attr , ast_bridge_call_thread , data ) ;
pthread_attr_destroy ( & attr ) ;
memset ( & sched , 0 , sizeof ( sched ) ) ;
pthread_setschedparam ( thread , SCHED_RR , & sched ) ;
2005-01-05 19:56:47 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
static int adsi_announce_park ( struct ast_channel * chan , char * parkingexten )
2004-09-15 19:49:33 +00:00
{
int res ;
int justify [ 5 ] = { ADSI_JUST_CENT , ADSI_JUST_CENT , ADSI_JUST_CENT , ADSI_JUST_CENT } ;
2005-09-07 21:01:31 +00:00
char tmp [ 256 ] ;
2005-09-07 18:55:03 +00:00
char * message [ 5 ] = { NULL , NULL , NULL , NULL , NULL } ;
2004-09-15 19:49:33 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
snprintf ( tmp , sizeof ( tmp ) , " Parked on %s " , parkingexten ) ;
2005-09-07 18:55:03 +00:00
message [ 0 ] = tmp ;
2006-09-20 04:34:51 +00:00
res = ast_adsi_load_session ( chan , NULL , 0 , 1 ) ;
2006-04-14 23:20:29 +00:00
if ( res = = - 1 )
2004-09-15 19:49:33 +00:00
return res ;
2006-09-20 04:34:51 +00:00
return ast_adsi_print ( chan , message , justify , 1 ) ;
2004-09-15 19:49:33 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Notify metermaids that we've changed an extension */
static void notify_metermaids ( char * exten , char * context )
{
if ( option_debug > 3 )
ast_log ( LOG_DEBUG , " Notification of state change to metermaids %s@%s \n " , exten , context ) ;
/* Send notification to devicestate subsystem */
ast_device_state_changed ( " park:%s@%s " , exten , context ) ;
return ;
}
/*! \brief metermaids callback from devicestate.c */
static int metermaidstate ( const char * data )
{
int res = AST_DEVICE_INVALID ;
char * context = ast_strdupa ( data ) ;
char * exten ;
exten = strsep ( & context , " @ " ) ;
if ( ! context )
return res ;
if ( option_debug > 3 )
ast_log ( LOG_DEBUG , " Checking state of exten %s in context %s \n " , exten , context ) ;
res = ast_exists_extension ( NULL , context , exten , 1 , NULL ) ;
if ( ! res )
return AST_DEVICE_NOT_INUSE ;
else
return AST_DEVICE_INUSE ;
}
2009-02-03 21:57:01 +00:00
static struct parkeduser * park_space_reserve ( struct ast_channel * chan )
2001-12-27 11:07:33 +00:00
{
struct parkeduser * pu , * cur ;
2009-02-03 21:57:01 +00:00
int i , parking_space = - 1 , parking_range ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
const char * parkingexten ;
2009-02-03 21:57:01 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Allocate memory for parking data */
2006-06-21 07:49:29 +00:00
if ( ! ( pu = ast_calloc ( 1 , sizeof ( * pu ) ) ) )
2009-02-03 21:57:01 +00:00
return NULL ;
2006-06-21 07:49:29 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Lock parking lot */
2005-07-25 17:31:53 +00:00
ast_mutex_lock ( & parking_lock ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Check for channel variable PARKINGEXTEN */
parkingexten = pbx_builtin_getvar_helper ( chan , " PARKINGEXTEN " ) ;
if ( ! ast_strlen_zero ( parkingexten ) ) {
2008-06-12 15:46:08 +00:00
/*!\note The API forces us to specify a numeric parking slot, even
* though the architecture would tend to support non - numeric extensions
* ( as are possible with SIP , for example ) . Hence , we enforce that
* limitation here . If extout was not numeric , we could permit
* arbitrary non - numeric extensions .
*/
2009-02-03 21:57:01 +00:00
if ( sscanf ( parkingexten , " %d " , & parking_space ) ! = 1 | | parking_space < 0 ) {
2008-06-12 15:46:08 +00:00
ast_log ( LOG_WARNING , " PARKINGEXTEN does not indicate a valid parking slot: '%s'. \n " , parkingexten ) ;
ast_mutex_unlock ( & parking_lock ) ;
free ( pu ) ;
2009-02-03 21:57:01 +00:00
return NULL ;
2008-06-12 15:46:08 +00:00
}
2009-02-03 21:57:01 +00:00
snprintf ( pu - > parkingexten , sizeof ( pu - > parkingexten ) , " %d " , parking_space ) ;
2008-06-12 15:46:08 +00:00
if ( ast_exists_extension ( NULL , parking_con , pu - > parkingexten , 1 , NULL ) ) {
2007-05-15 19:52:18 +00:00
ast_mutex_unlock ( & parking_lock ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
ast_log ( LOG_WARNING , " Requested parking extension already exists: %s@%s \n " , parkingexten , parking_con ) ;
2009-02-03 21:57:01 +00:00
free ( pu ) ;
return NULL ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
}
} else {
/* Select parking space within range */
parking_range = parking_stop - parking_start + 1 ;
for ( i = 0 ; i < parking_range ; i + + ) {
2009-02-03 21:57:01 +00:00
parking_space = ( i + parking_offset ) % parking_range + parking_start ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
cur = parkinglot ;
while ( cur ) {
2009-02-03 21:57:01 +00:00
if ( cur - > parkingnum = = parking_space )
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
break ;
cur = cur - > next ;
}
if ( ! cur )
2001-12-27 11:07:33 +00:00
break ;
}
2005-04-27 03:58:40 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( ! ( i < parking_range ) ) {
ast_log ( LOG_WARNING , " No more parking spaces \n " ) ;
ast_mutex_unlock ( & parking_lock ) ;
2009-02-03 21:57:01 +00:00
free ( pu ) ;
return NULL ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
}
/* Set pointer for next parking */
if ( parkfindnext )
2009-02-03 21:57:01 +00:00
parking_offset = parking_space - parking_start + 1 ;
snprintf ( pu - > parkingexten , sizeof ( pu - > parkingexten ) , " %d " , parking_space ) ;
2005-07-25 17:31:53 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
2009-02-03 21:57:01 +00:00
pu - > notquiteyet = 1 ;
pu - > parkingnum = parking_space ;
pu - > next = parkinglot ;
parkinglot = pu ;
ast_mutex_unlock ( & parking_lock ) ;
return pu ;
}
static int park_call_full ( struct ast_channel * chan , struct ast_channel * peer , int timeout , int * extout , const char * orig_chan_name , struct parkeduser * pu )
{
struct ast_context * con ;
int parkingnum_copy ;
2009-02-12 20:34:36 +00:00
const char * event_from ;
2009-02-03 21:57:01 +00:00
/* Get a valid space if not already done */
if ( pu = = NULL )
pu = park_space_reserve ( chan ) ;
if ( pu = = NULL )
return 1 ; /* Continue execution if possible */
snprintf ( pu - > parkingexten , sizeof ( pu - > parkingexten ) , " %d " , pu - > parkingnum ) ;
2005-07-25 17:31:53 +00:00
chan - > appl = " Parked Call " ;
chan - > data = NULL ;
pu - > chan = chan ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
2006-07-19 20:44:39 +00:00
/* Put the parked channel on hold if we have two different channels */
2005-07-25 17:31:53 +00:00
if ( chan ! = peer ) {
2006-07-19 20:44:39 +00:00
ast_indicate_data ( pu - > chan , AST_CONTROL_HOLD ,
S_OR ( parkmohclass , NULL ) ,
! ast_strlen_zero ( parkmohclass ) ? strlen ( parkmohclass ) + 1 : 0 ) ;
2005-07-25 17:31:53 +00:00
}
2006-07-19 20:44:39 +00:00
2005-07-25 17:31:53 +00:00
pu - > start = ast_tvnow ( ) ;
2006-04-16 18:37:01 +00:00
pu - > parkingtime = ( timeout > 0 ) ? timeout : parkingtime ;
2005-07-25 17:31:53 +00:00
if ( extout )
2009-02-03 21:57:01 +00:00
* extout = pu - > parkingnum ;
2007-12-26 17:24:17 +00:00
2008-06-13 16:29:07 +00:00
if ( peer ) {
/* This is so ugly that it hurts, but implementing get_base_channel() on local channels
could have ugly side effects . We could have transferer < - > local , 1 < - > local , 2 < - > parking
and we need the callback name to be that of transferer . Since local , 1 / 2 have the same
name we can be tricky and just grab the bridged channel from the other side of the local
*/
if ( ! strcasecmp ( peer - > tech - > type , " Local " ) ) {
struct ast_channel * tmpchan , * base_peer ;
char other_side [ AST_CHANNEL_NAME ] ;
char * c ;
2009-01-20 18:40:56 +00:00
ast_copy_string ( other_side , S_OR ( orig_chan_name , peer - > name ) , sizeof ( other_side ) ) ;
2008-06-13 16:29:07 +00:00
if ( ( c = strrchr ( other_side , ' , ' ) ) ) {
* + + c = ' 1 ' ;
}
if ( ( tmpchan = ast_get_channel_by_name_locked ( other_side ) ) ) {
if ( ( base_peer = ast_bridged_channel ( tmpchan ) ) ) {
ast_copy_string ( pu - > peername , base_peer - > name , sizeof ( pu - > peername ) ) ;
}
ast_channel_unlock ( tmpchan ) ;
}
} else {
2009-01-20 18:40:56 +00:00
ast_copy_string ( pu - > peername , S_OR ( orig_chan_name , peer - > name ) , sizeof ( pu - > peername ) ) ;
2008-06-13 16:29:07 +00:00
}
}
2005-07-25 17:31:53 +00:00
/* Remember what had been dialed, so that if the parking
expires , we try to come back to the same place */
2006-04-14 23:20:29 +00:00
ast_copy_string ( pu - > context , S_OR ( chan - > macrocontext , chan - > context ) , sizeof ( pu - > context ) ) ;
ast_copy_string ( pu - > exten , S_OR ( chan - > macroexten , chan - > exten ) , sizeof ( pu - > exten ) ) ;
pu - > priority = chan - > macropriority ? chan - > macropriority : chan - > priority ;
2008-09-16 21:44:21 +00:00
parkingnum_copy = pu - > parkingnum ;
2009-02-03 21:57:01 +00:00
/* If parking a channel directly (peer == chan), don't quite yet get parking running on it.
* All parking lot entires are put into the parking lot with notquiteyet on . */
if ( peer ! = chan )
pu - > notquiteyet = 0 ;
2008-09-16 21:44:21 +00:00
2005-07-25 17:31:53 +00:00
if ( option_verbose > 1 )
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
ast_verbose ( VERBOSE_PREFIX_2 " Parked %s on %d@%s. Will timeout back to extension [%s] %s, %d in %d seconds \n " , pu - > chan - > name , pu - > parkingnum , parking_con , pu - > context , pu - > exten , pu - > priority , ( pu - > parkingtime / 1000 ) ) ;
2005-07-25 17:31:53 +00:00
2009-02-12 20:34:36 +00:00
if ( peer ) {
event_from = peer - > name ;
} else {
event_from = pbx_builtin_getvar_helper ( chan , " BLINDTRANSFER " ) ;
}
2005-07-25 17:31:53 +00:00
manager_event ( EVENT_FLAG_CALL , " ParkedCall " ,
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
" Exten: %s \r \n "
2005-07-25 17:31:53 +00:00
" Channel: %s \r \n "
" From: %s \r \n "
" Timeout: %ld \r \n "
" CallerID: %s \r \n "
2006-04-21 10:47:07 +00:00
" CallerIDName: %s \r \n " ,
2009-02-12 20:34:36 +00:00
pu - > parkingexten , pu - > chan - > name , event_from ? event_from : " " ,
2006-04-21 10:47:07 +00:00
( long ) pu - > start . tv_sec + ( long ) ( pu - > parkingtime / 1000 ) - ( long ) time ( NULL ) ,
S_OR ( pu - > chan - > cid . cid_num , " <unknown> " ) ,
S_OR ( pu - > chan - > cid . cid_name , " <unknown> " )
2005-07-25 17:31:53 +00:00
) ;
2003-07-02 14:06:12 +00:00
2006-09-20 04:34:51 +00:00
if ( peer & & adsipark & & ast_adsi_available ( peer ) ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
adsi_announce_park ( peer , pu - > parkingexten ) ; /* Only supports parking numbers */
2006-09-20 04:34:51 +00:00
ast_adsi_unload_session ( peer ) ;
2005-07-25 17:31:53 +00:00
}
2006-06-21 07:49:29 +00:00
2005-07-25 17:31:53 +00:00
con = ast_context_find ( parking_con ) ;
2006-06-21 07:49:29 +00:00
if ( ! con )
2005-07-25 17:31:53 +00:00
con = ast_context_create ( NULL , parking_con , registrar ) ;
2006-06-21 07:49:29 +00:00
if ( ! con ) /* Still no context? Bad */
ast_log ( LOG_ERROR , " Parking context '%s' does not exist and unable to create \n " , parking_con ) ;
2008-09-16 21:44:21 +00:00
if ( con ) {
2009-03-11 03:25:04 +00:00
if ( ! ast_add_extension2 ( con , 1 , pu - > parkingexten , 1 , NULL , NULL , parkedcall , strdup ( pu - > parkingexten ) , ast_free_ptr , registrar ) ) {
2008-09-16 21:44:21 +00:00
notify_metermaids ( pu - > parkingexten , parking_con ) ;
}
}
/* Wake up the (presumably select()ing) thread */
pthread_kill ( parking_thread , SIGURG ) ;
2008-09-16 16:14:25 +00:00
/* Only say number if it's a number and the channel hasn't been masqueraded away */
if ( peer & & ( ast_strlen_zero ( orig_chan_name ) | | ! strcasecmp ( peer - > name , orig_chan_name ) ) ) {
2007-09-05 20:53:41 +00:00
/* Make sure we don't start saying digits to the channel being parked */
ast_set_flag ( peer , AST_FLAG_MASQ_NOSTREAM ) ;
2008-09-16 16:14:25 +00:00
/* Tell the peer channel the number of the parking space */
2008-09-16 21:44:21 +00:00
ast_say_digits ( peer , parkingnum_copy , " " , peer - > language ) ;
2007-09-05 20:53:41 +00:00
ast_clear_flag ( peer , AST_FLAG_MASQ_NOSTREAM ) ;
}
2008-09-16 21:44:21 +00:00
2008-09-18 21:01:23 +00:00
if ( peer = = chan ) { /* pu->notquiteyet = 1 */
2005-07-25 17:31:53 +00:00
/* Wake up parking thread if we're really done */
2006-07-19 20:44:39 +00:00
ast_indicate_data ( pu - > chan , AST_CONTROL_HOLD ,
S_OR ( parkmohclass , NULL ) ,
! ast_strlen_zero ( parkmohclass ) ? strlen ( parkmohclass ) + 1 : 0 ) ;
2005-07-25 17:31:53 +00:00
pu - > notquiteyet = 0 ;
pthread_kill ( parking_thread , SIGURG ) ;
2001-12-27 11:07:33 +00:00
}
return 0 ;
}
2007-11-21 18:59:27 +00:00
/*! \brief Park a call
\ note We put the user in the parking list , then wake up the parking thread to be sure it looks
after these channels too */
int ast_park_call ( struct ast_channel * chan , struct ast_channel * peer , int timeout , int * extout )
{
2009-02-03 21:57:01 +00:00
return park_call_full ( chan , peer , timeout , extout , NULL , NULL ) ;
2007-11-21 18:59:27 +00:00
}
2009-01-20 18:40:56 +00:00
static int masq_park_call ( struct ast_channel * rchan , struct ast_channel * peer , int timeout , int * extout , int play_announcement , const char * orig_chan_name )
2001-12-27 11:07:33 +00:00
{
struct ast_channel * chan ;
struct ast_frame * f ;
2009-02-03 21:57:01 +00:00
struct parkeduser * pu ;
2008-06-12 15:46:08 +00:00
int park_status ;
2005-07-25 17:31:53 +00:00
2009-02-03 21:57:01 +00:00
if ( ( pu = park_space_reserve ( rchan ) ) = = NULL ) {
2009-02-12 17:57:10 +00:00
if ( peer )
ast_stream_and_wait ( peer , " beeperr " , peer - > language , " " ) ;
2009-02-03 21:57:01 +00:00
return FEATURE_RETURN_PARKFAILED ;
}
2001-12-27 11:07:33 +00:00
/* Make a new, fake channel that we'll use to masquerade in the real one */
2007-04-09 18:32:07 +00:00
if ( ! ( chan = ast_channel_alloc ( 0 , AST_STATE_DOWN , 0 , 0 , rchan - > accountcode , rchan - > exten , rchan - > context , rchan - > amaflags , " Parked/%s " , rchan - > name ) ) ) {
2001-12-27 11:07:33 +00:00
ast_log ( LOG_WARNING , " Unable to create parked channel \n " ) ;
return - 1 ;
}
2006-06-21 07:49:29 +00:00
/* Make formats okay */
chan - > readformat = rchan - > readformat ;
chan - > writeformat = rchan - > writeformat ;
ast_channel_masquerade ( chan , rchan ) ;
/* Setup the extensions and such */
set_c_e_p ( chan , rchan - > context , rchan - > exten , rchan - > priority ) ;
/* Make the masq execute */
2008-09-16 16:14:25 +00:00
if ( ( f = ast_read ( chan ) ) ) {
2006-06-21 07:49:29 +00:00
ast_frfree ( f ) ;
2008-09-16 16:14:25 +00:00
}
2006-06-21 07:49:29 +00:00
2009-01-15 18:22:49 +00:00
if ( peer = = rchan ) {
peer = chan ;
}
2009-01-20 18:40:56 +00:00
if ( ! play_announcement | | ! orig_chan_name ) {
2008-09-16 16:14:25 +00:00
orig_chan_name = ast_strdupa ( chan - > name ) ;
}
2008-01-28 18:26:31 +00:00
2009-02-03 21:57:01 +00:00
park_status = park_call_full ( chan , peer , timeout , extout , orig_chan_name , pu ) ;
2008-06-12 15:46:08 +00:00
if ( park_status = = 1 ) {
/* would be nice to play: "invalid parking extension" */
ast_hangup ( chan ) ;
return - 1 ;
}
2008-01-28 18:26:31 +00:00
2001-12-27 11:07:33 +00:00
return 0 ;
}
2008-09-16 16:14:25 +00:00
int ast_masq_park_call ( struct ast_channel * rchan , struct ast_channel * peer , int timeout , int * extout )
{
2009-01-20 18:40:56 +00:00
return masq_park_call ( rchan , peer , timeout , extout , 0 , NULL ) ;
2008-09-16 16:14:25 +00:00
}
2009-01-20 18:40:56 +00:00
static int masq_park_call_announce ( struct ast_channel * rchan , struct ast_channel * peer , int timeout , int * extout , const char * orig_chan_name )
2008-09-16 16:14:25 +00:00
{
2009-01-20 18:40:56 +00:00
return masq_park_call ( rchan , peer , timeout , extout , 1 , orig_chan_name ) ;
2008-09-16 16:14:25 +00:00
}
2005-01-04 04:01:40 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief
2006-04-16 19:26:57 +00:00
* set caller and callee according to the direction
*/
static void set_peers ( struct ast_channel * * caller , struct ast_channel * * callee ,
struct ast_channel * peer , struct ast_channel * chan , int sense )
{
if ( sense = = FEATURE_SENSE_PEER ) {
* caller = peer ;
* callee = chan ;
} else {
* callee = peer ;
* caller = chan ;
}
}
2005-01-04 04:01:40 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief support routing for one touch call parking */
2007-08-23 20:16:41 +00:00
static int builtin_parkcall ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2006-05-22 16:43:43 +00:00
{
struct ast_channel * parker ;
2008-10-03 20:44:22 +00:00
struct ast_channel * parkee ;
2006-08-21 02:11:39 +00:00
int res = 0 ;
struct ast_module_user * u ;
2009-01-20 23:49:34 +00:00
const char * orig_chan_name ;
2006-05-22 16:43:43 +00:00
2006-08-21 02:11:39 +00:00
u = ast_module_user_add ( chan ) ;
2006-05-22 16:43:43 +00:00
set_peers ( & parker , & parkee , peer , chan , sense ) ;
2009-01-20 23:49:34 +00:00
orig_chan_name = ast_strdupa ( parker - > name ) ;
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
/* we used to set chan's exten and priority to "s" and 1
here , but this generates ( in some cases ) an invalid
extension , and if " s " exists , could errantly
cause execution of extensions you don ' t expect It
makes more sense to let nature take its course
when chan finishes , and let the pbx do its thing
and hang up when the park is over .
*/
2006-05-22 16:43:43 +00:00
if ( chan - > _state ! = AST_STATE_UP )
res = ast_answer ( chan ) ;
if ( ! res )
res = ast_safe_sleep ( chan , 1000 ) ;
2006-08-21 02:11:39 +00:00
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
if ( ! res ) { /* one direction used to call park_call.... */
2009-02-03 21:57:01 +00:00
res = masq_park_call_announce ( parkee , parker , 0 , NULL , orig_chan_name ) ;
/* PBX should hangup zombie channel if a masquerade actually occurred (res=0) */
2006-05-22 16:43:43 +00:00
}
2008-09-16 16:14:25 +00:00
ast_module_user_remove ( u ) ;
2006-05-22 16:43:43 +00:00
return res ;
}
2007-08-23 20:16:41 +00:00
static int builtin_automonitor ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2005-01-05 19:56:47 +00:00
{
2005-12-08 18:18:59 +00:00
char * caller_chan_id = NULL , * callee_chan_id = NULL , * args = NULL , * touch_filename = NULL ;
2005-01-10 04:03:30 +00:00
int x = 0 ;
size_t len ;
2006-04-18 13:05:48 +00:00
struct ast_channel * caller_chan , * callee_chan ;
2005-01-11 18:24:27 +00:00
2005-01-10 04:03:30 +00:00
if ( ! monitor_ok ) {
ast_log ( LOG_ERROR , " Cannot record the call. The monitor application is disabled. \n " ) ;
return - 1 ;
}
2005-01-05 19:56:47 +00:00
2006-04-16 18:37:01 +00:00
if ( ! monitor_app & & ! ( monitor_app = pbx_findapp ( " Monitor " ) ) ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
monitor_ok = 0 ;
2006-04-16 18:37:01 +00:00
ast_log ( LOG_ERROR , " Cannot record the call. The monitor application is disabled. \n " ) ;
return - 1 ;
2005-01-10 04:03:30 +00:00
}
2006-04-16 19:26:57 +00:00
set_peers ( & caller_chan , & callee_chan , peer , chan , sense ) ;
2005-01-10 04:03:30 +00:00
if ( ! ast_strlen_zero ( courtesytone ) ) {
2005-01-11 18:24:27 +00:00
if ( ast_autoservice_start ( callee_chan ) )
2005-01-10 04:03:30 +00:00
return - 1 ;
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( caller_chan , courtesytone , caller_chan - > language , " " ) ) {
2006-04-16 22:46:00 +00:00
ast_log ( LOG_WARNING , " Failed to play courtesy tone! \n " ) ;
ast_autoservice_stop ( callee_chan ) ;
return - 1 ;
2005-01-05 22:38:07 +00:00
}
2005-01-11 18:24:27 +00:00
if ( ast_autoservice_stop ( callee_chan ) )
2005-01-10 04:03:30 +00:00
return - 1 ;
}
2005-01-11 18:24:27 +00:00
if ( callee_chan - > monitor ) {
2005-01-10 04:03:30 +00:00
if ( option_verbose > 3 )
ast_verbose ( VERBOSE_PREFIX_3 " User hit '%s' to stop recording call. \n " , code ) ;
2005-01-11 18:24:27 +00:00
ast_monitor_stop ( callee_chan , 1 ) ;
2005-01-05 19:56:47 +00:00
return FEATURE_RETURN_SUCCESS ;
}
2005-01-11 18:24:27 +00:00
if ( caller_chan & & callee_chan ) {
2005-12-03 19:25:33 +00:00
const char * touch_format = pbx_builtin_getvar_helper ( caller_chan , " TOUCH_MONITOR_FORMAT " ) ;
const char * touch_monitor = pbx_builtin_getvar_helper ( caller_chan , " TOUCH_MONITOR " ) ;
2005-05-16 00:43:16 +00:00
if ( ! touch_format )
touch_format = pbx_builtin_getvar_helper ( callee_chan , " TOUCH_MONITOR_FORMAT " ) ;
2005-01-10 04:03:30 +00:00
if ( ! touch_monitor )
2005-01-11 18:24:27 +00:00
touch_monitor = pbx_builtin_getvar_helper ( callee_chan , " TOUCH_MONITOR " ) ;
2005-12-08 18:18:59 +00:00
2005-01-10 04:03:30 +00:00
if ( touch_monitor ) {
len = strlen ( touch_monitor ) + 50 ;
args = alloca ( len ) ;
2005-12-08 18:18:59 +00:00
touch_filename = alloca ( len ) ;
2006-02-22 22:53:49 +00:00
snprintf ( touch_filename , len , " auto-%ld-%s " , ( long ) time ( NULL ) , touch_monitor ) ;
2005-12-08 18:18:59 +00:00
snprintf ( args , len , " %s|%s|m " , ( touch_format ) ? touch_format : " wav " , touch_filename ) ;
2005-01-10 04:03:30 +00:00
} else {
2006-04-21 10:47:07 +00:00
caller_chan_id = ast_strdupa ( S_OR ( caller_chan - > cid . cid_num , caller_chan - > name ) ) ;
callee_chan_id = ast_strdupa ( S_OR ( callee_chan - > cid . cid_num , callee_chan - > name ) ) ;
2005-01-11 18:24:27 +00:00
len = strlen ( caller_chan_id ) + strlen ( callee_chan_id ) + 50 ;
2005-01-10 04:03:30 +00:00
args = alloca ( len ) ;
2005-12-08 18:18:59 +00:00
touch_filename = alloca ( len ) ;
2006-02-22 22:53:49 +00:00
snprintf ( touch_filename , len , " auto-%ld-%s-%s " , ( long ) time ( NULL ) , caller_chan_id , callee_chan_id ) ;
2006-04-21 10:47:07 +00:00
snprintf ( args , len , " %s|%s|m " , S_OR ( touch_format , " wav " ) , touch_filename ) ;
2005-01-10 04:03:30 +00:00
}
2006-04-14 23:20:29 +00:00
for ( x = 0 ; x < strlen ( args ) ; x + + ) {
2005-01-10 04:03:30 +00:00
if ( args [ x ] = = ' / ' )
args [ x ] = ' - ' ;
2006-04-14 23:20:29 +00:00
}
2005-01-10 04:03:30 +00:00
if ( option_verbose > 3 )
ast_verbose ( VERBOSE_PREFIX_3 " User hit '%s' to record call. filename: %s \n " , code , args ) ;
2006-03-30 21:29:39 +00:00
pbx_exec ( callee_chan , monitor_app , args ) ;
2005-12-08 18:18:59 +00:00
pbx_builtin_setvar_helper ( callee_chan , " TOUCH_MONITOR_OUTPUT " , touch_filename ) ;
pbx_builtin_setvar_helper ( caller_chan , " TOUCH_MONITOR_OUTPUT " , touch_filename ) ;
2005-01-10 04:03:30 +00:00
return FEATURE_RETURN_SUCCESS ;
}
ast_log ( LOG_NOTICE , " Cannot record the call. One or both channels have gone away. \n " ) ;
2005-01-05 19:56:47 +00:00
return - 1 ;
}
2007-08-23 20:16:41 +00:00
static int builtin_disconnect ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2005-01-04 04:01:40 +00:00
{
if ( option_verbose > 3 )
ast_verbose ( VERBOSE_PREFIX_3 " User hit '%s' to disconnect call. \n " , code ) ;
return FEATURE_RETURN_HANGUP ;
}
2006-04-16 19:26:57 +00:00
static int finishup ( struct ast_channel * chan )
{
ast_indicate ( chan , AST_CONTROL_UNHOLD ) ;
2006-07-19 20:44:39 +00:00
return ast_autoservice_stop ( chan ) ;
2006-04-16 19:26:57 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Find the context for the transfer */
2006-04-16 19:26:57 +00:00
static const char * real_ctx ( struct ast_channel * transferer , struct ast_channel * transferee )
{
2006-05-26 17:59:29 +00:00
const char * s = pbx_builtin_getvar_helper ( transferer , " TRANSFER_CONTEXT " ) ;
2006-04-16 19:26:57 +00:00
if ( ast_strlen_zero ( s ) )
2006-05-26 17:59:29 +00:00
s = pbx_builtin_getvar_helper ( transferee , " TRANSFER_CONTEXT " ) ;
2006-04-16 19:26:57 +00:00
if ( ast_strlen_zero ( s ) ) /* Use the non-macro context to transfer the call XXX ? */
s = transferer - > macrocontext ;
if ( ast_strlen_zero ( s ) )
s = transferer - > context ;
return s ;
}
2007-08-23 20:16:41 +00:00
static int builtin_blindtransfer ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2005-01-04 04:01:40 +00:00
{
struct ast_channel * transferer ;
struct ast_channel * transferee ;
2005-12-03 19:25:33 +00:00
const char * transferer_real_context ;
2006-04-16 19:56:08 +00:00
char xferto [ 256 ] ;
2005-01-04 04:01:40 +00:00
int res ;
2009-01-21 23:23:59 +00:00
const char * orig_chan_name ;
2009-02-03 21:57:01 +00:00
int parkstatus = 0 ;
2005-01-04 04:01:40 +00:00
2006-04-16 19:26:57 +00:00
set_peers ( & transferer , & transferee , peer , chan , sense ) ;
2009-01-21 23:23:59 +00:00
orig_chan_name = ast_strdupa ( transferer - > name ) ;
2006-04-16 19:26:57 +00:00
transferer_real_context = real_ctx ( transferer , transferee ) ;
2006-04-16 19:41:12 +00:00
/* Start autoservice on chan while we talk to the originator */
2005-01-04 04:01:40 +00:00
ast_autoservice_start ( transferee ) ;
2006-07-19 20:44:39 +00:00
ast_indicate ( transferee , AST_CONTROL_HOLD ) ;
2005-01-04 04:01:40 +00:00
2006-04-16 19:56:08 +00:00
memset ( xferto , 0 , sizeof ( xferto ) ) ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2005-01-04 04:01:40 +00:00
/* Transfer */
2006-04-21 20:28:32 +00:00
res = ast_stream_and_wait ( transferer , " pbx-transfer " , transferer - > language , AST_DIGIT_ANY ) ;
2006-04-16 21:41:06 +00:00
if ( res < 0 ) {
finishup ( transferee ) ;
return - 1 ; /* error ? */
2005-01-04 04:01:40 +00:00
}
2006-04-18 13:05:48 +00:00
if ( res > 0 ) /* If they've typed a digit already, handle it */
xferto [ 0 ] = ( char ) res ;
2005-01-04 04:01:40 +00:00
2005-02-17 20:04:10 +00:00
ast_stopstream ( transferer ) ;
2006-04-16 19:56:08 +00:00
res = ast_app_dtget ( transferer , transferer_real_context , xferto , sizeof ( xferto ) , 100 , transferdigittimeout ) ;
2006-04-16 21:41:06 +00:00
if ( res < 0 ) { /* hangup, would be 0 for invalid and 1 for valid */
finishup ( transferee ) ;
2005-01-04 04:01:40 +00:00
return res ;
}
2006-04-16 19:56:08 +00:00
if ( ! strcmp ( xferto , ast_parking_ext ( ) ) ) {
2006-04-16 21:41:06 +00:00
res = finishup ( transferee ) ;
2005-01-17 12:37:55 +00:00
if ( res )
2005-01-04 04:01:40 +00:00
res = - 1 ;
2009-02-03 21:57:01 +00:00
else if ( ! ( parkstatus = masq_park_call_announce ( transferee , transferer , 0 , NULL , orig_chan_name ) ) ) { /* success */
2005-01-04 04:01:40 +00:00
/* We return non-zero, but tell the PBX not to hang the channel when
the thread dies - - We have to be careful now though . We are responsible for
hanging up the channel , else it will never be hung up ! */
2008-12-02 23:58:08 +00:00
return 0 ;
2005-01-04 04:01:40 +00:00
} else {
2009-02-03 21:57:01 +00:00
ast_log ( LOG_WARNING , " Unable to park call %s, parkstatus=%d \n " , transferee - > name , parkstatus ) ;
2005-01-04 04:01:40 +00:00
}
2006-04-17 04:31:21 +00:00
/*! \todo XXX Maybe we should have another message here instead of invalid extension XXX */
2006-04-16 19:56:08 +00:00
} else if ( ast_exists_extension ( transferee , transferer_real_context , xferto , 1 , transferer - > cid . cid_num ) ) {
2008-07-18 15:34:42 +00:00
pbx_builtin_setvar_helper ( transferer , " BLINDTRANSFER " , transferee - > name ) ;
pbx_builtin_setvar_helper ( transferee , " BLINDTRANSFER " , transferer - > name ) ;
2006-04-16 21:41:06 +00:00
res = finishup ( transferee ) ;
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
if ( ! transferer - > cdr ) { /* this code should never get called (in a perfect world) */
2007-03-30 14:11:59 +00:00
transferer - > cdr = ast_cdr_alloc ( ) ;
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
if ( transferer - > cdr ) {
2007-03-30 17:51:17 +00:00
ast_cdr_init ( transferer - > cdr , transferer ) ; /* initilize our channel's cdr */
ast_cdr_start ( transferer - > cdr ) ;
}
}
if ( transferer - > cdr ) {
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
struct ast_cdr * swap = transferer - > cdr ;
/* swap cdrs-- it will save us some time & work */
transferer - > cdr = transferee - > cdr ;
transferee - > cdr = swap ;
2007-03-30 14:11:59 +00:00
}
2007-08-14 15:27:13 +00:00
if ( ! transferee - > pbx ) {
/* Doh! Use our handy async_goto functions */
if ( option_verbose > 2 )
ast_verbose ( VERBOSE_PREFIX_3 " Transferring %s to '%s' (context %s) priority 1 \n "
, transferee - > name , xferto , transferer_real_context ) ;
if ( ast_async_goto ( transferee , transferer_real_context , xferto , 1 ) )
ast_log ( LOG_WARNING , " Async goto failed :-( \n " ) ;
2005-01-04 04:01:40 +00:00
res = - 1 ;
2007-08-14 15:27:13 +00:00
} else {
/* Set the channel's new extension, since it exists, using transferer context */
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
ast_set_flag ( transferee , AST_FLAG_BRIDGE_HANGUP_DONT ) ; /* don't let the after-bridge code run the h-exten */
2007-08-14 15:27:13 +00:00
set_c_e_p ( transferee , transferer_real_context , xferto , 0 ) ;
}
2005-04-22 02:55:14 +00:00
check_goto_on_transfer ( transferer ) ;
2005-01-04 04:01:40 +00:00
return res ;
} else {
if ( option_verbose > 2 )
2006-04-16 19:56:08 +00:00
ast_verbose ( VERBOSE_PREFIX_3 " Unable to find extension '%s' in context '%s' \n " , xferto , transferer_real_context ) ;
2005-01-04 04:01:40 +00:00
}
2009-02-03 21:57:01 +00:00
if ( parkstatus ! = FEATURE_RETURN_PARKFAILED & & ast_stream_and_wait ( transferer , xferfailsound , transferer - > language , AST_DIGIT_ANY ) < 0 ) {
2006-04-16 21:41:06 +00:00
finishup ( transferee ) ;
return - 1 ;
2005-01-04 04:01:40 +00:00
}
ast_stopstream ( transferer ) ;
2006-04-16 21:41:06 +00:00
res = finishup ( transferee ) ;
2005-01-04 04:01:40 +00:00
if ( res ) {
if ( option_verbose > 1 )
ast_verbose ( VERBOSE_PREFIX_2 " Hungup during autoservice stop on '%s' \n " , transferee - > name ) ;
return res ;
}
return FEATURE_RETURN_SUCCESS ;
}
2006-04-18 13:05:48 +00:00
static int check_compat ( struct ast_channel * c , struct ast_channel * newchan )
{
if ( ast_channel_make_compatible ( c , newchan ) < 0 ) {
ast_log ( LOG_WARNING , " Had to drop call because I couldn't make %s compatible with %s \n " ,
c - > name , newchan - > name ) ;
ast_hangup ( newchan ) ;
return - 1 ;
}
return 0 ;
}
2007-08-23 20:16:41 +00:00
static int builtin_atxfer ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2005-01-05 19:56:47 +00:00
{
struct ast_channel * transferer ;
struct ast_channel * transferee ;
2005-12-03 19:25:33 +00:00
const char * transferer_real_context ;
2006-07-19 20:44:39 +00:00
char xferto [ 256 ] = " " ;
2005-01-05 19:56:47 +00:00
int res ;
2006-04-18 13:05:48 +00:00
int outstate = 0 ;
struct ast_channel * newchan ;
struct ast_channel * xferchan ;
2005-01-05 19:56:47 +00:00
struct ast_bridge_thread_obj * tobj ;
2006-04-18 13:05:48 +00:00
struct ast_bridge_config bconfig ;
struct ast_frame * f ;
int l ;
2008-06-13 16:29:07 +00:00
struct ast_datastore * features_datastore ;
struct ast_dial_features * dialfeatures = NULL ;
2005-01-05 19:56:47 +00:00
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " Executing Attended Transfer %s, %s (sense=%d) \n " , chan - > name , peer - > name , sense ) ;
2006-04-16 19:26:57 +00:00
set_peers ( & transferer , & transferee , peer , chan , sense ) ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
transferer_real_context = real_ctx ( transferer , transferee ) ;
2006-04-16 19:41:12 +00:00
/* Start autoservice on chan while we talk to the originator */
2005-01-05 19:56:47 +00:00
ast_autoservice_start ( transferee ) ;
2006-07-19 20:44:39 +00:00
ast_indicate ( transferee , AST_CONTROL_HOLD ) ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2005-01-05 19:56:47 +00:00
/* Transfer */
2006-04-21 20:28:32 +00:00
res = ast_stream_and_wait ( transferer , " pbx-transfer " , transferer - > language , AST_DIGIT_ANY ) ;
2006-04-16 22:22:53 +00:00
if ( res < 0 ) {
finishup ( transferee ) ;
return res ;
2006-04-18 13:05:48 +00:00
}
if ( res > 0 ) /* If they've typed a digit already, handle it */
2006-04-16 22:22:53 +00:00
xferto [ 0 ] = ( char ) res ;
2006-04-16 19:26:57 +00:00
2006-04-16 22:22:53 +00:00
/* this is specific of atxfer */
res = ast_app_dtget ( transferer , transferer_real_context , xferto , sizeof ( xferto ) , 100 , transferdigittimeout ) ;
2006-04-16 23:05:42 +00:00
if ( res < 0 ) { /* hangup, would be 0 for invalid and 1 for valid */
finishup ( transferee ) ;
return res ;
}
if ( res = = 0 ) {
2006-04-16 22:22:53 +00:00
ast_log ( LOG_WARNING , " Did not read data. \n " ) ;
2006-04-16 23:05:42 +00:00
finishup ( transferee ) ;
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( transferer , " beeperr " , transferer - > language , " " ) )
2006-04-16 22:22:53 +00:00
return - 1 ;
2006-04-16 23:05:42 +00:00
return FEATURE_RETURN_SUCCESS ;
}
2006-04-18 13:05:48 +00:00
2006-04-16 23:05:42 +00:00
/* valid extension, res == 1 */
2006-04-18 13:05:48 +00:00
if ( ! ast_exists_extension ( transferer , transferer_real_context , xferto , 1 , transferer - > cid . cid_num ) ) {
ast_log ( LOG_WARNING , " Extension %s does not exist in context %s \n " , xferto , transferer_real_context ) ;
finishup ( transferee ) ;
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( transferer , " beeperr " , transferer - > language , " " ) )
2006-04-18 13:05:48 +00:00
return - 1 ;
return FEATURE_RETURN_SUCCESS ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
/* If we are attended transfering to parking, just use builtin_parkcall instead of trying to track all of
* the different variables for handling this properly with a builtin_atxfer */
if ( ! strcmp ( xferto , ast_parking_ext ( ) ) ) {
finishup ( transferee ) ;
return builtin_parkcall ( chan , peer , config , code , sense , data ) ;
}
2006-04-18 13:05:48 +00:00
l = strlen ( xferto ) ;
2008-06-13 16:29:07 +00:00
snprintf ( xferto + l , sizeof ( xferto ) - l , " @%s " , transferer_real_context ) ; /* append context */
2006-04-18 13:05:48 +00:00
newchan = ast_feature_request_and_dial ( transferer , " Local " , ast_best_codec ( transferer - > nativeformats ) ,
2008-02-27 17:26:55 +00:00
xferto , atxfernoanswertimeout , & outstate , transferer - > cid . cid_num , transferer - > cid . cid_name , transferer - > language ) ;
2006-04-18 13:05:48 +00:00
ast_indicate ( transferer , - 1 ) ;
if ( ! newchan ) {
finishup ( transferee ) ;
/* any reason besides user requested cancel and busy triggers the failed sound */
if ( outstate ! = AST_CONTROL_UNHOLD & & outstate ! = AST_CONTROL_BUSY & &
2006-04-21 20:28:32 +00:00
ast_stream_and_wait ( transferer , xferfailsound , transferer - > language , " " ) )
2006-04-18 13:05:48 +00:00
return - 1 ;
return FEATURE_RETURN_SUCCESS ;
}
2007-10-02 18:52:55 +00:00
if ( check_compat ( transferer , newchan ) ) {
/* we do mean transferee here, NOT transferer */
finishup ( transferee ) ;
2006-04-18 13:05:48 +00:00
return - 1 ;
2007-10-02 19:01:59 +00:00
}
2006-04-18 13:05:48 +00:00
memset ( & bconfig , 0 , sizeof ( struct ast_bridge_config ) ) ;
ast_set_flag ( & ( bconfig . features_caller ) , AST_FEATURE_DISCONNECT ) ;
ast_set_flag ( & ( bconfig . features_callee ) , AST_FEATURE_DISCONNECT ) ;
res = ast_bridge_call ( transferer , newchan , & bconfig ) ;
2007-05-01 21:57:10 +00:00
if ( newchan - > _softhangup | | ! transferer - > _softhangup ) {
2006-04-18 13:05:48 +00:00
ast_hangup ( newchan ) ;
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( transferer , xfersound , transferer - > language , " " ) )
2006-05-08 11:22:00 +00:00
ast_log ( LOG_WARNING , " Failed to play transfer sound! \n " ) ;
2006-04-18 13:05:48 +00:00
finishup ( transferee ) ;
transferer - > _softhangup = 0 ;
return FEATURE_RETURN_SUCCESS ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2007-10-02 18:52:55 +00:00
if ( check_compat ( transferee , newchan ) ) {
finishup ( transferee ) ;
2006-04-18 13:05:48 +00:00
return - 1 ;
2007-10-02 19:01:59 +00:00
}
2006-04-18 13:05:48 +00:00
2006-07-19 20:44:39 +00:00
ast_indicate ( transferee , AST_CONTROL_UNHOLD ) ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2006-04-18 13:05:48 +00:00
if ( ( ast_autoservice_stop ( transferee ) < 0 )
| | ( ast_waitfordigit ( transferee , 100 ) < 0 )
| | ( ast_waitfordigit ( newchan , 100 ) < 0 )
| | ast_check_hangup ( transferee )
| | ast_check_hangup ( newchan ) ) {
ast_hangup ( newchan ) ;
return - 1 ;
2005-01-05 19:56:47 +00:00
}
2007-04-09 18:32:07 +00:00
xferchan = ast_channel_alloc ( 0 , AST_STATE_DOWN , 0 , 0 , " " , " " , " " , 0 , " Transfered/%s " , transferee - > name ) ;
2006-04-18 13:05:48 +00:00
if ( ! xferchan ) {
ast_hangup ( newchan ) ;
return - 1 ;
}
/* Make formats okay */
2008-03-11 19:20:01 +00:00
xferchan - > visible_indication = transferer - > visible_indication ;
2006-04-18 13:05:48 +00:00
xferchan - > readformat = transferee - > readformat ;
xferchan - > writeformat = transferee - > writeformat ;
ast_channel_masquerade ( xferchan , transferee ) ;
ast_explicit_goto ( xferchan , transferee - > context , transferee - > exten , transferee - > priority ) ;
xferchan - > _state = AST_STATE_UP ;
ast_clear_flag ( xferchan , AST_FLAGS_ALL ) ;
xferchan - > _softhangup = 0 ;
if ( ( f = ast_read ( xferchan ) ) )
ast_frfree ( f ) ;
newchan - > _state = AST_STATE_UP ;
ast_clear_flag ( newchan , AST_FLAGS_ALL ) ;
newchan - > _softhangup = 0 ;
tobj = ast_calloc ( 1 , sizeof ( struct ast_bridge_thread_obj ) ) ;
if ( ! tobj ) {
ast_hangup ( xferchan ) ;
ast_hangup ( newchan ) ;
return - 1 ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2008-06-13 16:29:07 +00:00
ast_channel_lock ( newchan ) ;
if ( ( features_datastore = ast_channel_datastore_find ( newchan , & dial_features_info , NULL ) ) ) {
dialfeatures = features_datastore - > data ;
}
ast_channel_unlock ( newchan ) ;
if ( dialfeatures ) {
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
/* newchan should always be the callee and shows up as callee in dialfeatures, but for some reason
I don ' t currently understand , the abilities of newchan seem to be stored on the caller side */
ast_copy_flags ( & ( config - > features_callee ) , & ( dialfeatures - > features_caller ) , AST_FLAGS_ALL ) ;
}
ast_channel_lock ( xferchan ) ;
if ( ( features_datastore = ast_channel_datastore_find ( xferchan , & dial_features_info , NULL ) ) ) {
dialfeatures = features_datastore - > data ;
}
ast_channel_unlock ( xferchan ) ;
if ( dialfeatures ) {
ast_copy_flags ( & ( config - > features_caller ) , & ( dialfeatures - > features_caller ) , AST_FLAGS_ALL ) ;
2008-06-13 16:29:07 +00:00
}
2008-01-18 17:13:00 +00:00
tobj - > chan = newchan ;
tobj - > peer = xferchan ;
2006-04-18 13:05:48 +00:00
tobj - > bconfig = * config ;
2008-11-18 18:25:55 +00:00
if ( tobj - > bconfig . end_bridge_callback_data_fixup ) {
tobj - > bconfig . end_bridge_callback_data_fixup ( & tobj - > bconfig , tobj - > peer , tobj - > chan ) ;
}
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( newchan , xfersound , newchan - > language , " " ) )
2006-05-08 11:22:00 +00:00
ast_log ( LOG_WARNING , " Failed to play transfer sound! \n " ) ;
2006-04-18 13:05:48 +00:00
ast_bridge_call_thread_launch ( tobj ) ;
return - 1 ; /* XXX meaning the channel is bridged ? */
2005-01-05 19:56:47 +00:00
}
2005-01-04 04:01:40 +00:00
2005-01-05 19:56:47 +00:00
/* add atxfer and automon as undefined so you can only use em if you configure them */
2005-01-04 04:01:40 +00:00
# define FEATURES_COUNT (sizeof(builtin_features) / sizeof(builtin_features[0]))
2006-01-19 22:09:18 +00:00
2007-05-08 16:30:43 +00:00
AST_RWLOCK_DEFINE_STATIC ( features_lock ) ;
static struct ast_call_feature builtin_features [ ] =
2005-08-23 02:22:33 +00:00
{
2006-08-29 21:20:43 +00:00
{ AST_FEATURE_REDIRECT , " Blind Transfer " , " blindxfer " , " # " , " # " , builtin_blindtransfer , AST_FEATURE_FLAG_NEEDSDTMF , " " } ,
{ AST_FEATURE_REDIRECT , " Attended Transfer " , " atxfer " , " " , " " , builtin_atxfer , AST_FEATURE_FLAG_NEEDSDTMF , " " } ,
{ AST_FEATURE_AUTOMON , " One Touch Monitor " , " automon " , " " , " " , builtin_automonitor , AST_FEATURE_FLAG_NEEDSDTMF , " " } ,
{ AST_FEATURE_DISCONNECT , " Disconnect Call " , " disconnect " , " * " , " * " , builtin_disconnect , AST_FEATURE_FLAG_NEEDSDTMF , " " } ,
{ AST_FEATURE_PARKCALL , " Park Call " , " parkcall " , " " , " " , builtin_parkcall , AST_FEATURE_FLAG_NEEDSDTMF , " " } ,
2005-01-04 04:01:40 +00:00
} ;
2005-08-23 02:22:33 +00:00
2008-12-11 16:54:51 +00:00
static AST_RWLIST_HEAD_STATIC ( feature_list , ast_call_feature ) ;
2005-08-23 02:22:33 +00:00
2006-01-19 22:09:18 +00:00
/*! \brief register new feature into feature_list*/
2005-08-23 02:22:33 +00:00
void ast_register_feature ( struct ast_call_feature * feature )
{
if ( ! feature ) {
ast_log ( LOG_NOTICE , " You didn't pass a feature! \n " ) ;
return ;
}
2008-12-11 16:54:51 +00:00
AST_RWLIST_WRLOCK ( & feature_list ) ;
AST_RWLIST_INSERT_HEAD ( & feature_list , feature , feature_entry ) ;
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-08-23 02:22:33 +00:00
2008-12-11 16:54:51 +00:00
if ( option_verbose > = 2 ) {
2005-08-23 02:22:33 +00:00
ast_verbose ( VERBOSE_PREFIX_2 " Registered Feature '%s' \n " , feature - > sname ) ;
2008-12-11 16:54:51 +00:00
}
2005-08-23 02:22:33 +00:00
}
2006-01-19 22:09:18 +00:00
/*! \brief unregister feature from feature_list */
2005-08-23 02:22:33 +00:00
void ast_unregister_feature ( struct ast_call_feature * feature )
{
2006-04-16 18:37:01 +00:00
if ( ! feature )
return ;
2005-08-23 02:22:33 +00:00
2008-12-11 16:54:51 +00:00
AST_RWLIST_WRLOCK ( & feature_list ) ;
AST_RWLIST_REMOVE ( & feature_list , feature , feature_entry ) ;
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-08-23 02:22:33 +00:00
free ( feature ) ;
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Remove all features in the list */
2005-08-23 14:40:03 +00:00
static void ast_unregister_features ( void )
{
struct ast_call_feature * feature ;
2008-12-11 16:54:51 +00:00
AST_RWLIST_WRLOCK ( & feature_list ) ;
while ( ( feature = AST_LIST_REMOVE_HEAD ( & feature_list , feature_entry ) ) ) {
2005-08-23 14:40:03 +00:00
free ( feature ) ;
2008-12-11 16:54:51 +00:00
}
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-08-23 14:40:03 +00:00
}
2005-08-23 02:22:33 +00:00
2006-01-19 22:09:18 +00:00
/*! \brief find a feature by name */
2007-05-08 16:53:09 +00:00
static struct ast_call_feature * find_dynamic_feature ( const char * name )
2005-08-23 02:22:33 +00:00
{
struct ast_call_feature * tmp ;
2008-12-11 16:54:51 +00:00
AST_RWLIST_TRAVERSE ( & feature_list , tmp , feature_entry ) {
if ( ! strcasecmp ( tmp - > sname , name ) ) {
2005-09-07 21:36:30 +00:00
break ;
2008-12-11 16:54:51 +00:00
}
2005-08-23 02:22:33 +00:00
}
return tmp ;
}
2006-01-19 22:09:18 +00:00
/*! \brief exec an app by feature */
2007-08-23 20:16:41 +00:00
static int feature_exec_app ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense , void * data )
2005-08-23 02:22:33 +00:00
{
struct ast_app * app ;
2007-08-23 20:16:41 +00:00
struct ast_call_feature * feature = data ;
2006-08-29 21:20:43 +00:00
struct ast_channel * work , * idle ;
2005-08-23 02:22:33 +00:00
int res ;
if ( ! feature ) { /* shouldn't ever happen! */
ast_log ( LOG_NOTICE , " Found feature before, but at execing we've lost it?? \n " ) ;
return - 1 ;
}
2006-08-07 04:15:52 +00:00
if ( sense = = FEATURE_SENSE_CHAN ) {
if ( ! ast_test_flag ( feature , AST_FEATURE_FLAG_BYCALLER ) )
2007-09-17 16:46:59 +00:00
return FEATURE_RETURN_KEEPTRYING ;
2006-08-29 21:20:43 +00:00
if ( ast_test_flag ( feature , AST_FEATURE_FLAG_ONSELF ) ) {
work = chan ;
idle = peer ;
} else {
work = peer ;
idle = chan ;
}
2005-08-23 02:22:33 +00:00
} else {
2006-08-07 04:15:52 +00:00
if ( ! ast_test_flag ( feature , AST_FEATURE_FLAG_BYCALLEE ) )
2007-09-17 16:46:59 +00:00
return FEATURE_RETURN_KEEPTRYING ;
2006-08-29 21:20:43 +00:00
if ( ast_test_flag ( feature , AST_FEATURE_FLAG_ONSELF ) ) {
work = peer ;
idle = chan ;
} else {
work = chan ;
idle = peer ;
}
2006-08-07 04:15:52 +00:00
}
if ( ! ( app = pbx_findapp ( feature - > app ) ) ) {
2005-08-23 02:22:33 +00:00
ast_log ( LOG_WARNING , " Could not find application (%s) \n " , feature - > app ) ;
2006-01-05 23:08:55 +00:00
return - 2 ;
2005-08-23 02:22:33 +00:00
}
2006-08-07 04:15:52 +00:00
2006-08-29 21:20:43 +00:00
ast_autoservice_start ( idle ) ;
if ( ! ast_strlen_zero ( feature - > moh_class ) )
ast_moh_start ( idle , feature - > moh_class , NULL ) ;
2006-08-07 04:15:52 +00:00
res = pbx_exec ( work , app , feature - > app_args ) ;
2006-08-29 21:20:43 +00:00
if ( ! ast_strlen_zero ( feature - > moh_class ) )
ast_moh_stop ( idle ) ;
ast_autoservice_stop ( idle ) ;
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
if ( res )
2006-08-07 04:15:52 +00:00
return FEATURE_RETURN_SUCCESSBREAK ;
2005-08-23 02:22:33 +00:00
2006-04-17 04:31:21 +00:00
return FEATURE_RETURN_SUCCESS ; /*! \todo XXX should probably return res */
2005-08-23 02:22:33 +00:00
}
2005-01-04 04:01:40 +00:00
static void unmap_features ( void )
{
int x ;
2007-05-08 16:30:43 +00:00
ast_rwlock_wrlock ( & features_lock ) ;
2005-07-25 17:31:53 +00:00
for ( x = 0 ; x < FEATURES_COUNT ; x + + )
2005-01-04 04:01:40 +00:00
strcpy ( builtin_features [ x ] . exten , builtin_features [ x ] . default_exten ) ;
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2005-01-04 04:01:40 +00:00
}
static int remap_feature ( const char * name , const char * value )
{
2007-05-08 16:53:09 +00:00
int x , res = - 1 ;
2007-05-08 16:30:43 +00:00
ast_rwlock_wrlock ( & features_lock ) ;
2007-05-08 16:53:09 +00:00
for ( x = 0 ; x < FEATURES_COUNT ; x + + ) {
if ( strcasecmp ( builtin_features [ x ] . sname , name ) )
continue ;
ast_copy_string ( builtin_features [ x ] . exten , value , sizeof ( builtin_features [ x ] . exten ) ) ;
2007-05-08 16:30:43 +00:00
res = 0 ;
2007-05-08 16:53:09 +00:00
break ;
2005-01-04 04:01:40 +00:00
}
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2005-01-04 04:01:40 +00:00
return res ;
}
2009-03-19 16:15:16 +00:00
/*!
* \ brief Helper function for feature_interpret and ast_feature_detect
* \ param chan , peer , config , code , sense , dynamic_features char buf , feature flags , operation , feature
*
* Lock features list , browse for code , unlock list
* If a feature is found and the operation variable is set , that feature ' s
* operation is executed . The first feature found is copied to the feature parameter .
* \ retval res on success .
* \ retval - 1 on failure .
*/
static int feature_interpret_helper ( struct ast_channel * chan , struct ast_channel * peer ,
struct ast_bridge_config * config , char * code , int sense , char * dynamic_features_buf ,
struct ast_flags * features , int operation , struct ast_call_feature * feature )
2005-01-04 04:01:40 +00:00
{
int x ;
2009-03-19 16:15:16 +00:00
struct ast_call_feature * tmpfeature ;
2007-05-08 16:30:43 +00:00
char * tmp , * tok ;
2008-09-04 17:00:29 +00:00
int res = FEATURE_RETURN_PASSDIGITS ;
int feature_detected = 0 ;
2005-01-04 04:01:40 +00:00
2009-03-19 16:15:16 +00:00
if ( ! ( peer & & chan & & config ) & & operation ) {
return - 1 ; /* can not run feature operation */
2007-12-12 17:46:14 +00:00
}
2009-03-13 17:12:32 +00:00
2007-05-08 16:30:43 +00:00
ast_rwlock_rdlock ( & features_lock ) ;
for ( x = 0 ; x < FEATURES_COUNT ; x + + ) {
2009-03-19 16:15:16 +00:00
if ( ( ast_test_flag ( features , builtin_features [ x ] . feature_mask ) ) & &
2005-01-04 04:01:40 +00:00
! ast_strlen_zero ( builtin_features [ x ] . exten ) ) {
/* Feature is up for consideration */
if ( ! strcmp ( builtin_features [ x ] . exten , code ) ) {
2009-02-03 21:57:01 +00:00
if ( option_debug > 2 ) {
ast_log ( LOG_DEBUG , " Feature detected: fname=%s sname=%s exten=%s \n " , builtin_features [ x ] . fname , builtin_features [ x ] . sname , builtin_features [ x ] . exten ) ;
}
2009-03-19 16:15:16 +00:00
if ( operation ) {
res = builtin_features [ x ] . operation ( chan , peer , config , code , sense , NULL ) ;
}
memcpy ( feature , & builtin_features [ x ] , sizeof ( feature ) ) ;
2008-09-04 17:00:29 +00:00
feature_detected = 1 ;
2005-01-04 04:01:40 +00:00
break ;
} else if ( ! strncmp ( builtin_features [ x ] . exten , code , strlen ( code ) ) ) {
if ( res = = FEATURE_RETURN_PASSDIGITS )
2005-09-07 21:36:30 +00:00
res = FEATURE_RETURN_STOREDIGITS ;
2005-08-23 02:22:33 +00:00
}
}
}
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2005-08-23 02:22:33 +00:00
2009-03-13 17:12:32 +00:00
if ( ast_strlen_zero ( dynamic_features_buf ) | | feature_detected ) {
2007-05-08 16:30:43 +00:00
return res ;
2009-03-13 17:12:32 +00:00
}
2005-08-23 02:22:33 +00:00
2009-03-13 17:12:32 +00:00
tmp = dynamic_features_buf ;
2005-09-07 21:36:30 +00:00
2007-05-08 16:30:43 +00:00
while ( ( tok = strsep ( & tmp , " # " ) ) ) {
2009-03-13 17:12:32 +00:00
AST_RWLIST_RDLOCK ( & feature_list ) ;
2009-03-19 16:15:16 +00:00
if ( ! ( tmpfeature = find_dynamic_feature ( tok ) ) ) {
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2007-05-08 16:30:43 +00:00
continue ;
2007-06-15 20:18:58 +00:00
}
2009-03-19 16:15:16 +00:00
2007-05-08 16:30:43 +00:00
/* Feature is up for consideration */
2009-03-19 16:15:16 +00:00
if ( ! strcmp ( tmpfeature - > exten , code ) ) {
if ( option_debug > 2 ) {
ast_log ( LOG_NOTICE , " Feature Found: %s exten: %s \n " , tmpfeature - > sname , tok ) ;
}
if ( operation ) {
res = tmpfeature - > operation ( chan , peer , config , code , sense , tmpfeature ) ;
}
memcpy ( feature , tmpfeature , sizeof ( feature ) ) ;
2007-09-17 16:46:59 +00:00
if ( res ! = FEATURE_RETURN_KEEPTRYING ) {
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2007-09-17 16:46:59 +00:00
break ;
}
res = FEATURE_RETURN_PASSDIGITS ;
2009-03-19 16:15:16 +00:00
} else if ( ! strncmp ( tmpfeature - > exten , code , strlen ( code ) ) )
2007-05-08 16:30:43 +00:00
res = FEATURE_RETURN_STOREDIGITS ;
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-01-04 04:01:40 +00:00
}
2009-03-19 16:15:16 +00:00
2005-01-04 04:01:40 +00:00
return res ;
}
2009-03-19 16:15:16 +00:00
/*!
* \ brief Check the dynamic features
* \ param chan , peer , config , code , sense
*
* \ retval res on success .
* \ retval - 1 on failure .
*/
static int feature_interpret ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config , char * code , int sense ) {
char dynamic_features_buf [ 128 ] ;
const char * peer_dynamic_features , * chan_dynamic_features ;
struct ast_flags features ;
struct ast_call_feature feature ;
if ( sense = = FEATURE_SENSE_CHAN ) {
ast_copy_flags ( & features , & ( config - > features_caller ) , AST_FLAGS_ALL ) ;
}
else {
ast_copy_flags ( & features , & ( config - > features_callee ) , AST_FLAGS_ALL ) ;
}
ast_channel_lock ( peer ) ;
peer_dynamic_features = ast_strdupa ( S_OR ( pbx_builtin_getvar_helper ( peer , " DYNAMIC_FEATURES " ) , " " ) ) ;
ast_channel_unlock ( peer ) ;
ast_channel_lock ( chan ) ;
chan_dynamic_features = ast_strdupa ( S_OR ( pbx_builtin_getvar_helper ( chan , " DYNAMIC_FEATURES " ) , " " ) ) ;
ast_channel_unlock ( chan ) ;
snprintf ( dynamic_features_buf , sizeof ( dynamic_features_buf ) , " %s%s%s " , S_OR ( chan_dynamic_features , " " ) , chan_dynamic_features & & peer_dynamic_features ? " # " : " " , S_OR ( peer_dynamic_features , " " ) ) ;
if ( option_debug > 2 ) {
ast_log ( LOG_DEBUG , " Feature interpret: chan=%s, peer=%s, code=%s, sense=%d, features=%d, dynamic=%s \n " , chan - > name , peer - > name , code , sense , features . flags , dynamic_features_buf ) ;
}
return feature_interpret_helper ( chan , peer , config , code , sense , dynamic_features_buf , & features , 1 , & feature ) ;
}
int ast_feature_detect ( struct ast_channel * chan , struct ast_flags * features , char * code , struct ast_call_feature * feature ) {
2009-03-19 19:40:07 +00:00
return feature_interpret_helper ( chan , NULL , NULL , code , 0 , NULL , features , 0 , feature ) ;
2009-03-19 16:15:16 +00:00
}
2005-09-07 21:36:30 +00:00
static void set_config_flags ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config )
2005-01-04 04:01:40 +00:00
{
int x ;
2009-03-19 16:15:16 +00:00
2007-05-08 16:30:43 +00:00
ast_clear_flag ( config , AST_FLAGS_ALL ) ;
ast_rwlock_rdlock ( & features_lock ) ;
2005-08-23 15:33:27 +00:00
for ( x = 0 ; x < FEATURES_COUNT ; x + + ) {
2007-05-08 16:30:43 +00:00
if ( ! ast_test_flag ( builtin_features + x , AST_FEATURE_FLAG_NEEDSDTMF ) )
continue ;
2005-09-07 21:36:30 +00:00
2007-05-08 16:30:43 +00:00
if ( ast_test_flag ( & ( config - > features_caller ) , builtin_features [ x ] . feature_mask ) )
ast_set_flag ( config , AST_BRIDGE_DTMF_CHANNEL_0 ) ;
if ( ast_test_flag ( & ( config - > features_callee ) , builtin_features [ x ] . feature_mask ) )
ast_set_flag ( config , AST_BRIDGE_DTMF_CHANNEL_1 ) ;
2005-01-04 04:01:40 +00:00
}
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2009-03-19 16:15:16 +00:00
2005-09-07 21:36:30 +00:00
if ( chan & & peer & & ! ( ast_test_flag ( config , AST_BRIDGE_DTMF_CHANNEL_0 ) & & ast_test_flag ( config , AST_BRIDGE_DTMF_CHANNEL_1 ) ) ) {
2005-12-03 19:25:33 +00:00
const char * dynamic_features = pbx_builtin_getvar_helper ( chan , " DYNAMIC_FEATURES " ) ;
2005-09-07 21:36:30 +00:00
if ( dynamic_features ) {
char * tmp = ast_strdupa ( dynamic_features ) ;
char * tok ;
struct ast_call_feature * feature ;
/* while we have a feature */
2006-05-10 13:22:15 +00:00
while ( ( tok = strsep ( & tmp , " # " ) ) ) {
2008-12-11 16:54:51 +00:00
AST_RWLIST_RDLOCK ( & feature_list ) ;
2007-05-08 16:53:09 +00:00
if ( ( feature = find_dynamic_feature ( tok ) ) & & ast_test_flag ( feature , AST_FEATURE_FLAG_NEEDSDTMF ) ) {
2006-08-07 04:15:52 +00:00
if ( ast_test_flag ( feature , AST_FEATURE_FLAG_BYCALLER ) )
2006-04-16 18:37:01 +00:00
ast_set_flag ( config , AST_BRIDGE_DTMF_CHANNEL_0 ) ;
2006-08-07 04:15:52 +00:00
if ( ast_test_flag ( feature , AST_FEATURE_FLAG_BYCALLEE ) )
2006-04-16 18:37:01 +00:00
ast_set_flag ( config , AST_BRIDGE_DTMF_CHANNEL_1 ) ;
2005-09-07 21:36:30 +00:00
}
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-09-07 21:36:30 +00:00
}
}
}
2005-01-04 04:01:40 +00:00
}
2006-04-17 04:31:21 +00:00
/*! \todo XXX Check - this is very similar to the code in channel.c */
2008-02-27 17:26:55 +00:00
static struct ast_channel * ast_feature_request_and_dial ( struct ast_channel * caller , const char * type , int format , void * data , int timeout , int * outstate , const char * cid_num , const char * cid_name , const char * language )
2005-06-23 22:12:01 +00:00
{
int state = 0 ;
int cause = 0 ;
int to ;
struct ast_channel * chan ;
struct ast_channel * monitor_chans [ 2 ] ;
struct ast_channel * active_channel ;
int res = 0 , ready = 0 ;
if ( ( chan = ast_request ( type , format , data , & cause ) ) ) {
ast_set_callerid ( chan , cid_num , cid_name , cid_num ) ;
2008-02-27 17:26:55 +00:00
ast_string_field_set ( chan , language , language ) ;
2005-11-01 20:29:36 +00:00
ast_channel_inherit_variables ( caller , chan ) ;
2006-05-26 17:59:29 +00:00
pbx_builtin_setvar_helper ( chan , " TRANSFERERNAME " , caller - > name ) ;
2007-03-30 14:11:59 +00:00
2005-06-23 22:12:01 +00:00
if ( ! ast_call ( chan , data , timeout ) ) {
2005-07-15 23:00:47 +00:00
struct timeval started ;
2005-06-23 22:12:01 +00:00
int x , len = 0 ;
char * disconnect_code = NULL , * dialed_code = NULL ;
ast_indicate ( caller , AST_CONTROL_RINGING ) ;
/* support dialing of the featuremap disconnect code while performing an attended tranfer */
2007-05-08 16:30:43 +00:00
ast_rwlock_rdlock ( & features_lock ) ;
for ( x = 0 ; x < FEATURES_COUNT ; x + + ) {
2005-06-23 22:12:01 +00:00
if ( strcasecmp ( builtin_features [ x ] . sname , " disconnect " ) )
continue ;
disconnect_code = builtin_features [ x ] . exten ;
len = strlen ( disconnect_code ) + 1 ;
dialed_code = alloca ( len ) ;
memset ( dialed_code , 0 , len ) ;
break ;
}
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2005-06-23 22:12:01 +00:00
x = 0 ;
2005-07-15 23:00:47 +00:00
started = ast_tvnow ( ) ;
2005-06-23 22:12:01 +00:00
to = timeout ;
while ( ! ast_check_hangup ( caller ) & & timeout & & ( chan - > _state ! = AST_STATE_UP ) ) {
2006-04-16 20:09:01 +00:00
struct ast_frame * f = NULL ;
2005-06-23 22:12:01 +00:00
monitor_chans [ 0 ] = caller ;
monitor_chans [ 1 ] = chan ;
active_channel = ast_waitfor_n ( monitor_chans , 2 , & to ) ;
/* see if the timeout has been violated */
2005-07-15 23:00:47 +00:00
if ( ast_tvdiff_ms ( ast_tvnow ( ) , started ) > timeout ) {
2005-06-23 22:12:01 +00:00
state = AST_CONTROL_UNHOLD ;
ast_log ( LOG_NOTICE , " We exceeded our AT-timeout \n " ) ;
break ; /*doh! timeout*/
}
2006-04-16 20:09:01 +00:00
if ( ! active_channel )
2005-06-23 22:12:01 +00:00
continue ;
if ( chan & & ( chan = = active_channel ) ) {
f = ast_read ( chan ) ;
if ( f = = NULL ) { /*doh! where'd he go?*/
state = AST_CONTROL_HANGUP ;
res = 0 ;
break ;
}
if ( f - > frametype = = AST_FRAME_CONTROL | | f - > frametype = = AST_FRAME_DTMF | | f - > frametype = = AST_FRAME_TEXT ) {
if ( f - > subclass = = AST_CONTROL_RINGING ) {
state = f - > subclass ;
if ( option_verbose > 2 )
ast_verbose ( VERBOSE_PREFIX_3 " %s is ringing \n " , chan - > name ) ;
ast_indicate ( caller , AST_CONTROL_RINGING ) ;
} else if ( ( f - > subclass = = AST_CONTROL_BUSY ) | | ( f - > subclass = = AST_CONTROL_CONGESTION ) ) {
state = f - > subclass ;
2006-03-23 22:00:11 +00:00
if ( option_verbose > 2 )
ast_verbose ( VERBOSE_PREFIX_3 " %s is busy \n " , chan - > name ) ;
ast_indicate ( caller , AST_CONTROL_BUSY ) ;
2005-06-23 22:12:01 +00:00
ast_frfree ( f ) ;
f = NULL ;
break ;
} else if ( f - > subclass = = AST_CONTROL_ANSWER ) {
/* This is what we are hoping for */
state = f - > subclass ;
ast_frfree ( f ) ;
f = NULL ;
ready = 1 ;
break ;
2007-08-31 14:38:59 +00:00
} else if ( f - > subclass ! = - 1 ) {
2005-06-23 22:12:01 +00:00
ast_log ( LOG_NOTICE , " Don't know what to do about control frame: %d \n " , f - > subclass ) ;
}
/* else who cares */
}
} else if ( caller & & ( active_channel = = caller ) ) {
f = ast_read ( caller ) ;
if ( f = = NULL ) { /*doh! where'd he go?*/
if ( caller - > _softhangup & & ! chan - > _softhangup ) {
/* make this a blind transfer */
ready = 1 ;
break ;
}
state = AST_CONTROL_HANGUP ;
res = 0 ;
break ;
}
if ( f - > frametype = = AST_FRAME_DTMF ) {
dialed_code [ x + + ] = f - > subclass ;
dialed_code [ x ] = ' \0 ' ;
if ( strlen ( dialed_code ) = = len ) {
x = 0 ;
} else if ( x & & strncmp ( dialed_code , disconnect_code , x ) ) {
x = 0 ;
dialed_code [ x ] = ' \0 ' ;
}
if ( * dialed_code & & ! strcmp ( dialed_code , disconnect_code ) ) {
/* Caller Canceled the call */
state = AST_CONTROL_UNHOLD ;
ast_frfree ( f ) ;
f = NULL ;
break ;
}
}
}
2006-04-16 20:09:01 +00:00
if ( f )
2005-06-23 22:12:01 +00:00
ast_frfree ( f ) ;
2006-04-16 20:09:01 +00:00
} /* end while */
2005-06-23 22:12:01 +00:00
} else
ast_log ( LOG_NOTICE , " Unable to call channel %s/%s \n " , type , ( char * ) data ) ;
} else {
ast_log ( LOG_NOTICE , " Unable to request channel %s/%s \n " , type , ( char * ) data ) ;
switch ( cause ) {
case AST_CAUSE_BUSY :
state = AST_CONTROL_BUSY ;
break ;
case AST_CAUSE_CONGESTION :
state = AST_CONTROL_CONGESTION ;
break ;
}
}
ast_indicate ( caller , - 1 ) ;
if ( chan & & ready ) {
if ( chan - > _state = = AST_STATE_UP )
state = AST_CONTROL_ANSWER ;
res = 0 ;
} else if ( chan ) {
res = - 1 ;
ast_hangup ( chan ) ;
chan = NULL ;
} else {
res = - 1 ;
}
if ( outstate )
* outstate = state ;
return chan ;
}
2008-09-11 22:55:49 +00:00
static struct ast_cdr * pick_unlocked_cdr ( struct ast_cdr * cdr )
{
struct ast_cdr * cdr_orig = cdr ;
while ( cdr ) {
if ( ! ast_test_flag ( cdr , AST_CDR_FLAG_LOCKED ) )
return cdr ;
cdr = cdr - > next ;
}
return cdr_orig ; /* everybody LOCKED or some other weirdness, like a NULL */
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
static void set_bridge_features_on_config ( struct ast_bridge_config * config , const char * features )
{
const char * feature ;
if ( ast_strlen_zero ( features ) ) {
return ;
}
for ( feature = features ; * feature ; feature + + ) {
switch ( * feature ) {
case ' T ' :
case ' t ' :
ast_set_flag ( & ( config - > features_caller ) , AST_FEATURE_REDIRECT ) ;
break ;
case ' K ' :
case ' k ' :
ast_set_flag ( & ( config - > features_caller ) , AST_FEATURE_PARKCALL ) ;
break ;
case ' H ' :
case ' h ' :
ast_set_flag ( & ( config - > features_caller ) , AST_FEATURE_DISCONNECT ) ;
break ;
case ' W ' :
case ' w ' :
ast_set_flag ( & ( config - > features_caller ) , AST_FEATURE_AUTOMON ) ;
break ;
default :
ast_log ( LOG_WARNING , " Skipping unknown feature code '%c' \n " , * feature ) ;
}
}
}
static void add_features_datastores ( struct ast_channel * caller , struct ast_channel * callee , struct ast_bridge_config * config )
{
struct ast_datastore * ds_callee_features = NULL , * ds_caller_features = NULL ;
struct ast_dial_features * callee_features = NULL , * caller_features = NULL ;
ast_channel_lock ( caller ) ;
ds_caller_features = ast_channel_datastore_find ( caller , & dial_features_info , NULL ) ;
ast_channel_unlock ( caller ) ;
if ( ! ds_caller_features ) {
if ( ! ( ds_caller_features = ast_channel_datastore_alloc ( & dial_features_info , NULL ) ) ) {
ast_log ( LOG_WARNING , " Unable to create channel datastore for caller features. Aborting! \n " ) ;
return ;
}
if ( ! ( caller_features = ast_calloc ( 1 , sizeof ( * caller_features ) ) ) ) {
ast_log ( LOG_WARNING , " Unable to allocate memory for callee feature flags. Aborting! \n " ) ;
ast_channel_datastore_free ( ds_caller_features ) ;
return ;
}
ds_caller_features - > inheritance = DATASTORE_INHERIT_FOREVER ;
caller_features - > is_caller = 1 ;
ast_copy_flags ( & ( caller_features - > features_callee ) , & ( config - > features_callee ) , AST_FLAGS_ALL ) ;
ast_copy_flags ( & ( caller_features - > features_caller ) , & ( config - > features_caller ) , AST_FLAGS_ALL ) ;
ds_caller_features - > data = caller_features ;
ast_channel_lock ( caller ) ;
ast_channel_datastore_add ( caller , ds_caller_features ) ;
ast_channel_unlock ( caller ) ;
2009-02-02 23:48:06 +00:00
} else {
/* If we don't return here, then when we do a builtin_atxfer we will copy the disconnect
* flags over from the atxfer to the caller */
return ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
}
ast_channel_lock ( callee ) ;
ds_callee_features = ast_channel_datastore_find ( callee , & dial_features_info , NULL ) ;
ast_channel_unlock ( callee ) ;
if ( ! ds_callee_features ) {
if ( ! ( ds_callee_features = ast_channel_datastore_alloc ( & dial_features_info , NULL ) ) ) {
ast_log ( LOG_WARNING , " Unable to create channel datastore for callee features. Aborting! \n " ) ;
return ;
}
if ( ! ( callee_features = ast_calloc ( 1 , sizeof ( * callee_features ) ) ) ) {
ast_log ( LOG_WARNING , " Unable to allocate memory for callee feature flags. Aborting! \n " ) ;
ast_channel_datastore_free ( ds_callee_features ) ;
return ;
}
ds_callee_features - > inheritance = DATASTORE_INHERIT_FOREVER ;
callee_features - > is_caller = 0 ;
ast_copy_flags ( & ( callee_features - > features_callee ) , & ( config - > features_caller ) , AST_FLAGS_ALL ) ;
ast_copy_flags ( & ( callee_features - > features_caller ) , & ( config - > features_callee ) , AST_FLAGS_ALL ) ;
ds_callee_features - > data = callee_features ;
ast_channel_lock ( callee ) ;
ast_channel_datastore_add ( callee , ds_callee_features ) ;
ast_channel_unlock ( callee ) ;
}
return ;
}
2008-09-11 22:55:49 +00:00
2004-04-26 23:22:34 +00:00
int ast_bridge_call ( struct ast_channel * chan , struct ast_channel * peer , struct ast_bridge_config * config )
2001-12-27 11:07:33 +00:00
{
/* Copy voice back and forth between the two channels. Give the peer
the ability to transfer calls with ' # < extension ' syntax . */
struct ast_frame * f ;
struct ast_channel * who ;
2005-01-04 04:01:40 +00:00
char chan_featurecode [ FEATURE_MAX_LEN + 1 ] = " " ;
char peer_featurecode [ FEATURE_MAX_LEN + 1 ] = " " ;
2008-07-03 00:16:25 +00:00
char orig_channame [ AST_MAX_EXTENSION ] ;
char orig_peername [ AST_MAX_EXTENSION ] ;
2001-12-27 11:07:33 +00:00
int res ;
2004-08-06 13:54:07 +00:00
int diff ;
2005-01-04 04:01:40 +00:00
int hasfeatures = 0 ;
int hadfeatures = 0 ;
2008-10-31 22:36:57 +00:00
int autoloopflag ;
2001-12-27 11:07:33 +00:00
struct ast_option_header * aoh ;
2005-01-04 04:01:40 +00:00
struct ast_bridge_config backup_config ;
2008-07-03 00:16:25 +00:00
struct ast_cdr * bridge_cdr = NULL ;
(closes issue #11849)
Reported by: greyvoip
Tested by: murf
OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid
notebook pages of notes later, I have made the small
tweek necc. to get the start time right on the second
CDR when:
A Calls B
B answ.
A hits Xfer button on sip phone,
A dials C and hits the OK button,
A hangs up
C answers ringing phone
B and C converse
B and/or C hangs up
But does not harm the scenario where:
A Calls B
B answ.
B hits xfer button on sip phone,
B dials C and hits the OK button,
B hangs up
C answers ringing phone
A and C converse
A and/or C hangs up
The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.
I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.
I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR
changes and loses the proper start time.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:23:42 +00:00
struct ast_cdr * orig_peer_cdr = NULL ;
2008-09-11 22:55:49 +00:00
struct ast_cdr * chan_cdr = pick_unlocked_cdr ( chan - > cdr ) ; /* the proper chan cdr, if there are forked cdrs */
struct ast_cdr * peer_cdr = pick_unlocked_cdr ( peer - > cdr ) ; /* the proper chan cdr, if there are forked cdrs */
2008-09-23 16:41:49 +00:00
struct ast_cdr * new_chan_cdr = NULL ; /* the proper chan cdr, if there are forked cdrs */
struct ast_cdr * new_peer_cdr = NULL ; /* the proper chan cdr, if there are forked cdrs */
2004-09-17 03:49:57 +00:00
2005-01-04 04:01:40 +00:00
memset ( & backup_config , 0 , sizeof ( backup_config ) ) ;
2005-08-03 04:42:59 +00:00
config - > start_time = ast_tvnow ( ) ;
2004-10-27 22:01:33 +00:00
if ( chan & & peer ) {
2004-10-28 15:53:36 +00:00
pbx_builtin_setvar_helper ( chan , " BRIDGEPEER " , peer - > name ) ;
pbx_builtin_setvar_helper ( peer , " BRIDGEPEER " , chan - > name ) ;
2008-12-15 14:31:37 +00:00
} else if ( chan ) {
2004-10-27 22:01:33 +00:00
pbx_builtin_setvar_helper ( chan , " BLINDTRANSFER " , NULL ) ;
2008-12-15 14:31:37 +00:00
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
set_bridge_features_on_config ( config , pbx_builtin_getvar_helper ( chan , " BRIDGE_FEATURES " ) ) ;
add_features_datastores ( chan , peer , config ) ;
2008-12-15 14:31:37 +00:00
/* This is an interesting case. One example is if a ringing channel gets redirected to
* an extension that picks up a parked call . This will make sure that the call taken
* out of parking gets told that the channel it just got bridged to is still ringing . */
if ( chan - > _state = = AST_STATE_RINGING & & peer - > visible_indication ! = AST_CONTROL_RINGING ) {
ast_indicate ( peer , AST_CONTROL_RINGING ) ;
}
2004-10-27 22:01:33 +00:00
2004-09-17 14:15:11 +00:00
if ( monitor_ok ) {
2005-12-03 19:25:33 +00:00
const char * monitor_exec ;
struct ast_channel * src = NULL ;
2004-09-17 14:15:11 +00:00
if ( ! monitor_app ) {
if ( ! ( monitor_app = pbx_findapp ( " Monitor " ) ) )
2004-09-17 03:49:57 +00:00
monitor_ok = 0 ;
2004-09-17 14:15:11 +00:00
}
if ( ( monitor_exec = pbx_builtin_getvar_helper ( chan , " AUTO_MONITOR " ) ) )
2005-12-03 19:25:33 +00:00
src = chan ;
2004-09-17 14:15:11 +00:00
else if ( ( monitor_exec = pbx_builtin_getvar_helper ( peer , " AUTO_MONITOR " ) ) )
2005-12-03 19:25:33 +00:00
src = peer ;
2006-01-17 18:20:33 +00:00
if ( monitor_app & & src ) {
2005-12-03 19:25:33 +00:00
char * tmp = ast_strdupa ( monitor_exec ) ;
2006-05-10 13:22:15 +00:00
pbx_exec ( src , monitor_app , tmp ) ;
2005-12-03 19:25:33 +00:00
}
2004-09-17 03:49:57 +00:00
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2005-09-07 21:36:30 +00:00
set_config_flags ( chan , peer , config ) ;
2004-08-06 14:43:25 +00:00
config - > firstpass = 1 ;
2003-07-02 14:06:12 +00:00
2001-12-27 11:07:33 +00:00
/* Answer if need be */
2003-02-02 19:37:23 +00:00
if ( ast_answer ( chan ) )
return - 1 ;
2007-03-30 14:11:59 +00:00
2008-07-03 00:16:25 +00:00
ast_copy_string ( orig_channame , chan - > name , sizeof ( orig_channame ) ) ;
ast_copy_string ( orig_peername , peer - > name , sizeof ( orig_peername ) ) ;
2008-09-11 22:55:49 +00:00
orig_peer_cdr = peer_cdr ;
2008-07-03 00:16:25 +00:00
2008-09-11 22:55:49 +00:00
if ( ! chan_cdr | | ( chan_cdr & & ! ast_test_flag ( chan_cdr , AST_CDR_FLAG_POST_DISABLED ) ) ) {
2008-07-03 00:16:25 +00:00
2008-09-11 22:55:49 +00:00
if ( chan_cdr ) {
ast_set_flag ( chan_cdr , AST_CDR_FLAG_MAIN ) ;
2008-07-03 00:16:25 +00:00
ast_cdr_update ( chan ) ;
2008-09-11 22:55:49 +00:00
bridge_cdr = ast_cdr_dup ( chan_cdr ) ;
2008-07-03 00:16:25 +00:00
ast_copy_string ( bridge_cdr - > lastapp , chan - > appl , sizeof ( bridge_cdr - > lastapp ) ) ;
ast_copy_string ( bridge_cdr - > lastdata , chan - > data , sizeof ( bridge_cdr - > lastdata ) ) ;
} else {
/* better yet, in a xfer situation, find out why the chan cdr got zapped (pun unintentional) */
bridge_cdr = ast_cdr_alloc ( ) ; /* this should be really, really rare/impossible? */
ast_copy_string ( bridge_cdr - > channel , chan - > name , sizeof ( bridge_cdr - > channel ) ) ;
ast_copy_string ( bridge_cdr - > dstchannel , peer - > name , sizeof ( bridge_cdr - > dstchannel ) ) ;
ast_copy_string ( bridge_cdr - > uniqueid , chan - > uniqueid , sizeof ( bridge_cdr - > uniqueid ) ) ;
ast_copy_string ( bridge_cdr - > lastapp , chan - > appl , sizeof ( bridge_cdr - > lastapp ) ) ;
ast_copy_string ( bridge_cdr - > lastdata , chan - > data , sizeof ( bridge_cdr - > lastdata ) ) ;
ast_cdr_setcid ( bridge_cdr , chan ) ;
bridge_cdr - > disposition = ( chan - > _state = = AST_STATE_UP ) ? AST_CDR_ANSWERED : AST_CDR_NULL ;
bridge_cdr - > amaflags = chan - > amaflags ? chan - > amaflags : ast_default_amaflags ;
ast_copy_string ( bridge_cdr - > accountcode , chan - > accountcode , sizeof ( bridge_cdr - > accountcode ) ) ;
/* Destination information */
ast_copy_string ( bridge_cdr - > dst , chan - > exten , sizeof ( bridge_cdr - > dst ) ) ;
ast_copy_string ( bridge_cdr - > dcontext , chan - > context , sizeof ( bridge_cdr - > dcontext ) ) ;
2008-09-11 22:55:49 +00:00
if ( peer_cdr ) {
bridge_cdr - > start = peer_cdr - > start ;
ast_copy_string ( bridge_cdr - > userfield , peer_cdr - > userfield , sizeof ( bridge_cdr - > userfield ) ) ;
2008-07-03 00:16:25 +00:00
} else {
ast_cdr_start ( bridge_cdr ) ;
}
}
2008-09-11 22:55:49 +00:00
/* peer_cdr->answer will be set when a macro runs on the peer;
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:13:20 +00:00
in that case , the bridge answer will be delayed while the
macro plays on the peer channel . The peer answered the call
before the macro started playing . To the phone system ,
this is billable time for the call , even tho the caller
hears nothing but ringing while the macro does its thing . */
2008-09-11 22:55:49 +00:00
if ( peer_cdr & & ! ast_tvzero ( peer_cdr - > answer ) ) {
bridge_cdr - > answer = peer_cdr - > answer ;
chan_cdr - > answer = peer_cdr - > answer ;
bridge_cdr - > disposition = peer_cdr - > disposition ;
chan_cdr - > disposition = peer_cdr - > disposition ;
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:13:20 +00:00
} else {
ast_cdr_answer ( bridge_cdr ) ;
2008-09-11 22:55:49 +00:00
ast_cdr_answer ( chan_cdr ) ; /* for the sake of cli status checks */
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:13:20 +00:00
}
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
if ( ast_test_flag ( chan , AST_FLAG_BRIDGE_HANGUP_DONT ) ) {
ast_set_flag ( chan_cdr , AST_CDR_FLAG_BRIDGED ) ;
if ( peer_cdr ) {
ast_set_flag ( peer_cdr , AST_CDR_FLAG_BRIDGED ) ;
}
(closes issue #11849)
Reported by: greyvoip
Tested by: murf
OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid
notebook pages of notes later, I have made the small
tweek necc. to get the start time right on the second
CDR when:
A Calls B
B answ.
A hits Xfer button on sip phone,
A dials C and hits the OK button,
A hangs up
C answers ringing phone
B and C converse
B and/or C hangs up
But does not harm the scenario where:
A Calls B
B answ.
B hits xfer button on sip phone,
B dials C and hits the OK button,
B hangs up
C answers ringing phone
A and C converse
A and/or C hangs up
The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.
I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.
I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR
changes and loses the proper start time.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:23:42 +00:00
}
2008-07-03 00:16:25 +00:00
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2001-12-27 11:07:33 +00:00
for ( ; ; ) {
2006-04-14 23:20:29 +00:00
struct ast_channel * other ; /* used later */
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2005-07-25 17:31:53 +00:00
res = ast_channel_bridge ( chan , peer , config , & f , & who ) ;
This patch prevents the feature detection timeout from being cut in half.
Because the ast_channel_bridge() call will return 0 and pass
a frame pointer for both DTMF_BEGIN and DTMF_END, the feature_timer
field in hte config struct is getting decremented twice, which
effectively cuts the digittimeout in half. I added conditions
to the if statement to only let DTMF_END frames to flow thru,
which solved the problem. Also, when the frame pointer is null,
let control flow thru-- this usually happens on timeouts. I added
a comment to the code to explain what's going on and why.
Many thanks to sodom for reporting this problem. Personnally, it always seemed
like something was wrong with the featuredigittimeout, but I never
could quite decide what... and was too busy to investigate.
This bug forced the issue, and now we know.
Sodom had other issues in 14515, but I couldn't reproduce them. If
he still has problems, and wants to get them solved, he is welcome
to reopen 14515.
(closes issue #14515)
Reported by: sodom
Patches:
14515.patch uploaded by murf (license 17)
Tested by: murf, sodom
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@178804 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-02-26 17:09:03 +00:00
/* When frame is not set, we are probably involved in a situation
where we ' ve timed out .
When frame is set , we ' ll come thru this code twice ; once for DTMF_BEGIN
and also for DTMF_END . If we flow into the following ' if ' for both , then
our wait times are cut in half , as both will subtract from the
feature_timer . Not good !
*/
if ( config - > feature_timer & & ( ! f | | f - > frametype = = AST_FRAME_DTMF_END ) ) {
2004-08-06 13:54:07 +00:00
/* Update time limit for next pass */
Merged revisions 43778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43778 | russell | 2006-09-27 12:54:30 -0400 (Wed, 27 Sep 2006) | 42 lines
Fix a problem that occurred if a user entered a digit that matched a bridge
feature that was configured using multiple digits, and the digit that was
pressed timed out in the feature digit timeout period. For example, if blind
transfer is configured as '##', and a user presses just '#'. In this situation,
the call would lock up and no longer pass any frames.
(issue #7977 reported by festr, and issue #7982 reported by michaels and
valuable input provided by mneuhauser and kuj. Fixed by me, with testing help
and peer review from Joshua Colp).
There are a couple of issues involved in this fix:
1) When ast_generic_bridge determines that there has been a timeout, it returned
AST_BRIDGE_RETRY. Then, when ast_channel_bridge gets this result, it calls
ast_generic_bridge over again with the same timestamp for the next event.
This results in an endless loop of nothing until the call is terminated.
This is resolved by simply changing ast_generic_bridge to return
AST_BRIDGE_COMPLETE when it sees a timeout.
2) I also changed ast_channel_bridge such that if in the process of calculating
the time until the next event, it knows a timeout has already occured, to
immediately return AST_BRIDGE_COMPLETE instead of attempting to bridge the
channels anyway.
3) In the process of testing the previous two changes, I ran into a problem in
res_features where ast_channel_bridge would return because it determined
that there was a timeout. However, ast_bridge_call in res_features would
then determine by its own calculation that there was still 1 ms before the
timeout really occurs. It would then proceed, and since the bridge broke
out and did *not* return a frame, it interpreted this as the call was over
and hung up the channels.
The reason for this was because ast_bridge_call in res_features and
ast_channel_bridge in channel.c were using different times for their
calculations. channel.c uses the start_time on the bridge config, which
is the time that the feature digit was recieved. However, res_features
had another time, 'start', which was set right before calling
ast_channel_bridge. 'start' will always be slightly after start_time in the
bridge config, and sometimes enough to round up to one ms.
This is fixed by making ast_bridge_call use the same time as
ast_channel_bridge for the timeout calculation.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 16:55:49 +00:00
diff = ast_tvdiff_ms ( ast_tvnow ( ) , config - > start_time ) ;
2009-02-17 21:54:34 +00:00
if ( res = = AST_BRIDGE_RETRY ) {
/* The feature fully timed out but has not been updated. Skip
* the potential round error from the diff calculation and
* explicitly set to expired . */
config - > feature_timer = - 1 ;
} else {
config - > feature_timer - = diff ;
}
2005-01-04 04:01:40 +00:00
if ( hasfeatures ) {
/* Running on backup config, meaning a feature might be being
activated , but that ' s no excuse to keep things going
indefinitely ! */
2005-08-03 04:42:59 +00:00
if ( backup_config . feature_timer & & ( ( backup_config . feature_timer - = diff ) < = 0 ) ) {
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " Timed out, realtime this time! \n " ) ;
2005-08-03 04:42:59 +00:00
config - > feature_timer = 0 ;
2005-01-04 04:01:40 +00:00
who = chan ;
if ( f )
ast_frfree ( f ) ;
f = NULL ;
res = 0 ;
2005-08-03 04:42:59 +00:00
} else if ( config - > feature_timer < = 0 ) {
2005-01-04 04:01:40 +00:00
/* Not *really* out of time, just out of time for
digits to come in for features . */
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " Timed out for feature! \n " ) ;
2005-01-04 04:01:40 +00:00
if ( ! ast_strlen_zero ( peer_featurecode ) ) {
ast_dtmf_stream ( chan , peer , peer_featurecode , 0 ) ;
memset ( peer_featurecode , 0 , sizeof ( peer_featurecode ) ) ;
}
if ( ! ast_strlen_zero ( chan_featurecode ) ) {
ast_dtmf_stream ( peer , chan , chan_featurecode , 0 ) ;
memset ( chan_featurecode , 0 , sizeof ( chan_featurecode ) ) ;
}
if ( f )
ast_frfree ( f ) ;
hasfeatures = ! ast_strlen_zero ( chan_featurecode ) | | ! ast_strlen_zero ( peer_featurecode ) ;
if ( ! hasfeatures ) {
/* Restore original (possibly time modified) bridge config */
memcpy ( config , & backup_config , sizeof ( struct ast_bridge_config ) ) ;
memset ( & backup_config , 0 , sizeof ( backup_config ) ) ;
}
hadfeatures = hasfeatures ;
/* Continue as we were */
continue ;
Merged revisions 43778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43778 | russell | 2006-09-27 12:54:30 -0400 (Wed, 27 Sep 2006) | 42 lines
Fix a problem that occurred if a user entered a digit that matched a bridge
feature that was configured using multiple digits, and the digit that was
pressed timed out in the feature digit timeout period. For example, if blind
transfer is configured as '##', and a user presses just '#'. In this situation,
the call would lock up and no longer pass any frames.
(issue #7977 reported by festr, and issue #7982 reported by michaels and
valuable input provided by mneuhauser and kuj. Fixed by me, with testing help
and peer review from Joshua Colp).
There are a couple of issues involved in this fix:
1) When ast_generic_bridge determines that there has been a timeout, it returned
AST_BRIDGE_RETRY. Then, when ast_channel_bridge gets this result, it calls
ast_generic_bridge over again with the same timestamp for the next event.
This results in an endless loop of nothing until the call is terminated.
This is resolved by simply changing ast_generic_bridge to return
AST_BRIDGE_COMPLETE when it sees a timeout.
2) I also changed ast_channel_bridge such that if in the process of calculating
the time until the next event, it knows a timeout has already occured, to
immediately return AST_BRIDGE_COMPLETE instead of attempting to bridge the
channels anyway.
3) In the process of testing the previous two changes, I ran into a problem in
res_features where ast_channel_bridge would return because it determined
that there was a timeout. However, ast_bridge_call in res_features would
then determine by its own calculation that there was still 1 ms before the
timeout really occurs. It would then proceed, and since the bridge broke
out and did *not* return a frame, it interpreted this as the call was over
and hung up the channels.
The reason for this was because ast_bridge_call in res_features and
ast_channel_bridge in channel.c were using different times for their
calculations. channel.c uses the start_time on the bridge config, which
is the time that the feature digit was recieved. However, res_features
had another time, 'start', which was set right before calling
ast_channel_bridge. 'start' will always be slightly after start_time in the
bridge config, and sometimes enough to round up to one ms.
This is fixed by making ast_bridge_call use the same time as
ast_channel_bridge for the timeout calculation.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@43779 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-27 16:55:49 +00:00
} else if ( ! f ) {
/* The bridge returned without a frame and there is a feature in progress.
* However , we don ' t think the feature has quite yet timed out , so just
* go back into the bridge . */
continue ;
}
2005-01-04 04:01:40 +00:00
} else {
2005-08-03 04:42:59 +00:00
if ( config - > feature_timer < = 0 ) {
2005-01-04 04:01:40 +00:00
/* We ran out of time */
2005-08-03 04:42:59 +00:00
config - > feature_timer = 0 ;
2005-01-04 04:01:40 +00:00
who = chan ;
if ( f )
ast_frfree ( f ) ;
f = NULL ;
res = 0 ;
}
2004-08-06 13:54:07 +00:00
}
}
2001-12-27 11:07:33 +00:00
if ( res < 0 ) {
2007-10-30 16:13:39 +00:00
if ( ! ast_test_flag ( chan , AST_FLAG_ZOMBIE ) & & ! ast_test_flag ( peer , AST_FLAG_ZOMBIE ) & & ! ast_check_hangup ( chan ) & & ! ast_check_hangup ( peer ) )
ast_log ( LOG_WARNING , " Bridge failed on channels %s and %s \n " , chan - > name , peer - > name ) ;
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:13:20 +00:00
goto before_you_go ;
2001-12-27 11:07:33 +00:00
}
2006-04-16 18:37:01 +00:00
if ( ! f | | ( f - > frametype = = AST_FRAME_CONTROL & &
( f - > subclass = = AST_CONTROL_HANGUP | | f - > subclass = = AST_CONTROL_BUSY | |
f - > subclass = = AST_CONTROL_CONGESTION ) ) ) {
res = - 1 ;
break ;
2001-12-27 11:07:33 +00:00
}
2006-04-14 23:20:29 +00:00
/* many things should be sent to the 'other' channel */
other = ( who = = chan ) ? peer : chan ;
if ( f - > frametype = = AST_FRAME_CONTROL ) {
2007-07-05 20:50:08 +00:00
switch ( f - > subclass ) {
case AST_CONTROL_RINGING :
case AST_CONTROL_FLASH :
case - 1 :
ast_indicate ( other , f - > subclass ) ;
break ;
case AST_CONTROL_HOLD :
case AST_CONTROL_UNHOLD :
ast_indicate_data ( other , f - > subclass , f - > data , f - > datalen ) ;
break ;
case AST_CONTROL_OPTION :
2006-04-14 23:20:29 +00:00
aoh = f - > data ;
/* Forward option Requests */
2007-07-05 20:50:08 +00:00
if ( aoh & & aoh - > flag = = AST_OPTION_FLAG_REQUEST ) {
ast_channel_setoption ( other , ntohs ( aoh - > option ) , aoh - > data ,
f - > datalen - sizeof ( struct ast_option_header ) , 0 ) ;
}
break ;
2001-12-27 11:07:33 +00:00
}
2006-08-31 01:59:02 +00:00
} else if ( f - > frametype = = AST_FRAME_DTMF_BEGIN ) {
/* eat it */
} else if ( f - > frametype = = AST_FRAME_DTMF ) {
2005-01-04 04:01:40 +00:00
char * featurecode ;
int sense ;
2005-07-25 17:31:53 +00:00
2005-01-04 04:01:40 +00:00
hadfeatures = hasfeatures ;
/* This cannot overrun because the longest feature is one shorter than our buffer */
if ( who = = chan ) {
sense = FEATURE_SENSE_CHAN ;
featurecode = chan_featurecode ;
} else {
sense = FEATURE_SENSE_PEER ;
featurecode = peer_featurecode ;
}
2006-04-17 04:31:21 +00:00
/*! append the event to featurecode. we rely on the string being zero-filled, and
* not overflowing it .
* \ todo XXX how do we guarantee the latter ?
2006-04-14 23:20:29 +00:00
*/
2005-01-04 04:01:40 +00:00
featurecode [ strlen ( featurecode ) ] = f - > subclass ;
2006-05-23 16:37:40 +00:00
/* Get rid of the frame before we start doing "stuff" with the channels */
ast_frfree ( f ) ;
f = NULL ;
2005-08-03 04:42:59 +00:00
config - > feature_timer = backup_config . feature_timer ;
2009-03-19 16:15:16 +00:00
res = feature_interpret ( chan , peer , config , featurecode , sense ) ;
2005-01-04 04:01:40 +00:00
switch ( res ) {
case FEATURE_RETURN_PASSDIGITS :
ast_dtmf_stream ( other , who , featurecode , 0 ) ;
/* Fall through */
case FEATURE_RETURN_SUCCESS :
memset ( featurecode , 0 , sizeof ( chan_featurecode ) ) ;
break ;
}
if ( res > = FEATURE_RETURN_PASSDIGITS ) {
2001-12-27 11:07:33 +00:00
res = 0 ;
2006-05-23 16:37:40 +00:00
} else
2005-01-04 04:01:40 +00:00
break ;
hasfeatures = ! ast_strlen_zero ( chan_featurecode ) | | ! ast_strlen_zero ( peer_featurecode ) ;
if ( hadfeatures & & ! hasfeatures ) {
/* Restore backup */
memcpy ( config , & backup_config , sizeof ( struct ast_bridge_config ) ) ;
memset ( & backup_config , 0 , sizeof ( struct ast_bridge_config ) ) ;
} else if ( hasfeatures ) {
if ( ! hadfeatures ) {
/* Backup configuration */
memcpy ( & backup_config , config , sizeof ( struct ast_bridge_config ) ) ;
/* Setup temporary config options */
config - > play_warning = 0 ;
2005-01-10 14:46:59 +00:00
ast_clear_flag ( & ( config - > features_caller ) , AST_FEATURE_PLAY_WARNING ) ;
2005-07-25 17:31:53 +00:00
ast_clear_flag ( & ( config - > features_callee ) , AST_FEATURE_PLAY_WARNING ) ;
2005-01-04 04:01:40 +00:00
config - > warning_freq = 0 ;
config - > warning_sound = NULL ;
config - > end_sound = NULL ;
config - > start_sound = NULL ;
config - > firstpass = 0 ;
}
2006-08-01 23:09:28 +00:00
config - > start_time = ast_tvnow ( ) ;
2005-08-03 04:42:59 +00:00
config - > feature_timer = featuredigittimeout ;
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " Set time limit to %ld \n " , config - > feature_timer ) ;
2001-12-27 11:07:33 +00:00
}
2005-01-04 04:01:40 +00:00
}
if ( f )
ast_frfree ( f ) ;
2007-04-09 18:32:07 +00:00
2001-12-27 11:07:33 +00:00
}
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
before_you_go :
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
if ( ast_test_flag ( chan , AST_FLAG_BRIDGE_HANGUP_DONT ) ) {
ast_clear_flag ( chan , AST_FLAG_BRIDGE_HANGUP_DONT ) ; /* its job is done */
if ( bridge_cdr ) {
ast_cdr_discard ( bridge_cdr ) ;
/* QUESTION: should we copy bridge_cdr fields to the peer before we throw it away? */
}
return res ; /* if we shouldn't do the h-exten, we shouldn't do the bridge cdr, either! */
}
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
if ( config - > end_bridge_callback ) {
2008-11-09 01:08:07 +00:00
config - > end_bridge_callback ( config - > end_bridge_callback_data ) ;
2008-10-31 15:45:29 +00:00
}
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
if ( ! ast_test_flag ( & ( config - > features_caller ) , AST_FEATURE_NO_H_EXTEN ) & &
ast_exists_extension ( chan , chan - > context , " h " , 1 , chan - > cid . cid_num ) ) {
2008-11-21 23:14:50 +00:00
struct ast_cdr * swapper = NULL ;
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
char savelastapp [ AST_MAX_EXTENSION ] ;
char savelastdata [ AST_MAX_EXTENSION ] ;
char save_exten [ AST_MAX_EXTENSION ] ;
int save_prio ;
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
autoloopflag = ast_test_flag ( chan , AST_FLAG_IN_AUTOLOOP ) ;
ast_set_flag ( chan , AST_FLAG_IN_AUTOLOOP ) ;
2008-11-21 23:14:50 +00:00
if ( bridge_cdr & & ast_opt_end_cdr_before_h_exten ) {
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
ast_cdr_end ( bridge_cdr ) ;
}
/* swap the bridge cdr and the chan cdr for a moment, and let the endbridge
dialplan code operate on it */
ast_channel_lock ( chan ) ;
2008-11-21 23:14:50 +00:00
if ( bridge_cdr ) {
swapper = chan - > cdr ;
ast_copy_string ( savelastapp , bridge_cdr - > lastapp , sizeof ( bridge_cdr - > lastapp ) ) ;
ast_copy_string ( savelastdata , bridge_cdr - > lastdata , sizeof ( bridge_cdr - > lastdata ) ) ;
chan - > cdr = bridge_cdr ;
}
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
ast_copy_string ( save_exten , chan - > exten , sizeof ( save_exten ) ) ;
ast_copy_string ( chan - > exten , " h " , sizeof ( chan - > exten ) ) ;
save_prio = chan - > priority ;
chan - > priority = 1 ;
ast_channel_unlock ( chan ) ;
while ( ast_exists_extension ( chan , chan - > context , chan - > exten , chan - > priority , chan - > cid . cid_num ) ) {
2008-10-03 17:12:54 +00:00
if ( ast_spawn_extension ( chan , chan - > context , chan - > exten , chan - > priority , chan - > cid . cid_num ) ) {
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
/* Something bad happened, or a hangup has been requested. */
if ( option_debug )
ast_log ( LOG_DEBUG , " Spawn h extension (%s,%s,%d) exited non-zero on '%s' \n " , chan - > context , chan - > exten , chan - > priority , chan - > name ) ;
if ( option_verbose > 1 )
ast_verbose ( VERBOSE_PREFIX_2 " Spawn h extension (%s, %s, %d) exited non-zero on '%s' \n " , chan - > context , chan - > exten , chan - > priority , chan - > name ) ;
break ;
}
chan - > priority + + ;
}
/* swap it back */
ast_channel_lock ( chan ) ;
ast_copy_string ( chan - > exten , save_exten , sizeof ( chan - > exten ) ) ;
chan - > priority = save_prio ;
2009-03-03 18:27:09 +00:00
if ( bridge_cdr ) {
if ( chan - > cdr = = bridge_cdr ) {
chan - > cdr = swapper ;
} else {
bridge_cdr = NULL ;
}
}
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
ast_set_flag ( chan , AST_FLAG_BRIDGE_HANGUP_RUN ) ;
ast_channel_unlock ( chan ) ;
/* protect the lastapp/lastdata against the effects of the hangup/dialplan code */
2008-11-21 23:14:50 +00:00
if ( bridge_cdr ) {
ast_copy_string ( bridge_cdr - > lastapp , savelastapp , sizeof ( bridge_cdr - > lastapp ) ) ;
ast_copy_string ( bridge_cdr - > lastdata , savelastdata , sizeof ( bridge_cdr - > lastdata ) ) ;
}
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
ast_set2_flag ( chan , autoloopflag , AST_FLAG_IN_AUTOLOOP ) ;
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
}
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
/* obey the NoCDR() wishes. -- move the DISABLED flag to the bridge CDR if it was set on the channel during the bridge... */
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
new_chan_cdr = pick_unlocked_cdr ( chan - > cdr ) ; /* the proper chan cdr, if there are forked cdrs */
if ( bridge_cdr & & new_chan_cdr & & ast_test_flag ( new_chan_cdr , AST_CDR_FLAG_POST_DISABLED ) ) {
ast_set_flag ( bridge_cdr , AST_CDR_FLAG_POST_DISABLED ) ;
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
}
/* we can post the bridge CDR at this point */
2008-11-21 21:19:47 +00:00
if ( bridge_cdr ) {
ast_cdr_end ( bridge_cdr ) ;
ast_cdr_detach ( bridge_cdr ) ;
}
Tested by: sergee, murf, chris-mac, andrew, KNK
This is a "second attempt" to restore the previous "endbeforeh" behavior
in 1.4 and up. In order to capture information concerning all the
legs of transfers in all their infinite combinations, I was forced
to this particular solution by a chain of logical necessities, the
first being that I was not allowed to rewrite the CDR mechanism from
the ground up!
This change basically leaves the original machinery alone, which allows
IVR and local channel type situations to generate CDR's as normal, but
a channel flag can be set to suppress the normal running of the h exten.
That flag would be set by the code that runs the h exten from the
ast_bridge_call routine, to prevent the h exten from being run twice.
Also, a flag in the ast_bridge_config struct passed into ast_bridge_call
can be used to suppress the running of the h exten in that routine. This
would happen, for instance, if you use the 'g' option in the Dial app.
Running this routine 'early' allows not only the CDR() func to be used
in the h extension for reading CDR variables, but also allows them to
be modified before the CDR is posted to the backends.
While I dearly hope that this patch overcomes all problems, and
introduces no new problems, reality suggests that surely someone
will have problems. In this case, please re-open 13251 (or 13289),
and we'll see if we can't fix any remaining issues.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@142675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-09-12 04:29:34 +00:00
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
/* do a specialized reset on the beginning channel
CDR ' s , if they still exist , so as not to mess up
issues in future bridges ;
Here are the rules of the game :
1. The chan and peer channel pointers will not change
during the life of the bridge .
2. But , in transfers , the channel names will change .
between the time the bridge is started , and the
time the channel ends .
Usually , when a channel changes names , it will
also change CDR pointers .
3. Usually , only one of the two channels ( chan or peer )
will change names .
4. Usually , if a channel changes names during a bridge ,
it is because of a transfer . Usually , in these situations ,
it is normal to see 2 bridges running simultaneously , and
it is not unusual to see the two channels that change
swapped between bridges .
5. After a bridge occurs , we have 2 or 3 channels ' CDRs
to attend to ; if the chan or peer changed names ,
we have the before and after attached CDR ' s .
*/
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
if ( new_chan_cdr ) {
2008-09-23 16:41:49 +00:00
struct ast_channel * chan_ptr = NULL ;
2008-07-03 00:16:25 +00:00
2008-09-23 16:41:49 +00:00
if ( strcasecmp ( orig_channame , chan - > name ) ! = 0 ) {
/* old channel */
chan_ptr = ast_get_channel_by_name_locked ( orig_channame ) ;
if ( chan_ptr ) {
if ( ! ast_bridged_channel ( chan_ptr ) ) {
struct ast_cdr * cur ;
for ( cur = chan_ptr - > cdr ; cur ; cur = cur - > next ) {
if ( cur = = chan_cdr ) {
break ;
}
}
if ( cur )
ast_cdr_specialized_reset ( chan_cdr , 0 ) ;
}
ast_channel_unlock ( chan_ptr ) ;
2008-09-09 15:40:24 +00:00
}
2008-09-23 16:41:49 +00:00
/* new channel */
ast_cdr_specialized_reset ( new_chan_cdr , 0 ) ;
} else {
ast_cdr_specialized_reset ( chan_cdr , 0 ) ; /* nothing changed, reset the chan_cdr */
}
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
}
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
{
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
struct ast_channel * chan_ptr = NULL ;
new_peer_cdr = pick_unlocked_cdr ( peer - > cdr ) ; /* the proper chan cdr, if there are forked cdrs */
if ( new_chan_cdr & & ast_test_flag ( new_chan_cdr , AST_CDR_FLAG_POST_DISABLED ) & & new_peer_cdr & & ! ast_test_flag ( new_peer_cdr , AST_CDR_FLAG_POST_DISABLED ) )
ast_set_flag ( new_peer_cdr , AST_CDR_FLAG_POST_DISABLED ) ; /* DISABLED is viral-- it will propagate across a bridge */
if ( strcasecmp ( orig_peername , peer - > name ) ! = 0 ) {
2008-09-23 16:41:49 +00:00
/* old channel */
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
chan_ptr = ast_get_channel_by_name_locked ( orig_peername ) ;
2008-09-23 16:41:49 +00:00
if ( chan_ptr ) {
if ( ! ast_bridged_channel ( chan_ptr ) ) {
struct ast_cdr * cur ;
for ( cur = chan_ptr - > cdr ; cur ; cur = cur - > next ) {
if ( cur = = peer_cdr ) {
break ;
}
}
if ( cur )
ast_cdr_specialized_reset ( peer_cdr , 0 ) ;
(closes issue #12982)
Reported by: bcnit
Tested by: murf
I discovered that also, in the previous bug fixes and changes,
the cdr.conf 'unanswered' option is not being obeyed, so
I fixed this.
And, yes, there are two 'answer' times involved in this
scenario, and I would agree with you, that the first
answer time is the time that should appear in the CDR.
(the second 'answer' time is the time that the bridge
was begun).
I made the necessary adjustments, recording the first
answer time into the peer cdr, and then using that to
override the bridge cdr's value.
To get the 'unanswered' CDRs to appear, I purposely
output them, using the dial cmd to mark them as
DIALED (with a new flag), and outputting them if
they bear that flag, and you are in the right mode.
I also corrected one small mention of the Zap device
to equally consider the dahdi device.
I heavily tested 10-sec-wait macros in dial, and
without the macro call; I tested hangups while the
macro was running vs. letting the macro complete
and the bridge form. Looks OK. Removed all the
instrumentation and debug.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@135799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-08-05 23:13:20 +00:00
}
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
ast_channel_unlock ( chan_ptr ) ;
(closes issue #11849)
Reported by: greyvoip
Tested by: murf
OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid
notebook pages of notes later, I have made the small
tweek necc. to get the start time right on the second
CDR when:
A Calls B
B answ.
A hits Xfer button on sip phone,
A dials C and hits the OK button,
A hangs up
C answers ringing phone
B and C converse
B and/or C hangs up
But does not harm the scenario where:
A Calls B
B answ.
B hits xfer button on sip phone,
B dials C and hits the OK button,
B hangs up
C answers ringing phone
A and C converse
A and/or C hangs up
The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.
I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.
I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR
changes and loses the proper start time.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:23:42 +00:00
}
2008-09-23 16:41:49 +00:00
/* new channel */
ast_cdr_specialized_reset ( new_peer_cdr , 0 ) ;
} else {
The magic trick to avoid this crash is not to
try to find the channel by name in the list,
which is slow and resource consuming, but rather
to pay attention to the result codes from the
ast_bridge_call, to which I added the
AST_PBX_NO_HANGUP_PEER_PARKED value, which
now are returned when a channel is parked.
If you get AST_PBX_KEEPALIVE,
then don't touch the channel pointer.
If you get AST_PBX_NO_HANGUP_PEER, or
AST_PBX_NO_HANGUP_PEER_PARKED, then don't
touch the peer pointer.
Updated the several places where the results
from a bridge were not being properly obeyed,
and fixed some code I had introduced so that
the results of the bridge were not overridden
(in trunk).
All the places that previously tested for
AST_PBX_NO_HANGUP_PEER now have to check for
both AST_PBX_NO_HANGUP_PEER and AST_PBX_NO_HANGUP_PEER_PARKED.
I tested this against the 4 common parking
scenarios:
1. A calls B; B answers; A parks B; B hangs up while A is getting the parking
slot announcement, immediately after being put on hold.
2. A calls B; B answers; A parks B; B hangs up after A has been hung up, but
before the park times out.
3. A calls B; B answers; B parks A; A hangs up while B is getting the parking slot announcement, immediately after being put on hold.
4. A calls B; B answers; B parks A; A hangs up after B has been hung up, but before the park times out.
No crash.
I also ran the scenarios above against valgrind, and accesses looked good.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@152535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-10-29 04:36:32 +00:00
ast_cdr_specialized_reset ( peer_cdr , 0 ) ; /* nothing changed, reset the peer_cdr */
(closes issue #11849)
Reported by: greyvoip
Tested by: murf
OK, a few days of debugging, a bunch of instrumentation
in chan_sip, main/channel.c, main/pbx.c, etc. and 5 solid
notebook pages of notes later, I have made the small
tweek necc. to get the start time right on the second
CDR when:
A Calls B
B answ.
A hits Xfer button on sip phone,
A dials C and hits the OK button,
A hangs up
C answers ringing phone
B and C converse
B and/or C hangs up
But does not harm the scenario where:
A Calls B
B answ.
B hits xfer button on sip phone,
B dials C and hits the OK button,
B hangs up
C answers ringing phone
A and C converse
A and/or C hangs up
The difference in start times on the second CDR is because
of a Masquerade on the B channel when the xfer number is
sent. It ends up replacing the CDR on the B channel with
a duplicate, which ends up getting tossed out. We keep
a pointer to the first CDR, and update *that* after the
bridge closes. But, only if the CDR has changed.
I hope this change is specific enough not to muck
up any current CDR-based apps. In my defence, I
assert that the previous information was wrong,
and this change fixes it, and possibly other
similar scenarios.
I wonder if I should be doing the same thing
for the channel, as I did for the peer, but
I can't think of a scenario this might affect.
I leave it, then, as an exersize for the users,
to find the scenario where the chan's CDR
changes and loses the proper start time.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@134883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-07-31 19:23:42 +00:00
}
2007-03-30 17:51:17 +00:00
}
This patch fixes h-exten running misbehavior in manager-redirected
situations.
What it does:
1. A new Flag value is defined in include/asterisk/channel.h,
AST_FLAG_BRIDGE_HANGUP_DONT, which used as a messenge to the
bridge hangup exten code not to run the h-exten there (nor
publish the bridge cdr there). It will done at the pbx-loop
level instead.
2. In the manager Redirect code, I set this flag on the channel
if the channel has a non-null pbx pointer. I did the same for the
second (chan2) channel, which gets run if name2 is set...
and the first succeeds.
3. I restored the ending of the cdr for the pbx loop h-exten
running code. Don't know why it was removed in the first place.
4. The first attempt at the fix for this bug was to place code
directly in the async_goto routine, which was called from a
large number of places, and could affect a large number of
cases, so I tested that fix against a fair number of transfer
scenarios, both with and without the patch. In the process,
I saw that putting the fix in async_goto seemed not to affect
any of the blind or attended scenarios, but still, I was
was highly concerned that some other scenarios I had not tested
might be negatively impacted, so I refined the patch to
its current scope, and jmls tested both. In the process, tho,
I saw that blind xfers in one situation, when the one-touch
blind-xfer feature is used by the peer, we got strange
h-exten behavior. So, I inserted code to swap CDRs and
to set the HANGUP_DONT field, to get uniform behavior.
5. I added code to the bridge to obey the HANGUP_DONT flag,
skipping both publishing the bridge CDR, and running
the h-exten; they will be done at the pbx-loop (higher)
level instead.
6. I removed all the debug logs from the patch before committing.
7. I moved the AUTOLOOP set/reset in the h-exten code in res_features
so it's only done if the h-exten is going to be run. A very
minor performance improvement, but technically correct.
(closes issue #14241)
Reported by: jmls
Patches:
14241_redirect_no_bridgeCDR_or_h_exten_via_transfer uploaded by murf (license 17)
Tested by: murf, jmls
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-28 18:51:16 +00:00
2001-12-27 11:07:33 +00:00
return res ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
static void post_manager_event ( const char * s , char * parkingexten , struct ast_channel * chan )
2006-04-21 16:04:25 +00:00
{
manager_event ( EVENT_FLAG_CALL , s ,
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
" Exten: %s \r \n "
2006-04-21 16:04:25 +00:00
" Channel: %s \r \n "
" CallerID: %s \r \n "
" CallerIDName: %s \r \n \r \n " ,
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
parkingexten ,
chan - > name ,
2006-04-21 16:04:25 +00:00
S_OR ( chan - > cid . cid_num , " <unknown> " ) ,
S_OR ( chan - > cid . cid_name , " <unknown> " )
) ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
static char * callback_dialoptions ( struct ast_flags * features_callee , struct ast_flags * features_caller , char * options , size_t len )
{
int i = 0 ;
enum {
OPT_CALLEE_REDIRECT = ' t ' ,
OPT_CALLER_REDIRECT = ' T ' ,
OPT_CALLEE_AUTOMON = ' w ' ,
OPT_CALLER_AUTOMON = ' W ' ,
OPT_CALLEE_DISCONNECT = ' h ' ,
OPT_CALLER_DISCONNECT = ' H ' ,
OPT_CALLEE_PARKCALL = ' k ' ,
OPT_CALLER_PARKCALL = ' K ' ,
} ;
memset ( options , 0 , len ) ;
if ( ast_test_flag ( features_caller , AST_FEATURE_REDIRECT ) & & i < len ) {
options [ i + + ] = OPT_CALLER_REDIRECT ;
}
if ( ast_test_flag ( features_caller , AST_FEATURE_AUTOMON ) & & i < len ) {
options [ i + + ] = OPT_CALLER_AUTOMON ;
}
if ( ast_test_flag ( features_caller , AST_FEATURE_DISCONNECT ) & & i < len ) {
options [ i + + ] = OPT_CALLER_DISCONNECT ;
}
if ( ast_test_flag ( features_caller , AST_FEATURE_PARKCALL ) & & i < len ) {
options [ i + + ] = OPT_CALLER_PARKCALL ;
}
if ( ast_test_flag ( features_callee , AST_FEATURE_REDIRECT ) & & i < len ) {
options [ i + + ] = OPT_CALLEE_REDIRECT ;
}
if ( ast_test_flag ( features_callee , AST_FEATURE_AUTOMON ) & & i < len ) {
options [ i + + ] = OPT_CALLEE_AUTOMON ;
}
if ( ast_test_flag ( features_callee , AST_FEATURE_DISCONNECT ) & & i < len ) {
options [ i + + ] = OPT_CALLEE_DISCONNECT ;
}
if ( ast_test_flag ( features_callee , AST_FEATURE_PARKCALL ) & & i < len ) {
options [ i + + ] = OPT_CALLEE_PARKCALL ;
}
return options ;
}
2006-03-14 07:09:57 +00:00
/*! \brief Take care of parked calls and unpark them if needed */
2001-12-27 11:07:33 +00:00
static void * do_parking_thread ( void * ignore )
{
2006-04-16 20:32:14 +00:00
fd_set rfds , efds ; /* results from previous select, to be preserved across loops. */
2001-12-27 11:07:33 +00:00
FD_ZERO ( & rfds ) ;
FD_ZERO ( & efds ) ;
2004-12-09 22:39:14 +00:00
2001-12-27 11:07:33 +00:00
for ( ; ; ) {
2006-04-16 19:05:19 +00:00
struct parkeduser * pu , * pl , * pt = NULL ;
int ms = - 1 ; /* select timeout, uninitialized */
int max = - 1 ; /* max fd, none there yet */
2006-04-16 20:32:14 +00:00
fd_set nrfds , nefds ; /* args for the next select */
2006-04-16 19:05:19 +00:00
FD_ZERO ( & nrfds ) ;
FD_ZERO ( & nefds ) ;
2003-08-13 15:25:16 +00:00
ast_mutex_lock ( & parking_lock ) ;
2001-12-27 11:07:33 +00:00
pl = NULL ;
pu = parkinglot ;
2006-04-16 20:32:14 +00:00
/* navigate the list with prev-cur pointers to support removals */
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
while ( pu ) {
2006-04-16 19:41:12 +00:00
struct ast_channel * chan = pu - > chan ; /* shorthand */
2006-04-16 19:05:19 +00:00
int tms ; /* timeout for this item */
int x ; /* fd index in channel */
struct ast_context * con ;
2006-04-16 20:32:14 +00:00
if ( pu - > notquiteyet ) { /* Pretend this one isn't here yet */
2004-08-03 06:31:20 +00:00
pl = pu ;
pu = pu - > next ;
continue ;
}
2005-07-15 23:00:47 +00:00
tms = ast_tvdiff_ms ( ast_tvnow ( ) , pu - > start ) ;
2003-02-02 19:37:23 +00:00
if ( tms > pu - > parkingtime ) {
2006-04-16 19:41:12 +00:00
ast_indicate ( chan , AST_CONTROL_UNHOLD ) ;
2004-12-09 22:39:14 +00:00
/* Get chan, exten from derived kludge */
2004-12-28 23:49:46 +00:00
if ( pu - > peername [ 0 ] ) {
2006-04-16 20:32:14 +00:00
char * peername = ast_strdupa ( pu - > peername ) ;
char * cp = strrchr ( peername , ' - ' ) ;
2004-12-28 23:49:46 +00:00
if ( cp )
* cp = 0 ;
2004-12-09 22:39:14 +00:00
con = ast_context_find ( parking_con_dial ) ;
if ( ! con ) {
2004-12-28 23:49:46 +00:00
con = ast_context_create ( NULL , parking_con_dial , registrar ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( ! con )
2004-12-09 22:39:14 +00:00
ast_log ( LOG_ERROR , " Parking dial context '%s' does not exist and unable to create \n " , parking_con_dial ) ;
}
if ( con ) {
2006-04-16 19:05:19 +00:00
char returnexten [ AST_MAX_EXTENSION ] ;
2008-06-11 23:47:23 +00:00
struct ast_datastore * features_datastore ;
struct ast_dial_features * dialfeatures = NULL ;
ast_channel_lock ( chan ) ;
if ( ( features_datastore = ast_channel_datastore_find ( chan , & dial_features_info , NULL ) ) )
dialfeatures = features_datastore - > data ;
ast_channel_unlock ( chan ) ;
2009-01-15 18:22:49 +00:00
if ( ! strncmp ( peername , " Parked/ " , 7 ) ) {
peername + = 7 ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
if ( dialfeatures ) {
char buf [ MAX_DIAL_FEATURE_OPTIONS ] = { 0 , } ;
snprintf ( returnexten , sizeof ( returnexten ) , " %s|30|%s " , peername , callback_dialoptions ( & ( dialfeatures - > features_callee ) , & ( dialfeatures - > features_caller ) , buf , sizeof ( buf ) ) ) ;
} else { /* Existing default */
ast_log ( LOG_WARNING , " Dialfeatures not found on %s, using default! \n " , chan - > name ) ;
2008-06-11 23:47:23 +00:00
snprintf ( returnexten , sizeof ( returnexten ) , " %s|30|t " , peername ) ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
}
2008-06-11 23:47:23 +00:00
2009-03-11 03:25:04 +00:00
ast_add_extension2 ( con , 1 , peername , 1 , NULL , NULL , " Dial " , strdup ( returnexten ) , ast_free_ptr , registrar ) ;
2004-12-09 22:39:14 +00:00
}
2006-04-16 19:41:12 +00:00
set_c_e_p ( chan , parking_con_dial , peername , 1 ) ;
2004-12-09 22:39:14 +00:00
} else {
/* They've been waiting too long, send them back to where they came. Theoretically they
should have their original extensions and such , but we copy to be on the safe side */
2006-04-16 19:41:12 +00:00
set_c_e_p ( chan , pu - > context , pu - > exten , pu - > priority ) ;
2004-12-09 22:39:14 +00:00
}
2005-02-26 07:54:28 +00:00
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
post_manager_event ( " ParkedCallTimeOut " , pu - > parkingexten , chan ) ;
2005-02-26 07:54:28 +00:00
2004-12-09 22:39:14 +00:00
if ( option_verbose > 1 )
2006-04-16 19:41:12 +00:00
ast_verbose ( VERBOSE_PREFIX_2 " Timeout for %s parked on %d. Returning to %s,%s,%d \n " , chan - > name , pu - > parkingnum , chan - > context , chan - > exten , chan - > priority ) ;
2001-12-27 11:07:33 +00:00
/* Start up the PBX, or hang them up */
2006-04-16 19:41:12 +00:00
if ( ast_pbx_start ( chan ) ) {
ast_log ( LOG_WARNING , " Unable to restart the PBX for user on '%s', hanging them up... \n " , chan - > name ) ;
2006-04-16 21:41:06 +00:00
ast_hangup ( chan ) ;
2001-12-27 11:07:33 +00:00
}
/* And take them out of the parking lot */
if ( pl )
pl - > next = pu - > next ;
else
parkinglot = pu - > next ;
pt = pu ;
pu = pu - > next ;
2004-08-03 06:31:20 +00:00
con = ast_context_find ( parking_con ) ;
if ( con ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( ast_context_remove_extension2 ( con , pt - > parkingexten , 1 , NULL ) )
2004-08-03 06:31:20 +00:00
ast_log ( LOG_WARNING , " Whoa, failed to remove the extension! \n " ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
else
2006-07-27 04:44:49 +00:00
notify_metermaids ( pt - > parkingexten , parking_con ) ;
2004-08-03 06:31:20 +00:00
} else
ast_log ( LOG_WARNING , " Whoa, no parking context? \n " ) ;
2001-12-27 11:07:33 +00:00
free ( pt ) ;
2006-04-16 20:32:14 +00:00
} else { /* still within parking time, process descriptors */
2005-07-25 17:31:53 +00:00
for ( x = 0 ; x < AST_MAX_FDS ; x + + ) {
2006-04-16 19:05:19 +00:00
struct ast_frame * f ;
2006-04-16 20:32:14 +00:00
if ( chan - > fds [ x ] = = - 1 | | ( ! FD_ISSET ( chan - > fds [ x ] , & rfds ) & & ! FD_ISSET ( chan - > fds [ x ] , & efds ) ) )
continue ; /* nothing on this descriptor */
2006-04-16 19:05:19 +00:00
2006-04-16 19:41:12 +00:00
if ( FD_ISSET ( chan - > fds [ x ] , & efds ) )
ast_set_flag ( chan , AST_FLAG_EXCEPTION ) ;
2006-04-16 19:12:51 +00:00
else
2006-04-16 19:41:12 +00:00
ast_clear_flag ( chan , AST_FLAG_EXCEPTION ) ;
chan - > fdno = x ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
2006-04-16 19:12:51 +00:00
/* See if they need servicing */
2006-04-16 19:41:12 +00:00
f = ast_read ( chan ) ;
2006-04-16 20:32:14 +00:00
if ( ! f | | ( f - > frametype = = AST_FRAME_CONTROL & & f - > subclass = = AST_CONTROL_HANGUP ) ) {
2006-04-16 19:12:51 +00:00
if ( f )
2001-12-27 11:07:33 +00:00
ast_frfree ( f ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
post_manager_event ( " ParkedCallGiveUp " , pu - > parkingexten , chan ) ;
2006-04-16 19:12:51 +00:00
/* There's a problem, hang them up*/
if ( option_verbose > 1 )
2006-04-16 19:41:12 +00:00
ast_verbose ( VERBOSE_PREFIX_2 " %s got tired of being parked \n " , chan - > name ) ;
ast_hangup ( chan ) ;
2006-04-16 19:12:51 +00:00
/* And take them out of the parking lot */
if ( pl )
pl - > next = pu - > next ;
else
parkinglot = pu - > next ;
pt = pu ;
pu = pu - > next ;
con = ast_context_find ( parking_con ) ;
2008-09-16 21:44:21 +00:00
if ( con ) {
if ( ast_context_remove_extension2 ( con , pt - > parkingexten , 1 , NULL ) )
ast_log ( LOG_WARNING , " Whoa, failed to remove the extension! \n " ) ;
else {
notify_metermaids ( pt - > parkingexten , parking_con ) ;
}
} else
ast_log ( LOG_WARNING , " Whoa, no parking context? \n " ) ;
2006-04-16 19:12:51 +00:00
free ( pt ) ;
break ;
} else {
2006-04-17 04:31:21 +00:00
/*! \todo XXX Maybe we could do something with packets, like dial "0" for operator or something XXX */
2006-04-16 19:12:51 +00:00
ast_frfree ( f ) ;
2006-04-16 19:41:12 +00:00
if ( pu - > moh_trys < 3 & & ! chan - > generatordata ) {
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " MOH on parked call stopped by outside source. Restarting. \n " ) ;
2006-07-19 20:44:39 +00:00
ast_indicate_data ( pu - > chan , AST_CONTROL_HOLD ,
S_OR ( parkmohclass , NULL ) ,
! ast_strlen_zero ( parkmohclass ) ? strlen ( parkmohclass ) + 1 : 0 ) ;
2006-04-16 19:12:51 +00:00
pu - > moh_trys + + ;
2001-12-27 11:07:33 +00:00
}
2006-04-17 04:31:21 +00:00
goto std ; /*! \todo XXX Ick: jumping into an else statement??? XXX */
2006-04-16 19:12:51 +00:00
}
2006-04-16 19:05:19 +00:00
2006-04-16 18:37:01 +00:00
} /* end for */
2001-12-27 11:07:33 +00:00
if ( x > = AST_MAX_FDS ) {
2006-04-16 20:32:14 +00:00
std : for ( x = 0 ; x < AST_MAX_FDS ; x + + ) { /* mark fds for next round */
2006-04-16 19:41:12 +00:00
if ( chan - > fds [ x ] > - 1 ) {
FD_SET ( chan - > fds [ x ] , & nrfds ) ;
FD_SET ( chan - > fds [ x ] , & nefds ) ;
if ( chan - > fds [ x ] > max )
max = chan - > fds [ x ] ;
2001-12-27 11:07:33 +00:00
}
}
2006-04-16 20:32:14 +00:00
/* Keep track of our shortest wait */
if ( tms < ms | | ms < 0 )
2001-12-27 11:07:33 +00:00
ms = tms ;
pl = pu ;
pu = pu - > next ;
}
}
2006-04-16 18:37:01 +00:00
} /* end while */
2003-08-13 15:25:16 +00:00
ast_mutex_unlock ( & parking_lock ) ;
2001-12-27 11:07:33 +00:00
rfds = nrfds ;
efds = nefds ;
2006-04-16 20:32:14 +00:00
{
struct timeval tv = ast_samp2tv ( ms , 1000 ) ;
/* Wait for something to happen */
ast_select ( max + 1 , & rfds , NULL , & efds , ( ms > - 1 ) ? & tv : NULL ) ;
}
2001-12-27 11:07:33 +00:00
pthread_testcancel ( ) ;
}
return NULL ; /* Never reached */
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Park a call */
2004-08-03 06:31:20 +00:00
static int park_call_exec ( struct ast_channel * chan , void * data )
{
2007-11-21 18:59:27 +00:00
/* Cache the original channel name in case we get masqueraded in the middle
* of a park - - it is still theoretically possible for a transfer to happen before
* we get here , but it is _really_ unlikely */
2009-01-20 18:40:56 +00:00
char * orig_chan_name = ast_strdupa ( chan - > name ) ;
2008-01-04 22:55:56 +00:00
char orig_exten [ AST_MAX_EXTENSION ] ;
int orig_priority = chan - > priority ;
2004-08-03 06:31:20 +00:00
/* Data is unused at the moment but could contain a parking
lot context eventually */
2006-08-21 02:11:39 +00:00
int res = 0 ;
struct ast_module_user * u ;
u = ast_module_user_add ( chan ) ;
2008-01-04 22:55:56 +00:00
ast_copy_string ( orig_exten , chan - > exten , sizeof ( orig_exten ) ) ;
2004-08-03 06:31:20 +00:00
/* Setup the exten/priority to be s/1 since we don't know
where this call should return */
strcpy ( chan - > exten , " s " ) ;
chan - > priority = 1 ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Answer if call is not up */
2004-08-03 06:31:20 +00:00
if ( chan - > _state ! = AST_STATE_UP )
res = ast_answer ( chan ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Sleep to allow VoIP streams to settle down */
2004-08-03 06:31:20 +00:00
if ( ! res )
res = ast_safe_sleep ( chan , 1000 ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/* Park the call */
2008-01-04 22:55:56 +00:00
if ( ! res ) {
2009-01-20 18:40:56 +00:00
res = masq_park_call_announce ( chan , chan , 0 , NULL , orig_chan_name ) ;
2008-01-04 22:55:56 +00:00
/* Continue on in the dialplan */
if ( res = = 1 ) {
ast_copy_string ( chan - > exten , orig_exten , sizeof ( chan - > exten ) ) ;
chan - > priority = orig_priority ;
res = 0 ;
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
} else if ( ! res ) {
res = 1 ;
}
2008-01-04 22:55:56 +00:00
}
2006-08-21 02:11:39 +00:00
ast_module_user_remove ( u ) ;
2008-01-04 22:55:56 +00:00
return res ;
2004-08-03 06:31:20 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Pickup parked call */
2001-12-27 11:07:33 +00:00
static int park_exec ( struct ast_channel * chan , void * data )
{
2006-08-21 02:11:39 +00:00
int res = 0 ;
struct ast_module_user * u ;
2001-12-27 11:07:33 +00:00
struct ast_channel * peer = NULL ;
struct parkeduser * pu , * pl = NULL ;
2004-08-03 06:31:20 +00:00
struct ast_context * con ;
2007-03-30 14:11:59 +00:00
2001-12-27 11:07:33 +00:00
int park ;
2004-04-26 23:22:34 +00:00
struct ast_bridge_config config ;
2001-12-27 11:07:33 +00:00
if ( ! data ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
ast_log ( LOG_WARNING , " Parkedcall requires an argument (extension number) \n " ) ;
2001-12-27 11:07:33 +00:00
return - 1 ;
}
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2006-08-21 02:11:39 +00:00
u = ast_module_user_add ( chan ) ;
2001-12-27 11:07:33 +00:00
park = atoi ( ( char * ) data ) ;
2003-08-13 15:25:16 +00:00
ast_mutex_lock ( & parking_lock ) ;
2001-12-27 11:07:33 +00:00
pu = parkinglot ;
while ( pu ) {
if ( pu - > parkingnum = = park ) {
2008-10-09 18:56:00 +00:00
if ( pu - > chan - > pbx ) { /* do not allow call to be picked up until the PBX thread is finished */
ast_mutex_unlock ( & parking_lock ) ;
ast_module_user_remove ( u ) ;
return - 1 ;
}
2001-12-27 11:07:33 +00:00
if ( pl )
pl - > next = pu - > next ;
else
parkinglot = pu - > next ;
break ;
}
2003-02-02 19:37:23 +00:00
pl = pu ;
2001-12-27 11:07:33 +00:00
pu = pu - > next ;
}
2003-08-13 15:25:16 +00:00
ast_mutex_unlock ( & parking_lock ) ;
2001-12-27 11:07:33 +00:00
if ( pu ) {
peer = pu - > chan ;
2004-08-03 06:31:20 +00:00
con = ast_context_find ( parking_con ) ;
if ( con ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( ast_context_remove_extension2 ( con , pu - > parkingexten , 1 , NULL ) )
2004-08-03 06:31:20 +00:00
ast_log ( LOG_WARNING , " Whoa, failed to remove the extension! \n " ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
else
notify_metermaids ( pu - > parkingexten , parking_con ) ;
2004-08-03 06:31:20 +00:00
} else
ast_log ( LOG_WARNING , " Whoa, no parking context? \n " ) ;
2005-02-26 07:54:28 +00:00
manager_event ( EVENT_FLAG_CALL , " UnParkedCall " ,
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
" Exten: %s \r \n "
2005-02-26 07:54:28 +00:00
" Channel: %s \r \n "
" From: %s \r \n "
" CallerID: %s \r \n "
2006-04-21 10:47:07 +00:00
" CallerIDName: %s \r \n " ,
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
pu - > parkingexten , pu - > chan - > name , chan - > name ,
2006-04-21 10:47:07 +00:00
S_OR ( pu - > chan - > cid . cid_num , " <unknown> " ) ,
S_OR ( pu - > chan - > cid . cid_name , " <unknown> " )
2005-02-26 07:54:28 +00:00
) ;
2001-12-27 11:07:33 +00:00
free ( pu ) ;
}
2003-02-02 19:37:23 +00:00
/* JK02: it helps to answer the channel if not already up */
2006-04-16 20:32:14 +00:00
if ( chan - > _state ! = AST_STATE_UP )
2003-02-02 19:37:23 +00:00
ast_answer ( chan ) ;
2001-12-27 11:07:33 +00:00
if ( peer ) {
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
struct ast_datastore * features_datastore ;
struct ast_dial_features * dialfeatures = NULL ;
2006-01-08 00:25:31 +00:00
/* Play a courtesy to the source(s) configured to prefix the bridge connecting */
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
2004-08-31 13:32:11 +00:00
if ( ! ast_strlen_zero ( courtesytone ) ) {
2006-04-16 20:32:14 +00:00
int error = 0 ;
ast_indicate ( peer , AST_CONTROL_UNHOLD ) ;
2006-01-08 00:25:31 +00:00
if ( parkedplay = = 0 ) {
2006-04-21 20:28:32 +00:00
error = ast_stream_and_wait ( chan , courtesytone , chan - > language , " " ) ;
2006-04-16 21:41:06 +00:00
} else if ( parkedplay = = 1 ) {
2006-04-21 20:28:32 +00:00
error = ast_stream_and_wait ( peer , courtesytone , chan - > language , " " ) ;
2006-04-16 20:32:14 +00:00
} else if ( parkedplay = = 2 ) {
if ( ! ast_streamfile ( chan , courtesytone , chan - > language ) & &
! ast_streamfile ( peer , courtesytone , chan - > language ) ) {
2006-04-17 04:31:21 +00:00
/*! \todo XXX we would like to wait on both! */
2006-04-16 20:32:14 +00:00
res = ast_waitstream ( chan , " " ) ;
if ( res > = 0 )
res = ast_waitstream ( peer , " " ) ;
if ( res < 0 )
error = 1 ;
2004-08-31 13:32:11 +00:00
}
2006-04-16 20:32:14 +00:00
}
if ( error ) {
ast_log ( LOG_WARNING , " Failed to play courtesy tone! \n " ) ;
ast_hangup ( peer ) ;
2007-11-26 18:02:56 +00:00
ast_module_user_remove ( u ) ;
2006-04-16 20:32:14 +00:00
return - 1 ;
2004-08-31 13:32:11 +00:00
}
2006-07-19 20:44:39 +00:00
} else
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
ast_indicate ( peer , AST_CONTROL_UNHOLD ) ;
2006-05-03 21:39:24 +00:00
2001-12-27 11:07:33 +00:00
res = ast_channel_make_compatible ( chan , peer ) ;
if ( res < 0 ) {
ast_log ( LOG_WARNING , " Could not make channels %s and %s compatible for bridge \n " , chan - > name , peer - > name ) ;
ast_hangup ( peer ) ;
2007-11-26 18:02:56 +00:00
ast_module_user_remove ( u ) ;
2001-12-27 11:07:33 +00:00
return - 1 ;
}
/* This runs sorta backwards, since we give the incoming channel control, as if it
were the person called . */
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
if ( option_verbose > 2 )
2001-12-27 11:07:33 +00:00
ast_verbose ( VERBOSE_PREFIX_3 " Channel %s connected to parked call %d \n " , chan - > name , park ) ;
2004-04-26 23:22:34 +00:00
2007-03-30 14:11:59 +00:00
pbx_builtin_setvar_helper ( chan , " PARKEDCHANNEL " , peer - > name ) ;
ast_cdr_setdestchan ( chan - > cdr , peer - > name ) ;
2005-07-25 17:31:53 +00:00
memset ( & config , 0 , sizeof ( struct ast_bridge_config ) ) ;
2008-10-23 16:04:42 +00:00
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
/* Get datastore for peer and apply it's features to the callee side of the bridge config */
ast_channel_lock ( peer ) ;
if ( ( features_datastore = ast_channel_datastore_find ( peer , & dial_features_info , NULL ) ) ) {
dialfeatures = features_datastore - > data ;
}
ast_channel_unlock ( peer ) ;
if ( dialfeatures ) {
ast_copy_flags ( & ( config . features_callee ) , dialfeatures - > is_caller ? & ( dialfeatures - > features_caller ) : & ( dialfeatures - > features_callee ) , AST_FLAGS_ALL ) ;
}
2008-10-23 16:04:42 +00:00
if ( ( parkedcalltransfers = = AST_FEATURE_FLAG_BYCALLEE ) | | ( parkedcalltransfers = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_callee ) , AST_FEATURE_REDIRECT ) ;
}
if ( ( parkedcalltransfers = = AST_FEATURE_FLAG_BYCALLER ) | | ( parkedcalltransfers = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_caller ) , AST_FEATURE_REDIRECT ) ;
}
2009-01-31 00:15:09 +00:00
if ( ( parkedcallreparking = = AST_FEATURE_FLAG_BYCALLEE ) | | ( parkedcallreparking = = AST_FEATURE_FLAG_BYBOTH ) ) {
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
ast_set_flag ( & ( config . features_callee ) , AST_FEATURE_PARKCALL ) ;
}
2009-01-31 00:15:09 +00:00
if ( ( parkedcallreparking = = AST_FEATURE_FLAG_BYCALLER ) | | ( parkedcallreparking = = AST_FEATURE_FLAG_BYBOTH ) ) {
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
ast_set_flag ( & ( config . features_caller ) , AST_FEATURE_PARKCALL ) ;
}
if ( ( parkedcallhangup = = AST_FEATURE_FLAG_BYCALLEE ) | | ( parkedcallhangup = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_callee ) , AST_FEATURE_DISCONNECT ) ;
}
if ( ( parkedcallhangup = = AST_FEATURE_FLAG_BYCALLER ) | | ( parkedcallhangup = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_caller ) , AST_FEATURE_DISCONNECT ) ;
}
if ( ( parkedcallrecording = = AST_FEATURE_FLAG_BYCALLEE ) | | ( parkedcallrecording = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_callee ) , AST_FEATURE_AUTOMON ) ;
}
if ( ( parkedcallrecording = = AST_FEATURE_FLAG_BYCALLER ) | | ( parkedcallrecording = = AST_FEATURE_FLAG_BYBOTH ) ) {
ast_set_flag ( & ( config . features_caller ) , AST_FEATURE_AUTOMON ) ;
}
2005-07-25 17:31:53 +00:00
res = ast_bridge_call ( chan , peer , & config ) ;
2004-04-26 23:22:34 +00:00
2007-01-23 20:32:54 +00:00
pbx_builtin_setvar_helper ( chan , " PARKEDCHANNEL " , peer - > name ) ;
ast_cdr_setdestchan ( chan - > cdr , peer - > name ) ;
2001-12-27 11:07:33 +00:00
/* Simulate the PBX hanging up */
This merges the masqpark branch into 1.4
These changes eliminate the need for (and use of)
the KEEPALIVE return code in res_features.c;
There are other places that use this result code
for similar purposes at a higher level, these appear
to be left alone in 1.4, but attacked in trunk.
The reason these changes are being made in 1.4, is
that parking ends a channel's life, in some situations,
and the code in the bridge (and some other places),
was not checking the result code properly, and dereferencing
the channel pointer, which could lead to memory corruption
and crashes.
Calling the masq_park function eliminates this danger
in higher levels.
A series of previous commits have replaced some parking calls
with masq_park, but this patch puts them ALL to rest,
(except one, purposely left alone because a masquerade
is done anyway), and gets rid of the code that tests
the KEEPALIVE result, and the NOHANGUP_PEER result codes.
While bug 13820 inspired this work, this patch does
not solve all the problems mentioned there.
I have tested this patch (again) to make sure I have
not introduced regressions.
Crashes that occurred when a parked party hung up
while the parking party was listening to the numbers
of the parking stall being assigned, is eliminated.
These are the cases where parking code may be activated:
1. Feature one touch (eg. *3)
2. Feature blind xfer to parking lot (eg ##700)
3. Run Park() app from dialplan (eg sip xfer to 700)
(eg. dahdi hookflash xfer to 700)
4. Run Park via manager.
The interesting testing cases for parking are:
I. A calls B, A parks B
a. B hangs up while A is getting the numbers announced.
b. B hangs up after A gets the announcement, but
before the parking time expires
c. B waits, time expires, A is redialed,
A answers, B and A are connected, after
which, B hangs up.
d. C picks up B while still in parking lot.
II. A calls B, B parks A
a. A hangs up while B is getting the numbers announced.
b. A hangs up after B gets the announcement, but
before the parking time expires
c. A waits, time expires, B is redialed,
B answers, A and B are connected, after
which, A hangs up.
d. C picks up A while still in parking lot.
Testing this throroughly involves acting all the permutations
of I and II, in situations 1,2,3, and 4.
Since I added a few more changes (ALL references to KEEPALIVE in the bridge
code eliimated (I missed one earlier), I retested
most of the above cases, and no crashes.
H-extension weirdness.
Current h-extension execution is not completely
correct for several of the cases.
For the case where A calls B, and A parks B, the
'h' exten is run on A's channel as soon as the park
is accomplished. This is expected behavior.
But when A calls B, and B parks A, this will be
current behavior:
After B parks A, B is hung up by the system, and
the 'h' (hangup) exten gets run, but the channel
mentioned will be a derivative of A's...
Thus, if A is DAHDI/1, and B is DAHDI/2,
the h-extension will be run on channel
Parked/DAHDI/1-1<ZOMBIE>, and the
start/answer/end info will be those
relating to Channel A.
And, in the case where A is reconnected to
B after the park time expires, when both parties
hang up after the joyful reunion, no h-exten
will be run at all.
In the case where C picks up A from the
parking lot, when either A or C hang up,
the h-exten will be run for the C channel.
CDR's are a separate issue, and not addressed
here.
As to WHY this strange behavior occurs,
the answer lies in the procedure followed
to accomplish handing over the channel
to the parking manager thread. This procedure
is called masquerading. In the process,
a duplicate copy of the channel is created,
and most of the active data is given to the
new copy. The original channel gets its name
changed to XXX<ZOMBIE> and keeps the PBX
information for the sake of the original
thread (preserving its role as a call
originator, if it had this role to begin
with), while the new channel is without
this info and becomes a call target (a
"peer").
In this case, the parking lot manager
thread is handed the new (masqueraded)
channel. It will not run an h-exten
on the channel if it hangs up while
in the parking lot. The h exten will
be run on the original channel instead,
in the original thread, after the bridge
completes.
See bug 13820 for our intentions as
to how to clean up the h exten behavior.
Review: http://reviewboard.digium.com/r/29/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@166093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2008-12-19 22:30:32 +00:00
ast_hangup ( peer ) ;
2007-11-26 18:02:56 +00:00
ast_module_user_remove ( u ) ;
2004-04-07 04:11:00 +00:00
return res ;
2001-12-27 11:07:33 +00:00
} else {
2006-04-17 04:31:21 +00:00
/*! \todo XXX Play a message XXX */
2006-04-21 20:28:32 +00:00
if ( ast_stream_and_wait ( chan , " pbx-invalidpark " , chan - > language , " " ) )
2004-12-28 23:49:46 +00:00
ast_log ( LOG_WARNING , " ast_streamfile of %s failed on %s \n " , " pbx-invalidpark " , chan - > name ) ;
2001-12-27 11:07:33 +00:00
if ( option_verbose > 2 )
2005-04-13 23:33:47 +00:00
ast_verbose ( VERBOSE_PREFIX_3 " Channel %s tried to talk to nonexistent parked call %d \n " , chan - > name , park ) ;
2001-12-27 11:07:33 +00:00
res = - 1 ;
}
2006-08-21 02:11:39 +00:00
ast_module_user_remove ( u ) ;
2001-12-27 11:07:33 +00:00
return res ;
}
2005-02-06 23:36:35 +00:00
static int handle_showfeatures ( int fd , int argc , char * argv [ ] )
{
int i ;
2005-08-23 02:22:33 +00:00
struct ast_call_feature * feature ;
2005-02-06 23:36:35 +00:00
char format [ ] = " %-25s %-7s %-7s \n " ;
2005-08-23 02:22:33 +00:00
ast_cli ( fd , format , " Builtin Feature " , " Default " , " Current " ) ;
ast_cli ( fd , format , " --------------- " , " ------- " , " ------- " ) ;
2005-02-06 23:36:35 +00:00
ast_cli ( fd , format , " Pickup " , " *8 " , ast_pickup_ext ( ) ) ; /* default hardcoded above, so we'll hardcode it here */
2007-05-08 16:30:43 +00:00
ast_rwlock_rdlock ( & features_lock ) ;
for ( i = 0 ; i < FEATURES_COUNT ; i + + )
2005-02-06 23:36:35 +00:00
ast_cli ( fd , format , builtin_features [ i ] . fname , builtin_features [ i ] . default_exten , builtin_features [ i ] . exten ) ;
2007-05-08 16:30:43 +00:00
ast_rwlock_unlock ( & features_lock ) ;
2005-08-23 02:22:33 +00:00
ast_cli ( fd , " \n " ) ;
ast_cli ( fd , format , " Dynamic Feature " , " Default " , " Current " ) ;
ast_cli ( fd , format , " --------------- " , " ------- " , " ------- " ) ;
2008-12-11 16:54:51 +00:00
if ( AST_RWLIST_EMPTY ( & feature_list ) ) {
2005-08-23 14:40:03 +00:00
ast_cli ( fd , " (none) \n " ) ;
2008-12-11 16:54:51 +00:00
} else {
AST_RWLIST_RDLOCK ( & feature_list ) ;
AST_RWLIST_TRAVERSE ( & feature_list , feature , feature_entry ) {
ast_cli ( fd , format , feature - > sname , " no def " , feature - > exten ) ;
}
AST_RWLIST_UNLOCK ( & feature_list ) ;
2005-08-23 02:22:33 +00:00
}
2005-10-13 23:58:33 +00:00
ast_cli ( fd , " \n Call parking \n " ) ;
ast_cli ( fd , " ------------ \n " ) ;
ast_cli ( fd , " %-20s: %s \n " , " Parking extension " , parking_ext ) ;
ast_cli ( fd , " %-20s: %s \n " , " Parking context " , parking_con ) ;
ast_cli ( fd , " %-20s: %d-%d \n " , " Parked call extensions " , parking_start , parking_stop ) ;
ast_cli ( fd , " \n " ) ;
2005-08-23 02:22:33 +00:00
2005-02-06 23:36:35 +00:00
return RESULT_SUCCESS ;
}
static char showfeatures_help [ ] =
2006-09-18 19:54:18 +00:00
" Usage: feature list \n "
2005-02-06 23:36:35 +00:00
" Lists currently configured features. \n " ;
2003-07-02 14:06:12 +00:00
static int handle_parkedcalls ( int fd , int argc , char * argv [ ] )
{
struct parkeduser * cur ;
2005-04-20 16:27:44 +00:00
int numparked = 0 ;
2003-07-02 14:06:12 +00:00
ast_cli ( fd , " %4s %25s (%-15s %-12s %-4s) %-6s \n " , " Num " , " Channel "
, " Context " , " Extension " , " Pri " , " Timeout " ) ;
2003-08-13 15:25:16 +00:00
ast_mutex_lock ( & parking_lock ) ;
2003-07-02 14:06:12 +00:00
2006-04-16 19:05:19 +00:00
for ( cur = parkinglot ; cur ; cur = cur - > next ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
ast_cli ( fd , " %-10.10s %25s (%-15s %-12s %-4d) %6lds \n "
, cur - > parkingexten , cur - > chan - > name , cur - > context , cur - > exten
2003-07-02 14:06:12 +00:00
, cur - > priority , cur - > start . tv_sec + ( cur - > parkingtime / 1000 ) - time ( NULL ) ) ;
2005-04-20 16:27:44 +00:00
numparked + + ;
2003-07-02 14:06:12 +00:00
}
2006-04-16 22:02:30 +00:00
ast_mutex_unlock ( & parking_lock ) ;
2005-07-07 22:32:20 +00:00
ast_cli ( fd , " %d parked call%s. \n " , numparked , ( numparked ! = 1 ) ? " s " : " " ) ;
2003-07-02 14:06:12 +00:00
return RESULT_SUCCESS ;
}
static char showparked_help [ ] =
" Usage: show parkedcalls \n "
" Lists currently parked calls. \n " ;
2006-09-18 19:54:18 +00:00
static struct ast_cli_entry cli_show_features_deprecated = {
{ " show " , " features " , NULL } ,
handle_showfeatures , NULL ,
NULL } ;
static struct ast_cli_entry cli_features [ ] = {
2006-11-02 23:00:20 +00:00
{ { " feature " , " show " , NULL } ,
2006-09-18 19:54:18 +00:00
handle_showfeatures , " Lists configured features " ,
showfeatures_help , NULL , & cli_show_features_deprecated } ,
{ { " show " , " parkedcalls " , NULL } ,
handle_parkedcalls , " Lists parked calls " ,
showparked_help } ,
} ;
2005-07-25 17:31:53 +00:00
2006-01-19 22:09:18 +00:00
/*! \brief Dump lot status */
2007-01-05 22:16:33 +00:00
static int manager_parking_status ( struct mansession * s , const struct message * m )
2004-01-30 05:49:44 +00:00
{
struct parkeduser * cur ;
2007-02-16 17:40:38 +00:00
const char * id = astman_get_header ( m , " ActionID " ) ;
2004-07-14 07:53:57 +00:00
char idText [ 256 ] = " " ;
2005-11-08 01:55:31 +00:00
if ( ! ast_strlen_zero ( id ) )
2007-02-16 17:40:38 +00:00
snprintf ( idText , sizeof ( idText ) , " ActionID: %s \r \n " , id ) ;
2004-01-30 05:49:44 +00:00
2004-01-30 06:31:25 +00:00
astman_send_ack ( s , m , " Parked calls will follow " ) ;
2004-01-30 05:49:44 +00:00
2007-02-16 17:40:38 +00:00
ast_mutex_lock ( & parking_lock ) ;
2004-01-30 05:49:44 +00:00
2007-02-16 17:40:38 +00:00
for ( cur = parkinglot ; cur ; cur = cur - > next ) {
2006-04-16 21:41:06 +00:00
astman_append ( s , " Event: ParkedCall \r \n "
2004-01-30 05:49:44 +00:00
" Exten: %d \r \n "
" Channel: %s \r \n "
2005-12-21 08:51:44 +00:00
" From: %s \r \n "
2004-01-30 06:31:25 +00:00
" Timeout: %ld \r \n "
2004-01-30 05:49:44 +00:00
" CallerID: %s \r \n "
2004-10-02 00:58:31 +00:00
" CallerIDName: %s \r \n "
2004-07-14 07:53:57 +00:00
" %s "
2006-04-21 10:47:07 +00:00
" \r \n " ,
2007-02-16 17:40:38 +00:00
cur - > parkingnum , cur - > chan - > name , cur - > peername ,
( long ) cur - > start . tv_sec + ( long ) ( cur - > parkingtime / 1000 ) - ( long ) time ( NULL ) ,
2006-04-21 10:47:07 +00:00
S_OR ( cur - > chan - > cid . cid_num , " " ) , /* XXX in other places it is <unknown> */
S_OR ( cur - > chan - > cid . cid_name , " " ) ,
idText ) ;
2007-02-16 17:40:38 +00:00
}
2004-01-30 05:49:44 +00:00
2006-03-25 23:50:09 +00:00
astman_append ( s ,
2006-04-16 21:41:06 +00:00
" Event: ParkedCallsComplete \r \n "
" %s "
" \r \n " , idText ) ;
2004-07-14 07:53:57 +00:00
2007-02-16 17:40:38 +00:00
ast_mutex_unlock ( & parking_lock ) ;
2004-01-30 05:49:44 +00:00
2007-02-16 17:40:38 +00:00
return RESULT_SUCCESS ;
2004-01-30 05:49:44 +00:00
}
2006-03-06 23:12:48 +00:00
static char mandescr_park [ ] =
" Description: Park a channel. \n "
" Variables: (Names marked with * are required) \n "
" *Channel: Channel name to park \n "
" *Channel2: Channel to announce park info to (and return to if timeout) \n "
" Timeout: Number of milliseconds to wait before callback. \n " ;
2007-01-05 22:16:33 +00:00
static int manager_park ( struct mansession * s , const struct message * m )
2006-03-06 23:12:48 +00:00
{
2007-01-05 22:16:33 +00:00
const char * channel = astman_get_header ( m , " Channel " ) ;
const char * channel2 = astman_get_header ( m , " Channel2 " ) ;
const char * timeout = astman_get_header ( m , " Timeout " ) ;
2006-03-06 23:12:48 +00:00
char buf [ BUFSIZ ] ;
int to = 0 ;
int res = 0 ;
int parkExt = 0 ;
struct ast_channel * ch1 , * ch2 ;
if ( ast_strlen_zero ( channel ) ) {
astman_send_error ( s , m , " Channel not specified " ) ;
return 0 ;
}
if ( ast_strlen_zero ( channel2 ) ) {
astman_send_error ( s , m , " Channel2 not specified " ) ;
return 0 ;
}
ch1 = ast_get_channel_by_name_locked ( channel ) ;
if ( ! ch1 ) {
snprintf ( buf , sizeof ( buf ) , " Channel does not exist: %s " , channel ) ;
astman_send_error ( s , m , buf ) ;
return 0 ;
}
ch2 = ast_get_channel_by_name_locked ( channel2 ) ;
if ( ! ch2 ) {
snprintf ( buf , sizeof ( buf ) , " Channel does not exist: %s " , channel2 ) ;
astman_send_error ( s , m , buf ) ;
2006-04-29 14:50:18 +00:00
ast_channel_unlock ( ch1 ) ;
2006-03-06 23:12:48 +00:00
return 0 ;
}
if ( ! ast_strlen_zero ( timeout ) ) {
sscanf ( timeout , " %d " , & to ) ;
}
res = ast_masq_park_call ( ch1 , ch2 , to , & parkExt ) ;
if ( ! res ) {
ast_softhangup ( ch2 , AST_SOFTHANGUP_EXPLICIT ) ;
astman_send_ack ( s , m , " Park successful " ) ;
} else {
astman_send_error ( s , m , " Park failure " ) ;
}
2006-04-29 14:50:18 +00:00
ast_channel_unlock ( ch1 ) ;
ast_channel_unlock ( ch2 ) ;
2006-03-06 23:12:48 +00:00
return 0 ;
}
2003-07-02 14:06:12 +00:00
2005-07-25 17:31:53 +00:00
int ast_pickup_call ( struct ast_channel * chan )
{
struct ast_channel * cur = NULL ;
int res = - 1 ;
while ( ( cur = ast_channel_walk_locked ( cur ) ) ! = NULL ) {
if ( ! cur - > pbx & &
( cur ! = chan ) & &
( chan - > pickupgroup & cur - > callgroup ) & &
( ( cur - > _state = = AST_STATE_RINGING ) | |
( cur - > _state = = AST_STATE_RING ) ) ) {
break ;
}
2006-04-29 14:50:18 +00:00
ast_channel_unlock ( cur ) ;
2005-07-25 17:31:53 +00:00
}
if ( cur ) {
if ( option_debug )
ast_log ( LOG_DEBUG , " Call pickup on chan '%s' by '%s' \n " , cur - > name , chan - > name ) ;
res = ast_answer ( chan ) ;
if ( res )
ast_log ( LOG_WARNING , " Unable to answer '%s' \n " , chan - > name ) ;
res = ast_queue_control ( chan , AST_CONTROL_ANSWER ) ;
if ( res )
ast_log ( LOG_WARNING , " Unable to queue answer on '%s' \n " , chan - > name ) ;
res = ast_channel_masquerade ( cur , chan ) ;
if ( res )
ast_log ( LOG_WARNING , " Unable to masquerade '%s' into '%s' \n " , chan - > name , cur - > name ) ; /* Done */
2006-04-29 14:50:18 +00:00
ast_channel_unlock ( cur ) ;
2005-07-25 17:31:53 +00:00
} else {
if ( option_debug )
ast_log ( LOG_DEBUG , " No call pickup possible... \n " ) ;
}
return res ;
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
/*! \brief Add parking hints for all defined parking lots */
static void park_add_hints ( char * context , int start , int stop )
{
int numext ;
char device [ AST_MAX_EXTENSION ] ;
char exten [ 10 ] ;
for ( numext = start ; numext < = stop ; numext + + ) {
snprintf ( exten , sizeof ( exten ) , " %d " , numext ) ;
snprintf ( device , sizeof ( device ) , " park:%s@%s " , exten , context ) ;
ast_add_extension ( context , 1 , exten , PRIORITY_HINT , NULL , NULL , device , NULL , NULL , registrar ) ;
}
}
2005-01-10 04:03:30 +00:00
static int load_config ( void )
2001-12-27 11:07:33 +00:00
{
2005-01-10 04:03:30 +00:00
int start = 0 , end = 0 ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
int res ;
2005-01-10 04:03:30 +00:00
struct ast_context * con = NULL ;
struct ast_config * cfg = NULL ;
struct ast_variable * var = NULL ;
2005-10-13 23:58:33 +00:00
char old_parking_ext [ AST_MAX_EXTENSION ] ;
2005-11-10 23:26:40 +00:00
char old_parking_con [ AST_MAX_EXTENSION ] = " " ;
2005-10-13 23:58:33 +00:00
if ( ! ast_strlen_zero ( parking_con ) ) {
strcpy ( old_parking_ext , parking_ext ) ;
strcpy ( old_parking_con , parking_con ) ;
}
/* Reset to defaults */
strcpy ( parking_con , " parkedcalls " ) ;
strcpy ( parking_con_dial , " park-dial " ) ;
strcpy ( parking_ext , " 700 " ) ;
strcpy ( pickup_ext , " *8 " ) ;
2006-07-19 20:44:39 +00:00
strcpy ( parkmohclass , " default " ) ;
2005-10-13 23:58:33 +00:00
courtesytone [ 0 ] = ' \0 ' ;
strcpy ( xfersound , " beep " ) ;
strcpy ( xferfailsound , " pbx-invalid " ) ;
parking_start = 701 ;
parking_stop = 750 ;
parkfindnext = 0 ;
2006-03-30 01:35:56 +00:00
adsipark = 0 ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
parkaddhints = 0 ;
2008-10-23 16:04:42 +00:00
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH ;
2009-01-31 00:15:09 +00:00
parkedcallreparking = 0 ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
parkedcallhangup = 0 ;
parkedcallrecording = 0 ;
2005-10-13 23:58:33 +00:00
2005-01-04 04:01:40 +00:00
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT ;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT ;
2006-05-23 18:23:05 +00:00
atxfernoanswertimeout = DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER ;
2005-01-04 04:01:40 +00:00
2005-01-25 06:10:20 +00:00
cfg = ast_config_load ( " features.conf " ) ;
2006-08-31 21:00:20 +00:00
if ( ! cfg ) {
ast_log ( LOG_WARNING , " Could not load features.conf \n " ) ;
return AST_MODULE_LOAD_DECLINE ;
}
for ( var = ast_variable_browse ( cfg , " general " ) ; var ; var = var - > next ) {
if ( ! strcasecmp ( var - > name , " parkext " ) ) {
ast_copy_string ( parking_ext , var - > value , sizeof ( parking_ext ) ) ;
} else if ( ! strcasecmp ( var - > name , " context " ) ) {
ast_copy_string ( parking_con , var - > value , sizeof ( parking_con ) ) ;
} else if ( ! strcasecmp ( var - > name , " parkingtime " ) ) {
if ( ( sscanf ( var - > value , " %d " , & parkingtime ) ! = 1 ) | | ( parkingtime < 1 ) ) {
ast_log ( LOG_WARNING , " %s is not a valid parkingtime \n " , var - > value ) ;
parkingtime = DEFAULT_PARK_TIME ;
} else
parkingtime = parkingtime * 1000 ;
} else if ( ! strcasecmp ( var - > name , " parkpos " ) ) {
if ( sscanf ( var - > value , " %d-%d " , & start , & end ) ! = 2 ) {
2007-11-19 15:53:32 +00:00
ast_log ( LOG_WARNING , " Format for parking positions is a-b, where a and b are numbers at line %d of features.conf \n " , var - > lineno ) ;
2006-08-31 21:00:20 +00:00
} else {
parking_start = start ;
parking_stop = end ;
}
} else if ( ! strcasecmp ( var - > name , " findslot " ) ) {
parkfindnext = ( ! strcasecmp ( var - > value , " next " ) ) ;
} else if ( ! strcasecmp ( var - > name , " parkinghints " ) ) {
parkaddhints = ast_true ( var - > value ) ;
2008-10-23 16:04:42 +00:00
} else if ( ! strcasecmp ( var - > name , " parkedcalltransfers " ) ) {
if ( ! strcasecmp ( var - > value , " no " ) )
parkedcalltransfers = 0 ;
else if ( ! strcasecmp ( var - > value , " caller " ) )
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLER ;
else if ( ! strcasecmp ( var - > value , " callee " ) )
parkedcalltransfers = AST_FEATURE_FLAG_BYCALLEE ;
else if ( ! strcasecmp ( var - > value , " both " ) )
parkedcalltransfers = AST_FEATURE_FLAG_BYBOTH ;
2009-01-31 00:15:09 +00:00
} else if ( ! strcasecmp ( var - > name , " parkedcallreparking " ) ) {
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
if ( ! strcasecmp ( var - > value , " no " ) )
2009-01-31 00:15:09 +00:00
parkedcallreparking = 0 ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
else if ( ! strcasecmp ( var - > value , " caller " ) )
2009-01-31 00:15:09 +00:00
parkedcallreparking = AST_FEATURE_FLAG_BYCALLER ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
else if ( ! strcasecmp ( var - > value , " callee " ) )
2009-01-31 00:15:09 +00:00
parkedcallreparking = AST_FEATURE_FLAG_BYCALLEE ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
else if ( ! strcasecmp ( var - > value , " both " ) )
2009-01-31 00:15:09 +00:00
parkedcallreparking = AST_FEATURE_FLAG_BYBOTH ;
Fix feature inheritance with builtin features
When using builtin features like parking and transfers, the AST_FEATURE_* flags
would not be set correctly for all instances when either performing a builtin
attended transfer, or parking a call and getting the timeout callback. Also,
there was no way on a per-call basis to specify what features someone should
have on picking up a parked call (since that doesn't involve the Dial() command).
There was a global option for setting whether or not all users who pickup a
parked call should have AST_FEATURE_REDIRECT set, but nothing for DISCONNECT,
AUTOMON, or PARKCALL.
This patch:
1) adds the BRIDGE_FEATURES dialplan variable which can be set either in the
dialplan or with setvar in channels that support it. This variable can be set
to any combination of 't', 'k', 'w', and 'h' (case insensitive matching of the
equivalent dial options), to set what features should be activated on this
channel. The patch moves the setting of the features datastores into the
bridging code instead of app_dial to help facilitate this.
2) adds global options parkedcallparking, parkedcallhangup, and
parkedcallrecording to be similar to the parkedcalltransfers option for
globally setting features.
3) has builtin_atxfer call builtin_parkcall if being transfered to the parking
extension since tracking everything through multiple masquerades, etc. is
difficult and error-prone
4) attempts to fix all cases of return calls from parking and completed builtin
transfers not having the correct permissions
(closes issue #14274)
Reported by: aragon
Patches:
fix_feature_inheritence.diff.txt uploaded by otherwiseguy (license 396)
Tested by: aragon, otherwiseguy
Review http://reviewboard.digium.com/r/138/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@172517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-30 17:47:41 +00:00
} else if ( ! strcasecmp ( var - > name , " parkedcallhangup " ) ) {
if ( ! strcasecmp ( var - > value , " no " ) )
parkedcallhangup = 0 ;
else if ( ! strcasecmp ( var - > value , " caller " ) )
parkedcallhangup = AST_FEATURE_FLAG_BYCALLER ;
else if ( ! strcasecmp ( var - > value , " callee " ) )
parkedcallhangup = AST_FEATURE_FLAG_BYCALLEE ;
else if ( ! strcasecmp ( var - > value , " both " ) )
parkedcallhangup = AST_FEATURE_FLAG_BYBOTH ;
} else if ( ! strcasecmp ( var - > name , " parkedcallrecording " ) ) {
if ( ! strcasecmp ( var - > value , " no " ) )
parkedcallrecording = 0 ;
else if ( ! strcasecmp ( var - > value , " caller " ) )
parkedcallrecording = AST_FEATURE_FLAG_BYCALLER ;
else if ( ! strcasecmp ( var - > value , " callee " ) )
parkedcallrecording = AST_FEATURE_FLAG_BYCALLEE ;
else if ( ! strcasecmp ( var - > value , " both " ) )
parkedcallrecording = AST_FEATURE_FLAG_BYBOTH ;
2006-08-31 21:00:20 +00:00
} else if ( ! strcasecmp ( var - > name , " adsipark " ) ) {
adsipark = ast_true ( var - > value ) ;
} else if ( ! strcasecmp ( var - > name , " transferdigittimeout " ) ) {
if ( ( sscanf ( var - > value , " %d " , & transferdigittimeout ) ! = 1 ) | | ( transferdigittimeout < 1 ) ) {
ast_log ( LOG_WARNING , " %s is not a valid transferdigittimeout \n " , var - > value ) ;
transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT ;
} else
transferdigittimeout = transferdigittimeout * 1000 ;
} else if ( ! strcasecmp ( var - > name , " featuredigittimeout " ) ) {
if ( ( sscanf ( var - > value , " %d " , & featuredigittimeout ) ! = 1 ) | | ( featuredigittimeout < 1 ) ) {
ast_log ( LOG_WARNING , " %s is not a valid featuredigittimeout \n " , var - > value ) ;
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT ;
2002-05-30 01:34:15 +00:00
}
2006-08-31 21:00:20 +00:00
} else if ( ! strcasecmp ( var - > name , " atxfernoanswertimeout " ) ) {
if ( ( sscanf ( var - > value , " %d " , & atxfernoanswertimeout ) ! = 1 ) | | ( atxfernoanswertimeout < 1 ) ) {
ast_log ( LOG_WARNING , " %s is not a valid atxfernoanswertimeout \n " , var - > value ) ;
atxfernoanswertimeout = DEFAULT_NOANSWER_TIMEOUT_ATTENDED_TRANSFER ;
} else
atxfernoanswertimeout = atxfernoanswertimeout * 1000 ;
} else if ( ! strcasecmp ( var - > name , " courtesytone " ) ) {
ast_copy_string ( courtesytone , var - > value , sizeof ( courtesytone ) ) ;
} else if ( ! strcasecmp ( var - > name , " parkedplay " ) ) {
if ( ! strcasecmp ( var - > value , " both " ) )
parkedplay = 2 ;
else if ( ! strcasecmp ( var - > value , " parked " ) )
parkedplay = 1 ;
else
parkedplay = 0 ;
} else if ( ! strcasecmp ( var - > name , " xfersound " ) ) {
ast_copy_string ( xfersound , var - > value , sizeof ( xfersound ) ) ;
} else if ( ! strcasecmp ( var - > name , " xferfailsound " ) ) {
ast_copy_string ( xferfailsound , var - > value , sizeof ( xferfailsound ) ) ;
} else if ( ! strcasecmp ( var - > name , " pickupexten " ) ) {
ast_copy_string ( pickup_ext , var - > value , sizeof ( pickup_ext ) ) ;
} else if ( ! strcasecmp ( var - > name , " parkedmusicclass " ) ) {
ast_copy_string ( parkmohclass , var - > value , sizeof ( parkmohclass ) ) ;
2002-05-30 01:34:15 +00:00
}
2006-08-31 21:00:20 +00:00
}
2005-08-23 02:22:33 +00:00
2006-08-31 21:00:20 +00:00
unmap_features ( ) ;
for ( var = ast_variable_browse ( cfg , " featuremap " ) ; var ; var = var - > next ) {
if ( remap_feature ( var - > name , var - > value ) )
ast_log ( LOG_NOTICE , " Unknown feature '%s' \n " , var - > name ) ;
}
/* Map a key combination to an application*/
ast_unregister_features ( ) ;
for ( var = ast_variable_browse ( cfg , " applicationmap " ) ; var ; var = var - > next ) {
char * tmp_val = ast_strdupa ( var - > value ) ;
char * exten , * activateon , * activatedby , * app , * app_args , * moh_class ;
struct ast_call_feature * feature ;
/* strsep() sets the argument to NULL if match not found, and it
* is safe to use it with a NULL argument , so we don ' t check
* between calls .
*/
exten = strsep ( & tmp_val , " , " ) ;
activatedby = strsep ( & tmp_val , " , " ) ;
app = strsep ( & tmp_val , " , " ) ;
app_args = strsep ( & tmp_val , " , " ) ;
moh_class = strsep ( & tmp_val , " , " ) ;
activateon = strsep ( & activatedby , " / " ) ;
/*! \todo XXX var_name or app_args ? */
if ( ast_strlen_zero ( app ) | | ast_strlen_zero ( exten ) | | ast_strlen_zero ( activateon ) | | ast_strlen_zero ( var - > name ) ) {
ast_log ( LOG_NOTICE , " Please check the feature Mapping Syntax, either extension, name, or app aren't provided %s %s %s %s \n " ,
app , exten , activateon , var - > name ) ;
continue ;
2005-01-04 04:01:40 +00:00
}
2005-08-23 02:22:33 +00:00
2008-12-11 16:54:51 +00:00
AST_RWLIST_RDLOCK ( & feature_list ) ;
2007-05-08 16:53:09 +00:00
if ( ( feature = find_dynamic_feature ( var - > name ) ) ) {
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2006-08-31 21:00:20 +00:00
ast_log ( LOG_WARNING , " Dynamic Feature '%s' specified more than once! \n " , var - > name ) ;
continue ;
}
2008-12-11 16:54:51 +00:00
AST_RWLIST_UNLOCK ( & feature_list ) ;
2006-08-31 21:00:20 +00:00
if ( ! ( feature = ast_calloc ( 1 , sizeof ( * feature ) ) ) )
continue ;
2005-08-23 02:22:33 +00:00
2006-08-31 21:00:20 +00:00
ast_copy_string ( feature - > sname , var - > name , FEATURE_SNAME_LEN ) ;
ast_copy_string ( feature - > app , app , FEATURE_APP_LEN ) ;
ast_copy_string ( feature - > exten , exten , FEATURE_EXTEN_LEN ) ;
if ( app_args )
ast_copy_string ( feature - > app_args , app_args , FEATURE_APP_ARGS_LEN ) ;
2005-08-23 02:22:33 +00:00
2006-08-31 21:00:20 +00:00
if ( moh_class )
ast_copy_string ( feature - > moh_class , moh_class , FEATURE_MOH_LEN ) ;
2006-08-07 04:15:52 +00:00
2006-08-31 21:00:20 +00:00
ast_copy_string ( feature - > exten , exten , sizeof ( feature - > exten ) ) ;
feature - > operation = feature_exec_app ;
ast_set_flag ( feature , AST_FEATURE_FLAG_NEEDSDTMF ) ;
/* Allow caller and calle to be specified for backwards compatability */
if ( ! strcasecmp ( activateon , " self " ) | | ! strcasecmp ( activateon , " caller " ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_ONSELF ) ;
else if ( ! strcasecmp ( activateon , " peer " ) | | ! strcasecmp ( activateon , " callee " ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_ONPEER ) ;
else {
ast_log ( LOG_NOTICE , " Invalid 'ActivateOn' specification for feature '%s', "
" must be 'self', or 'peer' \n " , var - > name ) ;
continue ;
}
2005-08-23 02:22:33 +00:00
2006-08-31 21:00:20 +00:00
if ( ast_strlen_zero ( activatedby ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_BYBOTH ) ;
else if ( ! strcasecmp ( activatedby , " caller " ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_BYCALLER ) ;
else if ( ! strcasecmp ( activatedby , " callee " ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_BYCALLEE ) ;
else if ( ! strcasecmp ( activatedby , " both " ) )
ast_set_flag ( feature , AST_FEATURE_FLAG_BYBOTH ) ;
else {
ast_log ( LOG_NOTICE , " Invalid 'ActivatedBy' specification for feature '%s', "
" must be 'caller', or 'callee', or 'both' \n " , var - > name ) ;
continue ;
}
2006-08-07 04:15:52 +00:00
2006-08-31 21:00:20 +00:00
ast_register_feature ( feature ) ;
if ( option_verbose > = 1 )
ast_verbose ( VERBOSE_PREFIX_2 " Mapping Feature '%s' to app '%s(%s)' with code '%s' \n " , var - > name , app , app_args , exten ) ;
}
2005-08-23 02:22:33 +00:00
ast_config_destroy ( cfg ) ;
2005-10-13 23:58:33 +00:00
/* Remove the old parking extension */
if ( ! ast_strlen_zero ( old_parking_con ) & & ( con = ast_context_find ( old_parking_con ) ) ) {
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( ast_context_remove_extension2 ( con , old_parking_ext , 1 , registrar ) )
notify_metermaids ( old_parking_ext , old_parking_con ) ;
2006-04-17 04:31:21 +00:00
if ( option_debug )
ast_log ( LOG_DEBUG , " Removed old parking extension %s@%s \n " , old_parking_ext , old_parking_con ) ;
2005-10-13 23:58:33 +00:00
}
2005-01-10 04:03:30 +00:00
2006-04-15 00:05:08 +00:00
if ( ! ( con = ast_context_find ( parking_con ) ) & & ! ( con = ast_context_create ( NULL , parking_con , registrar ) ) ) {
ast_log ( LOG_ERROR , " Parking context '%s' does not exist and unable to create \n " , parking_con ) ;
return - 1 ;
2001-12-27 11:07:33 +00:00
}
2007-01-06 00:24:38 +00:00
res = ast_add_extension2 ( con , 1 , ast_parking_ext ( ) , 1 , NULL , NULL , parkcall , NULL , NULL , registrar ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
if ( parkaddhints )
park_add_hints ( parking_con , parking_start , parking_stop ) ;
if ( ! res )
notify_metermaids ( ast_parking_ext ( ) , parking_con ) ;
return res ;
2005-01-10 04:03:30 +00:00
}
2006-08-21 02:11:39 +00:00
static int reload ( void )
2006-04-14 14:08:19 +00:00
{
2005-01-10 04:03:30 +00:00
return load_config ( ) ;
}
2006-08-21 02:11:39 +00:00
static int load_module ( void )
2005-01-10 04:03:30 +00:00
{
int res ;
2005-08-23 02:22:33 +00:00
2005-10-13 23:58:33 +00:00
memset ( parking_ext , 0 , sizeof ( parking_ext ) ) ;
memset ( parking_con , 0 , sizeof ( parking_con ) ) ;
2005-08-23 02:22:33 +00:00
2005-01-10 04:03:30 +00:00
if ( ( res = load_config ( ) ) )
return res ;
2006-09-18 19:54:18 +00:00
ast_cli_register_multiple ( cli_features , sizeof ( cli_features ) / sizeof ( struct ast_cli_entry ) ) ;
2004-08-08 17:15:02 +00:00
ast_pthread_create ( & parking_thread , NULL , do_parking_thread , NULL ) ;
2004-01-30 06:31:25 +00:00
res = ast_register_application ( parkedcall , park_exec , synopsis , descrip ) ;
2004-08-03 06:31:20 +00:00
if ( ! res )
res = ast_register_application ( parkcall , park_call_exec , synopsis2 , descrip2 ) ;
2004-01-30 05:49:44 +00:00
if ( ! res ) {
2005-07-25 17:31:53 +00:00
ast_manager_register ( " ParkedCalls " , 0 , manager_parking_status , " List parked calls " ) ;
2006-03-06 23:12:48 +00:00
ast_manager_register2 ( " Park " , EVENT_FLAG_CALL , manager_park ,
" Park a channel " , mandescr_park ) ;
2004-01-30 05:49:44 +00:00
}
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
res | = ast_devstate_prov_add ( " Park " , metermaidstate ) ;
2001-12-27 11:07:33 +00:00
return res ;
}
2003-04-09 04:00:43 +00:00
2006-08-21 02:11:39 +00:00
static int unload_module ( void )
2001-12-27 11:07:33 +00:00
{
2006-08-21 02:11:39 +00:00
ast_module_user_hangup_all ( ) ;
2003-07-02 14:06:12 +00:00
2005-07-25 17:31:53 +00:00
ast_manager_unregister ( " ParkedCalls " ) ;
2006-03-06 23:12:48 +00:00
ast_manager_unregister ( " Park " ) ;
2006-09-18 19:54:18 +00:00
ast_cli_unregister_multiple ( cli_features , sizeof ( cli_features ) / sizeof ( struct ast_cli_entry ) ) ;
2004-08-03 06:31:20 +00:00
ast_unregister_application ( parkcall ) ;
METERMAIDS:
-----------
- Adding devicestate providers, a new architecture to add non-channel related
device state information, like parking lots, queues, meetmes, vending machines
and Windows 98 reboots (lots of blinking on those lights)
- Adding provider for parking lots, so you can subscribe to the status of a
parking lot
- Adding provider for meetme, so you can have a blinking lamp for a meetme
( Example: exten => edvina,hint,meetme:1234 )
- Adding support for directed parking - set the PARKINGEXTEN before you manually
call Park() and you will be parked on that space. If it's occupied, dialplan
execution will continue.
This work was sponsored by Voop A/S - www.voop.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36055 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-26 16:43:21 +00:00
ast_devstate_prov_del ( " Park " ) ;
2001-12-27 11:07:33 +00:00
return ast_unregister_application ( parkedcall ) ;
}
2006-08-21 02:11:39 +00:00
AST_MODULE_INFO ( ASTERISK_GPL_KEY , AST_MODFLAG_GLOBAL_SYMBOLS , " Call Features Resource " ,
. load = load_module ,
. unload = unload_module ,
. reload = reload ,
) ;