Brad Bishop | c342db3 | 2019-05-15 21:57:59 -0400 | [diff] [blame] | 1 | From 8194daabfd590f17825f0c61e9534bee5c99cc86 Mon Sep 17 00:00:00 2001 |
| 2 | From: Thomas Markwalder <tmark@isc.org> |
| 3 | Date: Fri, 14 Sep 2018 13:41:41 -0400 |
| 4 | Subject: [master] Added includes of new BIND9 compatibility headers |
| 5 | |
| 6 | Merges in rt48072. |
| 7 | |
| 8 | Upstream-Status: Backport |
| 9 | Signed-off-by: Adrian Bunk <bunk@stusta.de> |
| 10 | |
| 11 | diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h |
| 12 | index 75a87ff6..538b927f 100644 |
| 13 | --- a/includes/omapip/isclib.h |
| 14 | +++ b/includes/omapip/isclib.h |
| 15 | @@ -48,6 +48,9 @@ |
| 16 | #include <string.h> |
| 17 | #include <netdb.h> |
| 18 | |
| 19 | +#include <isc/boolean.h> |
| 20 | +#include <isc/int.h> |
| 21 | + |
| 22 | #include <isc/buffer.h> |
| 23 | #include <isc/lex.h> |
| 24 | #include <isc/lib.h> |
| 25 | diff --git a/includes/omapip/result.h b/includes/omapip/result.h |
| 26 | index 91243e1b..860298f6 100644 |
| 27 | --- a/includes/omapip/result.h |
| 28 | +++ b/includes/omapip/result.h |
| 29 | @@ -26,6 +26,7 @@ |
| 30 | #ifndef DHCP_RESULT_H |
| 31 | #define DHCP_RESULT_H 1 |
| 32 | |
| 33 | +#include <isc/boolean.h> |
| 34 | #include <isc/lang.h> |
| 35 | #include <isc/resultclass.h> |
| 36 | #include <isc/types.h> |
| 37 | diff --git a/server/dhcpv6.c b/server/dhcpv6.c |
| 38 | index a7110f98..cde4f617 100644 |
| 39 | --- a/server/dhcpv6.c |
| 40 | +++ b/server/dhcpv6.c |
| 41 | @@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply, |
| 42 | shared_name, |
| 43 | inet_ntop(AF_INET6, &lease->addr, |
| 44 | tmp_addr, sizeof(tmp_addr)), |
| 45 | - used, count); |
| 46 | + (long long unsigned)(used), |
| 47 | + (long long unsigned)(count)); |
| 48 | } |
| 49 | return; |
| 50 | } |
| 51 | @@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply, |
| 52 | "address: %s; high threshold %d%% %llu/%llu.", |
| 53 | shared_name, |
| 54 | inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)), |
| 55 | - poolhigh, used, count); |
| 56 | + poolhigh, (long long unsigned)(used), |
| 57 | + (long long unsigned)(count)); |
| 58 | |
| 59 | /* handle the low threshold now, if we don't |
| 60 | * have one we default to 0. */ |
| 61 | @@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply) |
| 62 | log_debug("Unable to pick client address: " |
| 63 | "no addresses available - shared network %s: " |
| 64 | " 2^64-1 < total, %llu active, %llu abandoned", |
| 65 | - shared_name, active - abandoned, abandoned); |
| 66 | + shared_name, (long long unsigned)(active - abandoned), |
| 67 | + (long long unsigned)(abandoned)); |
| 68 | } else { |
| 69 | log_debug("Unable to pick client address: " |
| 70 | "no addresses available - shared network %s: " |
| 71 | "%llu total, %llu active, %llu abandoned", |
| 72 | - shared_name, total, active - abandoned, abandoned); |
| 73 | + shared_name, (long long unsigned)(total), |
| 74 | + (long long unsigned)(active - abandoned), |
| 75 | + (long long unsigned)(abandoned)); |
| 76 | } |
| 77 | |
| 78 | return ISC_R_NORESOURCES; |
| 79 | |