commit 316e2730acfc439c6bb12beb7c286daffb3cac4e
author Simon Kelley <simon@thekelleys.org.uk> Fri Jan 22 20:16:09 2010 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Thu Jan 05 17:31:15 2012 +0000
tree 6cc34f1b137b5c39f2df2bfbe6276725a1e323d3
parent 1f15b81d610eb7c9612814603221d25871927833

import of dnsmasq-2.52.tar.gz

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 48e3ecf..6f70768 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -1,4 +1,4 @@
-/* dnsmasq is Copyright (c) 2000-2009 Simon Kelley
+/* dnsmasq is Copyright (c) 2000-2010 Simon Kelley
 
    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
@@ -596,6 +596,11 @@
 	{
 	  FD_SET(daemon->dhcpfd, &rset);
 	  bump_maxfd(daemon->dhcpfd, &maxfd);
+	  if (daemon->pxefd != -1)
+	    {
+	      FD_SET(daemon->pxefd, &rset);
+	      bump_maxfd(daemon->pxefd, &maxfd);
+	    }
 	}
 #endif
 
@@ -676,8 +681,13 @@
 #endif      
 
 #ifdef HAVE_DHCP
-      if (daemon->dhcp && FD_ISSET(daemon->dhcpfd, &rset))
-	dhcp_packet(now);
+      if (daemon->dhcp)
+	{
+	  if (FD_ISSET(daemon->dhcpfd, &rset))
+	    dhcp_packet(now, 0);
+	  if (daemon->pxefd != -1 && FD_ISSET(daemon->pxefd, &rset))
+	    dhcp_packet(now, 1);
+	}
 
 #  ifdef HAVE_SCRIPT
       if (daemon->helperfd != -1 && FD_ISSET(daemon->helperfd, &wset))