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

Remove ndcconf_test, since the old ndc parser is gone. Remove

Browse Source 
dispatch_tcp_test, since the only parts of the dispatcher api it used
no longer exist.
This commit is contained in:
Brian Wellington
2001-02-16 01:07:37 +00:00
parent c44ecc9bb8
commit a1c4585f1c
3 changed files with 1 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/tests/Makefile.in
View File

@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.108 2001/02/15 05:15:27 gson Exp $
# $Id: Makefile.in,v 1.109 2001/02/16 01:07:34 bwelling Exp $
srcdir = @srcdir@
VPATH = @srcdir@
@@ -52,7 +52,6 @@ XTARGETS = adb_test \
cfg_test \
compress_test \
db_test \
dispatch_tcp_test \
dispatch_test \
entropy_test \
entropy2_test \
@@ -72,7 +71,6 @@ XTARGETS = adb_test \
mempool_test \
name_test \
nconf_test \
ndcconf_test \
nxtify \
omapi_test \
ratelimiter_test \
@@ -95,7 +93,6 @@ SRCS = adb_test.c \
byname_test.c \
compress_test.c \
db_test.c \
dispatch_tcp_test.c \
dispatch_test.c \
entropy_test.c \
entropy2_test.c \
@@ -115,7 +112,6 @@ SRCS = adb_test.c \
mempool_test.c \
name_test.c \
nconf_test.c \
ndcconf_test.c \
nxtify.c \
omapi_test.c \
printmsg.c \
@@ -256,18 +252,10 @@ dispatch_test: dispatch_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dispatch_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
dispatch_tcp_test: dispatch_tcp_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dispatch_tcp_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
nconf_test: nconf_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ nconf_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
ndcconf_test: ndcconf_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ndcconf_test.@O@ \
${DNSLIBS} ${ISCLIBS} ${LIBS}
fsaccess_test: fsaccess_test.@O@ ${ISCDEPLIBS}
${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ fsaccess_test.@O@ \
${ISCLIBS} ${LIBS}

291
bin/tests/dispatch_tcp_test.c
View File

@@ -1,291 +0,0 @@
/*
* Copyright (C) 1998-2001 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.
*/
/* $Id: dispatch_tcp_test.c,v 1.37 2001/01/09 21:40:58 bwelling Exp $ */
#include <config.h>
#include <stdlib.h>
#include <unistd.h>
#include <isc/app.h>
#include <isc/log.h>
#include <isc/mem.h>
#include <isc/string.h>
#include <isc/task.h>
#include <isc/util.h>
#include <dns/dispatch.h>
#include <dns/log.h>
#include <dns/message.h>
#include <dns/name.h>
#include <dns/rdatalist.h>
#include <dns/rdataset.h>
#include <dns/result.h>
isc_mem_t *mctx;
isc_taskmgr_t *taskmgr;
isc_socketmgr_t *socketmgr;
dns_dispatchmgr_t *dispatchmgr;
dns_dispatch_t *disp;
isc_task_t *t0;
isc_buffer_t render;
unsigned char render_buffer[1024];
dns_rdataset_t rdataset;
dns_rdatalist_t rdatalist;
static void
got_request(isc_task_t *, isc_event_t *);
static isc_result_t
printmsg(dns_message_t *msg, FILE *out) {
unsigned char text[8192];
isc_buffer_t textbuf;
int result;
isc_buffer_init(&textbuf, text, sizeof text);
result = dns_message_totext(msg, 0, &textbuf);
if (result != ISC_R_SUCCESS)
return (result);
fprintf(out, "msg:\n%*s\n",
isc_buffer_usedlength(&textbuf),
(char *)isc_buffer_base(&textbuf));
return (ISC_R_SUCCESS);
}
static void
hex_dump(isc_buffer_t *b) {
unsigned int len;
isc_region_t r;
isc_buffer_remainingregion(b, &r);
printf("Buffer %p (%p, %d): used region base %p, length %d",
b, b->base, b->length, r.base, r.length);
for (len = 0 ; len < r.length ; len++) {
if (len % 16 == 0)
printf("\n");
printf("%02x ", r.base[len]);
}
printf("\n");
}
static inline void
CHECKRESULT(isc_result_t result, const char *msg) {
if (result != ISC_R_SUCCESS) {
printf("%s: %s\n", msg, isc_result_totext(result));
exit(1);
}
}
static void
my_accept(isc_task_t *task, isc_event_t *ev_in) {
isc_socket_newconnev_t *ev = (isc_socket_newconnev_t *)ev_in;
dns_dispentry_t *resp;
unsigned int attrs;
if (ev->result != ISC_R_SUCCESS) {
isc_event_free(&ev_in);
isc_app_shutdown();
}
/*
* Create a dispatch context
*/
attrs = 0;
attrs |= DNS_DISPATCHATTR_IPV4;
attrs |= DNS_DISPATCHATTR_TCP;
attrs |= DNS_DISPATCHATTR_CONNECTED;
disp = NULL;
RUNTIME_CHECK(dns_dispatch_createtcp(dispatchmgr, ev->newsocket,
taskmgr, 4096, 64, 1024,
17, 19, attrs, &disp)
== ISC_R_SUCCESS);
resp = NULL;
RUNTIME_CHECK(dns_dispatch_addrequest(disp, task, got_request, NULL,
&resp)
== ISC_R_SUCCESS);
isc_socket_detach(&ev->newsocket);
isc_event_free(&ev_in);
}
static void
got_request(isc_task_t *task, isc_event_t *ev_in) {
dns_dispatchevent_t *ev = (dns_dispatchevent_t *)ev_in;
dns_dispentry_t *resp = ev->ev_sender;
static int cnt = 0;
dns_message_t *msg;
isc_result_t result;
printf("App: Got request. Result: %s\n",
isc_result_totext(ev->result));
if (ev->result != ISC_R_SUCCESS) {
printf("Got error, terminating application\n");
dns_dispatch_removerequest(&resp, &ev);
dns_dispatch_detach(&disp);
isc_app_shutdown();
return;
}
hex_dump(&ev->buffer);
msg = NULL;
result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &msg);
CHECKRESULT(result, "dns_message_create() failed");
result = dns_message_parse(msg, &ev->buffer, 0);
CHECKRESULT(result, "dns_message_parse() failed");
result = printmsg(msg, stderr);
CHECKRESULT(result, "printmsg() failed");
dns_message_destroy(&msg);
sleep (1);
printf("App: Ready.\n");
cnt++;
switch (cnt) {
case 6:
printf("--- removing request\n");
dns_dispatch_removerequest(&resp, &ev);
dns_dispatch_detach(&disp);
isc_app_shutdown();
break;
case 3:
printf("--- removing request\n");
dns_dispatch_removerequest(&resp, &ev);
printf("--- adding request\n");
RUNTIME_CHECK(dns_dispatch_addrequest(disp, task, got_request,
NULL, &resp)
== ISC_R_SUCCESS);
break;
default:
dns_dispatch_freeevent(disp, resp, &ev);
break;
}
}
int
main(int argc, char *argv[]) {
isc_socket_t *s0;
isc_sockaddr_t sockaddr;
(void)argc;
(void)argv;
RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS);
/*
* EVERYTHING needs a memory context.
*/
mctx = NULL;
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
dns_result_register();
/*
* The task manager is independent (other than memory context)
*/
taskmgr = NULL;
RUNTIME_CHECK(isc_taskmgr_create(mctx, 5, 0, &taskmgr) ==
ISC_R_SUCCESS);
t0 = NULL;
RUNTIME_CHECK(isc_task_create(taskmgr, 0, &t0) == ISC_R_SUCCESS);
socketmgr = NULL;
RUNTIME_CHECK(isc_socketmgr_create(mctx, &socketmgr) == ISC_R_SUCCESS);
dispatchmgr = NULL;
RUNTIME_CHECK(dns_dispatchmgr_create(mctx, NULL, &dispatchmgr)
== ISC_R_SUCCESS);
/*
* Open up a random socket. Who cares where.
*/
s0 = NULL;
memset(&sockaddr, 0, sizeof(sockaddr));
sockaddr.type.sin.sin_family = AF_INET;
sockaddr.type.sin.sin_port = htons(5555);
sockaddr.length = sizeof (struct sockaddr_in);
RUNTIME_CHECK(isc_socket_create(socketmgr, PF_INET,
isc_sockettype_tcp, &s0) ==
ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_bind(s0, &sockaddr) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_listen(s0, 0) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_socket_accept(s0, t0, my_accept, NULL)
== ISC_R_SUCCESS);
isc_app_run();
isc_socket_detach(&s0);
fprintf(stderr, "canceling dispatcher\n");
isc_mem_stats(mctx, stderr);
sleep(2);
dns_dispatch_cancel(disp);
INSIST(disp != NULL);
fprintf(stderr, "detaching from dispatcher\n");
isc_mem_stats(mctx, stderr);
sleep(2);
dns_dispatch_detach(&disp);
fprintf(stderr, "destroying dispatch manager\n");
isc_mem_stats(mctx, stderr);
sleep(2);
dns_dispatchmgr_destroy(&dispatchmgr);
fprintf(stderr, "Destroying socket manager\n");
isc_mem_stats(mctx, stderr);
sleep(2);
isc_socketmgr_destroy(&socketmgr);
isc_task_shutdown(t0);
isc_task_detach(&t0);
fprintf(stderr, "Destroying task manager\n");
isc_mem_stats(mctx, stderr);
sleep(2);
isc_taskmgr_destroy(&taskmgr);
isc_app_finish();
#if 0
isc_log_destroy(&log);
sleep(2);
#endif
isc_mem_stats(mctx, stderr);
fflush(stderr);
isc_mem_detach(&mctx);
isc_app_finish();
return (0);
}

86
bin/tests/ndcconf_test.c
View File

@@ -1,86 +0,0 @@
/*
* Copyright (C) 2000, 2001 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.
*/
/* $Id: ndcconf_test.c,v 1.11 2001/01/09 21:41:25 bwelling Exp $ */
#include <config.h>
#include <stdlib.h>
#include <isc/mem.h>
#include <isc/string.h>
#include <isc/util.h>
#include <dns/log.h>
#include <dns/confndc.h>
int
main(int argc, char **argv) {
dns_c_ndcctx_t *ndcctx = NULL;
const char *conffile;
isc_mem_t *mem = NULL;
isc_log_t *log = NULL;
isc_logconfig_t *logcfg = NULL;
const char *program = NULL;
program = strrchr(argv[0], '/');
if (program == NULL) {
program = argv[0];
} else {
program++;
}
argc--;
argv++;
if (argc == 0) {
fprintf(stderr, "usage: %s file\n", program);
exit (1);
}
conffile = argv[0];
RUNTIME_CHECK(isc_mem_create(0, 0, &mem) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_log_create(mem, &log, &logcfg) == ISC_R_SUCCESS);
isc_log_setcontext(log);
dns_log_init(log);
dns_log_setcontext(log);
RUNTIME_CHECK(isc_log_usechannel(logcfg, "default_stderr", NULL, NULL)
== ISC_R_SUCCESS);
dns_lctx = log;
if (dns_c_ndcparseconf(conffile, mem, &ndcctx) != ISC_R_SUCCESS) {
fprintf(stderr, "parse_configuration failed.\n");
exit(1);
} else {
dns_c_ndcctx_print(stderr, ndcctx);
}
dns_c_ndcctx_destroy(&ndcctx);
dns_lctx = NULL;
isc_log_destroy(&log);
isc_mem_destroy(&mem);
return (0);
}