diff options
| author | Thomas Markwalder <tmark@isc.org> | 2016-03-04 14:16:29 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2016-03-04 14:16:29 -0500 |
| commit | cc1bd34e09bad3313a16d89f7ad491ff16754dc7 (patch) | |
| tree | aefafa2e9b960601a4071c684b1dc58905be90d3 /includes/dhcpd.h | |
| parent | 7f4e6f97789799a76aa0b8b5ffab39042bcbff5e (diff) | |
| download | isc-dhcp-cc1bd34e09bad3313a16d89f7ad491ff16754dc7.tar.gz | |
[master] Added lease-id-format to server and client
Merges in rt26378
Diffstat (limited to 'includes/dhcpd.h')
| -rw-r--r-- | includes/dhcpd.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 4b3001a8..d1497928 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -1243,6 +1243,9 @@ struct client_config { int do_forward_update; /* If nonzero, and if we have the information we need, update the A record for the address we get. */ + + int lease_id_format; /* format for IDs in lease file, + TOKEN_OCTAL or TOKEN_HEX */ }; /* Per-interface state used in the dhcp client... */ @@ -2065,6 +2068,7 @@ extern int server_id_check; extern int prefix_length_mode; extern int authoring_byte_order; +extern int lease_id_format; extern const char *path_dhcpd_conf; extern const char *path_dhcpd_db; @@ -2089,6 +2093,7 @@ extern enum dhcp_shutdown_state shutdown_state; isc_result_t dhcp_io_shutdown (omapi_object_t *, void *); isc_result_t dhcp_set_control_state (control_object_state_t oldstate, control_object_state_t newstate); + #if defined (DEBUG_MEMORY_LEAKAGE_ON_EXIT) void relinquish_ackqueue(void); #endif @@ -2532,13 +2537,13 @@ int binding_scope_reference (struct binding_scope **, int dns_zone_allocate (struct dns_zone **, const char *, int); int dns_zone_reference (struct dns_zone **, struct dns_zone *, const char *, int); - /* print.c */ #define DEFAULT_TIME_FORMAT 0 #define LOCAL_TIME_FORMAT 1 extern int db_time_format; char *quotify_string (const char *, const char *, int); -char *quotify_buf (const unsigned char *, unsigned, const char *, int); +char *quotify_buf (const unsigned char *, unsigned, const char, + const char *, int); char *print_base64 (const unsigned char *, unsigned, const char *, int); char *print_hw_addr (const int, const int, const unsigned char *); void print_lease (struct lease *); @@ -2572,7 +2577,10 @@ void print_dns_status (int, struct dhcp_ddns_cb *, isc_result_t); const char *print_time(TIME); void get_hw_addr(const char *name, struct hardware *hw); - +char *buf_to_hex (const unsigned char *s, unsigned len, + const char *file, int line); +char *format_lease_id(const unsigned char *s, unsigned len, int format, + const char *file, int line); /* socket.c */ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \ || defined (USE_SOCKET_FALLBACK) |