Changed Namestore API, changed error handling, changed gns record json

[oweals/gnunet.git] / src / gns / nss / nss_gns_query.c

diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index b8f6c164de7617eb0ff53ba003c208b1e4d2281c..867ead6247b6be9da5101c60ee886cee853e4331 100644 (file)
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -1,27 +1,28 @@
 /*
      This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 GNUnet e.V.
 
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     Affero General Public License for more details.
 
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "nss_gns_query.h"
 #include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 
 
 /**
@@ -33,70 +34,89 @@
  * @param u the userdata (result struct)
  * @return -1 on error else 0
  */
-int gns_resolve_name(int af, const char *name, struct userdata *u)
+int
+gns_resolve_name (int af,
+                 const char *name,
+                 struct userdata *u)
 {
   FILE *p;
   char *cmd;
   char line[128];
+  int ret;
 
-  if (af == AF_INET6)
+  if (AF_INET6 == af)
   {
-    if (-1 == asprintf(&cmd, "%s -t AAAA -u %s\n", "gnunet-gns -r", name))
+    if (-1 == asprintf (&cmd,
+                       "%s -t AAAA -u %s\n",
+                       "gnunet-gns -r",
+                        name))
       return -1;
   }
   else
   {
-    if (-1 == asprintf(&cmd, "%s %s\n", "gnunet-gns -r -u", name))
+    if (-1 == asprintf (&cmd,
+                       "%s %s\n",
+                       "gnunet-gns -r -u",
+                        name))
       return -1;
   }
-
-  p = popen(cmd,"r");
-
-  if (p != NULL )
+  if (NULL == (p = popen (cmd, "r")))
+  {
+    free (cmd);
+    return -1;
+  }
+  while (NULL != fgets (line,
+                        sizeof(line),
+                        p))
   {
-    while (fgets( line, sizeof(line), p ) != NULL)
+    if (u->count >= MAX_ENTRIES)
+      break;
+    if (line[strlen(line)-1] == '\n')
     {
-
-      if (u->count >= MAX_ENTRIES)
-        break;
-
-      if (line[strlen(line)-1] == '\n')
+      line[strlen(line)-1] = '\0';
+      if (AF_INET == af)
       {
-        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);
-            free (cmd);
-            return -1;
-          }
-        }
-        else if ((af == AF_INET6))
+         u->count++;
+         u->data_len += sizeof(ipv4_address_t);
+       }
+       else
+       {
+         pclose (p);
+         free (cmd);
+         return -1;
+       }
+      }
+      else if (AF_INET6 == af)
+      {
+       if (inet_pton(af,
+                      line,
+                      &u->data.ipv6[u->count]))
+        {
+         u->count++;
+         u->data_len += sizeof(ipv6_address_t);
+       }
+       else
         {
-          if (inet_pton(af, line, &(u->data.ipv6[u->count])))
-          {
-            u->count++;
-            u->data_len += sizeof(ipv6_address_t);
-          }
-          else
-          {
-            fclose (p);
-            free (cmd);
-            return -1;
-          }
-        }
+         pclose (p);
+         free (cmd);
+         return -1;
+       }
       }
     }
-    fclose (p);
   }
+  ret = pclose (p);
   free (cmd);
-
+  if (4 == ret)
+    return -2; /* not for GNS */
+  if (3 == ret)
+    return -3; /* timeout -> not found */
+  if ( (2 == ret) || (1 == ret) )
+    return -2; /* launch failure -> service unavailable */
   return 0;
-
 }
+
+/* end of nss_gns_query.c */