--- res_features.c 2007-10-23 14:59:06.000000000 -0700 +++ ../../tarballs/asterisk-1.4.13/res/res_features.c 2007-10-02 12:01:59.000000000 -0700 @@ -91,9 +91,6 @@ 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 */ -static char parktimeoutcontext[80] ; -static char parktimeoutexten[80] ; -static int parktimeoutpriority ; static int parking_offset; static int parkfindnext; @@ -1690,20 +1687,8 @@ post_manager_event("ParkedCallTimeOut", pu->parkingexten, chan); - if (option_verbose > 1) { - /*ast_verbose(VERBOSE_PREFIX_2 "Line=%d, Context size=%d, context length=%d, exten size=%d, exten length=%d\n", __LINE__, sizeof( chan->context ), strlen( chan->context ), sizeof( chan->exten ), strlen( chan->exten )) ;*/ - ast_verbose(VERBOSE_PREFIX_2 "context=%s, exten=%s, pri=%d\n", parktimeoutcontext, parktimeoutexten, parktimeoutpriority) ; - if( strlen(parktimeoutcontext)>0 ) { - strcpy(chan->context,parktimeoutcontext) ; - } - if( strlen(parktimeoutexten)>0 ) { - strcpy(chan->exten,parktimeoutexten) ; - } - if( parktimeoutpriority>-1 ) { - chan->priority=parktimeoutpriority ; - } - ast_verbose(VERBOSE_PREFIX_2 "Line=%d, Timeout for %s parked on %d. Returning to %s,%s,%d\n", __LINE__, chan->name, pu->parkingnum, chan->context, chan->exten, chan->priority); - } + if (option_verbose > 1) + 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); /* Start up the PBX, or hang them up */ if (ast_pbx_start(chan)) { ast_log(LOG_WARNING, "Unable to restart the PBX for user on '%s', hanging them up...\n", chan->name); @@ -2236,9 +2221,6 @@ parkfindnext = 0; adsipark = 0; parkaddhints = 0; - memset(parktimeoutcontext,0,sizeof(parktimeoutcontext)) ; - memset(parktimeoutexten,0,sizeof(parktimeoutexten)) ; - parktimeoutpriority=-1 ; transferdigittimeout = DEFAULT_TRANSFER_DIGIT_TIMEOUT; featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT; @@ -2307,12 +2289,6 @@ ast_copy_string(pickup_ext, var->value, sizeof(pickup_ext)); } else if (!strcasecmp(var->name, "parkedmusicclass")) { ast_copy_string(parkmohclass, var->value, sizeof(parkmohclass)); - } else if(!strcasecmp(var->name, "timeoutcontext")) { - ast_copy_string(parktimeoutcontext, var->value, sizeof(parktimeoutcontext)); - } else if(!strcasecmp(var->name, "timeoutexten")) { - ast_copy_string(parktimeoutexten, var->value, sizeof(parktimeoutexten)); - } else if(!strcasecmp(var->name, "timeoutpriority")) { - parktimeoutpriority=atoi(var->value) ; } }