X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Fnss%2Fnss_gns_query.c;h=380788d35d0cea3a761cbd87db8781edf050e26d;hb=557f5487b3e82416ff315989528e2ba6714cc650;hp=867ead6247b6be9da5101c60ee886cee853e4331;hpb=f293763907abc5e9da76adb44b9648eb43a56f57;p=oweals%2Fgnunet.git
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 867ead624..380788d35 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -14,6 +14,8 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
#include
#include
@@ -22,7 +24,23 @@
#include
#include
#include
+#include
#include
+#include
+#include
+#include
+
+
+static void
+kwait (pid_t chld)
+{
+ int ret;
+
+ kill (chld, SIGKILL);
+ waitpid (chld,
+ &ret,
+ 0);
+}
/**
@@ -32,7 +50,10 @@
* @param af address family
* @param name the name to resolve
* @param u the userdata (result struct)
- * @return -1 on error else 0
+ * @return -1 on internal error,
+ * -2 if request is not for GNS,
+ * -3 on timeout,
+ * else 0
*/
int
gns_resolve_name (int af,
@@ -40,33 +61,45 @@ gns_resolve_name (int af,
struct userdata *u)
{
FILE *p;
- char *cmd;
char line[128];
int ret;
+ int out[2];
+ pid_t pid;
- if (AF_INET6 == af)
+ if (0 != pipe (out))
+ return -1;
+ pid = fork ();
+ if (-1 == pid)
+ return -1;
+ if (0 == pid)
{
- if (-1 == asprintf (&cmd,
- "%s -t AAAA -u %s\n",
- "gnunet-gns -r",
- name))
- return -1;
+ char *argv[] = {
+ "gnunet-gns",
+ "-r",
+ "-t",
+ (AF_INET6 == af) ? "AAAA" : "A",
+ "-u",
+ (char *) name,
+ NULL
+ };
+
+ (void) close (STDOUT_FILENO);
+ if ( (0 != close (out[0])) ||
+ (STDOUT_FILENO != dup2 (out[1], STDOUT_FILENO)) )
+ _exit (1);
+ (void) execvp ("gnunet-gns",
+ argv);
+ _exit (1);
}
- else
- {
- if (-1 == asprintf (&cmd,
- "%s %s\n",
- "gnunet-gns -r -u",
- name))
+ (void) close (out[1]);
+ p = fdopen (out[0], "r");
+ if (NULL == p)
+ {
+ kwait (pid);
return -1;
- }
- if (NULL == (p = popen (cmd, "r")))
- {
- free (cmd);
- return -1;
- }
+ }
while (NULL != fgets (line,
- sizeof(line),
+ sizeof (line),
p))
{
if (u->count >= MAX_ENTRIES)
@@ -85,8 +118,9 @@ gns_resolve_name (int af,
}
else
{
- pclose (p);
- free (cmd);
+ (void) fclose (p);
+ kwait (pid);
+ errno = EINVAL;
return -1;
}
}
@@ -101,20 +135,26 @@ gns_resolve_name (int af,
}
else
{
- pclose (p);
- free (cmd);
+ (void) fclose (p);
+ kwait (pid);
+ errno = EINVAL;
return -1;
}
}
}
}
- ret = pclose (p);
- free (cmd);
- if (4 == ret)
+ (void) fclose (p);
+ waitpid (pid,
+ &ret,
+ 0);
+ if (! WIFEXITED (ret))
+ return -1;
+ if (4 == WEXITSTATUS (ret))
return -2; /* not for GNS */
if (3 == ret)
return -3; /* timeout -> not found */
- if ( (2 == ret) || (1 == ret) )
+ if ( (2 == WEXITSTATUS (ret)) ||
+ (1 == WEXITSTATUS (ret)) )
return -2; /* launch failure -> service unavailable */
return 0;
}