mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 06:45:27 +00:00
Code Issues Releases Wiki Activity

Add persist flag to stop the client from exiting if no interfaces are found.

Browse Source
This commit is contained in:
Ted Lemon
2000-05-01 17:15:23 +00:00
parent 36cbbce63e
commit 134ceef89f
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/dhclient.c
View File

@@ -41,7 +41,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = static char ocopyright[] =
"$Id: dhclient.c,v 1.100 2000/04/04 06:24:37 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: dhclient.c,v 1.101 2000/05/01 17:15:23 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -103,6 +103,7 @@ int main (argc, argv, envp)
int release_mode = 0; int release_mode = 0;
omapi_object_t *listener; omapi_object_t *listener;
isc_result_t result; isc_result_t result;
int persist = 0;
#ifdef SYSLOG_4_2 #ifdef SYSLOG_4_2
openlog ("dhclient", LOG_NDELAY); openlog ("dhclient", LOG_NDELAY);
@@ -154,7 +155,10 @@ int main (argc, argv, envp)
relay = argv [i]; relay = argv [i];
} else if (!strcmp (argv [i], "-n")) { } else if (!strcmp (argv [i], "-n")) {
/* do not start up any interfaces */ /* do not start up any interfaces */
interfaces_requested = 1; interfaces_requested = 1;
} else if (!strcmp (argv [i], "-w")) {
/* do not exit if there are no broadcast interfaces. */
persist = 1;
} else if (argv [i][0] == '-') { } else if (argv [i][0] == '-') {
usage (); usage ();
} else { } else {
@@ -283,14 +287,19 @@ int main (argc, argv, envp)
/* If no broadcast interfaces were discovered, call the script /* If no broadcast interfaces were discovered, call the script
and tell it so. */ and tell it so. */
if (!interfaces) { if (!interfaces) {
/* Call dhclient-script with the NBI flag, in case somebody
cares. */
script_init ((struct client_state *)0, "NBI", script_init ((struct client_state *)0, "NBI",
(struct string_list *)0); (struct string_list *)0);
script_go ((struct client_state *)0); script_go ((struct client_state *)0);
log_info ("No broadcast interfaces found - exiting."); /* If we haven't been asked to persist, waiting for new
interfaces, then just exit. */
/* Nothing more to do. */ if (!persist) {
exit (0); /* Nothing more to do. */
log_info ("No broadcast interfaces found - exiting.");
exit (0);
}
} else if (!release_mode) { } else if (!release_mode) {
/* Call the script with the list of interfaces. */ /* Call the script with the list of interfaces. */
for (ip = interfaces; ip; ip = ip -> next) { for (ip = interfaces; ip; ip = ip -> next) {