convert types and classes from str2host

diff --git a/rdata.c b/rdata.c
index 73ad6b1b9810f4e7e2b18bd7d6724a5e10c23974..3f173aa9077b6c17ef78605e303f7064c84c8331 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -270,8 +270,6 @@ ldns_rdf_new_frm_str(const char *str, ldns_rdf_type type)
        ldns_rdf *rdf;
        ldns_status status;
 
-       printf("type %d\n", type);
-       
        switch (type) {
        case LDNS_RDF_TYPE_DNAME:
                status = ldns_str2rdf_dname(&rdf, str);

diff --git a/rr.c b/rr.c
index a6193c5fd244c35c4c401d8933a42c6a7856d482..8410f76082f12f5e733762ef94cf6947c310e2f8 100644 (file)
--- a/rr.c
+++ b/rr.c
@@ -164,11 +164,15 @@ ldns_rr_new_frm_str(const char *str)
        r_min = ldns_rr_descriptor_minimum(desc);
 
        /* rdata (rdf's) */
+#ifdef DEBUG
        printf("tot rd [%s]\n", rdata);
+#endif
        for(rd = strtok(rdata, "\t \0"), r_cnt =0; rd; rd = strtok(NULL, "\t \0"), r_cnt++) {
                r = ldns_rdf_new_frm_str(rd,
                                ldns_rr_descriptor_field_type(desc, r_cnt));
+#ifdef DEBUG
                printf("rd str [%s] %d\n", rd, r_cnt);
+#endif
                if (!r) {
                        printf("rdf conversion mismatch\n");
                        return NULL;
@@ -877,7 +881,7 @@ ldns_get_rr_type_by_name(const char *name)
        if (strlen(name) > 4 && strncasecmp(name, "TYPE", 4) == 0) {
                return atoi(name + 4);
        }
-       
+
        /* Normal types */
        for (i = 0; i < (unsigned int) RDATA_FIELD_DESCRIPTORS_COUNT; i++) {
                desc = ldns_rr_descript(i);

diff --git a/run-test13.c b/run-test13.c
index 5a727ed8419eb20f48467616b4d21efb3c676720..ab293135d56e587c4dbb27d5cfe03f5b94c99242 100644 (file)
--- a/run-test13.c
+++ b/run-test13.c
@@ -59,9 +59,15 @@ main(int argc, char **argv)
        }
 
        sig = ldns_rr_new_frm_str("www.nlnetlabs.nl.   86400  IN  RRSIG    A RSASHA1 3 86400 1111020602 1108428602 ( 43791 nlnetlabs.nl.  Q/uyU1R/mLWsCONp5yu8F67Rm62yH/ts7PO3tFbZ72XONGlwliztUgHF5Cr0Jei/GsRb2TPpyHZjr5lkeFQU/PnFeUmiKT1tTw24OcYXaiFWbEsZ+ormYGtq+2t5cwvYEbZsMMsMikv+VRmG1y6b8sNObAeIjtRZhrXogQolCm4= )");
+       if (sig) {
+               ldns_rr_print(stdout,sig);
+               printf("\n");
+       }
+
 
        /* try to verify some things */
        
+       
 
         return 0;
 }

diff --git a/str2host.c b/str2host.c
index 160299ac7bb670043413cbbe899c916a9d714d7b..79823e8436c301b89a2ed0718ea054a9d118de06 100644 (file)
--- a/str2host.c
+++ b/str2host.c
@@ -391,11 +391,10 @@ ldns_str2rdf_nsec(ldns_rdf **ATTR_UNUSED(rd), const char *ATTR_UNUSED(str))
 ldns_status
 ldns_str2rdf_type(ldns_rdf **rd, const char *str)
 {
-       ldns_rr_type ty;
-       ty - ldns_get_rr_type_by_name(str);
+       uint16_t type;
+       type = htons(ldns_get_rr_type_by_name(str));
        /* ldns_rr_type is a 16 bit value */
-       
-       *rd = ldns_rdf_new_frm_data(sizeof(uint16_t), LDNS_RDF_TYPE_TYPE, (uint8_t*)&ty);
+       *rd = ldns_rdf_new_frm_data(sizeof(uint16_t), LDNS_RDF_TYPE_TYPE, (uint8_t*)&type);
        return LDNS_STATUS_OK;
 }
 
@@ -408,11 +407,10 @@ ldns_str2rdf_type(ldns_rdf **rd, const char *str)
 ldns_status
 ldns_str2rdf_class(ldns_rdf **ATTR_UNUSED(rd), const char *str)
 {
-       ldns_rr_class kl;
-       kl = ldns_get_rr_class_by_name(str);
+       uint16_t klass;
+       klass = htons(ldns_get_rr_class_by_name(str));
        /* class is 16 bit */
-
-       *rd = ldns_rdf_new_frm_data(sizeof(uint16_t), LDNS_RDF_TYPE_CLASS, (uint8_t*)&kl);
+       *rd = ldns_rdf_new_frm_data(sizeof(uint16_t), LDNS_RDF_TYPE_CLASS, (uint8_t*)&klass);
        return LDNS_STATUS_OK;
 }