tools: wr_date: get function should not set tai into kernel

In the previous version `wr_date get` would override kernel TAI time (using local file) and this could cause some problems in case leap second from /etc/leap-seconds.list was not the same than from PTP/WR protocol.

tools: wr_date: get function should not set tai into kernel
In the previous version `wr_date get` would override kernel TAI time (using local file) and this could cause some problems in case leap second from /etc/leap-seconds.list was not the same than from PTP/WR protocol.
ad85202f · Benoit Rat · Adam Wujek · 37232c76 · ad85202f
Commit ad85202f authored Apr 05, 2019 by Benoit Rat Committed by Adam Wujek Jun 03, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 2 deletions

wr_date.c userspace/tools/wr_date.c +18 -2

No files found.
--- a/userspace/tools/wr_date.c
+++ b/userspace/tools/wr_date.c
@@ -82,9 +82,25 @@ int wrdate_cfgfile(char *fname)
 	return 0;
 }

+
+int get_kern_leaps(void)
+{
+	struct timex tx = {0};
+	int *p;
+	if (adjtimex(&tx) < 0) {
+		fprintf(stderr, "%s: adjtimex(): %s\n", prgname,
+			strerror(errno));
+			return 0;
+	}
+
+	p = (int *)(&tx.stbcnt) + 1;
+	return *p;
+	//return t.tai;
+}
+
+
 int wrdate_get(struct PPSG_WB *pps, int tohost)
 {
-	int fix_host_tai(void); /* defined later */
 	unsigned long taih, tail, nsec, tmp1, tmp2;
 	uint64_t tai;
 	time_t t;
@@ -93,7 +109,7 @@ int wrdate_get(struct PPSG_WB *pps, int tohost)
 	char utcs[64], tais[64];
 	int tai_offset;

-	tai_offset = fix_host_tai();
+	tai_offset = get_kern_leaps();

 	if (opt_not) {
 		gettimeofday(&tv, NULL);