-moving code to new libgnunetgnsrecord in preparation for addressing #3052

4 files changed, 25 insertions, 21 deletions

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index e18a99fad..a3222482c 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -58,12 +58,12 @@ endif
 libexec_PROGRAMS = \
   gnunet-service-gns \
   $(DO_W32_HELPER) \
-  gnunet-dns2gns 
-#  $(DO_PROXY) 
+  gnunet-dns2gns
+#  $(DO_PROXY)
 
 bin_PROGRAMS = \
   $(DO_W32_NSPTOOLS) \
-  gnunet-gns 
+  gnunet-gns
 
 bin_SCRIPTS = gnunet-gns-proxy-setup-ca
 
@@ -74,6 +74,7 @@ gnunet_gns_SOURCES = \
  gnunet-gns.c
 gnunet_gns_LDADD = \
   $(top_builddir)/src/gns/libgnunetgns.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   $(top_builddir)/src/util/libgnunetutil.la \
@@ -103,7 +104,7 @@ gnunet_dns2gns_DEPENDENCIES = \
   libgnunetgns.la
 
 gnunet_gns_proxy_SOURCES = \
- gnunet-gns-proxy.c 
+ gnunet-gns-proxy.c
 gnunet_gns_proxy_LDADD = -lmicrohttpd -lcurl -lgnutls \
   $(top_builddir)/src/gns/libgnunetgns.la \
   $(top_builddir)/src/identity/libgnunetidentity.la \
@@ -140,7 +141,7 @@ gnunet_service_gns_SOURCES = \
  gnunet-service-gns.c \
  gnunet-service-gns_resolver.c gnunet-service-gns_resolver.h \
  gnunet-service-gns_shorten.c gnunet-service-gns_shorten.h \
- gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h 
+ gnunet-service-gns_interceptor.c gnunet-service-gns_interceptor.h
 gnunet_service_gns_LDADD = \
   -lm \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -206,9 +207,9 @@ check_SCRIPTS = \
   test_gns_ns_lookup.sh \
   test_gns_dht_lookup.sh\
   test_gns_pseu_shorten.sh\
-        test_gns_plus_lookup.sh\
-        test_gns_zkey_lookup.sh\
-  test_gns_cname_lookup.sh 
+  test_gns_plus_lookup.sh\
+  test_gns_zkey_lookup.sh\
+  test_gns_cname_lookup.sh
 
 if ENABLE_TEST_RUN
 if HAVE_SQLITE
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 0a4275f0d..6772844b8 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -26,6 +26,7 @@
 #include <gnunet_util_lib.h>
 #include <gnunet_dnsparser_lib.h>
 #include <gnunet_identity_service.h>
+#include <gnunet_gnsrecord_lib.h>
 #include <gnunet_namestore_service.h>
 #include <gnunet_gns_service.h>
 
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 4b26803ff..f8b7e1a42 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -34,6 +34,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_dnsstub_lib.h"
 #include "gnunet_dht_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_dns_service.h"
 #include "gnunet_resolver_service.h"
@@ -853,7 +854,7 @@ dns_result_parser (void *cls,
           continue;
         }
         rd[i - skip].data_size = buf_off - buf_start;
-        rd[i - skip].data = &buf[buf_start];    
+        rd[i - skip].data = &buf[buf_start];
         break;
       case GNUNET_DNSPARSER_TYPE_SOA:
         buf_start = buf_off;
@@ -868,7 +869,7 @@ dns_result_parser (void *cls,
           continue;
         }
         rd[i - skip].data_size = buf_off - buf_start;
-        rd[i - skip].data = &buf[buf_start];    
+        rd[i - skip].data = &buf[buf_start];
         break;
       case GNUNET_DNSPARSER_TYPE_MX:
         buf_start = buf_off;
@@ -883,7 +884,7 @@ dns_result_parser (void *cls,
           continue;
         }
         rd[i - skip].data_size = buf_off - buf_start;
-        rd[i - skip].data = &buf[buf_start];    
+        rd[i - skip].data = &buf[buf_start];
         break;
       case GNUNET_DNSPARSER_TYPE_SRV:
         buf_start = buf_off;
@@ -898,7 +899,7 @@ dns_result_parser (void *cls,
           continue;
         }
         rd[i - skip].data_size = buf_off - buf_start;
-        rd[i - skip].data = &buf[buf_start];    
+        rd[i - skip].data = &buf[buf_start];
         break;
       default:
         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -1187,7 +1188,7 @@ handle_gns_resolution_result (void *cls,
         GNUNET_break_op (0);
         rh->proc (rh->proc_cls, 0, NULL);
         GNS_resolver_lookup_cancel (rh);
-        return;                 
+        return;
       }
       handle_gns_cname_result (rh,
                                cname);
@@ -1301,7 +1302,7 @@ handle_gns_resolution_result (void *cls,
               rd_off++;
             }
           }
-          GNUNET_free_non_null (cname); 
+          GNUNET_free_non_null (cname);
         }
         break;
       case GNUNET_DNSPARSER_TYPE_SOA:
@@ -1338,7 +1339,7 @@ handle_gns_resolution_result (void *cls,
             }
           }
           if (NULL != soa)
-            GNUNET_DNSPARSER_free_soa (soa);    
+            GNUNET_DNSPARSER_free_soa (soa);
         }
         break;
       case GNUNET_DNSPARSER_TYPE_MX:
@@ -1374,8 +1375,8 @@ handle_gns_resolution_result (void *cls,
             }
           }
           if (NULL != mx)
-            GNUNET_DNSPARSER_free_mx (mx);      
-        }       
+            GNUNET_DNSPARSER_free_mx (mx);
+        }
         break;
       case GNUNET_DNSPARSER_TYPE_SRV:
         {
@@ -1414,7 +1415,7 @@ handle_gns_resolution_result (void *cls,
             }
           }
           if (NULL != srv)
-            GNUNET_DNSPARSER_free_srv (srv);    
+            GNUNET_DNSPARSER_free_srv (srv);
         }
         break;
       case GNUNET_NAMESTORE_TYPE_PKEY:
@@ -1422,7 +1423,7 @@ handle_gns_resolution_result (void *cls,
         if (NULL != rh->shorten_key)
         {
           struct GNUNET_CRYPTO_EcdsaPublicKey pub;
-        
+
           if (rd[i].data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))
           {
             GNUNET_break_op (0);
@@ -1610,7 +1611,7 @@ handle_gns_resolution_result (void *cls,
     case GNUNET_DNSPARSER_TYPE_CNAME:
       {
         char *cname;
-        
+
         off = 0;
         cname = GNUNET_DNSPARSER_parse_name (rd[i].data,
                                              rd[i].data_size,
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c
index f0c96716a..3d3ac0094 100644
--- a/src/gns/gnunet-service-gns_shorten.c
+++ b/src/gns/gnunet-service-gns_shorten.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
+#include "gnunet_gnsrecord_lib.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_resolver_service.h"
 #include "gnunet_gns_service.h"
@@ -492,7 +493,7 @@ process_zone_to_name_discover (void *cls,
   }
   /* record does not yet exist, go into DHT to find PSEU record */
   GNUNET_NAMESTORE_query_from_public_key (&gph->target_zone,
-                                          GNUNET_GNS_TLD_PLUS,                                  
+                                          GNUNET_GNS_TLD_PLUS,
                                           &lookup_key);
   gph->timeout_task = GNUNET_SCHEDULER_add_delayed (DHT_LOOKUP_TIMEOUT,
                                                     &handle_auth_discovery_timeout,