[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12076 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12076 - gnunet/src/transport |
Date: |
Thu, 1 Jul 2010 11:35:01 +0200 |
Author: wachs
Date: 2010-07-01 11:35:01 +0200 (Thu, 01 Jul 2010)
New Revision: 12076
Modified:
gnunet/src/transport/plugin_transport_http.c
Log:
Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c 2010-07-01 09:03:57 UTC
(rev 12075)
+++ gnunet/src/transport/plugin_transport_http.c 2010-07-01 09:35:01 UTC
(rev 12076)
@@ -524,7 +524,8 @@
GNUNET_CONTAINER_DLL_insert(cs->inbound_connections_head,cs->inbound_connections_tail,con);
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection info for inbound address %s
(%s) was found\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X for inbound address %s
(%s) was found\n",
+ con,
GNUNET_i2s(&cs->identity),
http_plugin_address_to_string(NULL,con->addr,con->addrlen));
return con;
@@ -555,12 +556,11 @@
GNUNET_assert(con != NULL);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received message with type %u and size %u from `%s' %s\n",
+ "Forwarding message to transport service, type %u and size %u
from `%s' (`%s')\n",
ntohs(message->type),
ntohs(message->size),
GNUNET_i2s(&(con->session->identity)),http_plugin_address_to_string(NULL,con->addr,con->addrlen));
-
con->session->plugin->env->receive (con->session->plugin->env->cls,
&con->session->identity,
message, 1, con->session,
@@ -928,7 +928,7 @@
if (con->pending_msgs_tail == NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection: %X: No Message to send,
pausing connection\n",con);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: No Message to send,
pausing connection\n",con);
con->send_paused = GNUNET_YES;
return CURL_READFUNC_PAUSE;
}
@@ -961,7 +961,7 @@
if ( msg->pos == msg->size)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection: %X: Message with %u bytes
sent, removing message from queue \n",con, msg->pos);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: Message with %u bytes
sent, removing message from queue \n",con, msg->pos);
/* Calling transmit continuation */
if (( NULL != con->pending_msgs_tail) && (NULL !=
con->pending_msgs_tail->transmit_cont))
msg->transmit_cont
(con->pending_msgs_tail->transmit_cont_cls,&(con->session)->identity,GNUNET_OK);
@@ -1023,13 +1023,13 @@
/* already connected, no need to initiate connection */
if ((con->connected == GNUNET_YES) && (con->curl_handle != NULL) &&
(con->send_paused == GNUNET_NO))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection: %X: active, enqueueing
message\n",con);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: active, enqueueing
message\n",con);
return bytes_sent;
}
if ((con->connected == GNUNET_YES) && (con->curl_handle != NULL) &&
(con->send_paused == GNUNET_YES))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection: %X: paused, unpausing
existing connection and enqueueing message\n",con);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: paused, unpausing
existing connection and enqueueing message\n",con);
curl_easy_pause(con->curl_handle,CURLPAUSE_CONT);
con->send_paused=GNUNET_NO;
return bytes_sent;
@@ -1041,7 +1041,7 @@
if ( NULL == con->curl_handle)
con->curl_handle = curl_easy_init();
GNUNET_assert (con->curl_handle != NULL);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection: %X: not existing, creating
new connection\n",con);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,"Connection %X: not connected,
initiating connection\n",con);
GNUNET_assert (NULL != con->pending_msgs_tail);
msg = con->pending_msgs_tail;
@@ -1105,7 +1105,6 @@
{
msg = curl_multi_info_read (plugin->multi_handle, &running);
- GNUNET_break (msg != NULL);
if (msg == NULL)
break;
/* get session for affected curl handle */
@@ -1121,12 +1120,14 @@
if ( (msg->data.result != CURLE_OK) &&
(msg->data.result != CURLE_GOT_NOTHING) )
{
+
+
GNUNET_log(GNUNET_ERROR_TYPE_INFO,
- _("%s failed for `%s' connection %X at %s:%d:
`%s'\n"),
+ _("Connection %X to peer `%s' (`%s') failed:
`%s' `%s'\n"),
+ con,
+ GNUNET_i2s(&cs->identity),
+ http_plugin_address_to_string(NULL, con->addr,
con->addrlen),
"curl_multi_perform",
- GNUNET_i2s(&cs->identity),con,
- __FILE__,
- __LINE__,
curl_easy_strerror (msg->data.result));
/* sending msg failed*/
con->connected = GNUNET_NO;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12076 - gnunet/src/transport,
gnunet <=