diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-19 10:10:38 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-03-19 10:10:38 +0000 |
| commit | e4da318bacfb681b7acbf587fbba0bb0e5a106b1 (patch) | |
| tree | 2d7f050303beac53ee1cc686e26145732eabdf10 | |
| parent | 9d7a1447fdf9d3c52b7ddd7125ac0fd27a5d2b14 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@13586 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_dial.c | 8 | ||||
| -rw-r--r-- | channels/chan_sip.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 2682ebf39..5ec606062 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -108,9 +108,10 @@ static char *descrip = " other than the number assigned to the caller.\n" " g - Proceed with dialplan execution at the current extension if the\n" " destination channel hangs up.\n" -" G(context^exten^pri) - If the call is answered, transfer both parties to\n" -" the specified priority. Optionally, an extension, or extension and\n" -" context may be specified. Otherwise, the current extension is used.\n" +" G(context^exten^pri) - If the call is answered, transfer the calling party to\n" +" the specified priority and the called party to the specified priority+1.\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 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" @@ -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(peer, opt_args[OPT_ARG_GOTO]); + peer->priority++; ast_pbx_start(peer); hanguptree(outgoing, NULL); LOCAL_USER_REMOVE(u); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c92ac2b0a..5658d29c4 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -583,7 +583,7 @@ struct sip_auth { #define SIP_PKT_DEBUG (1 << 0) /*!< Debug this packet */ #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 */ static struct sip_pvt { @@ -12454,6 +12454,7 @@ static int reload_config(void) global_rtptimeout = 0; global_rtpholdtimeout = 0; global_rtpkeepalive = 0; + global_rtautoclear = 120; pedanticsipchecking = 0; global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT; global_regattempts_max = 0; |