upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-09 03:32:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

use the new API rules for dns_message_t and names

Browse source
This commit is contained in:
Michael Graff 1999-09-10 20:25:51 +00:00
parent b87a704401
commit 8aa6d34be7
3 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bin/tests/dispatch_tcp_test.c
View file

@ -155,7 +155,7 @@ start_response(void)
isc_sockaddr_t from;
dns_message_t *msg;
isc_result_t result;
dns_name_t name;
dns_name_t *name;
unsigned char namebuf[255];
isc_buffer_t target;
isc_buffer_t source;
@ -169,10 +169,6 @@ start_response(void)
isc_buffer_setactive(&source, strlen(QUESTION));
isc_buffer_init(&target, namebuf, sizeof(namebuf),
ISC_BUFFERTYPE_BINARY);
dns_name_init(&name, NULL);
result = dns_name_fromtext(&name, &source, dns_rootname, ISC_FALSE,
&target);
CHECKRESULT(result, "dns_name_fromtext()");
memset(&from, 0, sizeof(from));
from.length = sizeof(struct sockaddr_in);
@ -188,7 +184,16 @@ start_response(void)
result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &msg);
CHECKRESULT(result, "dns_message_create()");
dns_message_addname(msg, &name, DNS_SECTION_QUESTION);
name = NULL;
result = dns_message_gettempname(msg, &name);
CHECKRESULT(result, "dns_message_gettempname()");
dns_name_init(name, NULL);
result = dns_name_fromtext(name, &source, dns_rootname, ISC_FALSE,
&target);
CHECKRESULT(result, "dns_name_fromtext()");
dns_message_addname(msg, name, DNS_SECTION_QUESTION);
rdatalist.rdclass = dns_rdataclass_in;
rdatalist.type = dns_rdatatype_a;
@ -199,7 +204,7 @@ start_response(void)
result = dns_rdatalist_tordataset(&rdatalist, &rdataset);
CHECKRESULT(result, "dns_rdatalist_tordataset()");
ISC_LIST_APPEND(name.list, &rdataset, link);
ISC_LIST_APPEND(name->list, &rdataset, link);
result = printmessage(msg);
CHECKRESULT(result, "printmessage()");

19
bin/tests/dispatch_test.c
View file

@ -134,7 +134,7 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
isc_sockaddr_t from;
dns_message_t *msg;
isc_result_t result;
dns_name_t name;
dns_name_t *name;
unsigned char namebuf[255];
isc_buffer_t target;
isc_buffer_t source;
@ -145,10 +145,6 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
isc_buffer_setactive(&source, strlen(query));
isc_buffer_init(&target, namebuf, sizeof(namebuf),
ISC_BUFFERTYPE_BINARY);
dns_name_init(&name, NULL);
result = dns_name_fromtext(&name, &source, dns_rootname, ISC_FALSE,
&target);
CHECKRESULT(result, "dns_name_fromtext()");
memset(&from, 0, sizeof(from));
from.length = sizeof(struct sockaddr_in);
@ -164,7 +160,16 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER, &msg);
CHECKRESULT(result, "dns_message_create()");
dns_message_addname(msg, &name, DNS_SECTION_QUESTION);
name = NULL;
result = dns_message_gettempname(msg, &name);
CHECKRESULT(result, "dns_message_gettempname()");
dns_name_init(name, NULL);
result = dns_name_fromtext(name, &source, dns_rootname, ISC_FALSE,
&target);
CHECKRESULT(result, "dns_name_fromtext()");
dns_message_addname(msg, name, DNS_SECTION_QUESTION);
cli->rdatalist.rdclass = dns_rdataclass_in;
cli->rdatalist.type = dns_rdatatype_a;
@ -175,7 +180,7 @@ start_response(clictx_t *cli, char *query, isc_task_t *task)
result = dns_rdatalist_tordataset(&cli->rdatalist, &cli->rdataset);
CHECKRESULT(result, "dns_rdatalist_tordataset()");
ISC_LIST_APPEND(name.list, &cli->rdataset, link);
ISC_LIST_APPEND(name->list, &cli->rdataset, link);
result = printmessage(msg);
CHECKRESULT(result, "printmessage()");

14
bin/tests/sdig.c
View file

@ -219,8 +219,9 @@ main(int argc, char *argv[]) {
char *server;
unsigned int port;
isc_boolean_t vc, have_name, have_type, edns0;
dns_fixedname_t fname;
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;
@ -273,11 +274,16 @@ main(int argc, char *argv[]) {
rdclass = dns_rdataclass_in;
edns0 = ISC_FALSE;
dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname);
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),
ISC_BUFFERTYPE_BINARY);
printf("\n; <<>> sdig <<>>");
for (i = 1; i < argc; i++) {
@ -308,7 +314,7 @@ main(int argc, char *argv[]) {
result = dns_name_fromtext(name, &b,
dns_rootname,
ISC_FALSE,
NULL);
&namebuffer);
check_result(result, "dns_name_fromtext()");
have_name = ISC_TRUE;
} else {