[GNUnet-SVN] r23572 - in gnunet/src: . dns gns

[gnunet]

Author: grothoff
Date: 2012-09-03 15:13:25 +0200 (Mon, 03 Sep 2012)
New Revision: 23572

Modified:
   gnunet/src/Makefile.am
   gnunet/src/dns/dnsstub.c
   gnunet/src/gns/gnunet-dns2gns.c
Log:
-bugfixes

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2012-09-03 13:07:17 UTC (rev 23571)
+++ gnunet/src/Makefile.am      2012-09-03 13:13:25 UTC (rev 23572)
@@ -46,7 +46,6 @@
   peerinfo-tool \
   core \
   testing_old \
-  testbed \
   nse \
   dht \
   hostlist \

Modified: gnunet/src/dns/dnsstub.c
===================================================================
--- gnunet/src/dns/dnsstub.c    2012-09-03 13:07:17 UTC (rev 23571)
+++ gnunet/src/dns/dnsstub.c    2012-09-03 13:13:25 UTC (rev 23572)
@@ -87,6 +87,9 @@
 };
 
 
+/**
+ * Handle to the stub resolver.
+ */ 
 struct GNUNET_DNSSTUB_Context
 {
 
@@ -509,7 +512,7 @@
 {
   unsigned int i;
 
-  for (i=0;i<=UINT16_MAX;i++)
+  for (i=0;i<DNS_SOCKET_MAX;i++)
     cleanup_rs (&ctx->sockets[i]);
   if (NULL != ctx->dns_exit)
   {

Modified: gnunet/src/gns/gnunet-dns2gns.c
===================================================================
--- gnunet/src/gns/gnunet-dns2gns.c     2012-09-03 13:07:17 UTC (rev 23571)
+++ gnunet/src/gns/gnunet-dns2gns.c     2012-09-03 13:13:25 UTC (rev 23572)
@@ -159,8 +159,9 @@
     listen_socket6 = NULL;
   }
   GNUNET_GNS_disconnect (gns);
+  gns = NULL;
   GNUNET_DNSSTUB_stop (dns_stub);
-  gns = NULL;
+  dns_stub = NULL;
 }
 
 
@@ -392,10 +393,11 @@
        (0 == strcasecmp (dns_suffix,
                         &name[name_len - strlen (dns_suffix)])) )
     {
-      if (0 == strcasecmp (fcfs_suffix,
-                           &name[name_len - strlen (fcfs_suffix)]))
+      if ( (name_len > strlen (fcfs_suffix)) &&
+          (0 == strcasecmp (fcfs_suffix,
+                            &name[name_len - strlen (fcfs_suffix)])) )
       {
-        name[name_len - strlen (dns_suffix) + 1] = '\0';
+        name[name_len - strlen (fcfs_suffix) + 1] = '\0';
         strcat (name, GNUNET_GNS_TLD);
       }
       else
@@ -556,19 +558,16 @@
 
   if (NULL == dns_suffix)
     dns_suffix = DNS_SUFFIX;
-
   if (NULL == fcfs_suffix)
     fcfs_suffix = FCFS_SUFFIX;
-
-  gns = GNUNET_GNS_connect (cfg);
-
-  dns_stub = GNUNET_DNSSTUB_start (dns_ip);
-
-  if (NULL == dns_stub)
+  if (NULL == (gns = GNUNET_GNS_connect (cfg)))
     return;
-
-  if (NULL == gns)
-    return;
+  if (NULL == (dns_stub = GNUNET_DNSSTUB_start (dns_ip)))
+    {
+      GNUNET_GNS_disconnect (gns);
+      gns = NULL;
+      return;
+    }
   listen_socket4 = GNUNET_NETWORK_socket_create (PF_INET,
                                                 SOCK_DGRAM, 
                                                 IPPROTO_UDP);
@@ -617,7 +616,13 @@
     }
   if ( (NULL == listen_socket4) &&
        (NULL == listen_socket6) )
-    return;
+    {
+      GNUNET_GNS_disconnect (gns);
+      gns = NULL;
+      GNUNET_DNSSTUB_stop (dns_stub);
+      dns_stub = NULL;
+      return;
+    }
   if (NULL != listen_socket4)
     t4 = GNUNET_SCHEDULER_add_read_net (GNUNET_TIME_UNIT_FOREVER_REL,
                                        listen_socket4,