kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 19:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13586 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-19 10:10:38 +00:00
parent fe83f9421b
commit 380d8cfcc4
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_dial.c
View File

@@ -108,9 +108,10 @@ static char *descrip =
" other than the number assigned to the caller.\n" " other than the number assigned to the caller.\n"
" g - Proceed with dialplan execution at the current extension if the\n" " g - Proceed with dialplan execution at the current extension if the\n"
" destination channel hangs up.\n" " destination channel hangs up.\n"
" G(context^exten^pri) - If the call is answered, transfer both parties to\n" " G(context^exten^pri) - If the call is answered, transfer the calling party to\n"
" the specified priority. Optionally, an extension, or extension and\n" " the specified priority and the called party to the specified priority+1.\n"
" context may be specified. Otherwise, the current extension is used.\n" " Optionally, an extension, or extension and context may be specified. \n"
" Otherwise, the current extension is used.\n"
" h - Allow the called party to hang up by sending the '*' DTMF digit.\n" " h - Allow the called party to hang up by sending the '*' DTMF digit.\n"
" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n" " H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
" j - Jump to priority n+101 if all of the requested channels were busy.\n" " j - Jump to priority n+101 if all of the requested channels were busy.\n"
@@ -1414,6 +1415,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
} }
ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]); ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]);
ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]); ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]);
peer->priority++;
ast_pbx_start(peer); ast_pbx_start(peer);
hanguptree(outgoing, NULL); hanguptree(outgoing, NULL);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);

3
channels/chan_sip.c
View File

@@ -583,7 +583,7 @@ struct sip_auth {
#define SIP_PKT_DEBUG (1 << 0) /*!< Debug this packet */ #define SIP_PKT_DEBUG (1 << 0) /*!< Debug this packet */
#define SIP_PKT_WITH_TOTAG (1 << 1) /*!< This packet has a to-tag */ #define SIP_PKT_WITH_TOTAG (1 << 1) /*!< This packet has a to-tag */
static int global_rtautoclear = 120; static int global_rtautoclear;
/*! \brief sip_pvt: PVT structures are used for each SIP conversation, ie. a call */ /*! \brief sip_pvt: PVT structures are used for each SIP conversation, ie. a call */
static struct sip_pvt { static struct sip_pvt {
@@ -12454,6 +12454,7 @@ static int reload_config(void)
global_rtptimeout = 0; global_rtptimeout = 0;
global_rtpholdtimeout = 0; global_rtpholdtimeout = 0;
global_rtpkeepalive = 0; global_rtpkeepalive = 0;
global_rtautoclear = 120;
pedanticsipchecking = 0; pedanticsipchecking = 0;
global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT; global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;
global_regattempts_max = 0; global_regattempts_max = 0;