aboutsummaryrefslogtreecommitdiff
path: root/contrib/ntp/ntpd/refclock_jjy.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ntp/ntpd/refclock_jjy.c')
-rw-r--r--contrib/ntp/ntpd/refclock_jjy.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/contrib/ntp/ntpd/refclock_jjy.c b/contrib/ntp/ntpd/refclock_jjy.c
index dba6070ef40c..2aa9d6a7d8b9 100644
--- a/contrib/ntp/ntpd/refclock_jjy.c
+++ b/contrib/ntp/ntpd/refclock_jjy.c
@@ -188,7 +188,7 @@ jjy_start ( int unit, struct peer *peer )
#ifdef DEBUG
if ( debug ) {
- printf ( "jjy_start (refclock_jjy.c) : %s mode=%d ", ntoa(&peer->srcadr), peer->ttlmax ) ;
+ printf ( "jjy_start (refclock_jjy.c) : %s mode=%d ", ntoa(&peer->srcadr), peer->ttl ) ;
printf ( DEVICE, unit ) ;
printf ( "\n" ) ;
}
@@ -202,15 +202,15 @@ jjy_start ( int unit, struct peer *peer )
sprintf ( pDeviceName, DEVICE, unit ) ;
/*
- * peer->ttlmax is a mode number specified by "127.127.40.X mode N" in the ntp.conf
+ * peer->ttl is a mode number specified by "127.127.40.X mode N" in the ntp.conf
*/
- switch ( peer->ttlmax ) {
+ switch ( peer->ttl ) {
case 0 :
case 1 : iDiscipline = LDISC_CLK ; break ;
case 2 : iDiscipline = LDISC_RAW ; break ;
default :
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
- ntoa(&peer->srcadr), peer->ttlmax ) ;
+ ntoa(&peer->srcadr), peer->ttl ) ;
free ( (void*) pDeviceName ) ;
return RC_START_ERROR ;
}
@@ -233,9 +233,9 @@ jjy_start ( int unit, struct peer *peer )
up->linediscipline = iDiscipline ;
/*
- * peer->ttlmax is a mode number specified by "127.127.40.X mode N" in the ntp.conf
+ * peer->ttl is a mode number specified by "127.127.40.X mode N" in the ntp.conf
*/
- switch ( peer->ttlmax ) {
+ switch ( peer->ttl ) {
case 0 :
/*
* The mode 0 is a default clock type at this time.
@@ -255,7 +255,7 @@ jjy_start ( int unit, struct peer *peer )
break ;
default :
msyslog ( LOG_ERR, "JJY receiver [ %s mode %d ] : Unsupported mode",
- ntoa(&peer->srcadr), peer->ttlmax ) ;
+ ntoa(&peer->srcadr), peer->ttl ) ;
close ( fd ) ;
free ( (void*) up ) ;
return RC_START_ERROR ;
@@ -422,8 +422,7 @@ jjy_receive ( struct recvbuf *rbufp )
pp->hour = up->hour ;
pp->minute = up->minute ;
pp->second = up->second ;
- pp->msec = up->msecond ;
- pp->usec = 0;
+ pp->nsec = up->msecond * 1000000;
/*
* JST to UTC
@@ -460,10 +459,9 @@ jjy_receive ( struct recvbuf *rbufp )
sprintf ( sLogText, "%04d/%02d/%02d %02d:%02d:%02d JST",
up->year, up->month, up->day, up->hour, up->minute, up->second ) ;
- record_clock_stats ( &peer->srcadr, sLogText ) ;
-
+ pp->lastref = pp->lastrec;
refclock_receive(peer);
-
+ record_clock_stats ( &peer->srcadr, sLogText ) ;
}
/**************************************************************************************************/