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 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_strings_lib.h"
-#include "gnunet_crypto_lib.h"
+#include "gnunet_util_lib.h"
#include "disk.h"
#include <unistr.h>
char sig;
char *pipe_fd;
ssize_t ret;
-
+
LOG (GNUNET_ERROR_TYPE_DEBUG, "`%s' invoked because of %d\n", __FUNCTION__,
tc->reason);
if (0 != (tc->reason &
{
if (-1 == ret)
LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "GNUNET_DISK_file_read");
- LOG (GNUNET_ERROR_TYPE_WARNING, "Closing control pipe\n");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Closing control pipe\n");
GNUNET_DISK_file_close (control_pipe);
control_pipe = NULL;
return;
putenv (GNUNET_OS_CONTROL_PIPE "=");
return;
}
- /* Gcc will issue a warning here. What to do with it? */
+#if !defined (WINDOWS)
+ if (pipe_fd >= FD_SETSIZE)
+#else
+ if ((FILE_TYPE_UNKNOWN == GetFileType ((HANDLE) (uintptr_t) pipe_fd))
+ && (0 != GetLastError ()))
+#endif
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "GNUNET_OS_CONTROL_PIPE `%s' contains garbage?\n", env_buf);
+ putenv (GNUNET_OS_CONTROL_PIPE "=");
+ return;
+ }
#if WINDOWS
- control_pipe = GNUNET_DISK_get_handle_from_w32_handle ((HANDLE) pipe_fd);
+ control_pipe = GNUNET_DISK_get_handle_from_w32_handle ((HANDLE) (uintptr_t) pipe_fd);
#else
control_pipe = GNUNET_DISK_get_handle_from_int_fd ((int) pipe_fd);
#endif
#else
LOG (GNUNET_ERROR_TYPE_DEBUG, "Sending signal %d to pid: %u via system call\n", sig, proc->pid);
return PLIBC_KILL (proc->pid, sig);
-#endif
+#endif
}
}
#endif
-/**
- * Set process priority
- *
- * @param proc pointer to process structure
- * @param prio priority value
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
- */
-int
-GNUNET_OS_set_process_priority (struct GNUNET_OS_Process *proc,
- enum GNUNET_SCHEDULER_Priority prio)
-{
- int rprio;
-
- GNUNET_assert (prio < GNUNET_SCHEDULER_PRIORITY_COUNT);
- if (GNUNET_SCHEDULER_PRIORITY_KEEP == prio)
- return GNUNET_OK;
-
- /* convert to MINGW/Unix values */
- switch (prio)
- {
- case GNUNET_SCHEDULER_PRIORITY_UI:
- case GNUNET_SCHEDULER_PRIORITY_URGENT:
-#ifdef MINGW
- rprio = HIGH_PRIORITY_CLASS;
-#else
- rprio = 0;
-#endif
- break;
-
- case GNUNET_SCHEDULER_PRIORITY_HIGH:
-#ifdef MINGW
- rprio = ABOVE_NORMAL_PRIORITY_CLASS;
-#else
- rprio = 5;
-#endif
- break;
-
- case GNUNET_SCHEDULER_PRIORITY_DEFAULT:
-#ifdef MINGW
- rprio = NORMAL_PRIORITY_CLASS;
-#else
- rprio = 7;
-#endif
- break;
-
- case GNUNET_SCHEDULER_PRIORITY_BACKGROUND:
-#ifdef MINGW
- rprio = BELOW_NORMAL_PRIORITY_CLASS;
-#else
- rprio = 10;
-#endif
- break;
-
- case GNUNET_SCHEDULER_PRIORITY_IDLE:
-#ifdef MINGW
- rprio = IDLE_PRIORITY_CLASS;
-#else
- rprio = 19;
-#endif
- break;
- default:
- GNUNET_assert (0);
- return GNUNET_SYSERR;
- }
-
- /* Set process priority */
-#ifdef MINGW
- {
- HANDLE h = proc->handle;
-
- GNUNET_assert (h != NULL);
- SetPriorityClass (h, rprio);
- }
-#elif LINUX
- pid_t pid;
-
- pid = proc->pid;
- if ((0 == pid) || (pid == getpid ()))
- {
- int have = nice (0);
- int delta = rprio - have;
-
- errno = 0;
- if ((delta != 0) && (rprio == nice (delta)) && (errno != 0))
- {
- LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK, "nice");
- return GNUNET_SYSERR;
- }
- }
- else
- {
- if (0 != setpriority (PRIO_PROCESS, pid, rprio))
- {
- LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
- "setpriority");
- return GNUNET_SYSERR;
- }
- }
-#else
- LOG (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
- "Priority management not availabe for this platform\n");
-#endif
- return GNUNET_OK;
-}
-
-
#if MINGW
static char *
CreateCustomEnvTable (char **vars)
{
#ifndef MINGW
pid_t ret;
- char lpid[16];
char fds[16];
struct GNUNET_OS_Process *gnunet_proc;
struct GNUNET_DISK_FileHandle *childpipe_read;
int fd_stdin_read;
int fd_stdin_write;
- if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename))
+ if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL))
return NULL; /* not executable */
if (GNUNET_YES == pipe_control)
{
struct GNUNET_DISK_PipeHandle *childpipe;
int dup_childpipe_read_fd = -1;
+
childpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES, GNUNET_NO);
if (NULL == childpipe)
return NULL;
&childpipe_read_fd, sizeof (int))) ||
(-1 == (dup_childpipe_read_fd = dup (childpipe_read_fd))))
{
- if (childpipe_read)
+ if (NULL != childpipe_read)
GNUNET_DISK_file_close (childpipe_read);
- if (childpipe_write)
+ if (NULL != childpipe_write)
GNUNET_DISK_file_close (childpipe_write);
if (0 <= dup_childpipe_read_fd)
close (dup_childpipe_read_fd);
}
else
{
- childpipe_read = NULL;
childpipe_write = NULL;
+ childpipe_read_fd = -1;
}
if (NULL != pipe_stdout)
{
int eno = errno;
LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "fork");
GNUNET_array_grow (lscp, ls, 0);
- if (childpipe_read)
- GNUNET_DISK_file_close (childpipe_read);
- if (childpipe_write)
+ if (NULL != childpipe_write)
GNUNET_DISK_file_close (childpipe_write);
if (0 <= childpipe_read_fd)
close (childpipe_read_fd);
}
if (0 != ret)
{
- gnunet_proc = GNUNET_malloc (sizeof (struct GNUNET_OS_Process));
+ unsetenv (GNUNET_OS_CONTROL_PIPE);
+ gnunet_proc = GNUNET_new (struct GNUNET_OS_Process);
gnunet_proc->pid = ret;
gnunet_proc->control_pipe = childpipe_write;
if (GNUNET_YES == pipe_control)
snprintf (fdbuf, 100, "%x", childpipe_read_fd);
setenv (GNUNET_OS_CONTROL_PIPE, fdbuf, 1);
}
+ else
+ unsetenv (GNUNET_OS_CONTROL_PIPE);
if (NULL != pipe_stdin)
{
GNUNET_break (0 == close (fd_stdin_write));
if (NULL != lscp)
{
/* read systemd documentation... */
- GNUNET_snprintf (lpid, sizeof (lpid), "%u", getpid ());
- setenv ("LISTEN_PID", lpid, 1);
i = 0;
tgt = 3;
while (-1 != lscp[i])
BOOL bresult;
DWORD error_code;
- if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename))
+ if (GNUNET_SYSERR == GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL))
return NULL; /* not executable */
-
+
/* Search in prefix dir (hopefully - the directory from which
* the current module was loaded), bindir and libdir, then in PATH
*/
else
SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, 0);
}
-
+
stdoh = GetStdHandle (STD_OUTPUT_HANDLE);
GetHandleInformation (stdoh, &stdof);
if (childpipe_write)
GNUNET_DISK_file_close (childpipe_write);
GNUNET_free (cmd);
- GNUNET_free (path);
return NULL;
}
/* Unlike *nix variant, we don't dup the handle, so can't close
if (lsocks_pipe == NULL)
{
GNUNET_free (cmd);
- GNUNET_free (path);
GNUNET_DISK_pipe_close (lsocks_pipe);
if (GNUNET_YES == pipe_control)
{
return NULL;
}
- bresult = CreateProcessW (wpath, wcmd, NULL, NULL, TRUE,
- DETACHED_PROCESS | CREATE_SUSPENDED, env_block, NULL, &start, &proc);
+ bresult = CreateProcessW (wpath, wcmd, NULL, NULL, GNUNET_YES,
+ CREATE_NO_WINDOW | CREATE_SUSPENDED, env_block, NULL, &start, &proc);
error_code = GetLastError ();
if ((NULL == pipe_stdin) && (stdih))
SetHandleInformation (stdih, HANDLE_FLAG_INHERIT, stdif);
-
+
if ((NULL == pipe_stdout) && (stdoh))
SetHandleInformation (stdoh, HANDLE_FLAG_INHERIT, stdof);
GNUNET_free (env_block);
GNUNET_free (cmd);
- GNUNET_free (path);
free (wpath);
free (wcmd);
if (GNUNET_YES == pipe_control)
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &count, sizeof (count));
if (sizeof (count) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Failed to write %u count bytes to the child: %u\n",
sizeof (count), GetLastError ());
break;
/* Get a socket duplication info */
if (SOCKET_ERROR == WSADuplicateSocketA (lsocks[i], gnunet_proc->pid, &pi))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to duplicate an socket[%llu]: %u\n", i,
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to duplicate an socket[%llu]: %u\n", i,
GetLastError ());
break;
}
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &size, sizeof (size));
if (sizeof (size) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to write %u size[%llu] bytes to the child: %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to write %u size[%llu] bytes to the child: %u\n",
sizeof (size), i, GetLastError ());
break;
}
wrote = GNUNET_DISK_file_write (lsocks_write_fd, &pi, sizeof (pi));
if (sizeof (pi) != wrote)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Failed to write %u socket[%llu] bytes to the child: %u\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to write %u socket[%llu] bytes to the child: %u\n",
sizeof (pi), i, GetLastError ());
break;
}
enum GNUNET_OS_InheritStdioFlags std_inheritance,
struct GNUNET_DISK_PipeHandle *pipe_stdin,
struct GNUNET_DISK_PipeHandle *pipe_stdout,
- const char *filename,
+ const char *filename,
char *const argv[])
{
return start_process (pipe_control,
/**
* Retrieve the status of a process, waiting on him if dead.
* Nonblocking version.
- *
+ *
* @param proc process ID
* @param type status type
* @param code return code/signal number
while ( (pid != (ret = waitpid (pid, NULL, 0))) &&
(EINTR == errno) ) ;
- if (pid != ret)
+ if (pid != ret)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid");
return GNUNET_SYSERR;
projects / oweals / gnunet.git / blobdiff