[GNUnet-SVN] r22448 - gnunet/src/gns/nss

[gnunet]

Author: schanzen
Date: 2012-07-03 00:37:44 +0200 (Tue, 03 Jul 2012)
New Revision: 22448

Modified:
   gnunet/src/gns/nss/nss_gns.c
   gnunet/src/gns/nss/nss_gns_query.c
Log:
-fix notfound handling

Modified: gnunet/src/gns/nss/nss_gns.c
===================================================================
--- gnunet/src/gns/nss/nss_gns.c        2012-07-02 21:42:36 UTC (rev 22447)
+++ gnunet/src/gns/nss/nss_gns.c        2012-07-02 22:37:44 UTC (rev 22448)
@@ -140,12 +140,19 @@
         if (!gns_resolve_name(af, name, &u) == 0)
         {
           status = NSS_STATUS_NOTFOUND;
+          goto finish;
         }
     }
+    else
+    {
+      status = NSS_STATUS_UNAVAIL;
+      goto finish;
+    }
 
     if (u.count == 0) {
         *errnop = ETIMEDOUT;
         *h_errnop = HOST_NOT_FOUND;
+        status = NSS_STATUS_NOTFOUND;
         goto finish;
     }
 

Modified: gnunet/src/gns/nss/nss_gns_query.c
===================================================================
--- gnunet/src/gns/nss/nss_gns_query.c  2012-07-02 21:42:36 UTC (rev 22447)
+++ gnunet/src/gns/nss/nss_gns_query.c  2012-07-02 22:37:44 UTC (rev 22448)
@@ -46,8 +46,11 @@
         line[strlen(line)-1] = '\0';
         if (af == AF_INET)
         {
-          if (inet_pton(af, line, &(u->data.ipv4[u->count++])))
+          if (inet_pton(af, line, &(u->data.ipv4[u->count])))
+          {
+            u->count++;
             u->data_len += sizeof(ipv4_address_t);
+          }
           else
           {
             fclose (p);
@@ -57,8 +60,11 @@
         }
         else if ((af == AF_INET6))
         {
-          if (inet_pton(af, line, &(u->data.ipv6[u->count++])))
+          if (inet_pton(af, line, &(u->data.ipv6[u->count])))
+          {
+            u->count++;
             u->data_len += sizeof(ipv6_address_t);
+          }
           else
           {
             fclose (p);