faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refclock: fix preprocessor conditional

Browse source 
Split the new SOCK conditional using __GLIBC_PREREQ macro (which has
arguments) to fix compilation when it is not defined.

Fix also debug message using sizeof(time_t) in case it's enabled on
64-bit systems.

Reported-by: Bryan Christianson <bryan@whatroute.net>
Fixes: badaa83c31 ("refclock: convert mismatched timeval in SOCK messages")
This commit is contained in:
Miroslav Lichvar 2023-01-19 11:34:55 +01:00
parent badaa83c31
commit 88e711ad9a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
refclock_sock.c
View file

@ -61,7 +61,8 @@ struct sock_sample {
/* On 32-bit glibc-based systems enable conversion between timevals using /* On 32-bit glibc-based systems enable conversion between timevals using
32-bit and 64-bit time_t to support SOCK clients compiled with different 32-bit and 64-bit time_t to support SOCK clients compiled with different
time_t size than chrony */ time_t size than chrony */
#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 34) && __TIMESIZE == 32 #ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 34) && __TIMESIZE == 32
#define CONVERT_TIMEVAL 1 #define CONVERT_TIMEVAL 1
#if defined(_TIME_BITS) && _TIME_BITS == 64 #if defined(_TIME_BITS) && _TIME_BITS == 64
typedef int32_t alt_time_t; typedef int32_t alt_time_t;
@ -75,6 +76,7 @@ struct alt_timeval {
alt_suseconds_t tv_usec; alt_suseconds_t tv_usec;
}; };
#endif #endif
#endif
static void read_sample(int sockfd, int event, void *anything) static void read_sample(int sockfd, int event, void *anything)
{ {
@ -108,7 +110,7 @@ static void read_sample(int sockfd, int event, void *anything)
#endif #endif
sample.tv.tv_sec = atv.tv_sec; sample.tv.tv_sec = atv.tv_sec;
sample.tv.tv_usec = atv.tv_usec; sample.tv.tv_usec = atv.tv_usec;
DEBUG_LOG("Converted %u-bit timeval", 8 * sizeof (alt_time_t)); DEBUG_LOG("Converted %d-bit timeval", 8 * (int)sizeof (alt_time_t));
memcpy((char *)&sample + sizeof (struct timeval), buf + sizeof (struct alt_timeval), memcpy((char *)&sample + sizeof (struct timeval), buf + sizeof (struct alt_timeval),
sizeof (sample) - sizeof (struct timeval)); sizeof (sample) - sizeof (struct timeval));
#endif #endif