db9aaf09da
Move content from stx-gplv3 into stx-integ
Packages will be relocated to
stx-integ:
base/
anaconda
crontabs
dnsmasq
rsync
database/
python-psycopg2
filesystem/
parted
grub/
grub2
security/
python-keyring
Change-Id: I357310173e6bd1a1005e76be619a5ff5c9bcbed4
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
85 lines
3.3 KiB
Diff
85 lines
3.3 KiB
Diff
From c68370ac5678b1052592877ede04886d5f62d2dc Mon Sep 17 00:00:00 2001
|
|
From: Scott Little <scott.little@windriver.com>
|
|
Date: Tue, 18 Oct 2016 13:07:56 -0400
|
|
Subject: [PATCH 1/4] WRS: Patch22:
|
|
dnsmasq-update-ipv6-leases-from-config.patch
|
|
|
|
---
|
|
src/lease.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
|
|
1 file changed, 43 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/src/lease.c b/src/lease.c
|
|
index e5fe8a6..ffa683a 100644
|
|
--- a/src/lease.c
|
|
+++ b/src/lease.c
|
|
@@ -179,6 +179,18 @@ void lease_init(time_t now)
|
|
dns_dirty = 1;
|
|
}
|
|
|
|
+static int lease_match_config_addr(struct dhcp_lease *lease, struct dhcp_config *config)
|
|
+{
|
|
+ if (!(lease->flags & (LEASE_TA | LEASE_NA)) && (config->flags & CONFIG_ADDR))
|
|
+ return (lease->addr.s_addr == config->addr.s_addr);
|
|
+#ifdef HAVE_DHCP6
|
|
+ else if ((lease->flags & (LEASE_TA | LEASE_NA)) && (config->flags & CONFIG_ADDR6))
|
|
+ return IN6_ARE_ADDR_EQUAL(&config->addr6, &lease->addr6);
|
|
+#endif
|
|
+ else
|
|
+ return 0;
|
|
+}
|
|
+
|
|
void lease_update_from_configs(void)
|
|
{
|
|
/* changes to the config may change current leases. */
|
|
@@ -187,16 +199,37 @@ void lease_update_from_configs(void)
|
|
struct dhcp_config *config;
|
|
char *name;
|
|
|
|
- for (lease = leases; lease; lease = lease->next)
|
|
- if (lease->flags & (LEASE_TA | LEASE_NA))
|
|
- continue;
|
|
- else if ((config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len,
|
|
- lease->hwaddr, lease->hwaddr_len, lease->hwaddr_type, NULL)) &&
|
|
- (config->flags & CONFIG_NAME) &&
|
|
- (!(config->flags & CONFIG_ADDR) || config->addr.s_addr == lease->addr.s_addr))
|
|
- lease_set_hostname(lease, config->hostname, 1, get_domain(lease->addr), NULL);
|
|
- else if ((name = host_from_dns(lease->addr)))
|
|
- lease_set_hostname(lease, name, 1, get_domain(lease->addr), NULL); /* updates auth flag only */
|
|
+ for (lease = leases; lease; lease = lease->next) {
|
|
+ if (lease->flags & LEASE_TA)
|
|
+ continue; /* we do not update temporary ipv6 leases */
|
|
+
|
|
+ config = find_config(daemon->dhcp_conf, NULL, lease->clid, lease->clid_len,
|
|
+ (lease->hwaddr_len > 0 ? lease->hwaddr : NULL),
|
|
+ lease->hwaddr_len, lease->hwaddr_type, NULL);
|
|
+ if (config)
|
|
+ {
|
|
+ if ((!(config->flags & (CONFIG_ADDR | CONFIG_ADDR6))) ||
|
|
+ lease_match_config_addr(lease, config))
|
|
+ {
|
|
+ /*
|
|
+ * Either we matched on a config that doesn't have an address in
|
|
+ * which case we'll just use the hostname, or we matched on a
|
|
+ * config that has the same IP address.
|
|
+ */
|
|
+ if (!(lease->flags & (LEASE_TA | LEASE_NA)))
|
|
+ lease_set_hostname(lease, config->hostname, 1, get_domain(lease->addr), NULL);
|
|
+#ifdef HAVE_DHCP6
|
|
+ else
|
|
+ lease_set_hostname(lease, config->hostname, 1, get_domain6(&lease->addr6), NULL);
|
|
+#endif
|
|
+ continue; /* lease updated; move on to next lease */
|
|
+ }
|
|
+ }
|
|
+
|
|
+ /* attempt to find a matching DNS cache entry for an IPv4 entry */
|
|
+ if (!(lease->flags & (LEASE_TA | LEASE_NA)) && (name = host_from_dns(lease->addr)))
|
|
+ lease_set_hostname(lease, name, 1, get_domain(lease->addr), NULL); /* updates auth flag only */
|
|
+ }
|
|
}
|
|
|
|
static void ourprintf(int *errp, char *format, ...)
|
|
--
|
|
1.9.1
|
|
|