[src/netbsd-1-5]: src/usr.sbin/dhcp/includes Pull up revision 1.19 (requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0c0b056bef8a
branches:  netbsd-1-5
changeset: 491268:0c0b056bef8a
user:      he <he%NetBSD.org@localhost>
date:      Sat Apr 21 19:42:41 2001 +0000

description:
Pull up revision 1.19 (requested by mellon):
  Fix various bugs:
   - PR#11081 (dhclient loops if interface is unplugged)
   - PR#12065 (/etc/resolv.conf corrupted during DHCP lease renewal)
   - PR#9709 (same as 11081)
   - PR#11080 (dhclient -w doesn't work)
   - PR#9657 (dhclient requires writable lease file)

diffstat:

 usr.sbin/dhcp/includes/dhcpd.h |  39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diffs (77 lines):

diff -r b7a959c195c1 -r 0c0b056bef8a usr.sbin/dhcp/includes/dhcpd.h
--- a/usr.sbin/dhcp/includes/dhcpd.h    Sat Apr 21 19:42:23 2001 +0000
+++ b/usr.sbin/dhcp/includes/dhcpd.h    Sat Apr 21 19:42:41 2001 +0000
@@ -625,7 +625,8 @@
        S_REQUESTING = 4, 
        S_BOUND = 5,
        S_RENEWING = 6,
-       S_REBINDING = 7
+       S_REBINDING = 7,
+       S_STOPPED = 8
 };
 
 /* Authentication and BOOTP policy possibilities (not all values work
@@ -1650,6 +1651,7 @@
 extern int (*dhcp_interface_setup_hook) (struct interface_info *,
                                         struct iaddr *);
 extern int (*dhcp_interface_discovery_hook) (struct interface_info *);
+isc_result_t (*dhcp_interface_startup_hook) (struct interface_info *);
 
 extern void (*bootp_packet_handler) PROTO ((struct interface_info *,
                                            struct dhcp_packet *, unsigned,
@@ -1811,6 +1813,7 @@
 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 *);
 
 /* db.c */
 int write_lease PROTO ((struct lease *));
@@ -2182,6 +2185,24 @@
                                omapi_object_t *);
 isc_result_t dhcp_class_remove (omapi_object_t *,
                                omapi_object_t *);
+isc_result_t dhcp_subclass_set_value  (omapi_object_t *, omapi_object_t *,
+                                      omapi_data_string_t *,
+                                      omapi_typed_data_t *);
+isc_result_t dhcp_subclass_get_value (omapi_object_t *, omapi_object_t *,
+                                     omapi_data_string_t *,
+                                     omapi_value_t **); 
+isc_result_t dhcp_subclass_destroy (omapi_object_t *, const char *, int);
+isc_result_t dhcp_subclass_signal_handler (omapi_object_t *,
+                                          const char *, va_list);
+isc_result_t dhcp_subclass_stuff_values (omapi_object_t *,
+                                        omapi_object_t *,
+                                        omapi_object_t *);
+isc_result_t dhcp_subclass_lookup (omapi_object_t **,
+                                  omapi_object_t *, omapi_object_t *);
+isc_result_t dhcp_subclass_create (omapi_object_t **,
+                                  omapi_object_t *);
+isc_result_t dhcp_subclass_remove (omapi_object_t *,
+                                  omapi_object_t *);
 isc_result_t dhcp_shared_network_set_value  (omapi_object_t *,
                                             omapi_object_t *,
                                             omapi_data_string_t *,
@@ -2215,22 +2236,6 @@
                                 omapi_object_t *, omapi_object_t *);
 isc_result_t dhcp_subnet_create (omapi_object_t **,
                                 omapi_object_t *);
-isc_result_t dhcp_class_set_value  (omapi_object_t *, omapi_object_t *,
-                                   omapi_data_string_t *,
-                                   omapi_typed_data_t *);
-isc_result_t dhcp_class_get_value (omapi_object_t *, omapi_object_t *,
-                                  omapi_data_string_t *,
-                                  omapi_value_t **); 
-isc_result_t dhcp_class_destroy (omapi_object_t *, const char *, int);
-isc_result_t dhcp_class_signal_handler (omapi_object_t *,
-                                       const char *, va_list);
-isc_result_t dhcp_class_stuff_values (omapi_object_t *,
-                                     omapi_object_t *,
-                                     omapi_object_t *);
-isc_result_t dhcp_class_lookup (omapi_object_t **,
-                               omapi_object_t *, omapi_object_t *);
-isc_result_t dhcp_class_create (omapi_object_t **,
-                               omapi_object_t *);
 isc_result_t dhcp_interface_set_value (omapi_object_t *,
                                       omapi_object_t *,
                                       omapi_data_string_t *,