aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/isc-dhcp/includes
diff options
context:
space:
mode:
authorMurray Stokely <murray@FreeBSD.org>2002-04-01 07:54:44 +0000
committerMurray Stokely <murray@FreeBSD.org>2002-04-01 07:54:44 +0000
commit33075c330b0eaa2f7c5b223aeb32a262a3b78c9d (patch)
treedc453635e10392b086bc6d179ba3e703cf584ce2 /contrib/isc-dhcp/includes
parentce99b771f886a2c842db7aa803c9a5a5918f42c8 (diff)
downloadsrc-33075c330b0eaa2f7c5b223aeb32a262a3b78c9d.tar.gz
src-33075c330b0eaa2f7c5b223aeb32a262a3b78c9d.zip
Import ISC DHCP 3.0.1 RC8 client.
Notes
Notes: svn path=/vendor/isc-dhcp/dist/; revision=93507
Diffstat (limited to 'contrib/isc-dhcp/includes')
-rw-r--r--contrib/isc-dhcp/includes/dhcpd.h15
-rw-r--r--contrib/isc-dhcp/includes/dhctoken.h7
-rw-r--r--contrib/isc-dhcp/includes/minires/minires.h7
-rw-r--r--contrib/isc-dhcp/includes/site.h5
-rw-r--r--contrib/isc-dhcp/includes/version.h2
5 files changed, 27 insertions, 9 deletions
diff --git a/contrib/isc-dhcp/includes/dhcpd.h b/contrib/isc-dhcp/includes/dhcpd.h
index dc76d0e8ff73..155d3bf9a2e8 100644
--- a/contrib/isc-dhcp/includes/dhcpd.h
+++ b/contrib/isc-dhcp/includes/dhcpd.h
@@ -272,8 +272,7 @@ typedef enum {
FTS_ABANDONED = 5,
FTS_RESET = 6,
FTS_BACKUP = 7,
- FTS_RESERVED = 8,
- FTS_BOOTP = 9
+ FTS_LAST = 8
} binding_state_t;
/* A dhcp lease declaration structure. */
@@ -304,16 +303,19 @@ struct lease {
u_int8_t flags;
# define STATIC_LEASE 1
+# define BOOTP_LEASE 2
# define PERSISTENT_FLAGS (ON_ACK_QUEUE | ON_UPDATE_QUEUE)
# define MS_NULL_TERMINATION 8
# define ON_UPDATE_QUEUE 16
# define ON_ACK_QUEUE 32
# define UNICAST_BROADCAST_HACK 64
+# define ON_DEFERRED_QUEUE 128
# define EPHEMERAL_FLAGS (MS_NULL_TERMINATION | \
UNICAST_BROADCAST_HACK)
binding_state_t __attribute__ ((mode (__byte__))) binding_state;
binding_state_t __attribute__ ((mode (__byte__))) next_binding_state;
+ binding_state_t __attribute__ ((mode (__byte__))) desired_binding_state;
struct lease_state *state;
@@ -415,6 +417,7 @@ struct lease_state {
#define SV_PING_CHECKS 42
#define SV_UPDATE_STATIC_LEASES 43
#define SV_LOG_FACILITY 44
+#define SV_DO_FORWARD_UPDATES 45
#if !defined (DEFAULT_DEFAULT_LEASE_TIME)
# define DEFAULT_DEFAULT_LEASE_TIME 43200
@@ -717,6 +720,9 @@ struct client_config {
int omapi_port; /* port on which to accept OMAPI
connections, or -1 for no
listener. */
+ int do_forward_update; /* If nonzero, and if we have the
+ information we need, update the
+ A record for the address we get. */
};
/* Per-interface state used in the dhcp client... */
@@ -737,6 +743,7 @@ struct client_state {
u_int16_t secs; /* secs value from DHCPDISCOVER. */
TIME first_sending; /* When was first copy sent? */
TIME interval; /* What's the current resend interval? */
+ int dns_update_timeout; /* Last timeout set for DNS update. */
struct string_list *medium; /* Last media type tried. */
struct dhcp_packet packet; /* Outgoing DHCP packet. */
unsigned packet_length; /* Actual length of generated packet. */
@@ -1891,7 +1898,8 @@ void do_release PROTO ((struct client_state *));
int dhclient_interface_shutdown_hook (struct interface_info *);
int dhclient_interface_discovery_hook (struct interface_info *);
isc_result_t dhclient_interface_startup_hook (struct interface_info *);
-void client_dns_update (struct client_state *client, int);
+void client_dns_update_timeout (void *cp);
+isc_result_t client_dns_update (struct client_state *client, int, int);
/* db.c */
int write_lease PROTO ((struct lease *));
@@ -1904,6 +1912,7 @@ int db_printable_len PROTO ((const unsigned char *, unsigned));
void write_named_billing_class (const char *, unsigned, struct class *);
void write_billing_classes (void);
int write_billing_class PROTO ((struct class *));
+void commit_leases_timeout PROTO ((void *));
int commit_leases PROTO ((void));
void db_startup PROTO ((int));
int new_lease_file PROTO ((void));
diff --git a/contrib/isc-dhcp/includes/dhctoken.h b/contrib/isc-dhcp/includes/dhctoken.h
index 876d8f396179..5ef84e1453df 100644
--- a/contrib/isc-dhcp/includes/dhctoken.h
+++ b/contrib/isc-dhcp/includes/dhctoken.h
@@ -3,7 +3,7 @@
Tokens for config file lexer and parser. */
/*
- * Copyright (c) 1996-1999 Internet Software Consortium.
+ * Copyright (c) 1996-2002 Internet Software Consortium.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -315,10 +315,11 @@ enum dhcp_token {
CONNECT = 610,
REMOVE = 611,
REFRESH = 612,
- DOMAIN_NAME = 613
+ DOMAIN_NAME = 613,
+ DO_FORWARD_UPDATE = 614
};
#define is_identifier(x) ((x) >= FIRST_TOKEN && \
(x) != STRING && \
(x) != NUMBER && \
- (x) != EOF)
+ (x) != END_OF_FILE)
diff --git a/contrib/isc-dhcp/includes/minires/minires.h b/contrib/isc-dhcp/includes/minires/minires.h
index 2a6a1336ffcb..1158f0631b3a 100644
--- a/contrib/isc-dhcp/includes/minires/minires.h
+++ b/contrib/isc-dhcp/includes/minires/minires.h
@@ -18,6 +18,8 @@
#include "cdefs.h"
#include "osdep.h"
+#define _ns_flagdata MR_ns_flagdata
+
#include "minires/resolv.h"
#include "minires/res_update.h"
#include "isc-dhcp/result.h"
@@ -151,7 +153,7 @@ isc_result_t res_nmkquery (res_state, int, const char *, ns_class, ns_type,
const unsigned char *, unsigned,
const unsigned char *, double *,
unsigned, unsigned *);
-int ns_initparse (const unsigned char *, unsigned, ns_msg *);
+isc_result_t ns_initparse (const unsigned char *, unsigned, ns_msg *);
isc_result_t res_nquery(res_state, const char *,
ns_class, ns_type, double *, unsigned, unsigned *);
isc_result_t res_nsearch(res_state, const char *,
@@ -161,7 +163,8 @@ isc_result_t res_nquerydomain(res_state, const char *, const char *,
ns_class class, ns_type type,
double *, unsigned, unsigned *);
-int ns_skiprr(const unsigned char *, const unsigned char *, ns_sect, int);
+isc_result_t ns_skiprr(const unsigned char *,
+ const unsigned char *, ns_sect, int, int *);
int dn_skipname (const unsigned char *, const unsigned char *);
u_int32_t getULong (const unsigned char *);
int32_t getLong (const unsigned char *);
diff --git a/contrib/isc-dhcp/includes/site.h b/contrib/isc-dhcp/includes/site.h
index d103ef09b30a..bc8ca465f969 100644
--- a/contrib/isc-dhcp/includes/site.h
+++ b/contrib/isc-dhcp/includes/site.h
@@ -86,6 +86,11 @@
/* #define DEBUG_FAILOVER_TIMING */
+/* Define this if you want all leases written to the lease file, even if
+ they are free leases that have never been used. */
+
+#define DEBUG_DUMP_ALL_LEASES
+
/* Define this if you want DHCP failover protocol support in the DHCP
server. */
diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h
index 919ddc76137d..91c875f328a8 100644
--- a/contrib/isc-dhcp/includes/version.h
+++ b/contrib/isc-dhcp/includes/version.h
@@ -1,3 +1,3 @@
/* Current version of ISC DHCP Distribution. */
-#define DHCP_VERSION "V3.0.1rc6"
+#define DHCP_VERSION "V3.0.1rc8"