-tlsa rr added to namestore

6 files changed, 49 insertions, 20 deletions

diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 89aa4a06e..6a07f6d94 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -33,7 +33,7 @@
 #include "gnunet_dns_service.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_dnsparser_lib.h"
-#include "gns_records.h"
+#include "gns_protocol.h"
 #include "gnunet_gns_service.h"
 #include "block_gns.h"
 #include "gns.h"
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c
index 259d32e53..c9676e874 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -30,7 +30,7 @@
 #include "gnunet_namestore_service.h"
 #include "../namestore/namestore.h"
 #include "gnunet_dnsparser_lib.h"
-#include "gns_records.h"
+#include "gns_protocol.h"
 #include "gnunet_gns_service.h"
 
 /* DEFINES */
diff --git a/src/gns/gns_records.h b/src/include/gns_protocol.h
index b5e6f33e1..b5e6f33e1 100644
--- a/src/gns/gns_records.h
+++ b/src/include/gns_protocol.h
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h
index 4cc8fc8d2..328a2286a 100644
--- a/src/include/gnunet_dnsparser_lib.h
+++ b/src/include/gnunet_dnsparser_lib.h
@@ -42,6 +42,7 @@
 #define GNUNET_DNSPARSER_TYPE_TXT 16
 #define GNUNET_DNSPARSER_TYPE_AAAA 28
 #define GNUNET_DNSPARSER_TYPE_SRV 33
+#define GNUNET_DNSPARSER_TYPE_TLSA 52
 
 /**
  * A few common DNS classes (ok, only one is common, but I list a
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 47c743ea2..fcb71fa6f 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -23,10 +23,6 @@
  * @brief API to the GNS service
  * @author Martin Schanzenbach
  *
- * TODO:
- * - decide what goes into storage API and what into GNS-service API
- * - decide where to pass/expose/check keys / signatures
- * - are GNS private keys per peer or per user?
  */
 
 
diff --git a/src/namestore/namestore_common.c b/src/namestore/namestore_common.c
index 8b095eb26..f5c039c3b 100644
--- a/src/namestore/namestore_common.c
+++ b/src/namestore/namestore_common.c
@@ -32,7 +32,7 @@
 #include "gnunet_arm_service.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_dnsparser_lib.h"
-#include "../dns/dnsparser.h"
+#include "gns_protocol.h"
 #include "namestore.h"
 
 
@@ -348,19 +348,20 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
                                   const void *data,
                                   size_t data_size)
 {
-  char tmp[INET6_ADDRSTRLEN];
-  struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
   uint16_t mx_pref;
-  char* result;
-  char* soa_rname;
-  char* soa_mname;
   struct soa_data *soa;
-
   struct vpn_data *vpn;
+  struct srv_data *srv;
+  struct tlsa_data *tlsa;
+  struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
+  struct GNUNET_CRYPTO_HashAsciiEncoded s_peer;
   char* vpn_str;
   char* srv_str;
-  struct GNUNET_CRYPTO_HashAsciiEncoded s_peer;
-  struct srv_data *srv;
+  char* tlsa_str;
+  char* result;
+  char* soa_rname;
+  char* soa_mname;
+  char tmp[INET6_ADDRSTRLEN];
 
   switch (type)
   {
@@ -434,6 +435,16 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type,
                                       (char*)&srv[1]))
       return NULL;
     return srv_str;
+  case GNUNET_DNSPARSER_TYPE_TLSA:
+    tlsa = (struct tlsa_data*)data;
+
+    if (GNUNET_OK != GNUNET_asprintf (&tlsa_str, "%c %c %c %s",
+                                      tlsa->usage,
+                                      tlsa->selector,
+                                      tlsa->matching_type,
+                                      tlsa[1]))
+      return NULL;
+    return tlsa_str;
   default:
     GNUNET_break (0);
   }
@@ -461,20 +472,21 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
   struct in_addr value_a;
   struct in6_addr value_aaaa;
   struct GNUNET_CRYPTO_ShortHashCode pkey;
-  uint16_t mx_pref;
-  uint16_t mx_pref_n;
   struct soa_data *soa;
+  struct vpn_data *vpn;
+  struct tlsa_data *tlsa;
   char result[253];
   char soa_rname[63];
   char soa_mname[63];
+  char s_peer[104];
+  char s_serv[253];
   uint32_t soa_serial;
   uint32_t soa_refresh;
   uint32_t soa_retry;
   uint32_t soa_expire;
   uint32_t soa_min;
-  char s_peer[104];
-  char s_serv[253];
-  struct vpn_data* vpn;
+  uint16_t mx_pref;
+  uint16_t mx_pref_n;
   uint16_t proto;
   int ret;
   
@@ -582,6 +594,26 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type,
     vpn->proto = htons (proto);
     strcpy ((char*)&vpn[1], s_serv);
     return GNUNET_OK;
+  case GNUNET_DNSPARSER_TYPE_TLSA:
+    tlsa = (struct tlsa_data*)*data;
+    *data_size = sizeof (struct tlsa_data) + strlen (s) - 6;
+    tlsa = GNUNET_malloc (*data_size);
+    ret = SSCANF (s, "%c %c %c %s",
+                  &tlsa->usage,
+                  &tlsa->selector,
+                  &tlsa->matching_type,
+                  (char*)&tlsa[1]);
+
+    if (4 != ret)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Unable to parse TLSA record string %s\n", s);
+      *data_size = 0;
+      GNUNET_free (tlsa);
+      return GNUNET_SYSERR;
+    }
+
+    return GNUNET_OK;
   default:
     GNUNET_break (0);
   }