Skip to content
Permalink
Browse files

xmt/aorg and leap_expire fixes from Dave Mills

  • Loading branch information...
Unknown committed May 23, 2009
1 parent 2e89c40 commit fb8fa5f6330a7583ec74fba2dfb7b6bf62bdd246
Showing with 11 additions and 7 deletions.
  1. +2 −0 ChangeLog
  2. +1 −0 ntpd/ntp_crypto.c
  3. +1 −1 ntpd/ntp_peer.c
  4. +7 −6 ntpd/ntp_proto.c
@@ -1,3 +1,5 @@
* xmt -> aorg timestamp cleanup from Dave Mills, reported by Dave Hart.
* Leap/expire cleanup from Dave Mills.
(4.2.5p178) 2009/05/21 Released by Harlan Stenn <stenn@ntp.org>
* Provide erealloc() and estrdup(), a la emalloc().
* Improve ntp.conf's parser error messages.
@@ -967,6 +967,7 @@ crypto_recv(
leap_expire = ntohl(ep->pkt[2]);
crypto_update();
strcpy(str1, fstostr(leap_sec));
strcpy(str2, fstostr(leap_expire));
snprintf(tbuf, sizeof(tbuf),
"%d leap %s expire %s", leap_tai, str1,
str2);
@@ -995,7 +995,7 @@ findmanycastpeer(
peer->next) {
if (peer->cast_flags & MDF_ACAST) {
NTOHL_FP(&pkt->org, &p_org);
if (L_ISEQU(&peer->xmt, &p_org))
if (L_ISEQU(&p_org, &peer->aorg))
return (peer);
}
}
@@ -797,11 +797,10 @@ receive(
sys_restricted++;
return; /* not enabled */
}
if ((peer = newpeer(&rbufp->recv_srcadr,
rbufp->dstadr, MODE_CLIENT,
hisversion, NTP_MINDPOLL, NTP_MAXDPOLL,
FLAG_IBURST | FLAG_PREEMPT, MDF_UCAST | MDF_ACLNT,
0, skeyid)) == NULL) {
if ((peer = newpeer(&rbufp->recv_srcadr, rbufp->dstadr,
MODE_CLIENT, hisversion, NTP_MINDPOLL,
NTP_MAXDPOLL, FLAG_IBURST | FLAG_PREEMPT,
MDF_UCAST | MDF_ACLNT, 0, skeyid)) == NULL) {
sys_declined++;
return; /* ignore duplicate */
}
@@ -1062,6 +1061,8 @@ receive(
peer->flip = 1;
report_event(PEVNT_XLEAVE, peer, NULL);
}
} else {
L_CLR(&peer->aorg);
}

/*
@@ -1091,7 +1092,7 @@ receive(
peer->rec = p_xmt;
peer->dst = rbufp->recv_time;
}
L_CLR(&peer->xmt);
peer->xmt = p_xmt;

/*
* If this is a crypto_NAK, the server cannot authenticate a

0 comments on commit fb8fa5f

Please sign in to comment.
You can’t perform that action at this time.