diff options
| -rw-r--r-- | usr.sbin/dhcrelay/dhcpd.h | 3 | ||||
| -rw-r--r-- | usr.sbin/dhcrelay/dhcrelay.c | 3 | ||||
| -rw-r--r-- | usr.sbin/dhcrelay/tree.h | 107 |
3 files changed, 2 insertions, 111 deletions
diff --git a/usr.sbin/dhcrelay/dhcpd.h b/usr.sbin/dhcrelay/dhcpd.h index d631befe56c..b75c6f7c380 100644 --- a/usr.sbin/dhcrelay/dhcpd.h +++ b/usr.sbin/dhcrelay/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.2 2004/04/13 01:22:30 henning Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.3 2004/04/20 03:52:36 deraadt Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -72,7 +72,6 @@ #include <unistd.h> #include "dhcp.h" -#include "tree.h" #define LOCAL_PORT 68 #define REMOTE_PORT 67 diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c index 01c802319e1..6e5e7adbd58 100644 --- a/usr.sbin/dhcrelay/dhcrelay.c +++ b/usr.sbin/dhcrelay/dhcrelay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcrelay.c,v 1.14 2004/04/15 00:36:37 henning Exp $ */ +/* $OpenBSD: dhcrelay.c,v 1.15 2004/04/20 03:52:36 deraadt Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org> @@ -49,7 +49,6 @@ char *print_hw_addr(int, int, unsigned char *); time_t cur_time; time_t default_lease_time = 43200; /* 12 hours... */ time_t max_lease_time = 86400; /* 24 hours... */ -struct tree_cache *global_options [256]; int log_perror = 1; diff --git a/usr.sbin/dhcrelay/tree.h b/usr.sbin/dhcrelay/tree.h deleted file mode 100644 index a17c8888870..00000000000 --- a/usr.sbin/dhcrelay/tree.h +++ /dev/null @@ -1,107 +0,0 @@ -/* $OpenBSD: tree.h,v 1.1 2004/04/12 21:10:28 henning Exp $ */ - -/* Definitions for address trees... */ - -/* - * Copyright (c) 1995 The Internet Software Consortium. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of The Internet Software Consortium nor the names - * of its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM AND - * CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * This software has been written for the Internet Software Consortium - * by Ted Lemon <mellon@fugue.com> in cooperation with Vixie - * Enterprises. To learn more about the Internet Software Consortium, - * see ``http://www.vix.com/isc''. To learn more about Vixie - * Enterprises, see ``http://www.vix.com''. - */ - -/* A pair of pointers, suitable for making a linked list. */ -typedef struct _pair { - caddr_t car; - struct _pair *cdr; -} *pair; - -/* Tree node types... */ -#define TREE_CONCAT 1 -#define TREE_HOST_LOOKUP 2 -#define TREE_CONST 3 -#define TREE_LIMIT 4 - -/* Tree structure for deferred evaluation of changing values. */ -struct tree { - int op; - union { - struct concat { - struct tree *left; - struct tree *right; - } concat; - struct host_lookup { - struct dns_host_entry *host; - } host_lookup; - struct const_val { - unsigned char *data; - int len; - } const_val; - struct limit { - struct tree *tree; - int limit; - } limit; - } data; -}; - -/* DNS host entry structure... */ -struct dns_host_entry { - char *hostname; - unsigned char *data; - int data_len; - int buf_len; - time_t timeout; -}; - -struct tree_cache { - unsigned char *value; - int len; - int buf_size; - time_t timeout; - struct tree *tree; - int flags; -#define TC_AWAITING_RESOLUTION 1 -#define TC_TEMPORARY 2 -}; - -struct universe { - char *name; - struct hash_table *hash; - struct option *options[256]; -}; - -struct option { - char *name; - char *format; - struct universe *universe; - unsigned char code; -}; |