mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-24 11:48:48 +00:00
handle multi contact register responses and register timeout better
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9885 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
7a9928f1c3
commit
2a00a3f58b
@ -958,7 +958,7 @@ static void parse_gateways(sofia_profile_t *profile, switch_xml_t gateways_tag)
|
|||||||
gateway->freq, name);
|
gateway->freq, name);
|
||||||
gateway->freq = 3600;
|
gateway->freq = 3600;
|
||||||
}
|
}
|
||||||
gateway->freq -= 2;
|
|
||||||
|
|
||||||
gateway->next = profile->gateways;
|
gateway->next = profile->gateways;
|
||||||
profile->gateways = gateway;
|
profile->gateways = gateway;
|
||||||
|
@ -119,7 +119,12 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
|
|||||||
break;
|
break;
|
||||||
case REG_STATE_REGISTER:
|
case REG_STATE_REGISTER:
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "registered %s\n", gateway_ptr->name);
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "registered %s\n", gateway_ptr->name);
|
||||||
gateway_ptr->expires = now + gateway_ptr->freq;
|
if (gateway_ptr->expires > 60) {
|
||||||
|
gateway_ptr->expires = now + (gateway_ptr->freq - 15);
|
||||||
|
} else {
|
||||||
|
gateway_ptr->expires = now + (gateway_ptr->freq - 2);
|
||||||
|
}
|
||||||
|
|
||||||
gateway_ptr->state = REG_STATE_REGED;
|
gateway_ptr->state = REG_STATE_REGED;
|
||||||
gateway_ptr->status = SOFIA_GATEWAY_UP;
|
gateway_ptr->status = SOFIA_GATEWAY_UP;
|
||||||
break;
|
break;
|
||||||
@ -1025,9 +1030,14 @@ void sofia_reg_handle_sip_r_register(int status,
|
|||||||
const char *new_expires;
|
const char *new_expires;
|
||||||
uint32_t expi;
|
uint32_t expi;
|
||||||
if (contact->m_next) {
|
if (contact->m_next) {
|
||||||
//const char *sipip = profile->extsipip ? profile->extsipip : profile->sipip;
|
const char *sipip = profile->extsipip ? profile->extsipip : profile->sipip;
|
||||||
//find the contact
|
for ( ; contact && strcasecmp(contact->m_url->url_host, sipip); contact = contact->m_next);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!contact) {
|
||||||
|
contact = sip->sip_contact;
|
||||||
|
}
|
||||||
|
|
||||||
if (contact->m_expires) {
|
if (contact->m_expires) {
|
||||||
new_expires = contact->m_expires;
|
new_expires = contact->m_expires;
|
||||||
expi = (uint32_t) atoi(new_expires);
|
expi = (uint32_t) atoi(new_expires);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user