apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-19 02:17:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

ntp:fix parameter is negative numbers.

Browse Source 
Signed-off-by: yangguangcai <yangguangcai@xiaomi.com>
This commit is contained in:
yangguangcai
2023-10-25 21:13:11 +08:00
committed by Xiang Xiao
parent fb37ef3671
commit df4cdbaae9
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
netutils/ntpclient/ntpclient.c
View File

@@ -409,7 +409,7 @@ static inline void ntpc_setuint64(FAR uint8_t *ptr, uint64_t value)
* Name: ntp_secpart * Name: ntp_secpart
****************************************************************************/ ****************************************************************************/
static uint32_t ntp_secpart(uint64_t time) static int32_t ntp_secpart(int64_t time)
{ {
/* NTP timestamps are represented as a 64-bit fixed-point number, in /* NTP timestamps are represented as a 64-bit fixed-point number, in
* seconds relative to 0000 UT on 1 January 1900. The integer part is * seconds relative to 0000 UT on 1 January 1900. The integer part is
@@ -434,11 +434,11 @@ static uint32_t ntp_secpart(uint64_t time)
* Name: ntp_nsecpart * Name: ntp_nsecpart
****************************************************************************/ ****************************************************************************/
static uint32_t ntp_nsecpart(uint64_t time) static int32_t ntp_nsecpart(int64_t time)
{ {
/* Get fraction part converted to nanoseconds. */ /* Get fraction part converted to nanoseconds. */
return ((time & 0xffffffffu) * NSEC_PER_SEC) >> 32; return (((int64_t)((uint64_t)time << 32) >> 32) * NSEC_PER_SEC) >> 32;
} }
/**************************************************************************** /****************************************************************************
@@ -527,6 +527,30 @@ static void ntpc_calculate_offset(FAR int64_t *offset, FAR int64_t *delay,
(remote_xmittime - remote_recvtime); (remote_xmittime - remote_recvtime);
} }
/****************************************************************************
* Name: ntpc_apply_offset
****************************************************************************/
static void ntpc_apply_offset(FAR struct timespec *tp,
FAR struct timespec *src,
int64_t offset)
{
tp->tv_sec = src->tv_sec + ntp_secpart(offset);
tp->tv_nsec = src->tv_nsec + ntp_nsecpart(offset);
while (tp->tv_nsec < 0)
{
tp->tv_nsec += NSEC_PER_SEC;
tp->tv_sec--;
}
while (tp->tv_nsec >= NSEC_PER_SEC)
{
tp->tv_nsec -= NSEC_PER_SEC;
tp->tv_sec++;
}
}
/**************************************************************************** /****************************************************************************
* Name: ntpc_settime * Name: ntpc_settime
* *
@@ -580,14 +604,7 @@ static void ntpc_settime(int64_t offset, FAR struct timespec *start_realtime,
/* Apply offset */ /* Apply offset */
tp = curr_realtime; ntpc_apply_offset(&tp, &curr_realtime, offset);
tp.tv_sec += ntp_secpart(offset);
tp.tv_nsec += ntp_nsecpart(offset);
while (tp.tv_nsec >= NSEC_PER_SEC)
{
tp.tv_nsec -= NSEC_PER_SEC;
tp.tv_sec++;
}
/* Set the system time */ /* Set the system time */