tweak some ntp_proto.c timestamp log messages

bk: 57189c3cL-qT9ax_igJ5dXuh6QKp3g

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 1e6b925a09fd59b0b64b32dabadbc0b4101b9619..199063347de57aa8247e56f7ff1eb53b2136b563 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1580,7 +1580,7 @@ receive(
                if (peer->flip == 0 && !L_ISEQU(&p_org, &peer->aorg)) {
                        peer->bogusorg++;
                        msyslog(LOG_INFO,
-                               "receive: KoD origin timestamp %#010x.%08x from %s does not match %#010x.%08x - ignoring.",
+                               "receive: flip 0 KoD origin timestamp %#010x.%08x from %s does not match %#010x.%08x - ignoring.",
                                p_org.l_ui, p_org.l_uf,
                                ntoa(&peer->srcadr),
                                peer->aorg.l_ui, peer->aorg.l_uf);
@@ -1588,7 +1588,7 @@ receive(
                } else if (peer->flip == 1 && !L_ISEQU(&p_org, &peer->borg)) {
                        peer->bogusorg++;
                        msyslog(LOG_INFO,
-                               "receive: KoD origin timestamp %#010x.%08x from %s does not match interleave %#010x.%08x - ignoring.",
+                               "receive: flip 1 KoD origin timestamp %#010x.%08x from %s does not match interleave %#010x.%08x - ignoring.",
                                p_org.l_ui, p_org.l_uf,
                                ntoa(&peer->srcadr),
                                peer->borg.l_ui, peer->borg.l_uf);
@@ -1628,8 +1628,9 @@ receive(
                        peer->bogusorg++;
                        peer->flash |= TEST2;   /* bogus */
                        msyslog(LOG_INFO,
-                               "receive: Unexpected origin timestamp %#010x.%08x from %s@%s xmt %#010x.%08x",
+                               "receive: Unexpected origin timestamp %#010x.%08x does not match aorg %#010x.%08x from %s@%s xmt %#010x.%08x",
                                ntohl(pkt->org.l_ui), ntohl(pkt->org.l_uf),
+                               peer->aorg.l_ui, peer->aorg.l_uf,
                                hm_str, ntoa(&peer->srcadr),
                                ntohl(pkt->xmt.l_ui), ntohl(pkt->xmt.l_uf));
                        if (  !L_ISZERO(&peer->dst)