X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Futils%2Fbusybox%2Fpatches%2F230-ntpd_delayed_resolve.patch;fp=package%2Futils%2Fbusybox%2Fpatches%2F230-ntpd_delayed_resolve.patch;h=d46a0e3f24b5c643289252ddc3eedd5db0eb71d7;hp=0000000000000000000000000000000000000000;hb=035d36e80e7fbf95fdf2a59e9d995859e4b4414c;hpb=7bc5f5de9e23a35594d1af0ea87a176c0aa2203e

diff --git a/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch b/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
new file mode 100644
index 0000000000..d46a0e3f24
--- /dev/null
+++ b/package/utils/busybox/patches/230-ntpd_delayed_resolve.patch
@@ -0,0 +1,48 @@
+--- a/networking/ntpd.c
++++ b/networking/ntpd.c
+@@ -238,6 +238,7 @@ typedef struct {
+ typedef struct {
+ 	len_and_sockaddr *p_lsa;
+ 	char             *p_dotted;
++	char             *p_hostname;
+ 	int              p_fd;
+ 	int              datapoint_idx;
+ 	uint32_t         lastpkt_refid;
+@@ -738,8 +739,9 @@ add_peers(char *s)
+ 	peer_t *p;
+ 
+ 	p = xzalloc(sizeof(*p));
+-	p->p_lsa = xhost2sockaddr(s, 123);
+-	p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
++	p->p_hostname = s;
++	p->p_lsa = NULL;
++	p->p_dotted = NULL;
+ 	p->p_fd = -1;
+ 	p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
+ 	p->next_action_time = G.cur_time; /* = set_next(p, 0); */
+@@ -788,6 +790,25 @@ send_query_to_peer(peer_t *p)
+ 	 *
+ 	 * Uncomment this and use strace to see it in action:
+ 	 */
++
++	/* See if the peer hostname already resolved yet, if not, retry to resolv and return on failure */
++	if (!p->p_lsa)
++	{
++		p->p_lsa = host2sockaddr(p->p_hostname, 123);
++
++		if (p->p_lsa)
++		{
++			p->p_dotted = xmalloc_sockaddr2dotted_noport(&p->p_lsa->u.sa);
++			VERB1 bb_error_msg("resolved peer %s to %s", p->p_hostname, p->p_dotted);
++		}
++		else
++		{
++			set_next(p, RETRY_INTERVAL);
++			VERB1 bb_error_msg("could not resolve peer %s, skipping", p->p_hostname);
++			return;
++		}
++	}
++
+ #define PROBE_LOCAL_ADDR /* { len_and_sockaddr lsa; lsa.len = LSA_SIZEOF_SA; getsockname(p->query.fd, &lsa.u.sa, &lsa.len); } */
+ 
+ 	if (p->p_fd == -1) {