lib-libc-net

被广泛使用的域名服务(DNS)软件

! 	if ((n = dn_expand(msg, cp + MAXCDNAME, cp, name, sizeof name)) < 0)
X  		return (NULL);
X  	if (name[0] == '\0') {
***************
*** 382,393 ****
X   * Print resource record fields in human readable form.
X   */
! char *
! p_rr(cp, msg, file)
! 	char *cp, *msg;
X  	FILE *file;
X  {
X  	int type, class, dlen, n, c;
X  	struct in_addr inaddr;
! 	char *cp1, *cp2;
X  	u_int32_t tmpttl, t;
X  	int lcnt;
--- 427,438 ----
X   * Print resource record fields in human readable form.
X   */
! const u_char *
! __p_rr(cp, msg, file)
! 	const u_char *cp, *msg;
X  	FILE *file;
X  {
X  	int type, class, dlen, n, c;
X  	struct in_addr inaddr;
! 	const u_char *cp1, *cp2;
X  	u_int32_t tmpttl, t;
X  	int lcnt;
***************
*** 395,410 ****
X  	if ((cp = p_fqname(cp, msg, file)) == NULL)
X  		return (NULL);			/* compression error */
! 	type = _getshort(cp);
! 	cp += sizeof(u_int16_t);
! 	class = _getshort(cp);
! 	cp += sizeof(u_int16_t);
! 	tmpttl = _getlong(cp);
! 	cp += sizeof(u_int32_t);
! 	dlen = _getshort(cp);
! 	cp += sizeof(u_int16_t);
X  	cp1 = cp;
! 	if (!_res.pfcode || _res.pfcode & RES_PRF_TTLID)
X  		fprintf(file, "\t%lu", tmpttl);
! 	if (!_res.pfcode || _res.pfcode & RES_PRF_CLASS)
X  		fprintf(file, "\t%s", __p_class(class));
X  	fprintf(file, "\t%s", __p_type(type));
--- 440,455 ----
X  	if ((cp = p_fqname(cp, msg, file)) == NULL)
X  		return (NULL);			/* compression error */
! 	type = _getshort((u_char*)cp);
! 	cp += INT16SZ;
! 	class = _getshort((u_char*)cp);
! 	cp += INT16SZ;
! 	tmpttl = _getlong((u_char*)cp);
! 	cp += INT32SZ;
! 	dlen = _getshort((u_char*)cp);
! 	cp += INT16SZ;
X  	cp1 = cp;
! 	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_TTLID))
X  		fprintf(file, "\t%lu", tmpttl);
! 	if ((!_res.pfcode) || (_res.pfcode & RES_PRF_CLASS))
X  		fprintf(file, "\t%s", __p_class(class));
X  	fprintf(file, "\t%s", __p_type(type));
***************
*** 417,421 ****
X  		case C_IN:
X  		case C_HS:
! 			bcopy(cp, (char *)&inaddr, sizeof(inaddr));
X  			if (dlen == 4) {
X  				fprintf(file, "\t%s", inet_ntoa(inaddr));
--- 462,466 ----
X  		case C_IN:
X  		case C_HS:
! 			bcopy(cp, (char *)&inaddr, INADDRSZ);
X  			if (dlen == 4) {
X  				fprintf(file, "\t%s", inet_ntoa(inaddr));
***************
*** 427,437 ****
X  
X  				address = inet_ntoa(inaddr);
! 				cp += sizeof(inaddr);
X  				protocol = *(u_char*)cp;
X  				cp += sizeof(u_char);
! 				port = _getshort(cp);
! 				cp += sizeof(u_int16_t);
X  				fprintf(file, "\t%s\t; proto %d, port %d",
! 				    address, protocol, port);
X  			}
X  			break;
--- 472,482 ----
X  
X  				address = inet_ntoa(inaddr);
! 				cp += INADDRSZ;
X  				protocol = *(u_char*)cp;
X  				cp += sizeof(u_char);
! 				port = _getshort((u_char*)cp);
! 				cp += INT16SZ;
X  				fprintf(file, "\t%s\t; proto %d, port %d",
! 					address, protocol, port);
X  			}
X  			break;
***************
*** 451,462 ****
X  
X  	case T_HINFO:
X  		if (n = *cp++) {
X  			fprintf(file, "\t%.*s", n, cp);
X  			cp += n;
X  		}
! 		if (n = *cp++) {
X  			fprintf(file, "\t%.*s", n, cp);
X  			cp += n;
! 		}
X  		break;
X  
--- 496,510 ----
X  
X  	case T_HINFO:
+ 	case T_ISDN:
+ 		cp2 = cp + dlen;
X  		if (n = *cp++) {
X  			fprintf(file, "\t%.*s", n, cp);
X  			cp += n;
X  		}
! 		if ((cp < cp2) && (n = *cp++)) {
X  			fprintf(file, "\t%.*s", n, cp);
X  			cp += n;
! 		} else if (type == T_HINFO)
! 			fprintf(file, "\n;; *** Warning *** OS-type missing");
X  		break;
X  
***************
*** 467,479 ****
X  		cp = p_fqname(cp, msg, file);	/* mail addr */
X  		fputs(" (\n", file);
! 		t = _getlong(cp);  cp += sizeof(u_int32_t);
X  		fprintf(file, "\t\t\t%lu\t; serial\n", t);
! 		t = _getlong(cp);  cp += sizeof(u_int32_t);
X  		fprintf(file, "\t\t\t%lu\t; refresh (%s)\n", t, __p_time(t));
! 		t = _getlong(cp);  cp += sizeof(u_int32_t);
X  		fprintf(file, "\t\t\t%lu\t; retry (%s)\n", t, __p_time(t));
! 		t = _getlong(cp);  cp += sizeof(u_int32_t);
X  		fprintf(file, "\t\t\t%lu\t; expire (%s)\n", t, __p_time(t));
! 		t = _getlong(cp);  cp += sizeof(u_int32_t);
X  		fprintf(file, "\t\t\t%lu )\t; minimum (%s)", t, __p_time(t));
X  		break;
--- 515,527 ----
X  		cp = p_fqname(cp, msg, file);	/* mail addr */
X  		fputs(" (\n", file);
! 		t = _getlong((u_char*)cp);  cp += INT32SZ;
X  		fprintf(file, "\t\t\t%lu\t; serial\n", t);
! 		t = _getlong((u_char*)cp);  cp += INT32SZ;
X  		fprintf(file, "\t\t\t%lu\t; refresh (%s)\n", t, __p_time(t));
! 		t = _getlong((u_char*)cp);  cp += INT32SZ;
X  		fprintf(file, "\t\t\t%lu\t; retry (%s)\n", t, __p_time(t));
! 		t = _getlong((u_char*)cp);  cp += INT32SZ;
X  		fprintf(file, "\t\t\t%lu\t; expire (%s)\n", t, __p_time(t));
! 		t = _getlong((u_char*)cp);  cp += INT32SZ;
X  		fprintf(file, "\t\t\t%lu )\t; minimum (%s)", t, __p_time(t));
X  		break;
***************
*** 481,490 ****
X  	case T_MX:
X  	case T_AFSDB:
! 		fprintf(file, "\t%d ", _getshort(cp));
! 		cp += sizeof(u_int16_t);
X  		cp = p_fqname(cp, msg, file);
X  		break;
X  
X    	case T_TXT:
X  		(void) fputs("\t\"", file);
X  		cp2 = cp1 + dlen;
--- 529,548 ----
X  	case T_MX:
X  	case T_AFSDB:
! 	case T_RT:
! 		fprintf(file, "\t%d ", _getshort((u_char*)cp));
! 		cp += INT16SZ;
X  		cp = p_fqname(cp, msg, file);
X  		break;
X  
+         case T_PX:
+                 fprintf(file, "\t%d ", _getshort((u_char*)cp));
+                 cp += INT16SZ;
+                 cp = p_fqname(cp, msg, file);
+                 putc(' ', file);
+                 cp = p_fqname(cp, msg, file);
+                 break;
+ 
X    	case T_TXT:
+ 	case T_X25:
X  		(void) fputs("\t\"", file);
X  		cp2 = cp1 + dlen;
***************
*** 492,496 ****
X  			if (n = (unsigned char) *cp++) {
X  				for (c = n; c > 0 && cp < cp2; c--)
! 					if (*cp == '\n') {
X  					    (void) putc('\\', file);
X  					    (void) putc(*cp++, file);
--- 550,554 ----
X  			if (n = (unsigned char) *cp++) {
X  				for (c = n; c > 0 && cp < cp2; c--)
! 					if ((*cp == '\n') || (*cp == '"')) {
X  					    (void) putc('\\', file);
X  					    (void) putc(*cp++, file);
***************
*** 502,505 ****
--- 560,568 ----
X    		break;
X  
+   	case T_NSAP:
+ 		(void) fprintf(file, "\t%s", inet_nsap_ntoa(dlen, cp, NULL));
+ 		cp += dlen;
+   		break;
+ 
X  	case T_MINFO:
X  	case T_RP:
***************
*** 512,516 ****
X  	case T_UINFO:
X  		putc('\t', file);
! 		fputs(cp, file);
X  		cp += dlen;
X  		break;
--- 575,579 ----
X  	case T_UINFO:
X  		putc('\t', file);
! 		fputs((char *)cp, file);
X  		cp += dlen;
X  		break;
***************
*** 519,533 ****
X  	case T_GID:
X  		if (dlen == 4) {
! 			fprintf(file, "\t%u", _getlong(cp));
! 			cp += sizeof(int32_t);
X  		}
X  		break;
X  
X  	case T_WKS:
! 		if (dlen < sizeof(u_int32_t) + 1)
X  			break;
! 		bcopy(cp, (char *)&inaddr, sizeof(inaddr));
! 		cp += sizeof(u_int32_t);
! 		fprintf(file, "\t%s %s ( ", inet_ntoa(inaddr), deproto(*cp));
X  		cp += sizeof(u_char);
X  		n = 0;
--- 582,598 ----
X  	case T_GID:
X  		if (dlen == 4) {
! 			fprintf(file, "\t%u", _getlong((u_char*)cp));
! 			cp += INT32SZ;
X  		}
X  		break;
X  
X  	case T_WKS:
! 		if (dlen < INT32SZ + 1)
X  			break;
! 		bcopy(cp, (char *)&inaddr, INADDRSZ);
! 		cp += INT32SZ;
! 		fprintf(file, "\t%s %s ( ",
! 			inet_ntoa(inaddr),
! 			deproto((int) *cp));
X  		cp += sizeof(u_char);
X  		n = 0;
***************
*** 555,564 ****
X  		{
X  			int NumBytes = 8;
! 			char *DataPtr;
X  			int i;
X  
X  			if (dlen < NumBytes) NumBytes = dlen;
X  			fprintf(file, "\tFirst %d bytes of hex data:",
! 			    NumBytes);
X  			for (i = 0, DataPtr = cp; i < NumBytes; i++, DataPtr++)
X  				fprintf(file, " %x", *DataPtr);
--- 620,629 ----
X  		{
X  			int NumBytes = 8;
! 			u_char *DataPtr;
X  			int i;
X  
X  			if (dlen < NumBytes) NumBytes = dlen;
X  			fprintf(file, "\tFirst %d bytes of hex data:",
! 				NumBytes);
X  			for (i = 0, DataPtr = cp; i < NumBytes; i++, DataPtr++)
X  				fprintf(file, " %x", *DataPtr);
***************
*** 579,583 ****
X  	if (cp - cp1 != dlen) {
X  		fprintf(file, ";; packet size error (found %d, dlen was %d)\n",
! 		    cp - cp1, dlen);
X  		cp = NULL;
X  	}
--- 644,648 ----
X  	if (cp - cp1 != dlen) {
X  		fprintf(file, ";; packet size error (found %d, dlen was %d)\n",
! 			cp - cp1, dlen);
X  		cp = NULL;
X  	}
***************
*** 590,652 ****
X   * Return a string for the type
X   */
! char *
X  __p_type(type)
X  	int type;
X  {
X  	switch (type) {
! 	case T_A:
! 		return("A");
! 	case T_NS:		/* authoritative server */
! 		return("NS");
! 	case T_CNAME:		/* canonical name */
! 		return("CNAME");
! 	case T_SOA:		/* start of authority zone */
! 		return("SOA");
! 	case T_MB:		/* mailbox domain name */
! 		return("MB");
! 	case T_MG:		/* mail group member */
! 		return("MG");
! 	case T_MR:		/* mail rename name */
! 		return("MR");
! 	case T_NULL:		/* null resource record */
! 		return("NULL");
! 	case T_WKS:		/* well known service */
! 		return("WKS");
! 	case T_PTR:		/* domain name pointer */
! 		return("PTR");
! 	case T_HINFO:		/* host information */
! 		return("HINFO");
! 	case T_MINFO:		/* mailbox information */
! 		return("MINFO");
! 	case T_MX:		/* mail routing info */
! 		return("MX");
! 	case T_TXT:		/* text */
! 		return("TXT");
! 	case T_RP:		/* responsible person */
! 		return("RP");
! 	case T_AFSDB:		/* AFS cell database */
! 		return("AFSDB");
! 	case T_AXFR:		/* zone transfer */
! 		return("AXFR");
! 	case T_MAILB:		/* mail box */
! 		return("MAILB");
! 	case T_MAILA:		/* mail address */
! 		return("MAILA");
! 	case T_ANY:		/* matches any type */
! 		return("ANY");
! 	case T_UINFO:
! 		return("UINFO");
! 	case T_UID:
! 		return("UID");
! 	case T_GID:
! 		return("GID");
X  #ifdef ALLOW_T_UNSPEC
! 	case T_UNSPEC:
! 		return("UNSPEC");
X  #endif /* ALLOW_T_UNSPEC */
! 
! 	default:
! 		(void)sprintf(nbuf, "%d", type);
! 		return(nbuf);
X  	}
X  }
--- 655,701 ----
X   * Return a string for the type
X   */
! const char *
X  __p_type(type)
X  	int type;
X  {
X  	switch (type) {
! 	case T_A:	return "A";
! 	case T_NS:	return "NS";
! 	case T_CNAME:	return "CNAME";
! 	case T_SOA:	return "SOA";
! 	case T_MB:	return "MB";
! 	case T_MG:	return "MG";
! 	case T_MR:	return "MR";
! 	case T_NULL:	return "NULL";
! 	case T_WKS:	return "WKS";
! 	case T_PTR:	return "PTR";
! 	case T_HINFO:	return "HINFO";
! 	case T_MINFO:	return "MINFO";
! 	case T_MX:	return "MX";
! 	case T_TXT:	return "TXT";
! 	case T_RP:	return "RP";
! 	case T_AFSDB:	return "AFSDB";
! 	case T_X25:	return "X25";
! 	case T_ISDN:	return "ISDN";
! 	case T_RT:	return "RT";
! 	case T_NSAP:	return "NSAP";
! 	case T_NSAP_PTR: return "NSAP_PTR";
! 	case T_SIG:	return "SIG";
! 	case T_KEY:	return "KEY";
! 	case T_PX:	return "PX";
! 	case T_GPOS:	return "GPOS";
! 	case T_AAAA:	return "AAAA";
! 	case T_LOC:	return "LOC";
! 	case T_AXFR:	return "AXFR";
! 	case T_MAILB:	return "MAILB";
! 	case T_MAILA:	return "MAILA";
! 	case T_ANY:	return "ANY";
! 	case T_UINFO:	return "UINFO";
! 	case T_UID:	return "UID";
! 	case T_GID:	return "GID";
X  #ifdef ALLOW_T_UNSPEC
! 	case T_UNSPEC:	return "UNSPEC";
X  #endif /* ALLOW_T_UNSPEC */
! 	default:	(void)sprintf(nbuf, "%d", type); return (nbuf);
X  	}
X  }
***************
*** 655,673 ****
X   * Return a mnemonic for class
X   */
! char *
X  __p_class(class)
X  	int class;
X  {
- 
X  	switch (class) {
! 	case C_IN:		/* internet class */
! 		return("IN");
! 	case C_HS:		/* hesiod class */
! 		return("HS");
! 	case C_ANY:		/* matches any class */
! 		return("ANY");
! 	default:
! 		(void)sprintf(nbuf, "%d", class);
! 		return(nbuf);
X  	}
X  }
--- 704,716 ----
X   * Return a mnemonic for class
X   */
! const char *
X  __p_class(class)
X  	int class;
X  {
X  	switch (class) {
! 	case C_IN:	return "IN";
! 	case C_HS:	return "HS";
! 	case C_ANY:	return "ANY";
! 	default:	(void)sprintf(nbuf, "%d", class); return (nbuf);
X  	}
X  }
***************
*** 676,682 ****
X   * Return a mnemonic for an option
X   */
! static char *
! p_option(option)
! 	u_int32_t option;
X  {
X  	switch (option) {
--- 719,725 ----
X   * Return a mnemonic for an option
X   */
! const char *
! __p_option(option)
! 	u_long option;
X  {
X  	switch (option) {
***************
*** 691,694 ****
--- 734,739 ----
X  	case RES_STAYOPEN:	return "styopn";
X  	case RES_DNSRCH:	return "dnsrch";
+ 	case RES_INSECURE1:	return "insecure1";
+ 	case RES_INSECURE2:	return "insecure2";
X  	default:		sprintf(nbuf, "?0x%x?", option); return (nbuf);
X  	}
***************
*** 707,711 ****
X  	if (value == 0) {
X  		strcpy(nbuf, "0 secs");
! 		return(nbuf);
X  	}
X  
--- 752,756 ----
X  	if (value == 0) {
X  		strcpy(nbuf, "0 secs");
! 		return (nbuf);
X  	}
X  
***************
*** 742,745 ****
X  		(void)sprintf(p, "%d sec%s", PLURALIZE(secs));
X  	}
! 	return(nbuf);
X  }
--- 787,790 ----
X  		(void)sprintf(p, "%d sec%s", PLURALIZE(secs));
X  	}
! 	return (nbuf);
X  }
*** ../net-2.0b1/res_init.c	Mon Nov  7 10:54:50 1994
--- res_init.c	Mon Dec 12 00:50:19 1994
***************
*** 58,62 ****
X  #if defined(LIBC_SCCS) && !defined(lint)
X  static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
! static char rcsid[] = "=Id: res_init.c,v 4.9.1.8 1993/11/12 01:23:34 vixie Exp =";
X  #endif /* LIBC_SCCS and not lint */
X  
--- 58,62 ----
X  #if defined(LIBC_SCCS) && !defined(lint)
X  static char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
! s