[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12225 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12225 - gnunet/src/transport |
Date: |
Tue, 13 Jul 2010 14:26:46 +0200 |
Author: wachs
Date: 2010-07-13 14:26:46 +0200 (Tue, 13 Jul 2010)
New Revision: 12225
Modified:
gnunet/src/transport/Makefile.am
gnunet/src/transport/plugin_transport_http.c
gnunet/src/transport/test_transport_api.c
Log:
Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am 2010-07-13 11:29:51 UTC (rev 12224)
+++ gnunet/src/transport/Makefile.am 2010-07-13 12:26:46 UTC (rev 12225)
@@ -143,6 +143,7 @@
test_transport_api_udp \
test_transport_api_udp_nat \
test_plugin_transport_http \
+ test_transport_api_http \
test_transport_api_reliability_tcp \
test_transport_api_reliability_tcp_nat
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-07-13 11:29:51 UTC
(rev 12224)
+++ gnunet/src/transport/plugin_transport_http.c 2010-07-13 12:26:46 UTC
(rev 12225)
@@ -40,8 +40,8 @@
#include <curl/curl.h>
-#define DEBUG_CURL GNUNET_YES
-#define DEBUG_HTTP GNUNET_YES
+#define DEBUG_CURL GNUNET_NO
+#define DEBUG_HTTP GNUNET_NO
#define DEBUG_CONNECTIONS GNUNET_YES
#define INBOUND GNUNET_NO
@@ -1730,6 +1730,8 @@
struct Session *ps = NULL;
//struct Session *tmp = NULL;
+ return;
+
pc = GNUNET_CONTAINER_multihashmap_get (plugin->peers, &target->hashPubKey);
if (pc==NULL)
return;
@@ -2010,11 +2012,13 @@
t6->u6_port = htons (plugin->port_inbound);
plugin->env->notify_address(plugin->env->cls,"http",t6,sizeof (struct
IPv6HttpAddress) , GNUNET_TIME_UNIT_FOREVER_REL);
}
- return GNUNET_OK;
+ return GNUNET_NO;
+ /* FIXME: return GNUNET_OK; */
}
int remove_peer_context_Iterator (void *cls, const GNUNET_HashCode *key, void
*value)
{
+ struct Plugin *plugin = cls;
struct HTTP_PeerContext * pc = value;
struct Session * ps = pc->head;
struct Session * tmp = NULL;
@@ -2025,7 +2029,8 @@
while (ps!=NULL)
{
- tmp = ps->next;
+ plugin->env->session_end(plugin, &pc->identity, ps);
+ tmp = ps->next;
GNUNET_free_non_null (ps->addr);
GNUNET_free(ps->url);
@@ -2064,22 +2069,8 @@
struct GNUNET_TRANSPORT_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
CURLMcode mret;
-
GNUNET_assert(cls !=NULL);
- if (plugin->http_server_daemon_v4 != NULL)
- {
- MHD_stop_daemon (plugin->http_server_daemon_v4);
- plugin->http_server_daemon_v4 = NULL;
- }
- if (plugin->http_server_daemon_v6 != NULL)
- {
- MHD_stop_daemon (plugin->http_server_daemon_v6);
- plugin->http_server_daemon_v6 = NULL;
- }
-
-
-
if ( plugin->http_server_task_v4 != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_server_task_v4);
@@ -2092,6 +2083,18 @@
plugin->http_server_task_v6 = GNUNET_SCHEDULER_NO_TASK;
}
+
+ if (plugin->http_server_daemon_v4 != NULL)
+ {
+ MHD_stop_daemon (plugin->http_server_daemon_v4);
+ plugin->http_server_daemon_v4 = NULL;
+ }
+ if (plugin->http_server_daemon_v6 != NULL)
+ {
+ MHD_stop_daemon (plugin->http_server_daemon_v6);
+ plugin->http_server_daemon_v6 = NULL;
+ }
+
if ( plugin->http_curl_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
@@ -2103,7 +2106,7 @@
{
GNUNET_CONTAINER_multihashmap_iterate (plugin->peers,
&remove_peer_context_Iterator,
-
NULL);
+
plugin);
GNUNET_CONTAINER_multihashmap_destroy (plugin->peers);
}
if (plugin->multi_handle!=NULL)
@@ -2223,6 +2226,7 @@
/* Initializing cURL */
curl_global_init(CURL_GLOBAL_ALL);
plugin->multi_handle = curl_multi_init();
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl version is: `%s'\n",
curl_version());
if ( NULL == plugin->multi_handle )
{
Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c 2010-07-13 11:29:51 UTC (rev
12224)
+++ gnunet/src/transport/test_transport_api.c 2010-07-13 12:26:46 UTC (rev
12225)
@@ -36,7 +36,7 @@
#include "gnunet_transport_service.h"
#include "transport.h"
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
#define VERBOSE_ARM GNUNET_NO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12225 - gnunet/src/transport,
gnunet <=