git.libre-soc.org Git - buildroot.git/blob

   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: [PATCH] [master] Added includes of new BIND9 compatibility headers,
   5  updated util/bind.sh
   6
   7     Merges in rt48072.
   8 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
   9 [Retrieved (and updated to remvove bind.sh update) from:
  10 https://gitlab.isc.org/isc-projects/dhcp/commit/8194daabfd590f17825f0c61e9534bee5c99cc86]
  11 ---
  12  includes/omapip/isclib.h |  3 +++
  13  includes/omapip/result.h |  1 +
  14  server/dhcpv6.c          | 13 +++++++++----
  15  3 files changed, 39 insertions(+), 12 deletions(-)
  16
  17 diff --git a/includes/omapip/isclib.h b/includes/omapip/isclib.h
  18 index 75a87ff6..538b927f 100644
  19 --- a/includes/omapip/isclib.h
  20 +++ b/includes/omapip/isclib.h
  21 @@ -48,6 +48,9 @@
  22  #include <string.h>
  23  #include <netdb.h>
  24
  25 +#include <isc/boolean.h>
  26 +#include <isc/int.h>
  27 +
  28  #include <isc/buffer.h>
  29  #include <isc/lex.h>
  30  #include <isc/lib.h>
  31 diff --git a/includes/omapip/result.h b/includes/omapip/result.h
  32 index 91243e1b..860298f6 100644
  33 --- a/includes/omapip/result.h
  34 +++ b/includes/omapip/result.h
  35 @@ -26,6 +26,7 @@
  36  #ifndef DHCP_RESULT_H
  37  #define DHCP_RESULT_H 1
  38
  39 +#include <isc/boolean.h>
  40  #include <isc/lang.h>
  41  #include <isc/resultclass.h>
  42  #include <isc/types.h>
  43 diff --git a/server/dhcpv6.c b/server/dhcpv6.c
  44 index a7110f98..cde4f617 100644
  45 --- a/server/dhcpv6.c
  46 +++ b/server/dhcpv6.c
  47 @@ -1034,7 +1034,8 @@ void check_pool6_threshold(struct reply_state *reply,
  48                                   shared_name,
  49                                   inet_ntop(AF_INET6, &lease->addr,
  50                                             tmp_addr, sizeof(tmp_addr)),
  51 -                                 used, count);
  52 +                                 (long long unsigned)(used),
  53 +                                 (long long unsigned)(count));
  54                 }
  55                 return;
  56         }
  57 @@ -1066,7 +1067,8 @@ void check_pool6_threshold(struct reply_state *reply,
  58                   "address: %s; high threshold %d%% %llu/%llu.",
  59                   shared_name,
  60                   inet_ntop(AF_INET6, &lease->addr, tmp_addr, sizeof(tmp_addr)),
  61 -                 poolhigh, used, count);
  62 +                 poolhigh, (long long unsigned)(used),
  63 +                 (long long unsigned)(count));
  64
  65         /* handle the low threshold now, if we don't
  66          * have one we default to 0. */
  67 @@ -1436,12 +1438,15 @@ pick_v6_address(struct reply_state *reply)
  68                 log_debug("Unable to pick client address: "
  69                           "no addresses available  - shared network %s: "
  70                           " 2^64-1 < total, %llu active,  %llu abandoned",
  71 -                         shared_name, active - abandoned, abandoned);
  72 +                         shared_name, (long long unsigned)(active - abandoned),
  73 +                         (long long unsigned)(abandoned));
  74         } else {
  75                 log_debug("Unable to pick client address: "
  76                           "no addresses available  - shared network %s: "
  77                           "%llu total, %llu active,  %llu abandoned",
  78 -                         shared_name, total, active - abandoned, abandoned);
  79 +                         shared_name, (long long unsigned)(total),
  80 +                         (long long unsigned)(active - abandoned),
  81 +                         (long long unsigned)(abandoned));
  82         }
  83
  84         return ISC_R_NORESOURCES;
  85 --
  86 2.18.1
  87