kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tue Mar 3 07:47:19 CST 2009 Pekka Pessi <first.last@nokia.com> 

* nta: calculate timer D correctly
  Ignore-this: f43d9dcc11fb6a19c3674a6da35ee7ec
  
  Timer D is either 32 seconds or 64 times T1, whichever is larger.



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12387 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-03-03 17:26:13 +00:00
parent b6f8748e09
commit ba34225301
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Tue Mar 3 11:25:14 CST 2009 Tue Mar 3 11:25:58 CST 2009

15
libs/sofia-sip/libsofia-sip-ua/nta/nta.c
View File

@ -860,7 +860,7 @@ nta_agent_t *nta_agent_create(su_root_t *root,
ta_start(ta, tag, value); ta_start(ta, tag, value);
if ((agent = su_home_new(sizeof(*agent)))) { if ((agent = su_home_new(sizeof(*agent)))) {
unsigned timer_c; unsigned timer_c = 0, timer_d = 32000;
agent->sa_root = root; agent->sa_root = root;
agent->sa_callback = callback; agent->sa_callback = callback;
@ -925,6 +925,11 @@ nta_agent_t *nta_agent_create(su_root_t *root,
agent->sa_out.re_t1 = &agent->sa_out.re_list; agent->sa_out.re_t1 = &agent->sa_out.re_list;
if (agent->sa_use_timer_c || !agent->sa_is_a_uas)
timer_c = agent->sa_timer_c;
if (timer_d < agent->sa_t1x64)
timer_d = agent->sa_t1x64;
outgoing_queue_init(agent->sa_out.delayed, 0); outgoing_queue_init(agent->sa_out.delayed, 0);
outgoing_queue_init(agent->sa_out.resolving, 0); outgoing_queue_init(agent->sa_out.resolving, 0);
outgoing_queue_init(agent->sa_out.trying, agent->sa_t1x64); /* F */ outgoing_queue_init(agent->sa_out.trying, agent->sa_t1x64); /* F */
@ -932,10 +937,8 @@ nta_agent_t *nta_agent_create(su_root_t *root,
outgoing_queue_init(agent->sa_out.terminated, 0); outgoing_queue_init(agent->sa_out.terminated, 0);
/* Special queues (states) for outgoing INVITE transactions */ /* Special queues (states) for outgoing INVITE transactions */
outgoing_queue_init(agent->sa_out.inv_calling, agent->sa_t1x64); /* B */ outgoing_queue_init(agent->sa_out.inv_calling, agent->sa_t1x64); /* B */
timer_c = (agent->sa_use_timer_c || !agent->sa_is_a_uas)
? agent->sa_timer_c : 0;
outgoing_queue_init(agent->sa_out.inv_proceeding, timer_c); /* C */ outgoing_queue_init(agent->sa_out.inv_proceeding, timer_c); /* C */
outgoing_queue_init(agent->sa_out.inv_completed, 32000); /* Timer D */ outgoing_queue_init(agent->sa_out.inv_completed, timer_d); /* D */
if (leg_htable_resize(agent->sa_home, agent->sa_dialogs, 0) < 0 || if (leg_htable_resize(agent->sa_home, agent->sa_dialogs, 0) < 0 ||
leg_htable_resize(agent->sa_home, agent->sa_defaults, 0) < 0 || leg_htable_resize(agent->sa_home, agent->sa_defaults, 0) < 0 ||
@ -1446,6 +1449,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
unsigned sip_t4 = agent->sa_t4; unsigned sip_t4 = agent->sa_t4;
unsigned sip_t1x64 = agent->sa_t1x64; unsigned sip_t1x64 = agent->sa_t1x64;
unsigned timer_c = agent->sa_timer_c; unsigned timer_c = agent->sa_timer_c;
unsigned timer_d = 32000;
unsigned graylist = agent->sa_graylist; unsigned graylist = agent->sa_graylist;
unsigned blacklist = agent->sa_blacklist; unsigned blacklist = agent->sa_blacklist;
int ua = agent->sa_is_a_uas; int ua = agent->sa_is_a_uas;
@ -1646,6 +1650,9 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
agent->sa_timer_c = timer_c; agent->sa_timer_c = timer_c;
outgoing_queue_adjust(agent, agent->sa_out.inv_proceeding, timer_c); outgoing_queue_adjust(agent, agent->sa_out.inv_proceeding, timer_c);
} }
if (timer_d < sip_t1x64)
timer_d = sip_t1x64;
outgoing_queue_adjust(agent, agent->sa_out.inv_completed, timer_d);
if (graylist > 24 * 60 * 60) if (graylist > 24 * 60 * 60)
graylist = 24 * 60 * 60; graylist = 24 * 60 * 60;