Additional sanity check in filter_servers().

Logging queries lost the RRtype.

Revert to e.g. query[A] example.com

src/cache.c

@@ -2360,6 +2360,8 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
     source = "reply";
   else if (flags & F_AUTH)
     source = "auth";
+  else if (flags & F_QUERY)
+    source = "query";
   else if (flags & F_SECSTAT)
     {
       if (addr && addr->log.ede != EDE_UNSET && option_bool(OPT_EXTRALOG))
@@ -2400,8 +2402,8 @@ void log_query(unsigned int flags, char *name, union all_addr *addr, char *arg,
 	  source = "non-query opcode";
 	  name = opcodestring;
 	}
-      else if (!(flags & F_AUTH))
+      else if (type > 0)
-	source = "query";
+	source = querystr(source, type);
       
       verb = "from";
     }

src/dnsmasq.c

@@ -81,7 +81,9 @@ int main (int argc, char **argv)
   int tftp_prefix_missing = 0;
 #endif
 
+#ifdef HAVE_LINUX_NETWORK
   (void)netlink_warn;
+#endif
   
 #if defined(HAVE_IDN) || defined(HAVE_LIBIDN2) || defined(LOCALEDIR)
   setlocale(LC_ALL, "");

src/domain-match.c

@@ -343,10 +343,8 @@ int filter_servers(int seed, int flags, int *lowout, int *highout)
 		      else
 			{
 			  /* If we want a server for a particular domain, and this one isn't, return nothing. */
-			  if ((flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
+			  if (nlow < daemon->serverarraysz && nlow != nhigh && (flags & F_DOMAINSRV) && daemon->serverarray[nlow]->domain_len == 0)
 			    nlow = nhigh;
-			  else
-			    nlow = i;
 			}
 		    }
 		}

src/inotify.c

@@ -133,29 +133,44 @@ void inotify_dnsmasq_init()
     }
 }
 
-static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *path)
+static struct hostsfile *dyndir_addhosts(struct dyndir *dd, char *file)
 {
   /* Check if this file is already known in dd->files */
-  struct hostsfile *ah = NULL;
+  struct hostsfile *ah;
-  for(ah = dd->files; ah; ah = ah->next)
+  size_t dirlen = strlen(dd->dname);
-    if(ah && ah->fname && strcmp(path, ah->fname) == 0)
+  
+  /* ah->fname always starts with the string in dd->dname */
+  for (ah = dd->files; ah; ah = ah->next)
+    if (ah->fname[dirlen] == '/' &&
+        strcmp(&ah->fname[dirlen+1], file) == 0)
       return ah;
         
   /* Not known, create new hostsfile record for this dyndir */
-  struct hostsfile *newah = NULL;
+  if ((ah = whine_malloc(sizeof(struct hostsfile))))
-  if(!(newah = whine_malloc(sizeof(struct hostsfile))))
+    {
+      char *path;
+
+      if (!(path = whine_malloc(dirlen + strlen(file) + 2)))
+	{
+	  free(ah);
 	  return NULL;
+	}
+      
+      strcpy(path, dd->dname);
+      strcat(path, "/");
+      strcat(path, file);
       
       /* Add this file to the tip of the linked list */
-  newah->next = dd->files;
+      ah->next = dd->files;
-  dd->files = newah;
+      dd->files = ah;
       
       /* Copy flags, set index and the full file path */
-  newah->flags = dd->flags;
+      ah->flags = dd->flags;
-  newah->index = daemon->host_index++;
+      ah->index = daemon->host_index++;
-  newah->fname = path;
+      ah->fname = path;
+    }
   
-  return newah;
+  return ah;
 }
 
 
@@ -204,9 +219,7 @@ void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revh
 
        while ((ent = readdir(dir_stream)))
 	 {
-	   size_t lendir = strlen(dd->dname);
 	   size_t lenfile = strlen(ent->d_name);
-	   char *path;
 	   	   
 	   /* ignore emacs backups and dotfiles */
 	   if (lenfile == 0 || 
@@ -215,32 +228,35 @@ void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revh
 	       ent->d_name[0] == '.')
 	     continue;
 
-	   if ((path = whine_malloc(lendir + lenfile + 2)))
+	   if (dd->flags & AH_HOSTS)
 	     {
 	       struct hostsfile *ah;
 
+	       /* ignore non-regular files */
+	       if ((ah = dyndir_addhosts(dd, ent->d_name)) &&
+		   stat(ah->fname, &buf) != -1 && S_ISREG(buf.st_mode))
+		 total_size = read_hostsfile(ah->fname, ah->index, total_size, rhash, revhashsz);
+	     }
+#ifdef HAVE_DHCP
+	   else if (dd->flags & (AH_DHCP_HST | AH_DHCP_OPT))
+	     {
+	       char *path;
+	       
+	       if ((path = whine_malloc(strlen(dd->dname) + lenfile + 2)))
+		 {
 		   strcpy(path, dd->dname);
 		   strcat(path, "/");
 		   strcat(path, ent->d_name);
 		   
-	       if (!(ah = dyndir_addhosts(dd, path)))
-		 {
-		   free(path);
-		   continue;
-		 }
-	       
 		   /* ignore non-regular files */
 		   if (stat(path, &buf) != -1 && S_ISREG(buf.st_mode))
-		 {
-		   if (dd->flags & AH_HOSTS)
-		     total_size = read_hostsfile(path, ah->index, total_size, rhash, revhashsz);
-#ifdef HAVE_DHCP
-		   else if (dd->flags & (AH_DHCP_HST | AH_DHCP_OPT))
 		     option_read_dynfile(path, dd->flags);
+		   
+		   free(path);
+		 }
+	     }
 #endif		   
 	 }
-	     }
-	 }
        
        closedir(dir_stream);
     }
@@ -285,34 +301,25 @@ int inotify_check(time_t now)
 	  for (dd = daemon->dynamic_dirs; dd; dd = dd->next)
 	    if (dd->wd == in->wd)
 	      {
-		size_t lendir = strlen(dd->dname);
+		if (dd->flags & AH_HOSTS)
-		char *path;
-				
-		if ((path = whine_malloc(lendir + in->len + 2)))
 		  {
-		    struct hostsfile *ah = NULL;
+		    struct hostsfile *ah;
-
+		    if ((ah = dyndir_addhosts(dd, in->name)))
-		    strcpy(path, dd->dname);
+		      {
-		    strcat(path, "/");
+			const unsigned int removed = cache_remove_uid(ah->index);
-		    strcat(path, in->name);
 
 			/* Is this is a deletion event? */
 			if (in->mask & IN_DELETE)
-		      my_syslog(LOG_INFO, _("inotify: %s removed"), path);
+			  my_syslog(LOG_INFO, _("inotify: %s removed"), ah->fname);
 			else 
-		      my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
+			  my_syslog(LOG_INFO, _("inotify: %s new or modified"), ah->fname);
 
-		    if (dd->flags & AH_HOSTS)
-		      {
-			if ((ah = dyndir_addhosts(dd, path)))
-			  {
-			    const unsigned int removed = cache_remove_uid(ah->index);
 			if (removed > 0)
-			      my_syslog(LOG_INFO, _("inotify: flushed %u names read from %s"), removed, path);
+			  my_syslog(LOG_INFO, _("inotify: flushed %u names read from %s"), removed, ah->fname);
 			
 			/* (Re-)load hostsfile only if this event isn't triggered by deletion */
 			if (!(in->mask & IN_DELETE))
-			      read_hostsfile(path, ah->index, 0, NULL, 0);
+			  read_hostsfile(ah->fname, ah->index, 0, NULL, 0);
 #ifdef HAVE_DHCP
 			if (daemon->dhcp || daemon->doing_dhcp6) 
 			  {
@@ -326,9 +333,19 @@ int inotify_check(time_t now)
 		      }
 		  }
 #ifdef HAVE_DHCP
-		    else if (dd->flags & AH_DHCP_HST)
+		else if (!(in->mask & IN_DELETE))
 		  {
-			if (option_read_dynfile(path, AH_DHCP_HST))
+		    char *path;
+
+		    if ((path = whine_malloc(strlen(dd->dname) + in->len + 2)))
+		      {
+			strcpy(path, dd->dname);
+			strcat(path, "/");
+			strcat(path, in->name);
+			
+			my_syslog(LOG_INFO, _("inotify: %s new or modified"), path);
+
+			if ((dd->flags & AH_DHCP_HST) && option_read_dynfile(path, AH_DHCP_HST))
 			  {
 			    /* Propagate the consequences of loading a new dhcp-host */
 			    dhcp_update_configs(daemon->dhcp_conf);
@@ -336,17 +353,19 @@ int inotify_check(time_t now)
 			    lease_update_file(now); 
 			    lease_update_dns(1);
 			  }
-		      }
-		    else if (dd->flags & AH_DHCP_OPT)
-		      option_read_dynfile(path, AH_DHCP_OPT);
-#endif
 			
-		    if (!ah)
+			if (dd->flags & AH_DHCP_OPT)
+			  option_read_dynfile(path, AH_DHCP_OPT);
+		    
 			free(path);
 		      }
 		  }
+#endif
+		
 	      }
 	}
+    }
+  
   return hit;
 }
 

src/tftp.c

@@ -198,10 +198,10 @@ static void tftp_request(struct listener *listen, time_t now)
 
       name = namebuff;
       
-      addra.addr4 = addr.in.sin_addr;
-
       if (family == AF_INET6)
 	addra.addr6 = addr.in6.sin6_addr;
+      else
+	addra.addr4 = addr.in.sin_addr;
       
       if (daemon->tftp_interfaces)
 	{
@@ -679,7 +679,6 @@ void check_tftp_listeners(time_t now)
 	  /* Do transmission or re-transmission. When we get an ACK, the call to handle_tftp()
 	     bumps transfer->lastack and trips the retransmit timer so that we send the next block(s)
 	     here. */
-	  unsigned int i, winsize;
 	  ssize_t len;
 	  
 	  transfer->retransmit += transfer->timeout + (1<<(transfer->backoff/2));
@@ -691,10 +690,7 @@ void check_tftp_listeners(time_t now)
 	  else
 	    {
 	      /* send a window'a worth of blocks unless we're retransmitting OACK */
-	      winsize = transfer->block ? transfer->windowsize : 1;
+	      unsigned int i, winsize = transfer->block ? transfer->windowsize : 1;
-	      
-	      /* we overwrote the buffer... */
-	      daemon->srv_save = NULL;
 	      
 	      for (i = 0; i < winsize && !endcon; i++, transfer->block++)
 		{
@@ -861,6 +857,9 @@ static ssize_t tftp_err(int err, char *packet, char *message, char *file, char *
   } *mess = (struct errmess *)packet;
   ssize_t len, ret = 4;
 
+  /* we overwrote the buffer... */
+  daemon->srv_save = NULL;
+
   memset(packet, 0, daemon->packet_buff_sz);
   if (file)
     sanitise(file);
@@ -889,6 +888,9 @@ static ssize_t get_block(char *packet, struct tftp_transfer *transfer)
 {
   memset(packet, 0, daemon->packet_buff_sz);
 
+  /* we overwrote the buffer... */
+  daemon->srv_save = NULL;
+
   if (transfer->block == 0)
     {
       /* send OACK */