|
 |
632e5b |
From ffb24c0bbd4d6f2b4718a1a8f4f2da237cc6ed66 Mon Sep 17 00:00:00 2001
|
|
|
632e5b |
From: Thomas Markwalder <tmark@isc.org>
|
|
|
632e5b |
Date: Fri, 14 Sep 2018 13:41:41 -0400
|
|
|
632e5b |
Subject: [PATCH] [master] Added includes of new BIND9 compatibility headers,
|
|
|
632e5b |
updated util/bind.sh
|
|
|
632e5b |
|
|
|
632e5b |
Merges in rt48072.
|
|
|
632e5b |
|
|
|
632e5b |
(cherry picked from commit 8194daabfd590f17825f0c61e9534bee5c99cc86)
|
|
|
632e5b |
---
|
|
|
632e5b |
includes/omapip/isclib.h | 3 +++
|
|
|
632e5b |
includes/omapip/result.h | 1 +
|
|
|
632e5b |
server/dhcpv6.c | 13 +++++++++----
|
|
|
632e5b |
3 files changed, 13 insertions(+), 4 deletions(-)
|
|
|
632e5b |
|
|
|
632e5b |
diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
|
|
|
632e5b |
index e2963089..fa5d9ad3 100644
|
|
|
632e5b |
--- a/includes/omapip/isclib.h
|
|
|
632e5b |
+++ b/includes/omapip/isclib.h
|
|
|
632e5b |
@@ -48,6 +48,9 @@
|
|
|
632e5b |
#include <string.h>
|
|
|
632e5b |
#include <netdb.h>
|
|
|
632e5b |
|
|
|
632e5b |
+#include <isc/boolean.h>
|
|
|
632e5b |
+#include <isc/int.h>
|
|
|
632e5b |
+
|
|
|
632e5b |
#include <isc/buffer.h>
|
|
|
632e5b |
#include <isc/lex.h>
|
|
|
632e5b |
#include <isc/lib.h>
|
|
|
632e5b |
diff --git a/includes/omapip/result.h b/includes/omapip/result.h
|
|
|
632e5b |
index ae5f7d6a..9c1fab23 100644
|
|
|
632e5b |
--- a/includes/omapip/result.h
|
|
|
632e5b |
+++ b/includes/omapip/result.h
|
|
|
632e5b |
@@ -26,6 +26,7 @@
|
|
|
632e5b |
#ifndef DHCP_RESULT_H
|
|
|
632e5b |
#define DHCP_RESULT_H 1
|
|
|
632e5b |
|
|
|
632e5b |
+#include <isc/boolean.h>
|
|
|
632e5b |
#include <isc/lang.h>
|
|
|
632e5b |
#include <isc/resultclass.h>
|
|
|
632e5b |
#include <isc/types.h>
|
|
|
632e5b |
diff --git a/server/dhcpv6.c b/server/dhcpv6.c
|
|
|
632e5b |
index 74487667..1a6ff241 100644
|
|
|
632e5b |
--- a/server/dhcpv6.c
|
|
|
632e5b |
+++ b/server/dhcpv6.c
|
|
|
632e5b |
@@ -1003,7 +1003,8 @@ void check_pool6_threshold(struct reply_state *reply,
|
|
|
632e5b |
shared_name,
|
|
|
632e5b |
inet_ntop(AF_INET6, &lease->addr,
|
|
|
632e5b |
tmp_addr, sizeof(tmp_addr)),
|
|
|
632e5b |
- used, count);
|
|
|
632e5b |
+ (long long unsigned)(used),
|
|
|
632e5b |
+ (long long unsigned)(count));
|
|
|
632e5b |
}
|
|
|
632e5b |
return;
|
|
|
632e5b |
}
|
|
|
632e5b |
@@ -1035,7 +1036,8 @@ void check_pool6_threshold(struct reply_state *reply,
|
|
|
632e5b |
"address: %s; high threshold %d%% %llu/%llu.",
|
|
|
632e5b |
shared_name,
|
|
|
632e5b |
inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
|
|
|
632e5b |
- poolhigh, used, count);
|
|
|
632e5b |
+ poolhigh, (long long unsigned)(used),
|
|
|
632e5b |
+ (long long unsigned)(count));
|
|
|
632e5b |
|
|
|
632e5b |
/* handle the low threshold now, if we don't
|
|
|
632e5b |
* have one we default to 0. */
|
|
|
632e5b |
@@ -1383,12 +1385,15 @@ pick_v6_address(struct reply_state *reply)
|
|
|
632e5b |
log_debug("Unable to pick client address: "
|
|
|
632e5b |
"no addresses available - shared network %s: "
|
|
|
632e5b |
" 2^64-1 < total, %llu active, %llu abandoned",
|
|
|
632e5b |
- shared_name, active - abandoned, abandoned);
|
|
|
632e5b |
+ shared_name, (long long unsigned)(active - abandoned),
|
|
|
632e5b |
+ (long long unsigned)(abandoned));
|
|
|
632e5b |
} else {
|
|
|
632e5b |
log_debug("Unable to pick client address: "
|
|
|
632e5b |
"no addresses available - shared network %s: "
|
|
|
632e5b |
"%llu total, %llu active, %llu abandoned",
|
|
|
632e5b |
- shared_name, total, active - abandoned, abandoned);
|
|
|
632e5b |
+ shared_name, (long long unsigned)(total),
|
|
|
632e5b |
+ (long long unsigned)(active - abandoned),
|
|
|
632e5b |
+ (long long unsigned)(abandoned));
|
|
|
632e5b |
}
|
|
|
632e5b |
|
|
|
632e5b |
return ISC_R_NORESOURCES;
|
|
|
632e5b |
--
|
|
|
632e5b |
2.14.5
|