rr.h: (ldns_rr_class, ldns_rr_type) New enumerations.

rdata.h: (ldns_rdf_type) Prefix enum members with LDNS.

diff --git a/ldns/rdata.h b/ldns/rdata.h
index 6b450907a3e9a69b35f2ed6f28e50ade7dcbf222..2608b631daf1835116f7132aeed4a116e5dcc6e1 100644 (file)
--- a/ldns/rdata.h
+++ b/ldns/rdata.h
@@ -33,68 +33,56 @@
  * An rrset is an array of rr's.
  */ 
 
-#define MAXRDATALEN 64
-
+/*
+ * The different types of RDATA fields.
+ */
 enum ldns_enum_rdf_type
 {
        /** none */
-       RDF_TYPE_NONE,
+       LDNS_RDF_TYPE_NONE,
        /** domain name */
-       RDF_TYPE_DNAME,
+       LDNS_RDF_TYPE_DNAME,
        /** 8 bits */
-       RDF_TYPE_INT8,
+       LDNS_RDF_TYPE_INT8,
        /** 16 bits */
-       RDF_TYPE_INT16,
+       LDNS_RDF_TYPE_INT16,
        /** 32 bits */
-       RDF_TYPE_INT32,
+       LDNS_RDF_TYPE_INT32,
        /** 48 bits? */
-       RDF_TYPE_INT48,
+       LDNS_RDF_TYPE_INT48,
        /** A record */
-       RDF_TYPE_A,     
+       LDNS_RDF_TYPE_A,        
        /** AAAA record */
-       RDF_TYPE_AAAA,
+       LDNS_RDF_TYPE_AAAA,
        /** txt string */
-       RDF_TYPE_STR,
+       LDNS_RDF_TYPE_STR,
        /** apl data */
-       RDF_TYPE_APL,
+       LDNS_RDF_TYPE_APL,
        /** b64 string */
-       RDF_TYPE_B64,
+       LDNS_RDF_TYPE_B64,
        /** hex string */
-       RDF_TYPE_HEX,
+       LDNS_RDF_TYPE_HEX,
        /** nsec type codes */
-       RDF_TYPE_NSEC, 
+       LDNS_RDF_TYPE_NSEC, 
        /** a RR type */
-       RDF_TYPE_TYPE, 
+       LDNS_RDF_TYPE_TYPE, 
        /** a class */
-       RDF_TYPE_CLASS,
+       LDNS_RDF_TYPE_CLASS,
        /** certificates */
-       RDF_TYPE_CERT,
+       LDNS_RDF_TYPE_CERT,
        /** a key algorithm */
-       RDF_TYPE_ALG,
+       LDNS_RDF_TYPE_ALG,
        /** unknown types */
-       RDF_TYPE_UNKNOWN,
+       LDNS_RDF_TYPE_UNKNOWN,
        /** time */
-       RDF_TYPE_TIME,
+       LDNS_RDF_TYPE_TIME,
        /** protocol and port bitmaps */
-       RDF_TYPE_SERVICE,
+       LDNS_RDF_TYPE_SERVICE,
        /** location data */
-       RDF_TYPE_LOC
+       LDNS_RDF_TYPE_LOC
 };
 typedef enum ldns_enum_rdf_type ldns_rdf_type;
 
-enum ldns_enum_class
-{
-       /** the Internet */
-       CLASS_IN        = 1,
-       /** Chaos class */
-       CLASS_CHAOS     = 3,
-       /** Hesiod (Dyer 87) */
-       CLASS_HS        = 4,
-       /** Any class */
-       CLASS_ANY       = 255
-};
-typedef enum ldns_enum_class ldns_class;
-
 /**
  * \brief Resource record data
  *

diff --git a/ldns/rr.h b/ldns/rr.h
index afaf05af9366aad8e3efbe42d1729f679d92dd36..ba404f4d45b138e4fb7b11fd1026a182faa9a2e0 100644 (file)
--- a/ldns/rr.h
+++ b/ldns/rr.h
@@ -18,102 +18,125 @@
 #include <ldns/rdata.h>
 #include <ldns/rr.h>
 
-/* the different RR types */
-/**  a host address */
-#define TYPE_A          1 
-/**  an authoritative name server */
-#define TYPE_NS         2 
-/**  a mail destination (Obsolete - use MX) */
-#define TYPE_MD         3 
-/**  a mail forwarder (Obsolete - use MX) */
-#define TYPE_MF         4 
-/**  the canonical name for an alias */
-#define TYPE_CNAME      5 
-/**  marks the start of a zone of authority */
-#define TYPE_SOA        6 
-/**  a mailbox domain name (EXPERIMENTAL) */
-#define TYPE_MB         7 
-/**  a mail group member (EXPERIMENTAL) */
-#define TYPE_MG         8 
-/**  a mail rename domain name (EXPERIMENTAL) */
-#define TYPE_MR         9 
-/**  a null RR (EXPERIMENTAL) */
-#define TYPE_NULL       10
-/**  a well known service description */
-#define TYPE_WKS        11
-/**  a domain name pointer */
-#define TYPE_PTR        12
-/**  host information */
-#define TYPE_HINFO      13
-/**  mailbox or mail list information */
-#define TYPE_MINFO      14
-/**  mail exchange */
-#define TYPE_MX         15
-/**  text strings */
-#define TYPE_TXT        16
-/**  RFC1183 */
-#define TYPE_RP         17
-/**  RFC1183 */
-#define TYPE_AFSDB      18
-/**  RFC1183 */
-#define TYPE_X25        19
-/**  RFC1183 */
-#define TYPE_ISDN       20
-/**  RFC1183 */
-#define TYPE_RT         21
-/**  RFC1706 */
-#define TYPE_NSAP       22
-
-/**  2535typecode */
-#define TYPE_SIG        24
-/**  2535typecode */
-#define TYPE_KEY        25
-/**  RFC2163 */
-#define TYPE_PX         26
-
-/**  ipv6 address */
-#define TYPE_AAAA       28
-/**  LOC record  RFC1876 */
-#define TYPE_LOC        29
-/**  2535typecode */
-#define TYPE_NXT        30
-
-/**  SRV record RFC2782 */
-#define TYPE_SRV        33
-
-/**  RFC2915 */
-#define TYPE_NAPTR      35
-/**  RFC2230 */
-#define TYPE_KX         36
-/**  RFC2538 */
-#define TYPE_CERT       37
-
-/**  RFC2672 */
-#define TYPE_DNAME      39
-
-/**  Pseudo OPT record... */
-#define TYPE_OPT        41
-/**  RFC3123 */
-#define TYPE_APL        42
-/**  draft-ietf-dnsext-delegation */
-#define TYPE_DS         43
-/**  SSH Key Fingerprint */
-#define TYPE_SSHFP      44
-
-/**  draft-ietf-dnsext-dnssec-25 */
-#define TYPE_RRSIG      46
-#define TYPE_NSEC       47      
-#define TYPE_DNSKEY     48
-
-#define TYPE_TSIG       250
-#define TYPE_IXFR       251
-#define TYPE_AXFR       252
-/**  A request for mailbox-related records (MB, MG or MR) */
-#define TYPE_MAILB      25
-/**  A request for mail agent RRs (Obsolete - see MX) */
-#define TYPE_MAILA      25
-/**  any type (wildcard) */
-#define TYPE_ANY        25
+/**
+ * The different RR classes.
+ */
+enum ldns_enum_rr_class
+{
+       /** the Internet */
+       LDNS_RR_CLASS_IN        = 1,
+       /** Chaos class */
+       LDNS_RR_CLASS_CHAOS     = 3,
+       /** Hesiod (Dyer 87) */
+       LDNS_RR_CLASS_HS        = 4,
+       /** Any class */
+       LDNS_RR_CLASS_ANY       = 255,
+
+       LDNS_RR_CLASS_FIRST     = 0,
+       LDNS_RR_CLASS_LAST      = 65535,
+       LDNS_RR_CLASS_COUNT     = LDNS_RR_CLASS_LAST - LDNS_RR_CLASS_FIRST + 1
+};
+typedef enum ldns_enum_rr_class ldns_rr_class;
+
+/**
+ * The different RR types.
+ */
+enum ldns_enum_rr_type
+{
+       /**  a host address */
+       LDNS_RR_TYPE_A = 1, 
+       /**  an authoritative name server */
+       LDNS_RR_TYPE_NS = 2, 
+       /**  a mail destination (Obsolete - use MX) */
+       LDNS_RR_TYPE_MD = 3, 
+       /**  a mail forwarder (Obsolete - use MX) */
+       LDNS_RR_TYPE_MF = 4, 
+       /**  the canonical name for an alias */
+       LDNS_RR_TYPE_CNAME = 5, 
+       /**  marks the start of a zone of authority */
+       LDNS_RR_TYPE_SOA = 6, 
+       /**  a mailbox domain name (EXPERIMENTAL) */
+       LDNS_RR_TYPE_MB = 7, 
+       /**  a mail group member (EXPERIMENTAL) */
+       LDNS_RR_TYPE_MG = 8, 
+       /**  a mail rename domain name (EXPERIMENTAL) */
+       LDNS_RR_TYPE_MR = 9, 
+       /**  a null RR (EXPERIMENTAL) */
+       LDNS_RR_TYPE_NULL = 10,
+       /**  a well known service description */
+       LDNS_RR_TYPE_WKS = 11,
+       /**  a domain name pointer */
+       LDNS_RR_TYPE_PTR = 12,
+       /**  host information */
+       LDNS_RR_TYPE_HINFO = 13,
+       /**  mailbox or mail list information */
+       LDNS_RR_TYPE_MINFO = 14,
+       /**  mail exchange */
+       LDNS_RR_TYPE_MX = 15,
+       /**  text strings */
+       LDNS_RR_TYPE_TXT = 16,
+       /**  RFC1183 */
+       LDNS_RR_TYPE_RP = 17,
+       /**  RFC1183 */
+       LDNS_RR_TYPE_AFSDB = 18,
+       /**  RFC1183 */
+       LDNS_RR_TYPE_X25 = 19,
+       /**  RFC1183 */
+       LDNS_RR_TYPE_ISDN = 20,
+       /**  RFC1183 */
+       LDNS_RR_TYPE_RT = 21,
+       /**  RFC1706 */
+       LDNS_RR_TYPE_NSAP = 22,
+       /**  2535typecode */
+       LDNS_RR_TYPE_SIG = 24,
+       /**  2535typecode */
+       LDNS_RR_TYPE_KEY = 25,
+       /**  RFC2163 */
+       LDNS_RR_TYPE_PX = 26,
+       /**  ipv6 address */
+       LDNS_RR_TYPE_AAAA = 28,
+       /**  LOC record  RFC1876 */
+       LDNS_RR_TYPE_LOC = 29,
+       /**  2535typecode */
+       LDNS_RR_TYPE_NXT = 30,
+       /**  SRV record RFC2782 */
+       LDNS_RR_TYPE_SRV = 33,
+       /**  RFC2915 */
+       LDNS_RR_TYPE_NAPTR = 35,
+       /**  RFC2230 */
+       LDNS_RR_TYPE_KX = 36,
+       /**  RFC2538 */
+       LDNS_RR_TYPE_CERT = 37,
+       /**  RFC2672 */
+       LDNS_RR_TYPE_DNAME = 39,
+       /**  Pseudo OPT record... */
+       LDNS_RR_TYPE_OPT = 41,
+       /**  RFC3123 */
+       LDNS_RR_TYPE_APL = 42,
+       /**  draft-ietf-dnsext-delegation */
+       LDNS_RR_TYPE_DS = 43,
+       /**  SSH Key Fingerprint */
+       LDNS_RR_TYPE_SSHFP = 44,
+       /**  draft-ietf-dnsext-dnssec-25 */
+       LDNS_RR_TYPE_RRSIG = 46,
+       LDNS_RR_TYPE_NSEC = 47,      
+       LDNS_RR_TYPE_DNSKEY = 48,
+
+       LDNS_RR_TYPE_TSIG = 250,
+       LDNS_RR_TYPE_IXFR = 251,
+       LDNS_RR_TYPE_AXFR = 252,
+       /**  A request for mailbox-related records (MB, MG or MR) */
+       LDNS_RR_TYPE_MAILB = 253,
+       /**  A request for mail agent RRs (Obsolete - see MX) */
+       LDNS_RR_TYPE_MAILA = 254,
+       /**  any type (wildcard) */
+       LDNS_RR_TYPE_ANY = 255,
+
+       LDNS_RR_TYPE_FIRST = 0,
+       LDNS_RR_TYPE_LAST  = 65535,
+       LDNS_RR_TYPE_COUNT = LDNS_RR_TYPE_LAST - LDNS_RR_TYPE_FIRST + 1
+};
+typedef enum ldns_enum_rr_type ldns_rr_type;
 
 /** Maximum length of a dname label */
 #define MAXLABELLEN     63
@@ -134,12 +157,9 @@ struct ldns_struct_rr
        /** \brief Number of data fields */
        uint16_t        _rd_count;
        /** \brief the type of the RR. A, MX etc. */
-       uint16_t        _type;  
-       /** \brief Class of the resource record.
-        *
-        * name chosen to avoid clash with class keyword
-        */
-       ldns_class       _klass;
+       ldns_rr_type    _rr_type;       
+       /** \brief Class of the resource record.  */
+       ldns_rr_class   _rr_class;
        /* everything in the rdata is in network order */
        /** \brief The list of rdata's */
        ldns_rdf         **_rdata_fields;
@@ -182,7 +202,7 @@ ldns_rr * ldns_rr_new(void);
 void ldns_rr_set_owner(ldns_rr *, uint8_t *);
 void ldns_rr_set_ttl(ldns_rr *, uint16_t);
 void ldns_rr_set_rd_count(ldns_rr *, uint16_t);
-void ldns_rr_set_class(ldns_rr *, ldns_class);
+void ldns_rr_set_class(ldns_rr *, ldns_rr_class);
 bool ldns_rr_push_rdf(ldns_rr *, ldns_rdf *);
 uint8_t *ldns_rr_owner(ldns_rr *);
 uint8_t ldns_rr_ttl(ldns_rr *);

diff --git a/rr.c b/rr.c
index 158aa71d04715c73e7c5e96fde7168e5f9ed9953..d895803c1d042163d1c38ec4e4c78757f034d03d 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -66,9 +66,9 @@ ldns_rr_set_rd_count(ldns_rr *rr, uint16_t count)
  * set the class in the rr
  */
 void
-ldns_rr_set_class(ldns_rr *rr, ldns_class klass)
+ldns_rr_set_class(ldns_rr *rr, ldns_rr_class rr_class)
 {
-       rr->_klass = klass;
+       rr->_rr_class = rr_class;
 }
 
 /**
@@ -125,190 +125,190 @@ ldns_rr_rd_count(ldns_rr *rr)
        return rr->_rd_count;
 }
 
-static const ldns_rdf_type type_0_wireformat[] = { RDF_TYPE_UNKNOWN };
-static const ldns_rdf_type type_a_wireformat[] = { RDF_TYPE_A };
-static const ldns_rdf_type type_ns_wireformat[] = { RDF_TYPE_DNAME };
-static const ldns_rdf_type type_md_wireformat[] = { RDF_TYPE_DNAME };
-static const ldns_rdf_type type_mf_wireformat[] = { RDF_TYPE_DNAME };
-static const ldns_rdf_type type_cname_wireformat[] = { RDF_TYPE_DNAME };
+static const ldns_rdf_type type_0_wireformat[] = { LDNS_RDF_TYPE_UNKNOWN };
+static const ldns_rdf_type type_a_wireformat[] = { LDNS_RDF_TYPE_A };
+static const ldns_rdf_type type_ns_wireformat[] = { LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_md_wireformat[] = { LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_mf_wireformat[] = { LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_cname_wireformat[] = { LDNS_RDF_TYPE_DNAME };
 static const ldns_rdf_type type_soa_wireformat[] = {
-       RDF_TYPE_DNAME, RDF_TYPE_DNAME, RDF_TYPE_INT32, RDF_TYPE_INT32,
-       RDF_TYPE_INT32, RDF_TYPE_INT32, RDF_TYPE_INT32
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT32,
+       LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT32
 };
-static const ldns_rdf_type type_mb_wireformat[] = { RDF_TYPE_DNAME };
-static const ldns_rdf_type type_mg_wireformat[] = { RDF_TYPE_DNAME };
-static const ldns_rdf_type type_mr_wireformat[] = { RDF_TYPE_DNAME };
+static const ldns_rdf_type type_mb_wireformat[] = { LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_mg_wireformat[] = { LDNS_RDF_TYPE_DNAME };
+static const ldns_rdf_type type_mr_wireformat[] = { LDNS_RDF_TYPE_DNAME };
 static const ldns_rdf_type type_wks_wireformat[] = {
-       RDF_TYPE_A, RDF_TYPE_SERVICE
+       LDNS_RDF_TYPE_A, LDNS_RDF_TYPE_SERVICE
 };
-static const ldns_rdf_type type_ptr_wireformat[] = { RDF_TYPE_DNAME };
+static const ldns_rdf_type type_ptr_wireformat[] = { LDNS_RDF_TYPE_DNAME };
 static const ldns_rdf_type type_hinfo_wireformat[] = {
-       RDF_TYPE_STR, RDF_TYPE_STR
+       LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR
 };
 static const ldns_rdf_type type_minfo_wireformat[] = {
-       RDF_TYPE_DNAME, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_mx_wireformat[] = {
-       RDF_TYPE_INT8, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_rp_wireformat[] = {
-       RDF_TYPE_DNAME, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_afsdb_wireformat[] = {
-       RDF_TYPE_INT8, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_DNAME
 };
-static const ldns_rdf_type type_x25_wireformat[] = { RDF_TYPE_STR };
+static const ldns_rdf_type type_x25_wireformat[] = { LDNS_RDF_TYPE_STR };
 static const ldns_rdf_type type_isdn_wireformat[] = {
-       RDF_TYPE_STR, RDF_TYPE_STR
+       LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR
 };
 static const ldns_rdf_type type_rt_wireformat[] = {
-       RDF_TYPE_INT8, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_sig_wireformat[] = {
-       RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_INT32,
-       RDF_TYPE_INT32, RDF_TYPE_INT32, RDF_TYPE_INT16,
-       RDF_TYPE_DNAME, RDF_TYPE_B64
+       LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT32,
+       LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT16,
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_B64
 };
 static const ldns_rdf_type type_key_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_B64
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_B64
 };
 static const ldns_rdf_type type_px_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_DNAME, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_DNAME
 };
-static const ldns_rdf_type type_aaaa_wireformat[] = { RDF_TYPE_AAAA };
-static const ldns_rdf_type type_loc_wireformat[] = { RDF_TYPE_LOC };
+static const ldns_rdf_type type_aaaa_wireformat[] = { LDNS_RDF_TYPE_AAAA };
+static const ldns_rdf_type type_loc_wireformat[] = { LDNS_RDF_TYPE_LOC };
 static const ldns_rdf_type type_nxt_wireformat[] = {
-       RDF_TYPE_DNAME, RDF_TYPE_UNKNOWN
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_UNKNOWN
 };
 static const ldns_rdf_type type_srv_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_INT16, RDF_TYPE_INT16, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_naptr_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_INT16, RDF_TYPE_STR, RDF_TYPE_STR, RDF_TYPE_STR, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_STR, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_kx_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_DNAME
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_DNAME
 };
 static const ldns_rdf_type type_cert_wireformat[] = {
-        RDF_TYPE_CERT, RDF_TYPE_INT16, RDF_TYPE_ALG, RDF_TYPE_B64
+        LDNS_RDF_TYPE_CERT, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_ALG, LDNS_RDF_TYPE_B64
 };
-static const ldns_rdf_type type_dname_wireformat[] = { RDF_TYPE_DNAME };
+static const ldns_rdf_type type_dname_wireformat[] = { LDNS_RDF_TYPE_DNAME };
 static const ldns_rdf_type type_ds_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_HEX
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_HEX
 };
 static const ldns_rdf_type type_sshfp_wireformat[] = {
-       RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_HEX
+       LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_HEX
 };
 static const ldns_rdf_type type_rrsig_wireformat[] = {
-       RDF_TYPE_TYPE, RDF_TYPE_INT8, RDF_TYPE_INT8, RDF_TYPE_INT32,
-       RDF_TYPE_INT32, RDF_TYPE_INT32, RDF_TYPE_INT16, RDF_TYPE_DNAME, RDF_TYPE_B64
+       LDNS_RDF_TYPE_TYPE, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_INT32,
+       LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT32, LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_B64
 };
 static const ldns_rdf_type type_nsec_wireformat[] = {
-       RDF_TYPE_DNAME, RDF_TYPE_NSEC
+       LDNS_RDF_TYPE_DNAME, LDNS_RDF_TYPE_NSEC
 };
 static const ldns_rdf_type type_dnskey_wireformat[] = {
-       RDF_TYPE_INT16, RDF_TYPE_INT8, RDF_TYPE_ALG, RDF_TYPE_B64
+       LDNS_RDF_TYPE_INT16, LDNS_RDF_TYPE_INT8, LDNS_RDF_TYPE_ALG, LDNS_RDF_TYPE_B64
 };
 
 static ldns_rr_descriptor rdata_field_descriptors[] = {
        /* 0 */
-       { 0, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 0, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 1 */
-       { TYPE_A, "A", 1, 1, type_a_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_A, "A", 1, 1, type_a_wireformat, LDNS_RDF_TYPE_NONE },
        /* 2 */
-       { TYPE_NS, "NS", 1, 1, type_ns_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NS, "NS", 1, 1, type_ns_wireformat, LDNS_RDF_TYPE_NONE },
        /* 3 */
-       { TYPE_MD, "MD", 1, 1, type_md_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MD, "MD", 1, 1, type_md_wireformat, LDNS_RDF_TYPE_NONE },
        /* 4 */ 
-       { TYPE_MF, "MF", 1, 1, type_mf_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MF, "MF", 1, 1, type_mf_wireformat, LDNS_RDF_TYPE_NONE },
        /* 5 */
-       { TYPE_CNAME, "CNAME", 1, 1, type_cname_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_CNAME, "CNAME", 1, 1, type_cname_wireformat, LDNS_RDF_TYPE_NONE },
        /* 6 */
-       { TYPE_SOA, "SOA", 7, 7, type_soa_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_SOA, "SOA", 7, 7, type_soa_wireformat, LDNS_RDF_TYPE_NONE },
        /* 7 */
-       { TYPE_MB, "MB", 1, 1, type_mb_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MB, "MB", 1, 1, type_mb_wireformat, LDNS_RDF_TYPE_NONE },
        /* 8 */
-       { TYPE_MG, "MG", 1, 1, type_mg_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MG, "MG", 1, 1, type_mg_wireformat, LDNS_RDF_TYPE_NONE },
        /* 9 */
-       { TYPE_MR, "MR", 1, 1, type_mr_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MR, "MR", 1, 1, type_mr_wireformat, LDNS_RDF_TYPE_NONE },
        /* 10 */
-       { TYPE_NULL, "NULL", 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NULL, "NULL", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 11 */
-       { TYPE_WKS, "WKS", 2, 2, type_wks_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_WKS, "WKS", 2, 2, type_wks_wireformat, LDNS_RDF_TYPE_NONE },
        /* 12 */
-       { TYPE_PTR, "PTR", 1, 1, type_ptr_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_PTR, "PTR", 1, 1, type_ptr_wireformat, LDNS_RDF_TYPE_NONE },
        /* 13 */
-       { TYPE_HINFO, "HINFO", 2, 2, type_hinfo_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_HINFO, "HINFO", 2, 2, type_hinfo_wireformat, LDNS_RDF_TYPE_NONE },
        /* 14 */
-       { TYPE_MINFO, "MINFO", 2, 2, type_minfo_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MINFO, "MINFO", 2, 2, type_minfo_wireformat, LDNS_RDF_TYPE_NONE },
        /* 15 */
-       { TYPE_MX, "MX", 2, 2, type_mx_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_MX, "MX", 2, 2, type_mx_wireformat, LDNS_RDF_TYPE_NONE },
        /* 16 */
-       { TYPE_TXT, "TXT", 1, 0, NULL, RDF_TYPE_STR },
+       {LDNS_RR_TYPE_TXT, "TXT", 1, 0, NULL, LDNS_RDF_TYPE_STR },
        /* 17 */
-       { TYPE_RP, "RP", 2, 2, type_rp_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_RP, "RP", 2, 2, type_rp_wireformat, LDNS_RDF_TYPE_NONE },
        /* 18 */
-       { TYPE_AFSDB, "AFSDB", 2, 2, type_afsdb_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_AFSDB, "AFSDB", 2, 2, type_afsdb_wireformat, LDNS_RDF_TYPE_NONE },
        /* 19 */
-       { TYPE_X25, "X25", 1, 1, type_x25_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_X25, "X25", 1, 1, type_x25_wireformat, LDNS_RDF_TYPE_NONE },
        /* 20 */
-       { TYPE_ISDN, "ISDN", 1, 2, type_isdn_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_ISDN, "ISDN", 1, 2, type_isdn_wireformat, LDNS_RDF_TYPE_NONE },
        /* 21 */
-       { TYPE_RT, "RT", 2, 2, type_rt_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_RT, "RT", 2, 2, type_rt_wireformat, LDNS_RDF_TYPE_NONE },
        /* 22 */
-       { TYPE_NSAP, "NSAP", 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NSAP, "NSAP", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 23 */
-       { 23, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 23, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 24 */
-       { TYPE_SIG, "SIG", 9, 9, type_sig_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_SIG, "SIG", 9, 9, type_sig_wireformat, LDNS_RDF_TYPE_NONE },
        /* 25 */
-       { TYPE_KEY, "KEY", 4, 4, type_key_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_KEY, "KEY", 4, 4, type_key_wireformat, LDNS_RDF_TYPE_NONE },
        /* 26 */
-       { TYPE_PX, "PX", 3, 3, type_px_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_PX, "PX", 3, 3, type_px_wireformat, LDNS_RDF_TYPE_NONE },
        /* 27 */
-       { 27, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 27, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 28 */
-       { TYPE_AAAA, "AAAA", 1, 1, type_aaaa_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_AAAA, "AAAA", 1, 1, type_aaaa_wireformat, LDNS_RDF_TYPE_NONE },
        /* 29 */
-       { TYPE_LOC, "LOC", 1, 1, type_loc_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_LOC, "LOC", 1, 1, type_loc_wireformat, LDNS_RDF_TYPE_NONE },
        /* 30 */
-       { TYPE_NXT, "NXT", 2, 2, type_nxt_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NXT, "NXT", 2, 2, type_nxt_wireformat, LDNS_RDF_TYPE_NONE },
        /* 31 */
-       { 31, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 31, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 32 */
-       { 32, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 32, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 33 */
-       { TYPE_SRV, "SRV", 4, 4, type_srv_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_SRV, "SRV", 4, 4, type_srv_wireformat, LDNS_RDF_TYPE_NONE },
        /* 34 */
-       { 34, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 34, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 35 */
-       { TYPE_NAPTR, "NAPTR", 6, 6, type_naptr_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NAPTR, "NAPTR", 6, 6, type_naptr_wireformat, LDNS_RDF_TYPE_NONE },
        /* 36 */
-       { TYPE_KX, "KX", 2, 2, type_kx_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_KX, "KX", 2, 2, type_kx_wireformat, LDNS_RDF_TYPE_NONE },
        /* 37 */
-       { TYPE_CERT, "CERT", 4, 4, type_cert_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_CERT, "CERT", 4, 4, type_cert_wireformat, LDNS_RDF_TYPE_NONE },
        /* 38 */
-       { 38, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 38, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 39 */
-       { TYPE_DNAME, "DNAME", 1, 1, type_dname_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_DNAME, "DNAME", 1, 1, type_dname_wireformat, LDNS_RDF_TYPE_NONE },
        /* 40 */
-       { 40, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 40, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 41 */
-       { TYPE_OPT, "OPT", 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_OPT, "OPT", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 42 */
-       { TYPE_APL, "APL", 0, 0, NULL, RDF_TYPE_APL },
+       {LDNS_RR_TYPE_APL, "APL", 0, 0, NULL, LDNS_RDF_TYPE_APL },
        /* 43 */
-       { TYPE_DS, "DS", 4, 4, type_ds_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_DS, "DS", 4, 4, type_ds_wireformat, LDNS_RDF_TYPE_NONE },
        /* 44 */
-       { TYPE_SSHFP, "SSHFP", 3, 3, type_sshfp_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_SSHFP, "SSHFP", 3, 3, type_sshfp_wireformat, LDNS_RDF_TYPE_NONE },
        /* 45 */
-       { 45, NULL, 1, 1, type_0_wireformat, RDF_TYPE_NONE },
+       { 45, NULL, 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE },
        /* 46 */
-       { TYPE_RRSIG, "RRSIG", 9, 9, type_rrsig_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_RRSIG, "RRSIG", 9, 9, type_rrsig_wireformat, LDNS_RDF_TYPE_NONE },
        /* 47 */
-       { TYPE_NSEC, "NSEC", 2, 2, type_nsec_wireformat, RDF_TYPE_NONE },
+       {LDNS_RR_TYPE_NSEC, "NSEC", 2, 2, type_nsec_wireformat, LDNS_RDF_TYPE_NONE },
        /* 48 */
-       { TYPE_DNSKEY, "DNSKEY", 4, 4, type_dnskey_wireformat, RDF_TYPE_NONE }
+       {LDNS_RR_TYPE_DNSKEY, "DNSKEY", 4, 4, type_dnskey_wireformat, LDNS_RDF_TYPE_NONE }
 };
 
 #define RDATA_FIELD_DESCRIPTORS_COUNT \
@@ -333,7 +333,7 @@ ldns_rr_descriptor_minimum(ldns_rr_descriptor *descriptor)
 size_t
 ldns_rr_descriptor_maximum(ldns_rr_descriptor *descriptor)
 {
-       if (descriptor->_variable != RDF_TYPE_NONE) {
+       if (descriptor->_variable != LDNS_RDF_TYPE_NONE) {
                /* XXX: Should really be SIZE_MAX... bad FreeBSD.  */
                return UINT_MAX;
        } else {
@@ -347,7 +347,7 @@ ldns_rr_descriptor_field_type(ldns_rr_descriptor *descriptor,
 {
        assert(descriptor != NULL);
        assert(index < descriptor->_maximum
-              || descriptor->_variable != RDF_TYPE_NONE);
+              || descriptor->_variable != LDNS_RDF_TYPE_NONE);
        if (index < descriptor->_maximum) {
                return descriptor->_wireformat[index];
        } else {

diff --git a/run-test0.c b/run-test0.c
index 9d73d90031eff5cab969d43e96002009a4a77bc7..aab26265814f36e071e1131a016f3530d8daa151 100644 (file)
--- a/run-test0.c
+++ b/run-test0.c
@@ -41,7 +41,7 @@ main(void)
        
        rr = ldns_rr_new();
 
-       rd_f = _ldns_rdf_new(20, RDF_TYPE_DNAME, (uint8_t*)"hallo.nl");
+       rd_f = _ldns_rdf_new(20, LDNS_RDF_TYPE_DNAME, (uint8_t*)"hallo.nl");
        xprintf_rdf(rd_f);
        
        ldns_rr_push_rdf(rr, rd_f);