upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 08:39:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9886 Maintain si_lastcontact as struct timeval

Browse source
This commit is contained in:
Ondřej Kuzník 2022-09-26 10:55:09 +01:00 committed by Quanah Gibson-Mount
parent 0b4098ca90
commit 9134be7ecc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/slapd/syncrepl.c
View file

@ -176,7 +176,7 @@ typedef struct syncinfo_s {
/* monitor info */
int si_monitorInited;
time_t si_lastconnect;
time_t si_lastcontact;
struct timeval si_lastcontact;
struct berval si_connaddr;
struct berval si_lastCookieRcvd;
struct berval si_lastCookieSent;
@ -1361,7 +1361,7 @@ do_syncrep2(
rc = SYNC_SHUTDOWN;
goto done;
}
si->si_lastcontact = slap_get_time();
gettimeofday( &si->si_lastcontact, NULL );
switch( ldap_msgtype( msg ) ) {
case LDAP_RES_SEARCH_ENTRY:
#ifdef LDAP_CONTROL_X_DIRSYNC
@ -7095,8 +7095,9 @@ syncrepl_monitor_update(
if ( a->a_desc != ad_olmLastContact )
return SLAP_CB_CONTINUE;
if ( si->si_lastcontact ) {
ldap_pvt_gmtime( &si->si_lastcontact, &tm );
if ( si->si_lastcontact.tv_sec ) {
time_t last_contact = si->si_lastcontact.tv_sec;
ldap_pvt_gmtime( &last_contact, &tm );
lutil_gentime( tmbuf, sizeof( tmbuf ), &tm );
len = strlen( tmbuf );
assert( len == a->a_vals[0].bv_len );