From: Ted Lemon <source@isc.org>
Date: Sat, 6 Dec 1997 11:24:31 +0000 (+0000)
Subject: Don't use statmsg socket or handle network location notification in 2.0
X-Git-Tag: V2-BETA-1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d733e531e01f8097f61fea223b682729859a5b1;p=thirdparty%2Fdhcp.git

Don't use statmsg socket or handle network location notification in 2.0
---

diff --git a/client/dhclient.c b/client/dhclient.c
index c30368881..eb4d268f9 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -56,7 +56,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhclient.c,v 1.44 1997/12/06 04:02:35 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhclient.c,v 1.44.2.1 1997/12/06 11:24:31 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -231,9 +231,6 @@ int main (argc, argv, envp)
 	/* Set up the bootp packet handler... */
 	bootp_packet_handler = do_packet;
 
-	/* Start listening on the sysconf socket... */
-	sysconf_startup (status_message);
-
 	/* Start dispatching packets and timeouts... */
 	dispatch ();
 
@@ -2053,46 +2050,3 @@ void write_client_pid_file ()
 		fclose (pf);
 	}
 }
-
-void status_message (header, data)
-	struct sysconf_header *header;
-	void *data;
-{
-	switch (header -> type) {
-	      case NETWORK_LOCATION_CHANGED:
-		client_location_changed ();
-		break;
-
-	      default:
-		break;
-	}
-}
-
-void client_location_changed ()
-{
-	struct interface_info *ip;
-
-	for (ip = interfaces; ip; ip = ip -> next) {
-		switch (ip -> client -> state) {
-		      case S_SELECTING:
-			cancel_timeout (send_discover, ip);
-			break;
-
-		      case S_BOUND:
-			cancel_timeout (state_bound, ip);
-			break;
-
-		      case S_REBOOTING:
-		      case S_REQUESTING:
-		      case S_RENEWING:
-			cancel_timeout (send_request, ip);
-			break;
-
-		      case S_INIT:
-		      case S_REBINDING:
-			break;
-		}
-		ip -> client -> state = S_INIT;
-		state_reboot (ip);
-	}
-}