This file is part of GNUnet.
Copyright (C) 2009, 2010, 2011, 2016 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 Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* Closure for @e cb.
*/
void *cb_cls;
-
+
/**
* How long do we wait for restarting a crashed gnunet-helper-nat-server?
*/
memset (mybuf,
0,
sizeof (mybuf));
- bytes
+ bytes
= GNUNET_DISK_file_read (h->server_stdout_handle,
mybuf,
sizeof (mybuf));
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Finished reading from server stdout with code: %d\n",
- bytes);
+ (int) bytes);
if (0 != GNUNET_OS_process_kill (h->server_proc,
GNUNET_TERM_SIG))
GNUNET_log_from_strerror (GNUNET_ERROR_TYPE_WARNING,
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("gnunet-helper-nat-server generated malformed address `%s'\n"),
mybuf);
- h->server_read_task
+ h->server_read_task
= GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
h->server_stdout_handle,
&nat_server_read,
port);
h->cb (h->cb_cls,
&sin_addr);
- h->server_read_task
+ h->server_read_task
= GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
h->server_stdout_handle,
&nat_server_read,
struct HelperContext *h = cls;
char *binary;
char ia[INET_ADDRSTRLEN];
-
+
h->server_read_task = NULL;
- h->server_stdout
+ GNUNET_assert (NULL !=
+ inet_ntop (AF_INET,
+ &h->internal_address,
+ ia,
+ sizeof (ia)));
+ /* Start the server process */
+ binary
+ = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
+ if (GNUNET_YES !=
+ GNUNET_OS_check_helper_binary (binary,
+ GNUNET_YES,
+ ia))
+ {
+ /* move instantly to max delay, as this is unlikely to be fixed */
+ h->server_retry_delay
+ = GNUNET_TIME_STD_EXPONENTIAL_BACKOFF_THRESHOLD;
+ GNUNET_free (binary);
+ try_again (h);
+ return;
+ }
+ h->server_stdout
= GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES,
GNUNET_NO, GNUNET_YES);
if (NULL == h->server_stdout)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
"pipe");
+ GNUNET_free (binary);
try_again (h);
return;
}
- GNUNET_assert (NULL !=
- inet_ntop (AF_INET,
- &h->internal_address,
- ia,
- sizeof (ia)));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting `%s' at `%s'\n",
"gnunet-helper-nat-server",
ia);
- /* Start the server process */
- binary
- = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
- h->server_proc
+ h->server_proc
= GNUNET_OS_start_process (GNUNET_NO,
0,
NULL,
/* Close the write end of the read pipe */
GNUNET_DISK_pipe_close_end (h->server_stdout,
GNUNET_DISK_PIPE_END_WRITE);
- h->server_stdout_handle
+ h->server_stdout_handle
= GNUNET_DISK_pipe_handle (h->server_stdout,
GNUNET_DISK_PIPE_END_READ);
- h->server_read_task
+ h->server_read_task
= GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
h->server_stdout_handle,
&nat_server_read,
*/
void
GN_stop_gnunet_nat_server_ (struct HelperContext *h)
-{
+{
if (NULL != h->server_read_task)
{
GNUNET_SCHEDULER_cancel (h->server_read_task);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
"inet_ntop");
return GNUNET_SYSERR;
- }
+ }
GNUNET_snprintf (port_as_string,
sizeof (port_as_string),
"%d",