From 7cb1d6ccf36eccb294bd26e1c6da6866e7fc0ab7 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 2 Dec 2009 23:46:25 +0100 Subject: [PATCH] ntpd: try to avoid DNS requests *during* NTP roundtrip. +23 bytes Signed-off-by: Denys Vlasenko --- networking/ntpd.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/networking/ntpd.c b/networking/ntpd.c index 3bca69a4c..375f009a6 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c @@ -166,6 +166,15 @@ set_next(ntp_peer_t *p, unsigned t) p->next_action_time = time(NULL) + t; } +static len_and_sockaddr* +resolve_hostname(ntp_peer_t *p) +{ + p->lsa = host2sockaddr(p->hostname, 123); + if (p->lsa) + p->dotted = xmalloc_sockaddr2dotted_noport(&p->lsa->u.sa); + return p->lsa; +} + static void add_peers(char *s) { @@ -174,6 +183,7 @@ add_peers(char *s) p = xzalloc(sizeof(*p)); p->hostname = s; p->dotted = s; + resolve_hostname(p); p->fd = -1; p->msg.m_status = MODE_CLIENT | (NTP_VERSION << 3); p->trustlevel = TRUSTLEVEL_PATHETIC; @@ -300,12 +310,10 @@ send_query_to_peer(ntp_peer_t *p) //TODO: big ntpd uses all IPs, not just 1st, do we need to mimic that? //TODO: periodically re-resolve DNS names? if (!p->lsa) { - p->lsa = host2sockaddr(p->hostname, 123); - if (!p->lsa) { + if (!resolve_hostname(p)) { set_next(p, INTERVAL_QUERY_PATHETIC); return -1; } - p->dotted = xmalloc_sockaddr2dotted_noport(&p->lsa->u.sa); } family = p->lsa->u.sa.sa_family;