update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8360 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
90bc9ade7d
commit
1f8e6c96a6
|
@ -345,6 +345,10 @@ void sofia_event_callback(nua_event_t event,
|
||||||
default:
|
default:
|
||||||
if (nh && ((sofia_private && sofia_private->destroy_nh) || !nua_handle_magic(nh))) {
|
if (nh && ((sofia_private && sofia_private->destroy_nh) || !nua_handle_magic(nh))) {
|
||||||
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Destroy handle [%s]\n", nua_event_name(event));
|
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Destroy handle [%s]\n", nua_event_name(event));
|
||||||
|
if (sofia_private) {
|
||||||
|
nua_handle_bind(nh, NULL);
|
||||||
|
sofia_private->destroy_me = 1;
|
||||||
|
}
|
||||||
nua_handle_destroy(nh);
|
nua_handle_destroy(nh);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1532,8 +1536,6 @@ static void sofia_handle_sip_r_options(switch_core_session_t *session, int statu
|
||||||
}
|
}
|
||||||
gateway->ping = switch_timestamp(NULL) + gateway->ping_freq;
|
gateway->ping = switch_timestamp(NULL) + gateway->ping_freq;
|
||||||
sofia_reg_release_gateway(gateway);
|
sofia_reg_release_gateway(gateway);
|
||||||
nua_handle_bind(nh, NULL);
|
|
||||||
free(sofia_private);
|
|
||||||
gateway->pinging = 0;
|
gateway->pinging = 0;
|
||||||
} else if ((profile->pflags & PFLAG_UNREG_OPTIONS_FAIL) && status != 200 && sip && sip->sip_to) {
|
} else if ((profile->pflags & PFLAG_UNREG_OPTIONS_FAIL) && status != 200 && sip && sip->sip_to) {
|
||||||
char *sql;
|
char *sql;
|
||||||
|
|
|
@ -88,6 +88,7 @@ void sofia_reg_check_gateway(sofia_profile_t *profile, time_t now)
|
||||||
switch_assert(pvt);
|
switch_assert(pvt);
|
||||||
memset(pvt, 0, sizeof(*pvt));
|
memset(pvt, 0, sizeof(*pvt));
|
||||||
pvt->destroy_nh = 1;
|
pvt->destroy_nh = 1;
|
||||||
|
pvt->destroy_me = 1;
|
||||||
switch_copy_string(pvt->gateway_name, gateway_ptr->name, sizeof(pvt->gateway_name));
|
switch_copy_string(pvt->gateway_name, gateway_ptr->name, sizeof(pvt->gateway_name));
|
||||||
nua_handle_bind(nh, pvt);
|
nua_handle_bind(nh, pvt);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue