wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-02 13:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1629 from jbrzusto/fix-mg_ntp_parse

Browse Source 
NTP reponse gives fractional (not micro-) seconds, per RFC5905
This commit is contained in:
Sergey Lyubka authored and GitHub committed 2022-07-15 00:43:31 +01:00
2 parents 3f46ae7beb d5fe3261f4
commit 86aa38bfd5
2 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+2 -2
View File
@@ -3797,8 +3797,8 @@ int64_t mg_sntp_parse(const unsigned char *buf, size_t len) {
} else if (version == 4 || version == 3) { } else if (version == 4 || version == 3) {
uint32_t *data = (uint32_t *) &buf[40]; uint32_t *data = (uint32_t *) &buf[40];
unsigned long seconds = mg_ntohl(data[0]) - SNTP_TIME_OFFSET; unsigned long seconds = mg_ntohl(data[0]) - SNTP_TIME_OFFSET;
unsigned long useconds = mg_ntohl(data[1]); unsigned long fracseconds = mg_ntohl(data[1]);
res = ((int64_t) seconds) * 1000 + (int64_t) ((useconds / 1000) % 1000); res = ((int64_t) seconds) * 1000 + (((int64_t) (fracseconds) * 1000) >> 32);
} else { } else {
MG_ERROR(("unexpected version: %d", version)); MG_ERROR(("unexpected version: %d", version));
} }
src/sntp.c
+2 -2
View File
@@ -20,8 +20,8 @@ int64_t mg_sntp_parse(const unsigned char *buf, size_t len) {
} else if (version == 4 || version == 3) { } else if (version == 4 || version == 3) {
uint32_t *data = (uint32_t *) &buf[40]; uint32_t *data = (uint32_t *) &buf[40];
unsigned long seconds = mg_ntohl(data[0]) - SNTP_TIME_OFFSET; unsigned long seconds = mg_ntohl(data[0]) - SNTP_TIME_OFFSET;
unsigned long useconds = mg_ntohl(data[1]); unsigned long fracseconds = mg_ntohl(data[1]);
res = ((int64_t) seconds) * 1000 + (int64_t) ((useconds / 1000) % 1000); res = ((int64_t) seconds) * 1000 + (((int64_t) (fracseconds) * 1000) >> 32);
} else { } else {
MG_ERROR(("unexpected version: %d", version)); MG_ERROR(("unexpected version: %d", version));
} }