X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/92d636a906d450f9bd344ee312cfa9c88c3d2bd6..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-domain.c

diff --git a/print-domain.c b/print-domain.c
index 74c71dba..dcfc9fd2 100644
--- a/print-domain.c
+++ b/print-domain.c
@@ -495,30 +495,30 @@ const struct tok ns_type2str[] = {
 	{ T_MX,		"MX" },			/* RFC 1035 */
 	{ T_TXT,	"TXT" },		/* RFC 1035 */
 	{ T_RP,		"RP" },			/* RFC 1183 */
-	{ T_AFSDB,	"AFSDB" },		/* RFC 1183 */
+	{ T_AFSDB,	"AFSDB" },		/* RFC 5864 */
 	{ T_X25,	"X25" },		/* RFC 1183 */
 	{ T_ISDN,	"ISDN" },		/* RFC 1183 */
 	{ T_RT,		"RT" },			/* RFC 1183 */
 	{ T_NSAP,	"NSAP" },		/* RFC 1706 */
-	{ T_NSAP_PTR,	"NSAP_PTR" },
-	{ T_SIG,	"SIG" },		/* RFC 2535 */
-	{ T_KEY,	"KEY" },		/* RFC 2535 */
+	{ T_NSAP_PTR,	"NSAP_PTR" },		/* RFC 1706 */
+	{ T_SIG,	"SIG" },		/* RFC 3008 */
+	{ T_KEY,	"KEY" },		/* RFC 3110 */
 	{ T_PX,		"PX" },			/* RFC 2163 */
 	{ T_GPOS,	"GPOS" },		/* RFC 1712 */
-	{ T_AAAA,	"AAAA" },		/* RFC 1886 */
+	{ T_AAAA,	"AAAA" },		/* RFC 3596 */
 	{ T_LOC,	"LOC" },		/* RFC 1876 */
-	{ T_NXT,	"NXT" },		/* RFC 2535 */
+	{ T_NXT,	"NXT" },		/* RFC 3755 */
 	{ T_EID,	"EID" },		/* Nimrod */
 	{ T_NIMLOC,	"NIMLOC" },		/* Nimrod */
 	{ T_SRV,	"SRV" },		/* RFC 2782 */
 	{ T_ATMA,	"ATMA" },		/* ATM Forum */
-	{ T_NAPTR,	"NAPTR" },		/* RFC 2168, RFC 2915 */
+	{ T_NAPTR,	"NAPTR" },		/* RFC 3403 */
 	{ T_KX,		"KX" },			/* RFC 2230 */
-	{ T_CERT,	"CERT" },		/* RFC 2538 */
-	{ T_A6,		"A6" },			/* RFC 2874 */
-	{ T_DNAME,	"DNAME" },		/* RFC 2672 */
+	{ T_CERT,	"CERT" },		/* RFC 4398 */
+	{ T_A6,		"A6" },			/* RFC 6563 */
+	{ T_DNAME,	"DNAME" },		/* RFC 6672 */
 	{ T_SINK, 	"SINK" },
-	{ T_OPT,	"OPT" },		/* RFC 2671 */
+	{ T_OPT,	"OPT" },		/* RFC 6891 */
 	{ T_APL, 	"APL" },		/* RFC 3123 */
 	{ T_DS,		"DS" },			/* RFC 4034 */
 	{ T_SSHFP,	"SSHFP" },		/* RFC 4255 */
@@ -526,20 +526,47 @@ const struct tok ns_type2str[] = {
 	{ T_RRSIG, 	"RRSIG" },		/* RFC 4034 */
 	{ T_NSEC,	"NSEC" },		/* RFC 4034 */
 	{ T_DNSKEY,	"DNSKEY" },		/* RFC 4034 */
-	{ T_SPF,	"SPF" },		/* RFC-schlitt-spf-classic-02.txt */
+	{ T_DHCID,	"DHCID" },		/* RFC 4071 */
+	{ T_NSEC3,	"NSEC3" },		/* RFC 5155 */
+	{ T_NSEC3PARAM,	"NSEC3PARAM" },		/* RFC 5155 */
+	{ T_TLSA,	"TLSA" },		/* RFC 6698 */
+	{ T_SMIMEA,	"SMIMEA" },		/* RFC 8162 */
+	{ T_HIP,	"HIP" },		/* RFC 8005 */
+	{ T_NINFO,	"NINFO" },
+	{ T_RKEY,	"RKEY" },
+	{ T_TALINK,	"TALINK" },
+	{ T_CDS,	"CDS" },		/* RFC 7344 */
+	{ T_CDNSKEY,	"CDNSKEY" },		/* RFC 7344 */
+	{ T_OPENPGPKEY,	"OPENPGPKEY" },		/* RFC 7929 */
+	{ T_CSYNC,	"CSYNC" },		/* RFC 7477 */
+	{ T_ZONEMD,	"ZONEMD" },		/* RFC 8976 */
+	{ T_SVCB,	"SVCB" },
+	{ T_HTTPS,	"HTTPS" },
+	{ T_SPF,	"SPF" },		/* RFC 7208 */
 	{ T_UINFO,	"UINFO" },
 	{ T_UID,	"UID" },
 	{ T_GID,	"GID" },
 	{ T_UNSPEC,	"UNSPEC" },
-	{ T_UNSPECA,	"UNSPECA" },
+	{ T_NID,	"NID" },		/* RFC 6742 */
+	{ T_L32,	"L32" },		/* RFC 6742 */
+	{ T_L64,	"L64" },		/* RFC 6742 */
+	{ T_LP,		"LP" },			/* RFC 6742 */
+	{ T_EUI48,	"EUI48" },		/* RFC 7043 */
+	{ T_EUI64,	"EUI64" },		/* RFC 7043 */
 	{ T_TKEY,	"TKEY" },		/* RFC 2930 */
-	{ T_TSIG,	"TSIG" },		/* RFC 2845 */
+	{ T_TSIG,	"TSIG" },		/* RFC 8945 */
 	{ T_IXFR,	"IXFR" },		/* RFC 1995 */
-	{ T_AXFR,	"AXFR" },		/* RFC 1035 */
+	{ T_AXFR,	"AXFR" },		/* RFC 5936 */
 	{ T_MAILB,	"MAILB" },		/* RFC 1035 */
 	{ T_MAILA,	"MAILA" },		/* RFC 1035 */
-	{ T_ANY,	"ANY" },
+	{ T_ANY,	"ANY" },		/* RFC 8482 */
 	{ T_URI,	"URI" },		/* RFC 7553 */
+	{ T_CAA,	"CAA" },		/* RFC 8659 */
+	{ T_AVC,	"AVC" },
+	{ T_DOA,	"DOA" },
+	{ T_AMTRELAY,	"AMTRELAY" },		/* RFC 8777 */
+	{ T_TA,		"TA" },
+	{ T_DLV,	"DLV" },		/* RFC 8749 */
 	{ 0,		NULL }
 };
 
@@ -796,10 +823,8 @@ ns_rprint(netdissect_options *ndo,
 			ND_PRINT(" %u(bad plen)", pbit);
 			break;
 		} else if (pbit < 128) {
-			if (!ND_TTEST_LEN(cp + 1, sizeof(a) - pbyte))
-				return(NULL);
 			memset(a, 0, sizeof(a));
-			memcpy(a + pbyte, cp + 1, sizeof(a) - pbyte);
+			GET_CPY_BYTES(a + pbyte, cp + 1, sizeof(a) - pbyte);
 			ND_PRINT(" %u %s", pbit,
 			    addrtostr6(&a, ntop_buf, sizeof(ntop_buf)));
 		}
@@ -836,13 +861,6 @@ ns_rprint(netdissect_options *ndo,
         }
 		break;
 
-	case T_UNSPECA:		/* One long string */
-		if (!ND_TTEST_LEN(cp, len))
-			return(NULL);
-		if (nd_printn(ndo, cp, len, ndo->ndo_snapend))
-			return(NULL);
-		break;
-
 	case T_TSIG:
 	    {
 		if (cp + len > ndo->ndo_snapend)