mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-07-24 21:22:09 +00:00
FS-5527 --resolve
Conflicts: libs/sofia-sip/.update libs/sofia-sip/libsofia-sip-ua/nta/nta.c
This commit is contained in:
@@ -3434,6 +3434,21 @@ static void config_sofia_profile_urls(sofia_profile_t * profile)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef SOFIA_CUSTOM_TIME
|
||||
/* appears to not be granular enough */
|
||||
static void sofia_time(su_time_t *tv)
|
||||
{
|
||||
switch_time_t now;
|
||||
|
||||
if (tv) {
|
||||
now = switch_micro_time_now();
|
||||
tv->tv_sec = ((uint32_t) (now / 1000000)) + 2208988800UL;
|
||||
tv->tv_usec = (uint32_t) (now % 1000000);
|
||||
}
|
||||
|
||||
}
|
||||
#endif
|
||||
|
||||
switch_status_t sofia_init(void)
|
||||
{
|
||||
su_init();
|
||||
@@ -3442,6 +3457,10 @@ switch_status_t sofia_init(void)
|
||||
return SWITCH_STATUS_GENERR;
|
||||
}
|
||||
|
||||
#ifdef SOFIA_TIME
|
||||
su_set_time_func(sofia_time);
|
||||
#endif
|
||||
|
||||
/* Redirect loggers in sofia */
|
||||
su_log_redirect(su_log_default, logger, NULL);
|
||||
su_log_redirect(tport_log, logger, NULL);
|
||||
|
||||
Reference in New Issue
Block a user