summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2015-06-15 15:19:42 -0400
committerThomas Markwalder <tmark@isc.org>2015-06-15 15:19:42 -0400
commite422b8c78f8cb22ada4675ce9bb0372d739a0013 (patch)
tree41c37b82dd119b9c164b727894ecaeb0ff1e5453 /includes
parent3933e2aa5183d4602c4fffee4f2ae0d9ca25df99 (diff)
downloadisc-dhcp-e422b8c78f8cb22ada4675ce9bb0372d739a0013.tar.gz
[master] Delayed-ack now works correctly with failover
Merges in 31474.
Diffstat (limited to 'includes')
-rw-r--r--includes/dhcpd.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 2a43229f..378459b9 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -2313,9 +2313,7 @@ void ack_lease (struct packet *, struct lease *,
unsigned int, TIME, char *, int, struct host_decl *);
void echo_client_id(struct packet*, struct lease*, struct option_state*,
struct option_state*);
-void delayed_ack_enqueue(struct lease *);
-void commit_leases_readerdry(void *);
-void flush_ackqueue(void *);
+
void dhcp_reply (struct lease *);
int find_lease (struct lease **, struct packet *,
struct shared_network *, int *, int *, struct lease *,
@@ -2953,7 +2951,6 @@ isc_result_t write_named_billing_class(const void *, unsigned, void *);
void write_billing_classes (void);
int write_billing_class (struct class *);
void commit_leases_timeout (void *);
-void commit_leases_readerdry(void *);
int commit_leases (void);
int commit_leases_timed (void);
void db_startup (int);