Skip to content
Snippets Groups Projects
Commit a4366cc1 authored by Olle Johansson's avatar Olle Johansson
Browse files

maxtime is not needed any more now that we actually set the T1 timer

based on the qualify result.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46392 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent baf9547d
No related branches found
No related tags found
No related merge requests found
...@@ -970,7 +970,6 @@ struct sip_pvt { ...@@ -970,7 +970,6 @@ struct sip_pvt {
XXX BUG!!! XXX XXX BUG!!! XXX
*/ */
int maxtime; /*!< Max time for first response */
int initid; /*!< Auto-congest ID if appropriate (scheduler) */ int initid; /*!< Auto-congest ID if appropriate (scheduler) */
int autokillid; /*!< Auto-kill ID (scheduler) */ int autokillid; /*!< Auto-kill ID (scheduler) */
enum transfermodes allowtransfer; /*!< REFER: restriction scheme */ enum transfermodes allowtransfer; /*!< REFER: restriction scheme */
...@@ -2711,7 +2710,6 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer) ...@@ -2711,7 +2710,6 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
ast_string_field_set(dialog, fromdomain, peer->fromdomain); ast_string_field_set(dialog, fromdomain, peer->fromdomain);
if (!ast_strlen_zero(peer->fromuser)) if (!ast_strlen_zero(peer->fromuser))
ast_string_field_set(dialog, fromuser, peer->fromuser); ast_string_field_set(dialog, fromuser, peer->fromuser);
dialog->maxtime = peer->maxms;
dialog->callgroup = peer->callgroup; dialog->callgroup = peer->callgroup;
dialog->pickupgroup = peer->pickupgroup; dialog->pickupgroup = peer->pickupgroup;
dialog->allowtransfer = peer->allowtransfer; dialog->allowtransfer = peer->allowtransfer;
...@@ -2877,11 +2875,7 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout) ...@@ -2877,11 +2875,7 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout)
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG,"Our T38 capability (%d), joint T38 capability (%d)\n", p->t38.capability, p->t38.jointcapability); ast_log(LOG_DEBUG,"Our T38 capability (%d), joint T38 capability (%d)\n", p->t38.capability, p->t38.jointcapability);
transmit_invite(p, SIP_INVITE, 1, 2); transmit_invite(p, SIP_INVITE, 1, 2);
if (p->maxtime) p->initid = ast_sched_add(sched, SIP_TRANS_TIMEOUT, auto_congest, p);
/* Initialize auto-congest time */
p->initid = ast_sched_add(sched, p->maxtime * 4, auto_congest, p);
else
p->initid = ast_sched_add(sched, SIP_TRANS_TIMEOUT, auto_congest, p);
} }
return res; return res;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment