Merge branch 'master' into direct-rdata-storage

dns.h

@@ -119,7 +119,7 @@ typedef enum nsd_rc nsd_rc_type;
 #define TYPE_EID	31	/* draft-ietf-nimrod-dns-01 */
 #define TYPE_NIMLOC	32	/* draft-ietf-nimrod-dns-01 */
 #define TYPE_SRV	33	/* SRV record RFC2782 */
-#define TYPE_ATMA	34	/* http://www.jhsoft.com/rfc/af-saa-0069.000.rtf */
+#define TYPE_ATMA	34	/* ATM Address http://www.jhsoft.com/rfc/af-saa-0069.000.rtf */
 #define TYPE_NAPTR	35	/* RFC2915 */
 #define TYPE_KX		36	/* RFC2230 Key Exchange Delegation Record */
 #define TYPE_CERT	37	/* RFC2538 */

doc/ChangeLog

@@ -1,10 +1,14 @@
+23 January 2025: Willem
+	- Merge #418: Support for DSYNC, EID, NIMLOC, SINK, TALINK, DOA,
+	  AMTRELAY and IPN resource record types.
+
 22 January 2025: Wouter
 	- Fix #426: nsd crashes with patterns in config_apply_pattern.
 
 20 January 2025: Willem
 	- code repository continues with 4.11.2 under development.
-	- Fix re-enable to configure dns-cookies from config file, which was
-	  accidentally removed with the 4.11.1 release.
+	- Fix re-enable to configure dns-cookies from config file, which
+	  was accidentally removed with the 4.11.1 release.
 
 19 January 2025: Willem
 	- NSD 4.11.1 emergency quick-fix release

doc/RELNOTES

@@ -2,6 +2,10 @@ NSD RELEASE NOTES
 
 4.11.2
 ================
+FEATURES:
+	- Merge #418: Support for DSYNC, EID, NIMLOC, SINK, TALINK, DOA,
+	  AMTRELAY and IPN resource record types.
+
 BUG FIXES:
         - Fix re-enable to configure dns-cookies from config file, which was
           accidentally removed with the 4.11.1 release.

rdata.c

@@ -499,7 +499,7 @@ print_base64(struct buffer *output, uint16_t rdlength, const uint8_t *rdata,
 	size_t size = rdlength - *offset;
 	if(size == 0) {
 		/* single zero represents empty buffer */
-		buffer_write(output, "0", 1);
+		buffer_write(output, (rr->type == TYPE_DOA ? "-" : "0"), 1);
 		return 1;
 	}
 	buffer_reserve(output, size * 2 + 1);

tpkg/parsing-not-printing.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+printing = { (name[5:], int(num))
+             for name, num in [ ln.split(maxsplit=3)[1:3]
+                                for ln in open('dns.h')
+                                if ln.startswith('#define TYPE_') ] 
+             if int(num) != 41 and (int(num) < 128 or int(num) >= 256) }
+parsing  = { (name[10:], int(num[1:-2]))
+             for name, num in [ ln.split(maxsplit=3)[1:3]
+                                for ln in open('simdzone/include/zone.h')
+                                if ln.startswith('#define ZONE_TYPE_') ] }
+
+if printing - parsing:
+	print('implement parsing  for:', printing - parsing)
+if parsing - printing:
+	print('implement printing for:', parsing - printing)
+

tpkg/rr-test.tdir/rr-test.cmp_zone

@@ -37,6 +37,22 @@ blaat	3600	IN	SOA	elektron.atoom.net. miekg.atoom.net. (
 	3600	IN	LOC \# 16 001216138b3556c88008165000989a89
 	3600	IN	LOC \# 16 00121613791b7d2898e64c4f00989a68
 	3600	IN	LOC \# 16 002516138916cb3c70c310df009884ed
+	3600	IN	SINK	64 1 TkxuZXRMYWJzLm5s
+	3600	IN	TALINK	h0.blaat.nl. h2.blaat.nl.
+	3600	IN	DOA	0 1 2 "" bWFpbHRvOmxhYnNAbmxuZXRsYWJzLm5s
+	3600	IN	DOA	0 100000 200 "example/nothing" -
+	3600	IN	ATMA	39246f000e7c9c03120001000100001234567800
+	3600	IN	ATMA	+3584001234567
+	3600	IN	AMTRELAY	200 0 0
+        3600	IN	AMTRELAY	10 0 1 203.0.113.15
+        3600	IN	AMTRELAY	10 0 2 2001:db8::15
+        3600	IN	AMTRELAY	128 1 3 amtrelays.example.com.
+        3600	IN	IPN	100
+        3600	IN	IPN	429496729700
+        3600	IN	IPN	10000000000000000000
+$ORIGIN _dsync.blaat.nl.
+*	3600	IN	DSYNC	CDS 1 5359 cds-scanner.example.net.
+	3600	IN	DSYNC	CSYNC 1 5360 csync-scanner.example.net.
 $ORIGIN blaat.nl.
 caa	3600	IN	CAA 0 issue "ca.example.net"
 	3600	IN	CAA 0 iodef "mailto:[email protected]"
@@ -57,6 +73,9 @@ hinault	3600	IN	GPOS	-22.6882 116.8652 250.0
 lillee	3600	IN	GPOS	-32.6882 116.8652 10.0
 marsh	3600	IN	GPOS	-32.6882 116.8652 10.0
 $ORIGIN blaat.nl.
+h0	3600	IN	TALINK	. h1.blaat.nl.
+h1	3600	IN	TALINK	h0.blaat.nl. h2.blaat.nl.
+h2	3600	IN	TALINK	h1.blaat.nl. .
 highbit-\200\210\201a	3600	IN	A	127.0.0.1
 hip1	3600	IN	HIP	2 200100107b1a74df365639cc39f1d578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D
 hip2	3600	IN	HIP	2 200100107b1a74df365639cc39f1d578 AwEAAbdxyhNuSutc5EMzxTs9LBPCIkOFH8cIvM4p9+LrV4e19WzK00+CI6zBCQTdtWsuxKbWIy87UOoJTwkUs7lBu+Upr1gsNrut79ryra+bSRGQb1slImA8YVJyuIDsj7kwzG7jnERNqnWxZ48AWkskmdHaVDP4BcelrTI3rMXdXF5D rvs.example.com.
@@ -86,6 +105,11 @@ rt-host	3600	IN	A	127.0.0.1
 	3600	IN	X25	"x25 address in text format"
 	3600	IN	ISDN	"isdn address"
 ta	3600	IN	TA	56039 13 2 4104805b43928fc573f0704a2c1b5a10baa2878de26b8535dde77517c154ce9f
+vaxa	3600	IN	EID	3141592653589793
+	3600	IN	NIMLOC	75234159eac457800921
+venera	3600	IN	EID	813f4b7cdab34217
+	3600	IN	NIMLOC	3227450a010034
+	3600	IN	NIMLOC	75234159eac457800920
 wallet	3600	IN	WALLET	"BTC" "1H6WkSHdqVahBKczJrs9bBfFYhUHrP5R2F"
 	3600	IN	WALLET	"BCH" "1PdRYCYMv7RA8PwxQZ1Q3aCYC4gxKVwFPu"
 	3600	IN	WALLET	"NMC" "MwKMAXMaXPFQTSCiVD5zHucmA6r3gaAnra"

tpkg/rr-test.tdir/rr-test.zone

@@ -65,6 +65,37 @@ $ORIGIN blaat.nl.
 @	IN LOC   32   7 19 S 116 2 25.999 E 10m
 @	IN LOC   42 21 28.764 N 71 00 51.617 W -44.99m 2000m
 
+; draft-eastlake-kitchen-sink
+@	IN SINK 64 1 TkxuZXRMYWJzLm5s
+
+; draft-ietf-dnsop-dnssec-trust-history
+@	IN TALINK h0 h2
+h0	IN TALINK .  h1
+h1	IN TALINK h0 h2
+h2	IN TALINK h1 .
+
+; draft-durand-doa-over-dns
+@	IN DOA 0 1 2 "" bWFpbHRvOmxhYnNAbmxuZXRsYWJzLm5s
+	IN DOA 0 100000 200 example/nothing -
+
+; https://web.archive.org/web/20190112072924/http://www.broadband-forum.org/ftp/pub/approved-specs/af-dans-0152.000.pdf
+@	IN ATMA 39.246f.00.0e7c9c.0312.0001.0001.000012345678.00
+	IN ATMA +358.400.1234567
+
+; RFC 8777
+@	IN AMTRELAY 200 0 0
+	IN AMTRELAY 10 0 1 203.0.113.15
+	IN AMTRELAY 10 0 2 2001:db8::15
+	IN AMTRELAY 128 1 3 amtrelays.example.com.
+
+; draft-johnson-dns-ipn-cla-07 Section 3.1.
+@	IN IPN 100
+        IN IPN 100.100
+	IN IPN 10000000000000000000
+
+*._dsync	IN	DSYNC	CDS	1 5359 cds-scanner.example.net.
+*._dsync	IN	DSYNC	CSYNC	1 5360 csync-scanner.example.net.
+
 $ORIGIN blaat.nl.
 
 dotted\.label IN MX 10 foo\ bar\.nl
@@ -161,3 +192,12 @@ hip3		IN	HIP	( 2 200100107B1A74DF365639CC39F1D578
                                   rvs1.example.com.
                                   rvs2.example.com. )
 
+; EID and NIMLOC examples from draft-ietf-nimrod-dns-01
+VENERA	EID	813F 4B7C DAB3 4217
+	NIMLOC	( 3227 45
+		  0A 01 00 34 )
+	NIMLOC	752341 59EAC4 5780 0920
+
+VAXA	EID	3141 5926 5358 9793
+	NIMLOC	752341 59EAC4 5780 0921
+