mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-03 15:56:00 +00:00
Code Issues Releases Wiki Activity

Clean up obsolete dregs.

Browse Source
This commit is contained in:
Ted Lemon
1999-03-16 05:55:40 +00:00
parent 981aa1cdc2
commit 2da7561f13
3 changed files with 2 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
includes/dhcpd.h
View File

@@ -47,7 +47,6 @@
#include "tree.h" #include "tree.h"
#include "hash.h" #include "hash.h"
#include "inet.h" #include "inet.h"
#include "sysconf.h"
#include "auth.h" #include "auth.h"
#if !defined (OPTION_HASH_SIZE) #if !defined (OPTION_HASH_SIZE)
@@ -683,36 +682,6 @@ struct dns_query {
int backoff; /* Current backoff, in seconds. */ int backoff; /* Current backoff, in seconds. */
}; };
struct interact_client; /* forward */
/* Actions that can be taken by an interactive connection to the dhcp server
or client. */
struct interact_actions {
void (*ls) PROTO ((struct interact_client *));
void (*print) PROTO ((struct interact_client *, char *));
void (*set) PROTO ((struct interact_client *, char *));
void (*rm) PROTO ((struct interact_client *, char *));
void (*cd) PROTO ((struct interact_client *, char *));
void (*cdup) PROTO ((struct interact_client *));
void * (*next) PROTO ((struct interact_client *, void *));
};
/* Interactive connection state. */
struct interact_client {
struct interact_client *next;
int fd;
struct interact_actions cur_node_actions;
void *cur_node;
int cur_node_classp;
int last_input;
struct protocol *proto;
char ibuf [1024];
int ibuflen;
};
/* Bitmask of dhcp option codes. */ /* Bitmask of dhcp option codes. */
typedef unsigned char option_mask [16]; typedef unsigned char option_mask [16];
@@ -1335,7 +1304,6 @@ int script_go PROTO ((struct client_state *));
struct client_lease *packet_to_lease PROTO ((struct packet *)); struct client_lease *packet_to_lease PROTO ((struct packet *));
void go_daemon PROTO ((void)); void go_daemon PROTO ((void));
void write_client_pid_file PROTO ((void)); void write_client_pid_file PROTO ((void));
void status_message PROTO ((struct sysconf_header *, void *));
void client_location_changed PROTO ((void)); void client_location_changed PROTO ((void));
/* db.c */ /* db.c */
@@ -1461,20 +1429,6 @@ struct name_server *first_name_server PROTO ((void));
int inet_aton PROTO ((const char *, struct in_addr *)); int inet_aton PROTO ((const char *, struct in_addr *));
#endif #endif
/* sysconf.c */
void sysconf_startup PROTO ((void (*) (struct sysconf_header *, void *)));
void sysconf_restart PROTO ((void *));
void sysconf_message PROTO ((struct protocol *proto));
/* interact.c */
void interact_startup PROTO ((void));
void new_interact_connection PROTO ((struct protocol *));
void interact_client_input PROTO ((struct protocol *));
int interact_client_write PROTO ((struct interact_client *, char *, int));
/* dhcpdi.c */
extern struct interact_actions top_level_actions;
/* class.c */ /* class.c */
extern int have_billing_classes; extern int have_billing_classes;
struct class unknown_class; struct class unknown_class;

2
server/Makefile.dist
View File

@@ -19,7 +19,7 @@
CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5 CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c SRCS = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c
OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o dhcpdi.o class.o failover.o OBJS = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o
PROG = dhcpd PROG = dhcpd
MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5 MAN = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5

5
server/dhcpd.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = static char ocopyright[] =
"$Id: dhcpd.c,v 1.59 1999/03/16 05:50:44 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium."; "$Id: dhcpd.c,v 1.60 1999/03/16 05:55:40 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
#endif #endif
static char copyright[] = static char copyright[] =
@@ -184,9 +184,6 @@ int main (argc, argv, envp)
dns_startup (); dns_startup ();
#endif #endif
/* Start the interactive client listener. */
interact_startup ();
/* Set up the client classification system. */ /* Set up the client classification system. */
classification_setup (); classification_setup ();