[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r17272 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r17272 - gnunet/src/transport |
Date: |
Fri, 7 Oct 2011 10:39:37 +0200 |
Author: wachs
Date: 2011-10-07 10:39:36 +0200 (Fri, 07 Oct 2011)
New Revision: 17272
Modified:
gnunet/src/transport/plugin_transport_http_server.c
Log:
Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2011-10-07 08:20:56 UTC
(rev 17271)
+++ gnunet/src/transport/plugin_transport_http_server.c 2011-10-07 08:39:36 UTC
(rev 17272)
@@ -821,7 +821,8 @@
return;
GNUNET_assert (MHD_YES == MHD_run (plugin->server_v4));
- plugin->server_v4_task = server_schedule (plugin, plugin->server_v4,
GNUNET_NO);
+ if (plugin->server_v4 != NULL)
+ plugin->server_v4_task = server_schedule (plugin, plugin->server_v4,
GNUNET_NO);
}
@@ -844,7 +845,8 @@
return;
GNUNET_assert (MHD_YES == MHD_run (plugin->server_v6));
- plugin->server_v6_task = server_schedule (plugin, plugin->server_v6,
GNUNET_NO);
+ if (plugin->server_v6 != NULL)
+ plugin->server_v6_task = server_schedule (plugin, plugin->server_v6,
GNUNET_NO);
}
/**
@@ -1067,6 +1069,11 @@
struct Session *s = NULL;
struct Session *t = NULL;
+ struct MHD_Daemon *server_v4_tmp = plugin->server_v4;
+ plugin->server_v4 = NULL;
+ struct MHD_Daemon *server_v6_tmp = plugin->server_v6;
+ plugin->server_v6 = NULL;
+
if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
@@ -1079,16 +1086,12 @@
plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (plugin->server_v4 != NULL)
+ if (server_v6_tmp != NULL)
{
- struct MHD_Daemon *server_v4_tmp = plugin->server_v4;
- plugin->server_v4 = NULL;
MHD_stop_daemon (server_v4_tmp);
}
- if (plugin->server_v6 != NULL)
+ if (server_v6_tmp != NULL)
{
- struct MHD_Daemon *server_v6_tmp = plugin->server_v6;
- plugin->server_v6 = NULL;
MHD_stop_daemon (server_v6_tmp);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r17272 - gnunet/src/transport,
gnunet <=