From: Ted Lemon <source@isc.org>
Date: Mon, 21 Dec 1998 04:21:30 +0000 (+0000)
Subject: Generalize fallback support.
X-Git-Tag: V2-BETA-1-PATCH-7~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4403fdedb703375ff8833505b980d3a26358b710;p=thirdparty%2Fdhcp.git

Generalize fallback support.
---

diff --git a/server/bootp.c b/server/bootp.c
index 8f0591259..3bbb88ab9 100644
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bootp.c,v 1.28.2.1 1998/06/29 22:14:11 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bootp.c,v 1.28.2.2 1998/12/21 04:21:30 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -323,15 +323,15 @@ void bootp (packet)
 		to.sin_addr = raw.giaddr;
 		to.sin_port = local_port;
 
-#ifdef USE_FALLBACK
-		result = send_fallback (&fallback_interface,
-					(struct packet *)0,
-					&raw, outgoing.packet_length,
-					from, &to, &hto);
-		if (result < 0)
-			warn ("send_fallback: %m");
-		return;
-#endif
+		if (fallback_interface) {
+			result = send_packet (fallback_interface,
+					      (struct packet *)0,
+					      &raw, outgoing.packet_length,
+					      from, &to, &hto);
+			if (result < 0)
+				warn ("send_packet: %m");
+			return;
+		}
 	/* Otherwise, broadcast it on the local network. */
 	} else {
 		to.sin_addr.s_addr = INADDR_BROADCAST;
diff --git a/server/dhcpd.c b/server/dhcpd.c
index 7a589c7eb..929300d8d 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.45.2.4 1998/07/10 23:23:19 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.45.2.5 1998/12/21 04:20:47 mellon Exp $ Copyright 1995, 1996, 1997, 1998 The Internet Software Consortium.";
 #endif
 
 static char copyright[] =
@@ -60,10 +60,6 @@ struct group root_group;
 struct iaddr server_identifier;
 int server_identifier_matched;
 
-#ifdef USE_FALLBACK
-struct interface_info fallback_interface;
-#endif
-
 u_int16_t local_port;
 u_int16_t remote_port;