BUG11177: pppoe password not required anymore

[ipfire-2.x.git] / src / patches / dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch

--- a/src/cache.c	Wed Dec 16 19:24:12 2015
+++ b/src/cache.c	Wed Dec 16 19:37:37 2015
@@ -17,7 +17,7 @@
 #include "dnsmasq.h"
 
 static struct crec *cache_head = NULL, *cache_tail = NULL, **hash_table = NULL;
-#ifdef HAVE_DHCP
+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER)
 static struct crec *dhcp_spare = NULL;
 #endif
 static struct crec *new_chain = NULL;
@@ -217,6 +217,9 @@
       crecp->flags &= ~F_BIGNAME;
     }
 
+  if (crecp->flags & F_DHCP)
+    free(crecp->name.namep);
+
 #ifdef HAVE_DNSSEC
   cache_blockdata_free(crecp);
 #endif
@@ -1138,7 +1141,7 @@
   
 } 
 
-#ifdef HAVE_DHCP
+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER)
 struct in_addr a_record_from_hosts(char *name, time_t now)
 {
   struct crec *crecp = NULL;
@@ -1281,7 +1284,11 @@
       else
 	crec->ttd = ttd;
       crec->addr.addr = *host_address;
+#ifdef HAVE_ISC_READER
+      crec->name.namep = strdup(host_name);
+#else
       crec->name.namep = host_name;
+#endif
       crec->uid = next_uid();
       cache_hash(crec);
 
--- a/src/dnsmasq.c	Thu Jul 30 20:59:06 2015
+++ b/src/dnsmasq.c	Wed Dec 16 19:38:32 2015
@@ -1017,6 +1017,11 @@
 
 	  poll_resolv(0, daemon->last_resolv != 0, now); 	  
 	  daemon->last_resolv = now;
+
+#ifdef HAVE_ISC_READER
+	  if (daemon->lease_file && !daemon->dhcp)
+	    load_dhcp(now);
+#endif
 	}
 #endif
 
--- a/src/dnsmasq.h	Wed Dec 16 19:24:12 2015
+++ b/src/dnsmasq.h	Wed Dec 16 19:40:11 2015
@@ -1516,6 +1516,11 @@
 void poll_listen(int fd, short event);
 int do_poll(int timeout);
 
+/* isc.c */
+#ifdef HAVE_ISC_READER
+void load_dhcp(time_t now);
+#endif
+
 /* rrfilter.c */
 size_t rrfilter(struct dns_header *header, size_t plen, int mode);
 u16 *rrfilter_desc(int type);
 int expand_workspace(unsigned char ***wkspc, int *szp, int new);
-
--- /dev/null	Wed Dec 16 19:48:08 2015
+++ b/src/isc.c	Wed Dec 16 19:41:35 2015
@@ -0,0 +1,266 @@
+/* dnsmasq is Copyright (c) 2014 John Volpe, Simon Kelley and
+     Michael Tremer
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 dated June, 1991, or
+  (at your option) version 3 dated 29 June, 2007.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Code in this file is based on contributions by John Volpe and
+  Simon Kelley. Updated for recent versions of dnsmasq by
+  Michael Tremer.
+*/
+
+
+#define _GNU_SOURCE
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "dnsmasq.h"
+
+#ifdef HAVE_ISC_READER
+#define MAXTOK 50
+
+struct isc_dhcp_lease {
+	char* name;
+	char* fqdn;
+	time_t expires;
+	struct in_addr addr;
+	struct isc_dhcp_lease* next;
+};
+
+static struct isc_dhcp_lease* dhcp_lease_new(const char* hostname) {
+	struct isc_dhcp_lease* lease = whine_malloc(sizeof(*lease));
+       if (!lease)
+               return NULL;
+
+	lease->name = strdup(hostname);
+	if (daemon->domain_suffix) {
+               int r = asprintf(&lease->fqdn, "%s.%s", hostname, daemon->domain_suffix);
+
+               // Handle OOM
+               if (r < 0) {
+                       free(lease);
+                       return NULL;
+               }
+	}
+	lease->expires = 0;
+	lease->next = NULL;
+
+	return lease;
+}
+
+static void dhcp_lease_free(struct isc_dhcp_lease* lease) {
+	if (!lease)
+		return;
+
+	if (lease->name)
+		free(lease->name);
+	if (lease->fqdn)
+		free(lease->fqdn);
+	free(lease);
+}
+
+static int next_token(char* token, int buffsize, FILE* fp) {
+	int c, count = 0;
+	char* cp = token;
+
+	while ((c = getc(fp)) != EOF) {
+		if (c == '#') {
+			do {
+				c = getc(fp);
+			} while (c != '\n' && c != EOF);
+		}
+
+		if (c == ' ' || c == '\t' || c == '\n' || c == ';') {
+			if (count)
+				break;
+		} else if ((c != '"') && (count < buffsize - 1)) {
+			*cp++ = c;
+			count++;
+		}
+	}
+
+	*cp = 0;
+	return count ? 1 : 0;
+}
+
+static long get_utc_offset() {
+	time_t t = time(NULL);
+	struct tm* time_struct = localtime(&t);
+
+	return time_struct->tm_gmtoff;
+}
+
+static time_t parse_lease_time(const char* token_date, const char* token_time) {
+	time_t time = (time_t)(-1);
+	struct tm lease_time;
+
+	if (sscanf(token_date, "%d/%d/%d", &lease_time.tm_year, &lease_time.tm_mon, &lease_time.tm_mday) == 3) {
+		lease_time.tm_year -= 1900;
+		lease_time.tm_mon -= 1;
+
+		if (sscanf(token_time, "%d:%d:%d", &lease_time.tm_hour, &lease_time.tm_min, &lease_time.tm_sec) == 3) {
+			time = mktime(&lease_time) + get_utc_offset();
+		}
+	}
+
+	return time;
+}
+
+static struct isc_dhcp_lease* find_lease(const char* hostname, struct isc_dhcp_lease* leases) {
+	struct isc_dhcp_lease* lease = leases;
+
+	while (lease) {
+		if (strcmp(hostname, lease->name) == 0) {
+			return lease;
+		}
+		lease = lease->next;
+	}
+
+	return NULL;
+}
+
+static off_t lease_file_size = (off_t)0;
+static ino_t lease_file_inode = (ino_t)0;
+
+void load_dhcp(time_t now) {
+	struct isc_dhcp_lease* leases = NULL;
+
+	struct stat statbuf;
+	if (stat(daemon->lease_file, &statbuf) == -1) {
+		return;
+	}
+
+	/* Do nothing if the lease file has not changed. */
+	if ((statbuf.st_size <= lease_file_size) && (statbuf.st_ino == lease_file_inode))
+		return;
+
+	lease_file_size = statbuf.st_size;
+	lease_file_inode = statbuf.st_ino;
+
+	FILE* fp = fopen(daemon->lease_file, "r");
+	if (!fp) {
+		my_syslog(LOG_ERR, _("failed to load %s:%s"), daemon->lease_file, strerror(errno));
+		return;
+	}
+
+	my_syslog(LOG_INFO, _("reading %s"), daemon->lease_file);
+
+	char* hostname = daemon->namebuff;
+	struct in_addr host_address;
+	time_t time_starts = -1;
+	time_t time_ends = -1;
+	int nomem;
+
+	char token[MAXTOK];
+	while ((next_token(token, MAXTOK, fp))) {
+		if (strcmp(token, "lease") == 0) {
+			hostname[0] = '\0';
+
+			if (next_token(token, MAXTOK, fp) && ((host_address.s_addr = inet_addr(token)) != (in_addr_t)-1)) {
+				if (next_token(token, MAXTOK, fp) && *token == '{') {
+					while (next_token(token, MAXTOK, fp) && *token != '}') {
+						if ((strcmp(token, "client-hostname") == 0) || (strcmp(token, "hostname") == 0)) {
+							if (next_token(hostname, MAXDNAME, fp)) {
+								if (!canonicalise(hostname, &nomem)) {
+									*hostname = 0;
+									my_syslog(LOG_ERR, _("bad name in %s"), daemon->lease_file);
+								}
+							}
+						} else if ((strcmp(token, "starts") == 0) || (strcmp(token, "ends") == 0)) {
+							char token_date[MAXTOK];
+							char token_time[MAXTOK];
+
+							int is_starts = strcmp(token, "starts") == 0;
+
+							// Throw away the weekday and parse the date.
+							if (next_token(token, MAXTOK, fp) && next_token(token_date, MAXTOK, fp) && next_token(token_time, MAXTOK, fp)) {
+								time_t time = parse_lease_time(token_date, token_time);
+
+								if (is_starts)
+									time_starts = time;
+								else
+									time_ends = time;
+							}
+						}
+					}
+
+					if (!*hostname)
+						continue;
+
+					if ((time_starts == -1) || (time_ends == -1))
+						continue;
+
+					if (difftime(now, time_ends) > 0)
+						continue;
+
+					char* dot = strchr(hostname, '.');
+					if (dot) {
+						if (!daemon->domain_suffix || hostname_isequal(dot + 1, daemon->domain_suffix)) {
+							my_syslog(LOG_WARNING,
+								_("Ignoring DHCP lease for %s because it has an illegal domain part"),
+								hostname);
+							continue;
+						}
+						*dot = 0;
+					}
+
+					// Search for an existing lease in the list
+					// with the given host name and update the data
+					// if needed.
+					struct isc_dhcp_lease* lease = find_lease(hostname, leases);
+
+					// If no lease already exists, we create a new one
+					// and append it to the list.
+					if (!lease) {
+						lease = dhcp_lease_new(hostname);
+						assert(lease);
+
+						lease->next = leases;
+						leases = lease;
+					}
+
+					// Only update more recent leases.
+					if (lease->expires > time_ends)
+						continue;
+
+					lease->addr = host_address;
+					lease->expires = time_ends;
+				}
+			}
+		}
+	}
+
+	fclose(fp);
+
+	// Drop all entries.
+	cache_unhash_dhcp();
+
+	while (leases) {
+		struct isc_dhcp_lease *lease = leases;
+		leases = lease->next;
+
+		if (lease->fqdn) {
+			cache_add_dhcp_entry(lease->fqdn, AF_INET, (struct all_addr*)&lease->addr.s_addr, lease->expires);
+		}
+
+		if (lease->name) {
+			cache_add_dhcp_entry(lease->name, AF_INET, (struct all_addr*)&lease->addr.s_addr, lease->expires);
+		}
+
+		// Cleanup
+		dhcp_lease_free(lease);
+	}
+}
+
+#endif
--- a/src/option.c	Wed Dec 16 19:24:12 2015
+++ b/src/option.c	Wed Dec 16 19:42:48 2015
@@ -1771,7 +1771,7 @@
 	ret_err(_("bad MX target"));
       break;
 
-#ifdef HAVE_DHCP      
+#if (defined HAVE_DHCP) || (defined HAVE_ISC_READER)
     case 'l':  /* --dhcp-leasefile */
       daemon->lease_file = opt_string_alloc(arg);
       break;
--- a/Makefile	Wed Dec 16 19:24:12 2015
+++ b/Makefile	Wed Dec 16 19:28:45 2015
@@ -74,7 +74,7 @@
        helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
        dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \
        domain.o dnssec.o blockdata.o tables.o loop.o inotify.o \
-       poll.o rrfilter.o edns0.o arp.o
+       poll.o rrfilter.o edns0.o arp.o isc.o
 
 hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
        dns-protocol.h radv-protocol.h ip6addr.h