From 9778817e667bc13d4add8f4779b39b6f6a607bfb Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 6 Oct 2011 11:33:09 +0000 Subject: [PATCH] error handling if server could not be started --- src/transport/plugin_transport_http_server.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c index 328c14c77..2ec5964ca 100644 --- a/src/transport/plugin_transport_http_server.c +++ b/src/transport/plugin_transport_http_server.c @@ -996,8 +996,6 @@ server_start (struct Plugin *plugin) &server_disconnect_cb, plugin, MHD_OPTION_EXTERNAL_LOGGER, server_log, NULL, MHD_OPTION_END); - if (plugin->server_v4 == NULL) - res = GNUNET_SYSERR; } plugin->server_v6 = NULL; if (plugin->ipv6 == GNUNET_YES) @@ -1036,8 +1034,21 @@ server_start (struct Plugin *plugin) MHD_OPTION_EXTERNAL_LOGGER, server_log, NULL, MHD_OPTION_END); - if (plugin->server_v6 == NULL) - res = GNUNET_SYSERR; + } + + if ((plugin->ipv4 == GNUNET_YES) && (plugin->server_v4 == NULL)) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, + "Failed to start %s IPv4 server component on port %u\n", plugin->name, + plugin->port); + return GNUNET_SYSERR; + } + if ((plugin->ipv6 == GNUNET_YES) && (plugin->server_v6 == NULL)) + { + GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, + "Failed to start %s IPv6 server component on port %u\n", plugin->name, + plugin->port); + return GNUNET_SYSERR; } server_reschedule (plugin, GNUNET_NO); -- 2.25.1