ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Cleanup libirs APIs and slim down the library to just irs_resconf

Browse Source 
The libirs contained own re-implementations of the getaddrinfo,
getnameinfo and gai_strerror + irs_context and irs_dnsconf API that was
unused anywhere in the BIND 9.

Keep just the irs_resonf API that is being extensively used to parse
/etc/resolv.conf by several of BIND 9 tools.
This commit is contained in:
Ondřej Surý
2020-04-23 00:13:29 +02:00
parent 19245f3ff4
commit 5f0efcbb3c
22 changed files with 8 additions and 3322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/samples/Makefile.am
View File

@@ -8,7 +8,6 @@ AM_CPPFLAGS += \
noinst_PROGRAMS = \
resolve \
sample-async \
sample-gai \
sample-update \
sample-request \
nsprobe
@@ -19,9 +18,6 @@ resolve_LDADD = $(LIBISC_LIBS) $(LIBIRS_LIBS) $(LIBDNS_LIBS)
sample_async_SOURCES = sample-async.c
sample_async_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS)
sample_gai_SOURCES = sample-gai.c
sample_gai_LDADD = $(LIBIRS_LIBS)
sample_update_SOURCES = sample-update.c
sample_update_LDADD = $(LIBISC_LIBS) $(LIBDNS_LIBS)

1
lib/samples/resolve.c
View File

@@ -51,7 +51,6 @@
#include <dst/dst.h>
#include <irs/netdb.h>
#include <irs/resconf.h>
static char *algname;

71
lib/samples/sample-gai.c
View File

@@ -1,71 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <isc/net.h>
#include <isc/print.h>
#include <irs/netdb.h>
static void
do_gai(int family, char *hostname) {
struct addrinfo hints, *res, *res0;
int error;
char namebuf[1024], addrbuf[1024], servbuf[1024];
memset(&hints, 0, sizeof(hints));
hints.ai_family = family;
hints.ai_socktype = SOCK_STREAM;
hints.ai_flags = AI_CANONNAME;
error = getaddrinfo(hostname, "http", &hints, &res0);
if (error) {
fprintf(stderr, "getaddrinfo failed for %s,family=%d: %s\n",
hostname, family, gai_strerror(error));
return;
}
for (res = res0; res; res = res->ai_next) {
error = getnameinfo(res->ai_addr, (socklen_t)res->ai_addrlen,
addrbuf, sizeof(addrbuf), NULL, 0,
NI_NUMERICHOST);
if (error == 0) {
error = getnameinfo(res->ai_addr,
(socklen_t)res->ai_addrlen, namebuf,
sizeof(namebuf), servbuf,
sizeof(servbuf), 0);
}
if (error != 0) {
fprintf(stderr, "getnameinfo failed: %s\n",
gai_strerror(error));
} else {
printf("%s(%s/%s)=%s:%s\n", hostname, res->ai_canonname,
addrbuf, namebuf, servbuf);
}
}
freeaddrinfo(res0);
}
int
main(int argc, char *argv[]) {
if (argc < 2) {
exit(1);
}
do_gai(AF_INET, argv[1]);
do_gai(AF_INET6, argv[1]);
do_gai(AF_UNSPEC, argv[1]);
return (0);
}