eui is not draft and draft is stoopid

git-svn-id: file:///svn/nsd/trunk@4095 a26ef69c-88ff-0310-839f-98b793d9c207

Author: Matthijs Mekking

configure.ac

@@ -789,15 +789,6 @@ case "$enable_minimal_responses" in
                 ;;
 esac
 
-AC_ARG_ENABLE(draft-rrtypes, AC_HELP_STRING([--enable-draft-rrtypes], [Enable draft RRtypes.]))
-case "$enable_draft_rrtypes" in
-        yes)
-		AC_DEFINE_UNQUOTED([DRAFT_RRTYPES], [], [Define this to enable draft RRtypes.])
-                ;;
-        no|*)
-		;;
-esac
-
 AC_ARG_ENABLE(mmap, AC_HELP_STRING([--enable-mmap], [Use mmap instead of malloc. Experimental.]))
 case "$enable_mmap" in
         yes)

dns.c

@@ -426,14 +426,12 @@ static rrtype_descriptor_type rrtype_descriptors[(RRTYPE_DESCRIPTORS_LENGTH+1)]
 	{ TYPE_LP, "LP", T_LP, 2, 2,
 	  { RDATA_WF_SHORT, RDATA_WF_UNCOMPRESSED_DNAME },
 	  { RDATA_ZF_SHORT, RDATA_ZF_DNAME } },
-#ifdef DRAFT_RRTYPES
 	/* 108 */
 	{ TYPE_EUI48, "EUI48", T_EUI48, 1, 1,
 	  { RDATA_WF_EUI48 }, { RDATA_ZF_EUI48 } },
 	/* 109 */
 	{ TYPE_EUI64, "EUI64", T_EUI64, 1, 1,
 	  { RDATA_WF_EUI64 }, { RDATA_ZF_EUI64 } },
-#endif
 
 	/* 32769 */
 	{ TYPE_DLV, "DLV", T_DLV, 4, 4,

dns.h

@@ -143,11 +143,8 @@ typedef enum nsd_rc nsd_rc_type;
 #define TYPE_L32        105     /* RFC 6742 */
 #define TYPE_L64        106     /* RFC 6742 */
 #define TYPE_LP         107     /* RFC 6742 */
-
-#ifdef DRAFT_RRTYPES
 #define TYPE_EUI48      108     /* draft-jabley-dnsext-eui48-eui64-rrtypes */
 #define TYPE_EUI64      109     /* draft-jabley-dnsext-eui48-eui64-rrtypes */
-#endif
 
 #define TYPE_TSIG	250
 #define TYPE_IXFR	251
@@ -171,10 +168,8 @@ typedef enum nsd_rc nsd_rc_type;
 
 #define IP4ADDRLEN	(32/8)
 #define IP6ADDRLEN	(128/8)
-#ifdef DRAFT_RRTYPES
 #define EUI48ADDRLEN	(48/8)
 #define EUI64ADDRLEN	(64/8)
-#endif
 
 #define NSEC3_HASH_LEN 20
 
@@ -197,13 +192,9 @@ enum rdata_wireformat
 	RDATA_WF_BINARYWITHLENGTH,   /* Binary data preceded by 1 byte length */
 	RDATA_WF_APL,                /* APL data.  */
 	RDATA_WF_IPSECGATEWAY,       /* IPSECKEY gateway ip4, ip6 or dname. */
-#ifdef DRAFT_RRTYPES
 	RDATA_WF_ILNP64,             /* 64-bit uncompressed IPv6 address.  */
 	RDATA_WF_EUI48,	             /* 48-bit address.  */
 	RDATA_WF_EUI64               /* 64-bit address.  */
-#else
-	RDATA_WF_ILNP64              /* 64-bit uncompressed IPv6 address.  */
-#endif
 };
 typedef enum rdata_wireformat rdata_wireformat_type;
 
@@ -238,10 +229,8 @@ enum rdata_zoneformat
 	RDATA_ZF_NSEC,		/* NSEC type bitmap.  */
 	RDATA_ZF_LOC,		/* Location data.  */
 	RDATA_ZF_ILNP64,	/* 64-bit uncompressed IPv6 address.  */
-#ifdef DRAFT_RRTYPES
 	RDATA_ZF_EUI48,		/* EUI48 address.  */
 	RDATA_ZF_EUI64,		/* EUI64 address.  */
-#endif
 	RDATA_ZF_UNKNOWN	/* Unknown data.  */
 };
 typedef enum rdata_zoneformat rdata_zoneformat_type;
@@ -264,11 +253,7 @@ typedef struct rrtype_descriptor rrtype_descriptor_type;
  *
  * EUI64 + 1
  */
-#ifdef DRAFT_RRTYPES
 #define RRTYPE_DESCRIPTORS_LENGTH  (TYPE_EUI64 + 1)
-#else
-#define RRTYPE_DESCRIPTORS_LENGTH  (TYPE_LP + 1)
-#endif
 rrtype_descriptor_type *rrtype_descriptor_by_name(const char *name);
 rrtype_descriptor_type *rrtype_descriptor_by_type(uint16_t type);
 

doc/ChangeLog

@@ -1,3 +1,6 @@
+11 November 2013: Matthijs
+	- EUI48 and EUI64 is now RFC 7043
+
 5 November 2013: Wouter
 	- Accept interface: as an alternative for ip-address: for
 	  consistency with unbound.conf syntax.

doc/REQUIREMENTS

@@ -863,8 +863,8 @@ RR records details.
   "L64"      106,   # RFC 6742
   "LP"       107,   # RFC 6742
 
-  "EUI48"    108,   # [draft-jabley-dnsext-eui48-eui64-rrtypes]
-  "EUI64"    109,   # [draft-jabley-dnsext-eui48-eui64-rrtypes]
+  "EUI48"    108,   # RFC 7043
+  "EUI64"    109,   # RFC 7043
 
   "TKEY"     249,   # RFC 2930
   "TSIG"     250,   # RFC 2845

rdata.c

@@ -235,7 +235,6 @@ rdata_ilnp64_to_string(buffer_type *output, rdata_atom_type rdata,
 	return 1;
 }
 
-#ifdef DRAFT_RRTYPES
 static int
 rdata_eui48_to_string(buffer_type *output, rdata_atom_type rdata,
 	rr_type* ATTR_UNUSED(rr))
@@ -271,7 +270,6 @@ rdata_eui64_to_string(buffer_type *output, rdata_atom_type rdata,
 		a1, a2, a3, a4, a5, a6, a7, a8);
 	return 1;
 }
-#endif
 
 static int
 rdata_rrtype_to_string(buffer_type *output, rdata_atom_type rdata,
@@ -631,10 +629,8 @@ static rdata_to_string_type rdata_to_string_table[RDATA_ZF_UNKNOWN + 1] = {
 	rdata_nsec_to_string,
 	rdata_loc_to_string,
 	rdata_ilnp64_to_string,
-#ifdef DRAFT_RRTYPES
 	rdata_eui48_to_string,
 	rdata_eui64_to_string,
-#endif
 	rdata_unknown_to_string
 };
 
@@ -713,13 +709,11 @@ rdata_wireformat_to_rdata_atoms(region_type *region,
 		case RDATA_WF_ILNP64:
 			length = IP6ADDRLEN/2;
 			break;
-#ifdef DRAFT_RRTYPES
 		case RDATA_WF_EUI48:
 			length = EUI48ADDRLEN;
 		case RDATA_WF_EUI64:
 			length = EUI64ADDRLEN;
 			break;
-#endif
 		case RDATA_WF_BINARY:
 			/* Remaining RDATA is binary.  */
 			length = end - buffer_position(packet);

zonec.c

@@ -451,7 +451,6 @@ zparser_conv_ilnp64(region_type *region, const char *text)
 	return r;
 }
 
-#ifdef DRAFT_RRTYPES
 static uint16_t *
 zparser_conv_eui48(region_type *region, const char *text)
 {
@@ -541,7 +540,6 @@ zparser_conv_eui(region_type *region, const char *text, size_t len)
 	}
 	return r;
 }
-#endif
 
 uint16_t *
 zparser_conv_text(region_type *region, const char *text, size_t len)

zonec.h

@@ -96,9 +96,7 @@ uint16_t *zparser_conv_byte(region_type *region, const char *text);
 uint16_t *zparser_conv_a(region_type *region, const char *text);
 uint16_t *zparser_conv_aaaa(region_type *region, const char *text);
 uint16_t *zparser_conv_ilnp64(region_type *region, const char *text);
-#ifdef DRAFT_RRTYPES
 uint16_t *zparser_conv_eui(region_type *region, const char *text, size_t len);
-#endif
 uint16_t *zparser_conv_text(region_type *region, const char *text, size_t len);
 uint16_t *zparser_conv_dns_name(region_type *region, const uint8_t* name, size_t len);
 uint16_t *zparser_conv_b32(region_type *region, const char *b32);

zparser.y

@@ -995,21 +995,13 @@ rdata_lp:	STR sp dname trail
 
 rdata_eui48:	STR trail
     {
-#ifdef DRAFT_RRTYPES
 	    zadd_rdata_wireformat(zparser_conv_eui(parser->region, $1.str, 48));
-#else
-	    zc_error_prev_line("EUI48 not supported, enable with --enable-draft-rrtypes.");
-#endif
     }
     ;
 
 rdata_eui64:	STR trail
     {
-#ifdef DRAFT_RRTYPES
 	    zadd_rdata_wireformat(zparser_conv_eui(parser->region, $1.str, 64));
-#else
-	    zc_error_prev_line("EUI64 not supported, enable with --enable-draft-rrtypes.");
-#endif
     }
     ;