From: Ted Lemon <source@isc.org>
Date: Sat, 22 Feb 1997 08:36:36 +0000 (+0000)
Subject: Add some knobs to control booting; get server identifier from interface; add dummy... 
X-Git-Tag: DHCP_970222~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e07ac89ae909bfe382ec94bd9d34146adc821f61;p=thirdparty%2Fdhcp.git

Add some knobs to control booting; get server identifier from interface; add dummy relay function
---

diff --git a/bootp.c b/bootp.c
index 2703266d6..7564af4f5 100644
--- a/bootp.c
+++ b/bootp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bootp.c,v 1.23 1997/02/19 10:50:40 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bootp.c,v 1.24 1997/02/22 08:36:36 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -105,6 +105,18 @@ void bootp (packet)
 			}
 		}
 
+		if (host && (!host -> group -> allow_booting)) {
+			note ("Ignoring excluded BOOTP client %s",
+			      host -> name);
+			return;
+		}
+			
+		if (host && (!host -> group -> allow_bootp)) {
+			note ("Ignoring BOOTP request from client %s",
+			      host -> name);
+			return;
+		}
+			
 		/* If we've been told not to boot unknown clients,
 		   and we didn't find any host record for this client,
 		   ignore it. */
@@ -120,6 +132,20 @@ void bootp (packet)
 			return;
 		}
 
+		/* If we've been told not to boot with bootp on this
+		   network, ignore it. */
+		if (!host &&
+		    !(packet -> shared_network -> group -> allow_bootp)) {
+			note ("Ignoring BOOTP request from client %s via %s",
+			      print_hw_addr (packet -> raw -> htype,
+					     packet -> raw -> hlen,
+					     packet -> raw -> chaddr),
+			      packet -> raw -> giaddr.s_addr
+			      ? inet_ntoa (packet -> raw -> giaddr)
+			      : packet -> interface -> name);
+			return;
+		}
+
 		/* If the packet is from a host we don't know and there
 		   are no dynamic bootp addresses on the network it came
 		   in on, drop it on the floor. */
@@ -174,6 +200,20 @@ void bootp (packet)
 		goto lose;
 	}
 
+	/* Make sure we're allowed to boot this client. */
+	if (hp && (!hp -> group -> allow_booting)) {
+		note ("Ignoring excluded BOOTP client %s",
+		      hp -> name);
+		return;
+	}
+			
+	/* Make sure we're allowed to boot this client with bootp. */
+	if (hp && (!hp -> group -> allow_bootp)) {
+		note ("Ignoring BOOTP request from client %s",
+		      hp -> name);
+		return;
+	}
+			
 	/* Set up the outgoing packet... */
 	memset (&outgoing, 0, sizeof outgoing);
 	memset (&raw, 0, sizeof raw);
@@ -220,7 +260,7 @@ void bootp (packet)
 	else if (subnet -> interface_address.len)
 		memcpy (&raw.siaddr, subnet -> interface_address.iabuf, 4);
 	else
-		memcpy (&raw.siaddr, server_identifier.iabuf, 4);
+		raw.siaddr = packet -> interface -> primary_address;
 
 	raw.giaddr = packet -> raw -> giaddr;
 	if (hp -> group -> server_name) {
@@ -239,10 +279,7 @@ void bootp (packet)
 	hto.hlen = packet -> raw -> hlen;
 	memcpy (hto.haddr, packet -> raw -> chaddr, hto.hlen);
 
-	if (server_identifier.len)
-		memcpy (&from, server_identifier.iabuf, 4);
-	else
-		memset (&from, 0, 4);
+	from = packet -> interface -> primary_address;
 
 	/* Report what we're doing... */
 	note ("BOOTREPLY for %s to %s (%s) via %s",
@@ -288,3 +325,10 @@ void bootp (packet)
 	if (result < 0)
 		warn ("send_packet: %m");
 }
+
+void relay (ip, packet, length)
+	struct interface_info *ip;
+	struct dhcp_packet *packet;
+	int length;
+{
+}
diff --git a/server/bootp.c b/server/bootp.c
index 2703266d6..7564af4f5 100644
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bootp.c,v 1.23 1997/02/19 10:50:40 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bootp.c,v 1.24 1997/02/22 08:36:36 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -105,6 +105,18 @@ void bootp (packet)
 			}
 		}
 
+		if (host && (!host -> group -> allow_booting)) {
+			note ("Ignoring excluded BOOTP client %s",
+			      host -> name);
+			return;
+		}
+			
+		if (host && (!host -> group -> allow_bootp)) {
+			note ("Ignoring BOOTP request from client %s",
+			      host -> name);
+			return;
+		}
+			
 		/* If we've been told not to boot unknown clients,
 		   and we didn't find any host record for this client,
 		   ignore it. */
@@ -120,6 +132,20 @@ void bootp (packet)
 			return;
 		}
 
+		/* If we've been told not to boot with bootp on this
+		   network, ignore it. */
+		if (!host &&
+		    !(packet -> shared_network -> group -> allow_bootp)) {
+			note ("Ignoring BOOTP request from client %s via %s",
+			      print_hw_addr (packet -> raw -> htype,
+					     packet -> raw -> hlen,
+					     packet -> raw -> chaddr),
+			      packet -> raw -> giaddr.s_addr
+			      ? inet_ntoa (packet -> raw -> giaddr)
+			      : packet -> interface -> name);
+			return;
+		}
+
 		/* If the packet is from a host we don't know and there
 		   are no dynamic bootp addresses on the network it came
 		   in on, drop it on the floor. */
@@ -174,6 +200,20 @@ void bootp (packet)
 		goto lose;
 	}
 
+	/* Make sure we're allowed to boot this client. */
+	if (hp && (!hp -> group -> allow_booting)) {
+		note ("Ignoring excluded BOOTP client %s",
+		      hp -> name);
+		return;
+	}
+			
+	/* Make sure we're allowed to boot this client with bootp. */
+	if (hp && (!hp -> group -> allow_bootp)) {
+		note ("Ignoring BOOTP request from client %s",
+		      hp -> name);
+		return;
+	}
+			
 	/* Set up the outgoing packet... */
 	memset (&outgoing, 0, sizeof outgoing);
 	memset (&raw, 0, sizeof raw);
@@ -220,7 +260,7 @@ void bootp (packet)
 	else if (subnet -> interface_address.len)
 		memcpy (&raw.siaddr, subnet -> interface_address.iabuf, 4);
 	else
-		memcpy (&raw.siaddr, server_identifier.iabuf, 4);
+		raw.siaddr = packet -> interface -> primary_address;
 
 	raw.giaddr = packet -> raw -> giaddr;
 	if (hp -> group -> server_name) {
@@ -239,10 +279,7 @@ void bootp (packet)
 	hto.hlen = packet -> raw -> hlen;
 	memcpy (hto.haddr, packet -> raw -> chaddr, hto.hlen);
 
-	if (server_identifier.len)
-		memcpy (&from, server_identifier.iabuf, 4);
-	else
-		memset (&from, 0, 4);
+	from = packet -> interface -> primary_address;
 
 	/* Report what we're doing... */
 	note ("BOOTREPLY for %s to %s (%s) via %s",
@@ -288,3 +325,10 @@ void bootp (packet)
 	if (result < 0)
 		warn ("send_packet: %m");
 }
+
+void relay (ip, packet, length)
+	struct interface_info *ip;
+	struct dhcp_packet *packet;
+	int length;
+{
+}