mirror of
https://github.com/isc-projects/bind9.git
synced 2026-04-20 21:58:03 -04:00
sdig is gone
This commit is contained in:
Andreas Gustafsson
parent
da49cb62e0
commit
a89b06a49c
4 changed files with 4 additions and 397 deletions
4
CHANGES
4
CHANGES
|
|
@ -1,3 +1,7 @@
|
|||
201. [cleanup] Removed the test/sdig program, it has been
|
||||
replaced by bin/dig/dig.
|
||||
|
||||
|
||||
--- 9.0.0b3 released ---
|
||||
|
||||
200. [bug] Failures in sending query responses to clients
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ XTARGETS = adb_test \
|
|||
rbt_test \
|
||||
rdata_test \
|
||||
rwlock_test \
|
||||
sdig \
|
||||
serial_test \
|
||||
shutdown_test \
|
||||
sock_test \
|
||||
|
|
@ -107,7 +106,6 @@ SRCS = adb_test.c \
|
|||
rbt_test.c \
|
||||
rdata_test.c \
|
||||
rwlock_test.c \
|
||||
sdig.c \
|
||||
serial_test.c \
|
||||
shutdown_test.c \
|
||||
sock_test.c \
|
||||
|
|
@ -127,10 +125,6 @@ adb_test: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
|
|||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ adb_test.@O@ \
|
||||
${DNSLIBS} ${ISCLIBS} ${LIBS}
|
||||
|
||||
sdig: sdig.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
|
||||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ sdig.@O@ printmsg.@O@ \
|
||||
${DNSLIBS} ${ISCLIBS} ${LIBS}
|
||||
|
||||
nxtify: nxtify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
|
||||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ nxtify.@O@ \
|
||||
${DNSLIBS} ${ISCLIBS} ${LIBS}
|
||||
|
|
|
|||
390
bin/tests/sdig.c
390
bin/tests/sdig.c
|
|
@ -1,390 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1999, 2000 Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
||||
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
||||
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
||||
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
||||
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
||||
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
extern int h_errno;
|
||||
|
||||
#include <isc/app.h>
|
||||
#include <isc/mem.h>
|
||||
#include <isc/netdb.h>
|
||||
#include <isc/socket.h>
|
||||
#include <isc/string.h>
|
||||
#include <isc/task.h>
|
||||
#include <isc/util.h>
|
||||
|
||||
#include <dns/rdata.h>
|
||||
#include <dns/rdatalist.h>
|
||||
#include <dns/rdataset.h>
|
||||
#include <dns/rdataclass.h>
|
||||
#include <dns/rdatatype.h>
|
||||
#include <dns/result.h>
|
||||
|
||||
#include "printmsg.h"
|
||||
|
||||
#define SDIG_BUFFER_SIZE 2048
|
||||
|
||||
static dns_message_t *message = NULL;
|
||||
static isc_boolean_t have_ipv6 = ISC_FALSE;
|
||||
|
||||
static void
|
||||
fatal(char *format, ...) {
|
||||
va_list args;
|
||||
|
||||
va_start(args, format);
|
||||
vfprintf(stderr, format, args);
|
||||
va_end(args);
|
||||
fprintf(stderr, "\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static inline void
|
||||
check_result(isc_result_t result, char *msg) {
|
||||
if (result != ISC_R_SUCCESS)
|
||||
fatal("%s: %s", msg, isc_result_totext(result));
|
||||
}
|
||||
|
||||
static void
|
||||
usage() {
|
||||
fprintf(stderr,
|
||||
"usage: sdig [@server] [-p port] [+vc] name [type] [class]\n");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
static void
|
||||
add_type(dns_message_t *message, dns_name_t *name, dns_rdataclass_t rdclass,
|
||||
dns_rdatatype_t rdtype)
|
||||
{
|
||||
dns_rdataset_t *rdataset;
|
||||
isc_result_t result;
|
||||
|
||||
if (rdtype == dns_rdatatype_axfr)
|
||||
fatal("sdig does not support AXFR yet");
|
||||
if (rdtype == dns_rdatatype_ixfr)
|
||||
fatal("sdig does not support IXFR yet");
|
||||
rdataset = NULL;
|
||||
result = dns_message_gettemprdataset(message, &rdataset);
|
||||
check_result(result, "dns_message_gettemprdataset()");
|
||||
dns_rdataset_init(rdataset);
|
||||
dns_rdataset_makequestion(rdataset, rdclass, rdtype);
|
||||
ISC_LIST_APPEND(name->list, rdataset, link);
|
||||
}
|
||||
|
||||
static void
|
||||
add_opt(dns_message_t *message, isc_uint16_t udpsize) {
|
||||
dns_rdataset_t *rdataset;
|
||||
dns_rdatalist_t *rdatalist;
|
||||
dns_rdata_t *rdata;
|
||||
isc_result_t result;
|
||||
|
||||
rdataset = NULL;
|
||||
result = dns_message_gettemprdataset(message, &rdataset);
|
||||
check_result(result, "dns_message_gettemprdataset()");
|
||||
dns_rdataset_init(rdataset);
|
||||
rdatalist = NULL;
|
||||
result = dns_message_gettemprdatalist(message, &rdatalist);
|
||||
check_result(result, "dns_message_gettemprdatalist()");
|
||||
rdata = NULL;
|
||||
result = dns_message_gettemprdata(message, &rdata);
|
||||
check_result(result, "dns_message_gettemprdata()");
|
||||
|
||||
rdatalist->type = dns_rdatatype_opt;
|
||||
rdatalist->covers = 0;
|
||||
|
||||
/*
|
||||
* Set Maximum UDP buffer size.
|
||||
*/
|
||||
rdatalist->rdclass = udpsize;
|
||||
|
||||
/*
|
||||
* Set EXTENDED-RCODE, VERSION, and Z to 0.
|
||||
*/
|
||||
rdatalist->ttl = 0;
|
||||
|
||||
/*
|
||||
* No ENDS options.
|
||||
*/
|
||||
rdata->data = NULL;
|
||||
rdata->length = 0;
|
||||
|
||||
ISC_LIST_INIT(rdatalist->rdata);
|
||||
ISC_LIST_APPEND(rdatalist->rdata, rdata, link);
|
||||
dns_rdatalist_tordataset(rdatalist, rdataset);
|
||||
|
||||
result = dns_message_setopt(message, rdataset);
|
||||
check_result(result, "dns_message_setopt()");
|
||||
}
|
||||
|
||||
static void
|
||||
hex_dump(isc_buffer_t *b)
|
||||
{
|
||||
unsigned int len;
|
||||
isc_region_t r;
|
||||
|
||||
isc_buffer_remainingregion(b, &r);
|
||||
|
||||
for (len = 0 ; len < r.length ; len++) {
|
||||
printf("%02x ", r.base[len]);
|
||||
if (len != 0 && len % 16 == 0)
|
||||
printf("\n");
|
||||
}
|
||||
if (len % 16 != 0)
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
static void
|
||||
get_address(char *hostname, in_port_t port, isc_sockaddr_t *sockaddr) {
|
||||
struct in_addr in4;
|
||||
struct in6_addr in6;
|
||||
struct hostent *he;
|
||||
|
||||
if (have_ipv6 && inet_pton(AF_INET6, hostname, &in6) == 1)
|
||||
isc_sockaddr_fromin6(sockaddr, &in6, port);
|
||||
else if (inet_pton(AF_INET, hostname, &in4) == 1)
|
||||
isc_sockaddr_fromin(sockaddr, &in4, port);
|
||||
else {
|
||||
he = gethostbyname(hostname);
|
||||
if (he == NULL)
|
||||
fatal("gethostbyname() failed, h_errno = %d",
|
||||
h_errno);
|
||||
INSIST(he->h_addrtype == AF_INET);
|
||||
isc_sockaddr_fromin(sockaddr,
|
||||
(struct in_addr *)(he->h_addr_list[0]),
|
||||
port);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
recv_done(isc_task_t *task, isc_event_t *event) {
|
||||
isc_socketevent_t *sevent;
|
||||
isc_buffer_t *b;
|
||||
isc_result_t result;
|
||||
|
||||
REQUIRE(event->ev_type == ISC_SOCKEVENT_RECVDONE);
|
||||
sevent = (isc_socketevent_t *)event;
|
||||
|
||||
UNUSED(task);
|
||||
|
||||
/*
|
||||
* There will be one buffer (since that is what we put on the list).
|
||||
*/
|
||||
if (sevent->result == ISC_R_SUCCESS) {
|
||||
b = ISC_LIST_HEAD(sevent->bufferlist);
|
||||
ISC_LIST_DEQUEUE(sevent->bufferlist, b, link);
|
||||
dns_message_reset(message, DNS_MESSAGE_INTENTPARSE);
|
||||
result = dns_message_parse(message, b, ISC_FALSE);
|
||||
if (result != ISC_R_SUCCESS)
|
||||
hex_dump(b);
|
||||
check_result(result, "dns_message_parse()");
|
||||
result = printmessage(message);
|
||||
check_result(result, "printmessage()");
|
||||
printf("; Received %u bytes.\n", b->used);
|
||||
} else if (sevent->result != ISC_R_CANCELED)
|
||||
fatal("recv_done(): %s", isc_result_totext(sevent->result));
|
||||
|
||||
isc_event_free(&event);
|
||||
isc_app_shutdown();
|
||||
}
|
||||
|
||||
static void
|
||||
send_done(isc_task_t *task, isc_event_t *event) {
|
||||
UNUSED(task);
|
||||
|
||||
isc_event_free(&event);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[]) {
|
||||
char *server;
|
||||
in_port_t port;
|
||||
isc_boolean_t vc, have_name, have_type, edns0, recurse;
|
||||
dns_name_t *name;
|
||||
static unsigned char *namedata[512];
|
||||
isc_buffer_t namebuffer;
|
||||
dns_rdatatype_t rdtype;
|
||||
dns_rdataclass_t rdclass, nclass;
|
||||
size_t len;
|
||||
isc_buffer_t b, b2;
|
||||
isc_bufferlist_t bufferlist;
|
||||
isc_result_t result;
|
||||
isc_textregion_t tr;
|
||||
isc_mem_t *mctx;
|
||||
isc_taskmgr_t *taskmgr;
|
||||
isc_task_t *task;
|
||||
isc_socketmgr_t *socketmgr;
|
||||
isc_socket_t *sock;
|
||||
static unsigned char *data[SDIG_BUFFER_SIZE];
|
||||
static unsigned char *data2[SDIG_BUFFER_SIZE];
|
||||
isc_sockaddr_t sockaddr;
|
||||
int i;
|
||||
unsigned int bufsize = SDIG_BUFFER_SIZE;
|
||||
|
||||
/*
|
||||
* Initialize.
|
||||
*/
|
||||
|
||||
result = isc_app_start();
|
||||
check_result(result, "isc_app_start()");
|
||||
|
||||
dns_result_register();
|
||||
|
||||
RUNTIME_CHECK(isc_net_probeipv4() == ISC_R_SUCCESS);
|
||||
if (isc_net_probeipv6() == ISC_R_SUCCESS)
|
||||
have_ipv6 = ISC_TRUE;
|
||||
|
||||
mctx = NULL;
|
||||
result = isc_mem_create(0, 0, &mctx);
|
||||
check_result(result, "isc_mem_create()");
|
||||
taskmgr = NULL;
|
||||
result = isc_taskmgr_create(mctx, 1, 0, &taskmgr);
|
||||
check_result(result, "isc_taskmgr_create()");
|
||||
task = NULL;
|
||||
result = isc_task_create(taskmgr, 0, &task);
|
||||
check_result(result, "isc_task_create()");
|
||||
socketmgr = NULL;
|
||||
result = isc_socketmgr_create(mctx, &socketmgr);
|
||||
check_result(result, "isc_socketmgr_create()");
|
||||
sock = NULL;
|
||||
|
||||
server = "localhost";
|
||||
port = 53;
|
||||
vc = ISC_FALSE;
|
||||
have_name = ISC_FALSE;
|
||||
have_type = ISC_FALSE;
|
||||
rdclass = dns_rdataclass_in;
|
||||
edns0 = ISC_FALSE;
|
||||
recurse = ISC_TRUE;
|
||||
|
||||
message = NULL;
|
||||
result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &message);
|
||||
check_result(result, "dns_message_create()");
|
||||
name = NULL;
|
||||
result = dns_message_gettempname(message, &name);
|
||||
check_result(result, "dns_message_gettempname()");
|
||||
dns_name_init(name, NULL);
|
||||
|
||||
isc_buffer_init(&namebuffer, namedata, sizeof(namedata));
|
||||
|
||||
printf("\n; <<>> sdig <<>>");
|
||||
for (i = 1; i < argc; i++) {
|
||||
printf(" %s", argv[i]);
|
||||
}
|
||||
printf("\n");
|
||||
for (argc--, argv++; argc > 0; argc--, argv++) {
|
||||
if (strncmp(argv[0], "@", 1) == 0) {
|
||||
server = &argv[0][1];
|
||||
} else if (strcmp(argv[0], "-p") == 0) {
|
||||
if (argc < 2)
|
||||
usage();
|
||||
port = atoi(argv[1]);
|
||||
argv++;
|
||||
argc--;
|
||||
} else if (strcmp(argv[0], "+vc") == 0) {
|
||||
fatal("TCP transport not yet implemented");
|
||||
} else if (strcmp(argv[0], "+edns0") == 0) {
|
||||
edns0 = ISC_TRUE;
|
||||
} else if (strcmp(argv[0], "+norecurse") == 0) {
|
||||
recurse = ISC_FALSE;
|
||||
} else if (strncmp(argv[0], "+bufsize=", 9) == 0) {
|
||||
bufsize = atoi(&argv[0][9]);
|
||||
if (bufsize > SDIG_BUFFER_SIZE)
|
||||
bufsize = SDIG_BUFFER_SIZE;
|
||||
} else {
|
||||
len = strlen(argv[0]);
|
||||
tr.base = argv[0];
|
||||
tr.length = len;
|
||||
if (!have_name) {
|
||||
isc_buffer_init(&b, argv[0], len);
|
||||
isc_buffer_add(&b, len);
|
||||
result = dns_name_fromtext(name, &b,
|
||||
dns_rootname,
|
||||
ISC_FALSE,
|
||||
&namebuffer);
|
||||
check_result(result, "dns_name_fromtext()");
|
||||
have_name = ISC_TRUE;
|
||||
} else {
|
||||
if (dns_rdatatype_fromtext(&rdtype, &tr) ==
|
||||
ISC_R_SUCCESS) {
|
||||
add_type(message, name, rdclass,
|
||||
rdtype);
|
||||
have_type = ISC_TRUE;
|
||||
} else {
|
||||
if (dns_rdataclass_fromtext(&nclass,
|
||||
&tr) !=
|
||||
ISC_R_SUCCESS)
|
||||
fatal("unknown class "
|
||||
"or type %s", argv[0]);
|
||||
rdclass = nclass;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!have_name)
|
||||
usage();
|
||||
if (!have_type)
|
||||
add_type(message, name, dns_rdataclass_in, dns_rdatatype_a);
|
||||
|
||||
message->id = 1;
|
||||
message->opcode = dns_opcode_query;
|
||||
if (recurse)
|
||||
message->flags |= DNS_MESSAGEFLAG_RD;
|
||||
dns_message_addname(message, name, DNS_SECTION_QUESTION);
|
||||
|
||||
isc_buffer_init(&b, data, sizeof(data));
|
||||
result = dns_message_renderbegin(message, &b);
|
||||
check_result(result, "dns_message_renderbegin()");
|
||||
if (edns0)
|
||||
add_opt(message, (isc_uint16_t)bufsize);
|
||||
result = dns_message_rendersection(message, DNS_SECTION_QUESTION, 0);
|
||||
check_result(result, "dns_message_rendersection()");
|
||||
result = dns_message_renderend(message);
|
||||
check_result(result, "dns_message_renderend()");
|
||||
|
||||
(void)printmessage(message);
|
||||
|
||||
get_address(server, port, &sockaddr);
|
||||
|
||||
result = isc_socket_create(socketmgr, isc_sockaddr_pf(&sockaddr),
|
||||
isc_sockettype_udp, &sock);
|
||||
check_result(result, "isc_socket_create()");
|
||||
|
||||
ISC_LIST_INIT(bufferlist);
|
||||
isc_buffer_init(&b2, data2, sizeof data2);
|
||||
ISC_LIST_ENQUEUE(bufferlist, &b2, link);
|
||||
result = isc_socket_recvv(sock, &bufferlist, 1, task, recv_done, NULL);
|
||||
check_result(result, "isc_socket_recvv()");
|
||||
ISC_LIST_ENQUEUE(bufferlist, &b, link);
|
||||
result = isc_socket_sendtov(sock, &bufferlist, task, send_done, NULL,
|
||||
&sockaddr, NULL);
|
||||
check_result(result, "isc_socket_sendtov()");
|
||||
|
||||
isc_app_run();
|
||||
|
||||
dns_message_destroy(&message);
|
||||
isc_socket_cancel(sock, task, ISC_SOCKCANCEL_ALL);
|
||||
isc_task_detach(&task);
|
||||
isc_socket_detach(&sock);
|
||||
isc_taskmgr_destroy(&taskmgr);
|
||||
isc_socketmgr_destroy(&socketmgr);
|
||||
isc_mem_destroy(&mctx);
|
||||
|
||||
isc_app_finish();
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
|
@ -262,7 +262,6 @@
|
|||
./bin/tests/res_test.c C 1999,2000
|
||||
./bin/tests/resolv.conf.sample X 2000
|
||||
./bin/tests/rwlock_test.c C 1998,1999,2000
|
||||
./bin/tests/sdig.c C 1999,2000
|
||||
./bin/tests/serial_test.c C 1999,2000
|
||||
./bin/tests/shutdown_test.c C 1998,1999,2000
|
||||
./bin/tests/sock_test.c C 1998,1999,2000
|
||||
|
|
|
|||
Loading…
Reference in a new issue