2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00

use DNS_NAME_MAXTEXT/DNS_NAME_FORMATSIZE

This commit is contained in:
Andreas Gustafsson
2000-08-09 00:09:36 +00:00
parent ff56121a98
commit e605e98f3e
8 changed files with 18 additions and 24 deletions

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dig.h,v 1.41 2000/08/01 01:11:19 tale Exp $ */ /* $Id: dig.h,v 1.42 2000/08/09 00:09:27 gson Exp $ */
#ifndef DIG_H #ifndef DIG_H
#define DIG_H #define DIG_H
@@ -33,12 +33,7 @@
#include <isc/socket.h> #include <isc/socket.h>
#define MXSERV 6 #define MXSERV 6
/* XXXMWS Get MXNAME from name.h, or wherever */ #define MXNAME (DNS_NAME_MAXTEXT+1)
#define MXNAME 1005
/*
* MXNAME was decided upon on 7/31/00 at IETF by everyone.
* This may well NOT be true for bitstring labels.
*/
#define MXRD 32 #define MXRD 32
#define BUFSIZE 512 #define BUFSIZE 512
#define COMMSIZE 0xffff #define COMMSIZE 0xffff

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: query.c,v 1.124 2000/08/08 23:57:13 gson Exp $ */ /* $Id: query.c,v 1.125 2000/08/09 00:09:29 gson Exp $ */
#include <config.h> #include <config.h>
@@ -2905,7 +2905,7 @@ query_find(ns_client_t *client, dns_fetchevent_t *event) {
static inline void static inline void
log_query(ns_client_t *client) { log_query(ns_client_t *client) {
isc_buffer_t b; isc_buffer_t b;
char namebuf[1024]; char namebuf[DNS_NAME_FORMATSIZE];
char text[256]; char text[256];
isc_region_t r; isc_region_t r;
dns_rdataset_t *rdataset; dns_rdataset_t *rdataset;

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: xfrout.c,v 1.71 2000/08/07 20:39:10 gson Exp $ */ /* $Id: xfrout.c,v 1.72 2000/08/09 00:09:30 gson Exp $ */
#include <config.h> #include <config.h>
@@ -1512,7 +1512,7 @@ xfrout_logv(ns_client_t *client, dns_name_t *zonename, int level,
const char *fmt, va_list ap) const char *fmt, va_list ap)
{ {
char msgbuf[2048]; char msgbuf[2048];
char namebuf[1024]; char namebuf[DNS_NAME_FORMATSIZE];
dns_name_format(zonename, namebuf, sizeof(namebuf)); dns_name_format(zonename, namebuf, sizeof(namebuf));
vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap); vsnprintf(msgbuf, sizeof(msgbuf), fmt, ap);

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: nsupdate.c,v 1.40 2000/08/02 02:34:40 bwelling Exp $ */ /* $Id: nsupdate.c,v 1.41 2000/08/09 00:09:31 gson Exp $ */
#include <config.h> #include <config.h>
@@ -63,7 +63,6 @@
#include <unistd.h> #include <unistd.h>
#define MXNAME 256 #define MXNAME 256
#define MAXPNAME 1025
#define MAXCMD 1024 #define MAXCMD 1024
#define NAMEBUF 512 #define NAMEBUF 512
#define WORDLEN 512 #define WORDLEN 512
@@ -1191,7 +1190,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
} }
if (debugging) { if (debugging) {
char namestr[MAXPNAME]; char namestr[DNS_NAME_FORMATSIZE];
dns_name_format(name, namestr, sizeof(namestr)); dns_name_format(name, namestr, sizeof(namestr));
fprintf(stderr, "Found zone name: %s\n", namestr); fprintf(stderr, "Found zone name: %s\n", namestr);
} }
@@ -1213,7 +1212,7 @@ recvsoa(isc_task_t *task, isc_event_t *event) {
zonename = name; zonename = name;
if (debugging) { if (debugging) {
char namestr[MAXPNAME]; char namestr[DNS_NAME_FORMATSIZE];
dns_name_format(&master, namestr, sizeof(namestr)); dns_name_format(&master, namestr, sizeof(namestr));
fprintf(stderr, "The master is: %s\n", namestr); fprintf(stderr, "The master is: %s\n", namestr);
} }

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: byaddr_test.c,v 1.19 2000/08/01 01:12:37 tale Exp $ */ /* $Id: byaddr_test.c,v 1.20 2000/08/09 00:09:32 gson Exp $ */
/* /*
* Principal Author: Bob Halley * Principal Author: Bob Halley
@@ -59,7 +59,7 @@ done(isc_task_t *task, isc_event_t *event) {
for (name = ISC_LIST_HEAD(bevent->names); for (name = ISC_LIST_HEAD(bevent->names);
name != NULL; name != NULL;
name = ISC_LIST_NEXT(name, link)) { name = ISC_LIST_NEXT(name, link)) {
char text[1024]; char text[DNS_NAME_FORMATSIZE];
dns_name_format(name, text, sizeof(text)); dns_name_format(name, text, sizeof(text));
printf("%s\n", text); printf("%s\n", text);
} }

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: byname_test.c,v 1.21 2000/08/01 01:12:38 tale Exp $ */ /* $Id: byname_test.c,v 1.22 2000/08/09 00:09:34 gson Exp $ */
/* /*
* Principal Author: Bob Halley * Principal Author: Bob Halley
@@ -101,7 +101,7 @@ print_addresses(dns_adbfind_t *find) {
static void static void
print_name(dns_name_t *name) { print_name(dns_name_t *name) {
char text[1024]; char text[DNS_NAME_FORMATSIZE];
dns_name_format(name, text, sizeof(text)); dns_name_format(name, text, sizeof(text));
printf("%s\n", text); printf("%s\n", text);

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: adb.c,v 1.144 2000/08/01 01:22:09 tale Exp $ */ /* $Id: adb.c,v 1.145 2000/08/09 00:09:35 gson Exp $ */
/* /*
* Implementation notes * Implementation notes
@@ -2994,7 +2994,7 @@ dns_adb_dumpfind(dns_adbfind_t *find, FILE *f) {
static void static void
print_dns_name(FILE *f, dns_name_t *name) { print_dns_name(FILE *f, dns_name_t *name) {
char buf[1024]; char buf[DNS_NAME_FORMATSIZE];
INSIST(f != NULL); INSIST(f != NULL);

View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: xfrin.c,v 1.90 2000/08/08 23:49:28 gson Exp $ */ /* $Id: xfrin.c,v 1.91 2000/08/09 00:09:36 gson Exp $ */
#include <config.h> #include <config.h>
@@ -1217,8 +1217,8 @@ static void
xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr, xfrin_logv(int level, dns_name_t *zonename, isc_sockaddr_t *masteraddr,
const char *fmt, va_list ap) const char *fmt, va_list ap)
{ {
char zntext[1024]; char zntext[DNS_NAME_FORMATSIZE];
char mastertext[256]; char mastertext[ISC_SOCKADDR_FORMATSIZE];
char msgtext[2048]; char msgtext[2048];
dns_name_format(zonename, zntext, sizeof(zntext)); dns_name_format(zonename, zntext, sizeof(zntext));