src/usr.bin/dig/dighost.c - diff - 1.32

Return to dighost.c CVS log

Up to [local] / src / usr.bin / dig

Diff for /src/usr.bin/dig/dighost.c between version 1.31 and 1.32

version 1.31, 2020/09/15 08:15:17

version 1.32, 2020/09/15 08:19:29

Line 55

Line 55

#include <isc/base64.h>

#include <isc/base64.h>

#include <isc/hex.h>

#include <isc/hex.h>

#include <isc/log.h>

#include <isc/log.h>

#include <isc/netaddr.h>

#include <isc/result.h>

#include <isc/result.h>

#include <isc/serial.h>

#include <isc/serial.h>

#include <isc/sockaddr.h>

#include <isc/sockaddr.h>

Line 558

Line 557

set_nameserver(char *opt) {

set_nameserver(char *opt) {

isc_result_t result;

isc_result_t result;

isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];

isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];

isc_netaddr_t netaddr;

int count, i;

int count, i;

dig_server_t *srv;

dig_server_t *srv;

char tmp[ISC_NETADDR_FORMATSIZE];

char tmp[NI_MAXHOST];

if (opt == NULL)

if (opt == NULL)

return ISC_R_NOTFOUND;

return ISC_R_NOTFOUND;

Line 574

Line 572

flush_server_list();

flush_server_list();

for (i = 0; i < count; i++) {

for (i = 0; i < count; i++) {

isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);

int error;

isc_netaddr_format(&netaddr, tmp, sizeof(tmp));

error = getnameinfo(&sockaddrs[i].type.sa,

sockaddrs[i].type.sa.sa_len, tmp, sizeof(tmp), NULL, 0,

NI_NUMERICHOST | NI_NUMERICSERV);

if (error)

fatal("%s", gai_strerror(error));

srv = make_server(tmp, opt);

srv = make_server(tmp, opt);

if (srv == NULL)

if (srv == NULL)

fatal("memory allocation failure");

fatal("memory allocation failure");

Line 3733

Line 3735

getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) {

getaddresses(dig_lookup_t *lookup, const char *host, isc_result_t *resultp) {

isc_result_t result;

isc_result_t result;

isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];

isc_sockaddr_t sockaddrs[DIG_MAX_ADDRESSES];

isc_netaddr_t netaddr;

int count, i;

int count, i;

dig_server_t *srv;

dig_server_t *srv;

char tmp[ISC_NETADDR_FORMATSIZE];

char tmp[NI_MAXHOST];

result = get_addresses(host, 0, sockaddrs,

result = get_addresses(host, 0, sockaddrs,

DIG_MAX_ADDRESSES, &count);

DIG_MAX_ADDRESSES, &count);

Line 3750

Line 3751

}

}

for (i = 0; i < count; i++) {

for (i = 0; i < count; i++) {

isc_netaddr_fromsockaddr(&netaddr, &sockaddrs[i]);

int error;

isc_netaddr_format(&netaddr, tmp, sizeof(tmp));

error = getnameinfo(&sockaddrs[i].type.sa,

sockaddrs[i].type.sa.sa_len, tmp, sizeof(tmp), NULL, 0,

NI_NUMERICHOST | NI_NUMERICSERV);

if (error)

fatal("%s", gai_strerror(error));

srv = make_server(tmp, host);

srv = make_server(tmp, host);

ISC_LIST_APPEND(lookup->my_server_list, srv, link);

ISC_LIST_APPEND(lookup->my_server_list, srv, link);

}

}