mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
nuked zone2_test
This commit is contained in:
@@ -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.99 2000/08/08 21:47:49 bwelling Exp $
|
||||
# $Id: Makefile.in,v 1.100 2000/08/10 18:30:18 gson Exp $
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
@@ -82,8 +82,7 @@ XTARGETS = adb_test \
|
||||
task_test \
|
||||
timer_test \
|
||||
tkey_test \
|
||||
wire_test \
|
||||
zone2_test
|
||||
wire_test
|
||||
|
||||
# Alphabetically
|
||||
SRCS = adb_test.c \
|
||||
@@ -126,8 +125,7 @@ SRCS = adb_test.c \
|
||||
timer_test.c \
|
||||
tkey_test.c \
|
||||
wire_test.c \
|
||||
zone_test.c \
|
||||
zone2_test.c
|
||||
zone_test.c
|
||||
|
||||
@BIND9_MAKE_RULES@
|
||||
|
||||
@@ -244,10 +242,6 @@ serial_test: serial_test.@O@ ${ISCDEPLIBS}
|
||||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ serial_test.@O@ \
|
||||
${ISCLIBS} ${LIBS}
|
||||
|
||||
zone2_test: zone2_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
|
||||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ zone2_test.@O@ \
|
||||
${DNSLIBS} ${ISCLIBS} ${LIBS}
|
||||
|
||||
zone_test: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
|
||||
${LIBTOOL} ${CC} ${CFLAGS} -o $@ zone_test.@O@ \
|
||||
${DNSLIBS} ${ISCLIBS} ${LIBS}
|
||||
|
@@ -1,428 +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.
|
||||
*/
|
||||
|
||||
/* $Id: zone2_test.c,v 1.20 2000/08/01 01:13:32 tale Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <isc/app.h>
|
||||
#include <isc/mem.h>
|
||||
#include <isc/string.h>
|
||||
#include <isc/util.h>
|
||||
|
||||
#include <dns/confparser.h>
|
||||
#include <dns/journal.h>
|
||||
#include <dns/fixedname.h>
|
||||
#include <dns/rdataset.h>
|
||||
#include <dns/result.h>
|
||||
#include <dns/view.h>
|
||||
#include <dns/zone.h>
|
||||
#include <dns/zoneconf.h>
|
||||
#include <dns/zt.h>
|
||||
|
||||
#define ERRRET(result, function) \
|
||||
do { \
|
||||
if (result != ISC_R_SUCCESS) { \
|
||||
fprintf(stdout, "%s() returned %s\n", \
|
||||
function, dns_result_totext(result)); \
|
||||
return; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
#define ERRCONT(result, function) \
|
||||
if (result != ISC_R_SUCCESS) { \
|
||||
fprintf(stdout, "%s() returned %s\n", \
|
||||
function, dns_result_totext(result)); \
|
||||
continue; \
|
||||
} else \
|
||||
(void)NULL
|
||||
|
||||
typedef struct dns_zone_callbackarg dns_zone_callbackarg_t;
|
||||
|
||||
struct dns_zone_callbackarg {
|
||||
isc_mem_t *mctx;
|
||||
dns_viewlist_t oldviews;
|
||||
dns_viewlist_t newviews;
|
||||
};
|
||||
|
||||
static isc_result_t
|
||||
dns_zone_callback(dns_c_ctx_t *cfg, dns_c_zone_t *czone, dns_c_view_t *cview,
|
||||
void *uap) {
|
||||
dns_zone_callbackarg_t *cba = uap;
|
||||
dns_name_t *name = NULL;
|
||||
dns_view_t *oldview = NULL;
|
||||
dns_zone_t *oldzone = NULL;
|
||||
dns_view_t *newview = NULL;
|
||||
dns_zone_t *newzone = NULL;
|
||||
dns_zone_t *tmpzone = NULL;
|
||||
isc_result_t result;
|
||||
isc_boolean_t boolean;
|
||||
const char *viewname;
|
||||
|
||||
REQUIRE(czone != NULL);
|
||||
REQUIRE(cba != NULL);
|
||||
|
||||
/*
|
||||
* Find views by name.
|
||||
*/
|
||||
if (cview != NULL)
|
||||
dns_c_view_getname(cview, &viewname);
|
||||
else
|
||||
viewname = "default";
|
||||
|
||||
printf("view %s\n", viewname);
|
||||
|
||||
result = dns_viewlist_find(&cba->oldviews, viewname, czone->zclass,
|
||||
&oldview);
|
||||
result = dns_viewlist_find(&cba->newviews, viewname, czone->zclass,
|
||||
&newview);
|
||||
|
||||
if (newview == NULL) {
|
||||
result = dns_view_create(cba->mctx, czone->zclass, viewname,
|
||||
&newview);
|
||||
if (result != ISC_R_SUCCESS)
|
||||
goto cleanup;
|
||||
ISC_LIST_APPEND(cba->newviews, newview, link);
|
||||
}
|
||||
|
||||
/*
|
||||
* Create and populate a new zone structure.
|
||||
*/
|
||||
result = dns_zone_create(&newzone, cba->mctx);
|
||||
if (result != ISC_R_SUCCESS)
|
||||
goto cleanup;
|
||||
|
||||
result = dns_zone_configure(cfg, NULL, czone, NULL, newzone);
|
||||
if (result != ISC_R_SUCCESS)
|
||||
goto cleanup;
|
||||
|
||||
#if 0
|
||||
/* XXX hints should be a zone */
|
||||
if (dns_zone_gettype(newzone) == dns_zone_hint) {
|
||||
dns_view_sethints(newview, newzone);
|
||||
goto cleanup;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Find zone in mount table.
|
||||
*/
|
||||
name = dns_zone_getorigin(newzone);
|
||||
dns_zone_print(newzone);
|
||||
|
||||
result = dns_zt_find(newview->zonetable, name, 0, NULL, &tmpzone);
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
printf("zone already exists=\n");
|
||||
result = ISC_R_EXISTS;
|
||||
goto cleanup;
|
||||
} else if (result != DNS_R_PARTIALMATCH && result != ISC_R_NOTFOUND)
|
||||
goto cleanup;
|
||||
|
||||
if (oldview != NULL)
|
||||
result = dns_zt_find(oldview->zonetable, name, 0, NULL,
|
||||
&oldzone);
|
||||
else
|
||||
result = ISC_R_NOTFOUND;
|
||||
|
||||
printf("dns_zt_find() returned %s\n", dns_result_totext(result));
|
||||
|
||||
if (result == ISC_R_NOTFOUND || result == DNS_R_PARTIALMATCH) {
|
||||
if (result == DNS_R_PARTIALMATCH) {
|
||||
dns_zone_print(oldzone);
|
||||
}
|
||||
result = dns_view_addzone(newview, newzone);
|
||||
if (result != ISC_R_SUCCESS)
|
||||
goto cleanup;
|
||||
} else if (result == ISC_R_SUCCESS) {
|
||||
dns_zone_print(oldzone);
|
||||
/* Does the new configuration match the existing one? */
|
||||
boolean = dns_zone_equal(newzone, oldzone);
|
||||
printf("dns_zone_equal() returned %s\n", boolean ? "TRUE" : "FALSE");
|
||||
if (boolean)
|
||||
result = dns_view_addzone(newview, oldzone);
|
||||
else
|
||||
result = dns_view_addzone(newview, newzone);
|
||||
}
|
||||
|
||||
cleanup:
|
||||
if (tmpzone != NULL)
|
||||
dns_zone_detach(&tmpzone);
|
||||
if (newzone != NULL)
|
||||
dns_zone_detach(&newzone);
|
||||
if (oldzone != NULL)
|
||||
dns_zone_detach(&oldzone);
|
||||
return (result);
|
||||
}
|
||||
|
||||
static void
|
||||
print_rdataset(dns_name_t *name, dns_rdataset_t *rdataset) {
|
||||
isc_buffer_t text;
|
||||
char t[1000];
|
||||
isc_result_t result;
|
||||
isc_region_t r;
|
||||
|
||||
isc_buffer_init(&text, t, sizeof(t));
|
||||
result = dns_rdataset_totext(rdataset, name, ISC_FALSE, ISC_FALSE,
|
||||
&text);
|
||||
isc_buffer_usedregion(&text, &r);
|
||||
if (result == ISC_R_SUCCESS)
|
||||
printf("%.*s", (int)r.length, (char *)r.base);
|
||||
else
|
||||
printf("%s\n", dns_result_totext(result));
|
||||
}
|
||||
|
||||
static void
|
||||
query(dns_view_t *view) {
|
||||
char buf[1024];
|
||||
dns_fixedname_t name;
|
||||
char *s;
|
||||
isc_buffer_t buffer;
|
||||
isc_result_t result;
|
||||
dns_rdataset_t rdataset;
|
||||
dns_rdataset_t sigset;
|
||||
fd_set rfdset;
|
||||
int reload = 0;
|
||||
|
||||
|
||||
dns_rdataset_init(&rdataset);
|
||||
dns_rdataset_init(&sigset);
|
||||
|
||||
do {
|
||||
|
||||
fprintf(stdout, "zone_test ");
|
||||
fflush(stdout);
|
||||
FD_ZERO(&rfdset);
|
||||
FD_SET(0, &rfdset);
|
||||
select(1, &rfdset, NULL, NULL, NULL);
|
||||
if (fgets(buf, sizeof buf, stdin) == NULL) {
|
||||
fprintf(stdout, "\n");
|
||||
break;
|
||||
}
|
||||
buf[sizeof(buf) - 1] = '\0';
|
||||
|
||||
s = strchr(buf, '\n');
|
||||
if (s != NULL)
|
||||
*s = '\0';
|
||||
s = strchr(buf, '\r');
|
||||
if (s != NULL)
|
||||
*s = '\0';
|
||||
if (strlen(buf) == 0) {
|
||||
reload = 0;
|
||||
continue;
|
||||
}
|
||||
if (strcasecmp(buf, "exit") == 0 ||
|
||||
strcasecmp(buf, "quit") == 0)
|
||||
break;
|
||||
if (strcasecmp(buf, "reload") == 0) {
|
||||
reload = 1;
|
||||
continue;
|
||||
}
|
||||
if (strcasecmp(buf, "journal") == 0) {
|
||||
dns_journal_print(view->mctx, "dv.isc.org.ixfr",
|
||||
stdout);
|
||||
reload = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
dns_fixedname_init(&name);
|
||||
isc_buffer_init(&buffer, buf, strlen(buf));
|
||||
isc_buffer_add(&buffer, strlen(buf));
|
||||
result = dns_name_fromtext(dns_fixedname_name(&name),
|
||||
&buffer, dns_rootname, ISC_FALSE, NULL);
|
||||
ERRCONT(result, "dns_name_fromtext");
|
||||
|
||||
if (reload) {
|
||||
dns_zone_t *zone = NULL;
|
||||
result = dns_zt_find(view->zonetable,
|
||||
dns_fixedname_name(&name), 0,
|
||||
NULL, &zone);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
if (result == DNS_R_PARTIALMATCH)
|
||||
dns_zone_detach(&zone);
|
||||
reload = 0;
|
||||
continue;
|
||||
}
|
||||
result = dns_zone_load(zone);
|
||||
fprintf(stdout, "dns_zone_reload() returned %s\n",
|
||||
dns_result_totext(result));
|
||||
reload = 0;
|
||||
dns_zone_detach(&zone);
|
||||
} else {
|
||||
result = dns_view_simplefind(view,
|
||||
dns_fixedname_name(&name),
|
||||
dns_rdatatype_a, 0, 0,
|
||||
ISC_FALSE, &rdataset, &sigset);
|
||||
fprintf(stdout, "%s() returned %s\n",
|
||||
"dns_view_simplefind",
|
||||
dns_result_totext(result));
|
||||
switch (result) {
|
||||
case ISC_R_SUCCESS:
|
||||
print_rdataset(dns_fixedname_name(&name),
|
||||
&rdataset);
|
||||
break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
dns_rdataset_disassociate(&rdataset);
|
||||
}
|
||||
} while (1);
|
||||
dns_rdataset_invalidate(&rdataset);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char **argv) {
|
||||
const char *conf = "named.conf";
|
||||
isc_mem_t *mctx = NULL;
|
||||
dns_c_ctx_t *configctx = NULL;
|
||||
dns_view_t *view1 = NULL;
|
||||
dns_view_t *view2 = NULL;
|
||||
dns_view_t *view = NULL;
|
||||
dns_c_cbks_t cbks;
|
||||
int quiet = 0, stats = 0;
|
||||
isc_result_t result;
|
||||
int c;
|
||||
char *dir;
|
||||
dns_zone_callbackarg_t cba;
|
||||
|
||||
while ((c = getopt(argc, argv, "c:qs")) != EOF) {
|
||||
switch (c) {
|
||||
case 'c':
|
||||
conf = optarg;
|
||||
break;
|
||||
case 'q':
|
||||
quiet = 1;
|
||||
break;
|
||||
case 's':
|
||||
stats = 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
RUNTIME_CHECK(isc_app_start() == ISC_R_SUCCESS);
|
||||
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
|
||||
#if 0
|
||||
RUNTIME_CHECK(isc_taskmgr_create(mctx, 2, 0, &manager) ==
|
||||
ISC_R_SUCCESS);
|
||||
#endif
|
||||
|
||||
/*
|
||||
RUNTIME_CHECK(dns_view_create(mctx, dns_rdataclass_in,
|
||||
"default/IN", &view1) == ISC_R_SUCCESS);
|
||||
RUNTIME_CHECK(dns_view_create(mctx, dns_rdataclass_in,
|
||||
"default/IN", &view2) == ISC_R_SUCCESS);
|
||||
*/
|
||||
|
||||
cba.mctx = mctx;
|
||||
ISC_LIST_INIT(cba.oldviews);
|
||||
ISC_LIST_INIT(cba.newviews);
|
||||
|
||||
cbks.zonecbk = dns_zone_callback;
|
||||
cbks.zonecbkuap = &cba;
|
||||
cbks.optscbk = NULL;
|
||||
cbks.optscbkuap = NULL;
|
||||
|
||||
result = dns_c_parse_namedconf(conf, mctx, &configctx, &cbks);
|
||||
fprintf(stdout, "%s() returned %s\n", "dns_c_parse_namedconf",
|
||||
dns_result_totext(result));
|
||||
if (configctx != NULL)
|
||||
dns_c_ctx_delete(&configctx);
|
||||
|
||||
view = ISC_LIST_HEAD(cba.newviews);
|
||||
|
||||
while (view != NULL) {
|
||||
dns_zt_print(view->zonetable);
|
||||
view = ISC_LIST_NEXT(view, link);
|
||||
}
|
||||
|
||||
/* mv new ->old */
|
||||
cba.oldviews = cba.newviews;
|
||||
ISC_LIST_INIT(cba.newviews);
|
||||
|
||||
/*
|
||||
view = ISC_LIST_HEAD(cba.newviews);
|
||||
while (view != NULL) {
|
||||
dns_view_t *next;
|
||||
next = ISC_LIST_NEXT(view, link);
|
||||
ISC_LIST_UNLINK(cba.newviews, view, link);
|
||||
ISC_LIST_APPEND(cba.oldviews, view, link);
|
||||
view = next;
|
||||
}
|
||||
*/
|
||||
|
||||
result = dns_c_parse_namedconf(conf, mctx, &configctx, &cbks);
|
||||
fprintf(stdout, "%s() returned %s\n", "dns_c_parse_namedconf",
|
||||
dns_result_totext(result));
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
result = dns_c_ctx_getdirectory(configctx, &dir);
|
||||
if (result == ISC_R_SUCCESS)
|
||||
chdir(dir);
|
||||
view = ISC_LIST_HEAD(cba.newviews);
|
||||
while (view != NULL) {
|
||||
dns_zt_print(view->zonetable);
|
||||
dns_zt_load(view->zonetable, ISC_FALSE);
|
||||
dns_view_freeze(view);
|
||||
view = ISC_LIST_NEXT(view, link);
|
||||
}
|
||||
view = ISC_LIST_HEAD(cba.newviews);
|
||||
query(view);
|
||||
} else {
|
||||
view = ISC_LIST_HEAD(cba.oldviews);
|
||||
while (view != NULL) {
|
||||
dns_view_t *next;
|
||||
next = ISC_LIST_NEXT(view, link);
|
||||
ISC_LIST_UNLINK(cba.oldviews, view, link);
|
||||
dns_view_detach(&view);
|
||||
}
|
||||
}
|
||||
|
||||
/* cleanup */
|
||||
view = ISC_LIST_HEAD(cba.oldviews);
|
||||
while (view != NULL) {
|
||||
dns_view_t *next;
|
||||
next = ISC_LIST_NEXT(view, link);
|
||||
ISC_LIST_UNLINK(cba.oldviews, view, link);
|
||||
dns_view_detach(&view);
|
||||
view = next;
|
||||
}
|
||||
|
||||
view = ISC_LIST_HEAD(cba.newviews);
|
||||
while (view != NULL) {
|
||||
dns_view_t *next;
|
||||
next = ISC_LIST_NEXT(view, link);
|
||||
ISC_LIST_UNLINK(cba.newviews, view, link);
|
||||
dns_view_detach(&view);
|
||||
view = next;
|
||||
}
|
||||
|
||||
if (configctx != NULL)
|
||||
dns_c_ctx_delete(&configctx);
|
||||
if (view2 != NULL)
|
||||
dns_view_detach(&view2);
|
||||
if (view1 != NULL)
|
||||
dns_view_detach(&view1);
|
||||
|
||||
if (!quiet && stats)
|
||||
isc_mem_stats(mctx, stdout);
|
||||
isc_mem_destroy(&mctx);
|
||||
|
||||
return (0);
|
||||
}
|
Reference in New Issue
Block a user