diff options
| author | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
|---|---|---|
| committer | Stuart Henderson <sthen@cvs.openbsd.org> | 2013-02-18 10:18:40 +0000 |
| commit | c9dd09ab32087f97dfd1228f81b4d06cda4cbc29 (patch) | |
| tree | e7f3fe03d4ec991ae4e6c25ef17d93453da89839 /usr.sbin/nsd/dns.h | |
| parent | b0c1602e0968a3f81c378c5c32d38eaa302845c5 (diff) | |
resolve conflicts
Diffstat (limited to 'usr.sbin/nsd/dns.h')
| -rw-r--r-- | usr.sbin/nsd/dns.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/usr.sbin/nsd/dns.h b/usr.sbin/nsd/dns.h index f4cd1f8334a..ba526d8f994 100644 --- a/usr.sbin/nsd/dns.h +++ b/usr.sbin/nsd/dns.h @@ -139,6 +139,11 @@ typedef enum nsd_rc nsd_rc_type; #define TYPE_SPF 99 /* RFC 4408 */ +#define TYPE_NID 104 /* RFC 6742 */ +#define TYPE_L32 105 /* RFC 6742 */ +#define TYPE_L64 106 /* RFC 6742 */ +#define TYPE_LP 107 /* RFC 6742 */ + #define TYPE_TSIG 250 #define TYPE_IXFR 251 #define TYPE_AXFR 252 @@ -152,7 +157,7 @@ typedef enum nsd_rc nsd_rc_type; #define MAXLABELLEN 63 #define MAXDOMAINLEN 255 -#define MAXRDATALEN 64 /* This is more than enough, think multiple TXT. */ +#define MAXRDATALEN 64 /* This is more than enough, think multiple TXT. */ #define MAX_RDLENGTH 65535 /* Maximum size of a single RR. */ @@ -180,7 +185,8 @@ enum rdata_wireformat RDATA_WF_BINARY, /* Binary data (unknown length). */ RDATA_WF_BINARYWITHLENGTH, /* Binary data preceded by 1 byte length */ RDATA_WF_APL, /* APL data. */ - RDATA_WF_IPSECGATEWAY /* IPSECKEY gateway ip4, ip6 or dname. */ + RDATA_WF_IPSECGATEWAY, /* IPSECKEY gateway ip4, ip6 or dname. */ + RDATA_WF_ILNP64 /* 64-bit uncompressed IPv6 address. */ }; typedef enum rdata_wireformat rdata_wireformat_type; @@ -214,6 +220,7 @@ enum rdata_zoneformat RDATA_ZF_NXT, /* NXT type bitmap. */ RDATA_ZF_NSEC, /* NSEC type bitmap. */ RDATA_ZF_LOC, /* Location data. */ + RDATA_ZF_ILNP64, /* 64-bit uncompressed IPv6 address. */ RDATA_ZF_UNKNOWN /* Unknown data. */ }; typedef enum rdata_zoneformat rdata_zoneformat_type; @@ -234,9 +241,9 @@ typedef struct rrtype_descriptor rrtype_descriptor_type; * Indexed by type. The special type "0" can be used to get a * descriptor for unknown types (with one binary rdata). * - * spf + 1 + * lp + 1 */ -#define RRTYPE_DESCRIPTORS_LENGTH (TYPE_SPF + 1) +#define RRTYPE_DESCRIPTORS_LENGTH (TYPE_LP + 1) rrtype_descriptor_type *rrtype_descriptor_by_name(const char *name); rrtype_descriptor_type *rrtype_descriptor_by_type(uint16_t type); |