mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

Use interface_allocate to allocate command-line interfaces.

Browse Source
This commit is contained in:
Ted Lemon
2000-06-24 16:13:19 +00:00
parent 229a47a832
commit f3a05d7262
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
server/dhcpd.c
View File

@@ -43,7 +43,7 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhcpd.c,v 1.93 2000/06/24 06:28:27 mellon Exp $ Copyright 1995-2000 Internet Software Consortium.";
"$Id: dhcpd.c,v 1.94 2000/06/24 16:13:19 mellon Exp $ Copyright 1995-2000 Internet Software Consortium.";
#endif
static char copyright[] =
@@ -165,6 +165,20 @@ int main (argc, argv, envp)
int lose;
int omapi_port;
/* Set up the client classification system. */
classification_setup ();
/* Initialize the omapi system. */
result = omapi_init ();
if (result != ISC_R_SUCCESS)
log_fatal ("Can't initialize OMAPI: %s",
isc_result_totext (result));
/* Set up the OMAPI wrappers for various server database internal
objects. */
dhcp_db_objects_setup ();
dhcp_common_objects_setup ();
/* Initially, log errors to stderr as well as to syslogd. */
#ifdef SYSLOG_4_2
openlog ("dhcpd", LOG_NDELAY);
@@ -235,16 +249,20 @@ int main (argc, argv, envp)
usage ();
} else {
struct interface_info *tmp =
((struct interface_info *)
dmalloc (sizeof *tmp, MDL));
if (!tmp)
log_fatal ("Insufficient memory to %s %s",
"record interface", argv [i]);
memset (tmp, 0, sizeof *tmp);
(struct interface_info *)0;
result = interface_allocate (&tmp, MDL);
if (result != ISC_R_SUCCESS)
log_fatal ("Insufficient memory to %s %s: %s",
"record interface", argv [i],
isc_result_totext (result));
strcpy (tmp -> name, argv [i]);
tmp -> next = interfaces;
if (interfaces) {
interface_reference (&tmp -> next,
interfaces, MDL);
interface_dereference (&interfaces, MDL);
}
interface_reference (&interfaces, tmp, MDL);
tmp -> flags = INTERFACE_REQUESTED;
interfaces = tmp;
}
}
@@ -292,20 +310,6 @@ int main (argc, argv, envp)
/* Get the current time... */
GET_TIME (&cur_time);
/* Set up the client classification system. */
classification_setup ();
/* Initialize the omapi system. */
result = omapi_init ();
if (result != ISC_R_SUCCESS)
log_fatal ("Can't initialize OMAPI: %s",
isc_result_totext (result));
/* Set up the OMAPI wrappers for various server database internal
objects. */
dhcp_db_objects_setup ();
dhcp_common_objects_setup ();
/* Set up the initial dhcp option universe. */
initialize_common_option_spaces ();
initialize_server_option_spaces ();