From: Takao Abe Date: Sun, 8 May 2016 07:34:11 +0000 (+0000) Subject: driver40.html, refclock_jjy.c, driver40-ja.html, ChangeLog: X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d06b75a22969cc9d56950179b6f1a82e0ed4a3;p=thirdparty%2Fntp.git driver40.html, refclock_jjy.c, driver40-ja.html, ChangeLog: [Bug 3047] Fix refclock_jjy C-DEX JST2000. abe@ntp.org bk: 572eebf34EIAsYuvHU8blqd386y76g --- diff --git a/ChangeLog b/ChangeLog index f61a44798..eba5c9154 100644 --- a/ChangeLog +++ b/ChangeLog @@ -51,6 +51,8 @@ server if the delay exceeds 50ms. Retry again after the next broadcast packet. * [Bug 3036] autokey trips an INSIST in authistrustedip(). Harlan Stenn. +* [Bug 3047] Fix refclock_jjy C-DEX JST2000. abe@ntp.org + - Patch provided by Kuramatsu. * Document ntp.key's optional IP list in authenetic.html. Harlan Stenn. * Update html/xleave.html documentation. Harlan Stenn. * Update ntp.conf documentation. Harlan Stenn. diff --git a/html/drivers/driver40-ja.html b/html/drivers/driver40-ja.html index 8b67e9009..d84c3ce10 100644 --- a/html/drivers/driver40-ja.html +++ b/html/drivers/driver40-ja.html @@ -16,7 +16,7 @@

JJY Receivers

Last update: - 15-May-2015 00:00 + 08-May-2016 00:00 UTC          ENGLISH（英語）   JAPANESE（日本語）

Synopsis

@@ -137,7 +137,7 @@ {ENQ}1J{ETX}  -->  - {STX}JYYMMDD HHMMSSS{ETX} + {STX}JYYMMDDWHHMMSSS{ETX}
diff --git a/html/drivers/driver40.html b/html/drivers/driver40.html index 356429e49..3b5f00f15 100644 --- a/html/drivers/driver40.html +++ b/html/drivers/driver40.html @@ -16,7 +16,7 @@

JJY Receivers

Last update: - 15-May-2015 00:00 + 08-May-2016 00:00 UTC          ENGLISH   JAPANESE

Synopsis

@@ -136,7 +136,7 @@ {ENQ}1J{ETX}  -->  - {STX}JYYMMDD HHMMSSS{ETX} + {STX}JYYMMDDWHHMMSSS{ETX}
diff --git a/ntpd/refclock_jjy.c b/ntpd/refclock_jjy.c index fc51fd9ee..b2ecde9f1 100644 --- a/ntpd/refclock_jjy.c +++ b/ntpd/refclock_jjy.c @@ -106,6 +106,10 @@ /* 2015/05/15 */ /* [Add] Support the SEIKO TIME SYSTEMS TDC-300 */ /* */ +/* 2015/05/08 */ +/* [Fix] C-DEX JST2000 */ +/* Thanks to Mr. Kuramatsu for the report and the patch. */ +/* */ /**********************************************************************/ #ifdef HAVE_CONFIG_H @@ -1499,9 +1503,9 @@ jjy_receive_cdex_jst2000 ( struct recvbuf *rbufp ) return JJY_RECEIVE_ERROR ; } - /* JYYMMDD HHMMSSS */ + /* JYYMMDDWHHMMSSS */ - rc = sscanf ( pBuf, "J%2d%2d%2d %2d%2d%2d%1d", + rc = sscanf ( pBuf, "J%2d%2d%2d%*1d%2d%2d%2d%1d", &up->year, &up->month, &up->day, &up->hour, &up->minute, &up->second, &up->msecond ) ;