[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12224 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12224 - gnunet/src/transport |
Date: |
Tue, 13 Jul 2010 13:29:51 +0200 |
Author: wachs
Date: 2010-07-13 13:29:51 +0200 (Tue, 13 Jul 2010)
New Revision: 12224
Modified:
gnunet/src/transport/plugin_transport_http.c
gnunet/src/transport/test_plugin_transport_http.c
Log:
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-07-13 09:14:34 UTC
(rev 12223)
+++ gnunet/src/transport/plugin_transport_http.c 2010-07-13 11:29:51 UTC
(rev 12224)
@@ -40,8 +40,8 @@
#include <curl/curl.h>
-#define DEBUG_CURL GNUNET_NO
-#define DEBUG_HTTP GNUNET_NO
+#define DEBUG_CURL GNUNET_YES
+#define DEBUG_HTTP GNUNET_YES
#define DEBUG_CONNECTIONS GNUNET_YES
#define INBOUND GNUNET_NO
@@ -71,6 +71,11 @@
*/
#define HTTP_CONNECT_TIMEOUT 30
+#ifdef GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
+#undef GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
+#endif
+#define GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
+
/**
* Network format for IPv4 addresses.
*/
@@ -304,6 +309,11 @@
*/
struct GNUNET_TRANSPORT_PluginEnvironment *env;
+ /**
+ * Handle for reporting statistics.
+ */
+ struct GNUNET_STATISTICS_Handle *stats;
+
unsigned int port_inbound;
struct GNUNET_CONTAINER_MultiHashMap *peers;
@@ -400,7 +410,7 @@
static int remove_session (struct HTTP_PeerContext * pc, struct Session * ps,
int call_msg_cont, int call_msg_cont_result)
{
struct HTTP_Message * msg;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session with
id %u\n", ps, (ps->direction == INBOUND) ? "inbound" :
"outbound",ps->session_id);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: removing %s session %X
with id %u\n", ps, (ps->direction == INBOUND) ? "inbound" : "outbound", ps,
ps->session_id);
GNUNET_free_non_null (ps->addr);
GNUNET_SERVER_mst_destroy (ps->msgtok);
GNUNET_free(ps->url);
@@ -799,7 +809,7 @@
}
if ( 0 == strcmp (MHD_HTTP_METHOD_GET, method) )
{
- if (ps->send_force_disconnect)
+ if (ps->send_force_disconnect == GNUNET_YES)
{
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: outbound connection
was forced to disconnect\n",ps);
@@ -807,16 +817,19 @@
ps->send_active = GNUNET_NO;
return MHD_NO;
}
- ps->send_connected = GNUNET_YES;
- ps->send_active = GNUNET_YES;
- ps->send_endpoint = mhd_connection;
+ else
+ {
+ ps->send_connected = GNUNET_YES;
+ ps->send_active = GNUNET_YES;
+ ps->send_endpoint = mhd_connection;
#if DEBUG_CONNECTIONS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET
connection connected\n",ps);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound GET
connection connected\n",ps);
#endif
- response = MHD_create_response_from_callback(-1,32 * 1024,
&mhd_send_callback, ps, NULL);
- res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
- MHD_destroy_response (response);
- return MHD_YES;
+ response = MHD_create_response_from_callback(-1,32 * 1024,
&mhd_send_callback, ps, NULL);
+ res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+ MHD_destroy_response (response);
+ return MHD_YES;
+ }
}
return MHD_NO;
}
@@ -1154,7 +1167,7 @@
* @param ses session to send data to
* @param
*/
-static int curl_schedule(void *cls, struct Session* ses );
+static int curl_schedule(void *cls );
@@ -1170,6 +1183,7 @@
struct Plugin *plugin = cls;
CURLMcode mret;
struct HTTP_Message * msg;
+
struct GNUNET_TIME_Relative timeout =
GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT;
GNUNET_assert(cls !=NULL);
@@ -1207,7 +1221,7 @@
curl_multi_strerror (mret));
return GNUNET_SYSERR;
}
- if (curl_schedule (plugin, NULL) == GNUNET_SYSERR)
+ if (curl_schedule (plugin) == GNUNET_SYSERR)
return GNUNET_SYSERR;
#if DEBUG_CONNECTIONS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: inbound not
connected, initiating connection\n",ps);
@@ -1280,7 +1294,7 @@
curl_multi_strerror (mret));
return GNUNET_SYSERR;
}
- if (curl_schedule (plugin, NULL) == GNUNET_SYSERR)
+ if (curl_schedule (plugin) == GNUNET_SYSERR)
return GNUNET_SYSERR;
return GNUNET_YES;
}
@@ -1430,7 +1444,7 @@
}
if ((ps->recv_connected == GNUNET_NO) && (ps->send_connected
== GNUNET_NO))
remove_session (pc, ps, GNUNET_YES, GNUNET_SYSERR);
- return;
+ break;
default:
break;
}
@@ -1441,7 +1455,7 @@
handles_last_run = running;
}
while (mret == CURLM_CALL_MULTI_PERFORM);
- curl_schedule(plugin, cls);
+ curl_schedule(plugin);
}
@@ -1450,7 +1464,7 @@
* @param ses session to send data to
* @return GNUNET_SYSERR for hard failure, GNUNET_OK for ok
*/
-static int curl_schedule(void *cls, struct Session* ses )
+static int curl_schedule(void *cls )
{
struct Plugin *plugin = cls;
fd_set rs;
@@ -1710,6 +1724,7 @@
const struct GNUNET_PeerIdentity *target)
{
+
struct Plugin *plugin = cls;
struct HTTP_PeerContext *pc = NULL;
struct Session *ps = NULL;
@@ -1728,14 +1743,14 @@
{
if (ps->send_endpoint!=NULL)
{
- //curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint);
+ //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->send_endpoint));
//curl_easy_cleanup(ps->send_endpoint);
//ps->send_endpoint=NULL;
ps->send_force_disconnect = GNUNET_YES;
}
if (ps->recv_endpoint!=NULL)
{
- //curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint);
+ //GNUNET_assert(CURLM_OK ==
curl_multi_remove_handle(plugin->multi_handle,ps->recv_endpoint));
//curl_easy_cleanup(ps->recv_endpoint);
//ps->recv_endpoint=NULL;
ps->recv_force_disconnect = GNUNET_YES;
@@ -1756,6 +1771,10 @@
ps->send_active = GNUNET_NO;
ps=ps->next;
}
+ //if (plugin->http_curl_task!= GNUNET_SCHEDULER_NO_TASK)
+// GNUNET_SCHEDULER_cancel(plugin->env->sched, plugin->http_curl_task);
+ //curl_schedule(plugin);
+
}
@@ -2094,6 +2113,8 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"curl multihandle clean up
failed\n");
plugin->multi_handle = NULL;
}
+ curl_global_cleanup();
+
GNUNET_free (plugin);
GNUNET_free (api);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Unload http plugin complete...\n");
@@ -2117,6 +2138,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Starting http plugin...\n");
plugin = GNUNET_malloc (sizeof (struct Plugin));
+ plugin->stats = env->stats;
plugin->env = env;
plugin->peers = NULL;
Modified: gnunet/src/transport/test_plugin_transport_http.c
===================================================================
--- gnunet/src/transport/test_plugin_transport_http.c 2010-07-13 09:14:34 UTC
(rev 12223)
+++ gnunet/src/transport/test_plugin_transport_http.c 2010-07-13 11:29:51 UTC
(rev 12224)
@@ -57,7 +57,7 @@
/**
* Testcase timeout
*/
-#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
180)
+#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
20)
/**
* How long between recieve and send?
@@ -1081,11 +1081,10 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("\nPhase 3: send multiple or big
messages after disconnect\n\n"));
/* disconnect from peer, so new connections are created */
- //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Disconnect from peer: `%s'\n",
GNUNET_i2s(&my_identity));
- //api->disconnect(api->cls, &my_identity);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Disconnect from peer: `%s'\n",
GNUNET_i2s(&my_identity));
+ api->disconnect(api->cls, &my_identity);
/* send a multiple GNUNET_messages at a time*/
-
size = 2 * sizeof(struct GNUNET_MessageHeader);
msg = GNUNET_malloc( 2* size);
msg->size = htons(size);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12224 - gnunet/src/transport,
gnunet <=