Adapt to skalibs-2.11.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

5 files changed, 52 insertions, 10 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 0000000..6279422
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,5 @@
+ Please add a Signed-Off-By: line at the end of your commit,
+which certifies that you have the right and authority to pass
+it on as an open-source patch, as explicited in the Developer's
+Certificate of Origin available in this project's DCO file,
+or at https://developercertificate.org/
diff --git a/DCO b/DCO
new file mode 100644
index 0000000..8201f99
--- /dev/null
+++ b/DCO
@@ -0,0 +1,37 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+1 Letterman Drive
+Suite D4700
+San Francisco, CA, 94129
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/doc/index.html b/doc/index.html
index 5715341..b283e3e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -105,7 +105,7 @@ the previous versions of dnsfunnel and the current one. </li>
 
 <ul>
  <li> <tt>dnsfunnel</tt> is discussed on the
-<a href="//skarnet.org/lists.html#skaware">skaware</a> mailing-list. </li>
+<a href="//skarnet.org/lists/#skaware">skaware</a> mailing-list. </li>
 </ul>
 
 </body>
diff --git a/src/dnsfunnel/dnsfunnel-translate.c b/src/dnsfunnel/dnsfunnel-translate.c
index d842629..83c17d3 100644
--- a/src/dnsfunnel/dnsfunnel-translate.c
+++ b/src/dnsfunnel/dnsfunnel-translate.c
@@ -16,7 +16,7 @@
 #define dieusage() strerr_dieusage(100, USAGE)
 
 
-static size_t parse_nameservers (ip46_t *list, char const *file, char const *ignore)
+static size_t parse_nameservers (ip46 *list, char const *file, char const *ignore)
 {
   static char const zero[SKALIBS_IP_SIZE] = { 0 } ;
   char buf[4096] ;
@@ -44,14 +44,14 @@ static size_t parse_nameservers (ip46_t *list, char const *file, char const *ign
 
 int main (int argc, char const *const *argv)
 {
-  ip46_t list[S6DNS_MAX_SERVERS] = { IP46_ZERO } ;
+  ip46 list[S6DNS_MAX_SERVERS] = { IP46_ZERO } ;
   char const *resolvconf = "/etc/resolv.conf" ;
   char const *cachelist = "/run/dnsfunnel/root/caches" ;
   char ignore[4] = "\177\0\0\1" ;
   size_t n ;
   PROG = "dnsfunnel-translate" ;
   {
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
     for (;;)
     {
       int opt = subgetopt_r(argc, argv, "i:o:x:", &l) ;
diff --git a/src/dnsfunnel/dnsfunneld.c b/src/dnsfunnel/dnsfunneld.c
index 4aa2366..8c909a0 100644
--- a/src/dnsfunnel/dnsfunneld.c
+++ b/src/dnsfunnel/dnsfunneld.c
@@ -43,7 +43,7 @@
 #define DNSFUNNELD_INPUT_MAX 64
 
 unsigned int verbosity = 1 ;
-static tain_t globaltto ;
+static tain globaltto ;
 static int cont = 1 ;
 static s6dns_ip46list_t cachelist ;
 static uint32_t ops = 0 ;
@@ -53,7 +53,7 @@ static inline void X (void)
   strerr_dief1x(101, "internal inconsistency. Please submit a bug-report.") ;
 }
 
-static inline void s6dns_ip46list_copy (s6dns_ip46list_t *dst, ip46full_t const *src, size_t n)
+static inline void s6dns_ip46list_copy (s6dns_ip46list_t *dst, ip46full const *src, size_t n)
 {
   if (n >= S6DNS_MAX_SERVERS) n = S6DNS_MAX_SERVERS - 1 ;
   for (size_t i = 0 ; i < n ; i++)
@@ -69,7 +69,7 @@ static inline void s6dns_ip46list_copy (s6dns_ip46list_t *dst, ip46full_t const
 static int load_cachelist (int initial)
 {
   char buf[4096] ;
-  ip46full_t list[S6DNS_MAX_SERVERS] ;
+  ip46full list[S6DNS_MAX_SERVERS] ;
   size_t n ;
   ssize_t r = openreadnclose_nb("caches", buf, 4095) ;
   if (r < 0) return -1 ;
@@ -124,7 +124,7 @@ void query_new (s6dns_domain_t const *d, uint16_t qtype, uint16_t id, uint32_t i
     .dt = S6DNS_ENGINE_ZERO
   } ;
   s6dns_domain_t dd = *d ;
-  tain_t deadline ;
+  tain deadline ;
   uint32_t i ;
   if (!gensetdyn_new(&queries, &i))
     strerr_diefu1sys(111, "create new query") ;
@@ -181,7 +181,7 @@ int main (int argc, char const *const *argv)
     unsigned int t = 0 ;
     char ip[4] = { 127, 0, 0, 1 } ;
     uint16_t port = 53 ;
-    subgetopt_t l = SUBGETOPT_ZERO ;
+    subgetopt l = SUBGETOPT_ZERO ;
 
     for (;;)
     {
@@ -301,7 +301,7 @@ int main (int argc, char const *const *argv)
                   
   for (;;)                
   {
-    tain_t deadline = TAIN_INFINITE ;
+    tain deadline = TAIN_INFINITE ;
     uint32_t i = QUERY(sentinel)->next ;
     uint32_t j = 2 ;
     int r ;