diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-08-04 13:42:59 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2021-08-04 13:42:59 +0000 |
| commit | afa9e940e6748f3f9edd3f5b9b11f0b5337e2492 (patch) | |
| tree | 26c6980791ecd484281c102d059e1512a7784913 /src | |
| parent | 55a93740d89b7ba4e676b50717f03864196b67c5 (diff) | |
| download | dnsfunnel-afa9e940e6748f3f9edd3f5b9b11f0b5337e2492.tar.gz dnsfunnel-afa9e940e6748f3f9edd3f5b9b11f0b5337e2492.tar.xz dnsfunnel-afa9e940e6748f3f9edd3f5b9b11f0b5337e2492.zip | |
Adapt to skalibs-2.11.0.0
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dnsfunnel/dnsfunnel-translate.c | 6 | ||||
| -rw-r--r-- | src/dnsfunnel/dnsfunneld.c | 12 |
2 files changed, 9 insertions, 9 deletions
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 ; |