void *transmit_cont_cls;
};
+
+/**
+ * Session handle for connections.
+ */
+struct Session;
+
+struct ConnectionHandle
+{
+ CURL *easyhandle;
+ struct Session *s;
+};
+
+
+
/**
* Session handle for connections.
*/
*/
struct HTTP_Client_Plugin *plugin;
- /**
- * Was session given to transport service?
- */
- // int session_passed;
-
/**
* Client send handle
*/
void *client_put;
+ struct ConnectionHandle put;
+ struct ConnectionHandle get;
+
+ /**
+ * Is the client PUT handle currently paused
+ */
int put_paused;
+ /**
+ * Is the client PUT handle disconnect in progress?
+ */
int put_tmp_disconnecting;
+ /**
+ * Is the client PUT handle temporarily disconnected?
+ */
+ int put_tmp_disconnected;
+
+ /**
+ * We received data to send while disconnecting, reconnect immediately
+ */
+ int put_reconnect_required;
+
/**
* Client receive handle
*/
void *client_get;
+ /**
+ * Outbound overhead due to HTTP connection
+ * Add to next message of this session when calling callback
+ */
+ size_t overhead;
+
/**
* next pointer for double linked list
*/
* Absolute time when to receive data again
* Used for receive throttling
*/
- struct GNUNET_TIME_Absolute next_receive;
+ struct GNUNET_TIME_Absolute next_receive;
};
return GNUNET_NO;
}
-#if VERBOSE_CURL
+
/**
* Function to log curl debug messages with GNUNET_log
*
static int
client_log (CURL * curl, curl_infotype type, char *data, size_t size, void *cls)
{
- char *ttype;
+ struct ConnectionHandle *ch = cls;
+ char *ttype = "UNSPECIFIED";
if ((type == CURLINFO_TEXT) || (type == CURLINFO_HEADER_IN) || (type == CURLINFO_HEADER_OUT))
{
char text[size + 2];
break;
case CURLINFO_HEADER_OUT:
ttype = "HEADER_OUT";
+ /* Overhead*/
+
+ GNUNET_assert (NULL != ch);
+ GNUNET_assert (NULL != ch->easyhandle);
+ GNUNET_assert (NULL != ch->s);
+ ch->s->overhead += size;
break;
default:
+ ttype = "UNSPECIFIED";
break;
}
+#if VERBOSE_CURL
memcpy (text, data, size);
if (text[size - 1] == '\n')
text[size] = '\0';
}
#if BUILD_HTTPS
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-https_client",
- "Connection %p %s: %s", cls, ttype, text);
+ "Connection %p %s: %s", ch->easyhandle, ttype, text);
#else
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-http_client",
- "Connection %p %s: %s", cls, ttype, text);
+ "Connection %p %s: %s", ch->easyhandle, ttype, text);
#endif
}
+#endif
return 0;
}
-#endif
+
/**
* a fresh connection to another peer.
*
* @param cls closure
- * @param session which session must be used
+ * @param s which session must be used
* @param msgbuf the message to transmit
* @param msgbuf_size number of bytes in 'msgbuf'
* @param priority how important is the message (most plugins will
{
struct HTTP_Client_Plugin *plugin = cls;
struct HTTP_Message *msg;
+ char *stat_txt;
GNUNET_assert (plugin != NULL);
GNUNET_assert (s != NULL);
}
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Session %p/connection %p: Sending message with %u to peer `%s' with \n",
+ "Session %p/connection %p: Sending message with %u to peer `%s' \n",
s, s->client_put,
msgbuf_size, GNUNET_i2s (&s->target));
memcpy (msg->buf, msgbuf, msgbuf_size);
GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
+ GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, msgbuf_size, GNUNET_NO);
+
+ GNUNET_free (stat_txt);
+
if (GNUNET_YES == s->put_tmp_disconnecting)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
- "Session %p: Reconnecting PUT connection\n",
- s);
- s->put_tmp_disconnecting = GNUNET_NO;
- if (GNUNET_SYSERR == client_connect_put (s))
- {
- return GNUNET_SYSERR;
- }
+ /* PUT connection is currently getting disconnected */
+ s->put_reconnect_required = GNUNET_YES;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p/connection %jp: currently disconnecting, reconnecting immediately\n",
+ s, s->client_put);
+ return msgbuf_size;
}
-
- if (GNUNET_YES == s->put_paused)
+ else if (GNUNET_YES == s->put_paused)
{
+ /* PUT connection was paused, unpause */
GNUNET_assert (s->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK);
GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
s->put_paused = GNUNET_NO;
curl_easy_pause (s->client_put, CURLPAUSE_CONT);
}
+ else if (GNUNET_YES == s->put_tmp_disconnected)
+ {
+ /* PUT connection was disconnected, reconnect */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p: Reconnecting PUT connection\n",
+ s);
+ s->put_tmp_disconnected = GNUNET_NO;
+ GNUNET_break (s->client_put == NULL);
+ if (GNUNET_SYSERR == client_connect_put (s))
+ {
+ return GNUNET_SYSERR;
+ }
+ }
+
client_schedule (s->plugin, GNUNET_YES);
client_reschedule_session_timeout (s);
return msgbuf_size;
next = pos->next;
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, pos);
if (pos->transmit_cont != NULL)
- pos->transmit_cont (pos->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ pos->transmit_cont (pos->transmit_cont_cls, &s->target, GNUNET_SYSERR,
+ pos->size, pos->pos + s->overhead);
+ s->overhead = 0;
GNUNET_free (pos);
}
{
t = msg->next;
if (NULL != msg->transmit_cont)
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR);
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_SYSERR,
+ msg->size, msg->pos + s->overhead);
+ s->overhead = 0;
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
GNUNET_free (msg);
msg = t;
struct HTTP_Client_Plugin *plugin = s->plugin;
struct HTTP_Message *msg = s->msg_head;
size_t len;
+ char *stat_txt;
if (GNUNET_YES != client_exist_session (plugin, s))
{
/* Calling transmit continuation */
GNUNET_CONTAINER_DLL_remove (s->msg_head, s->msg_tail, msg);
if (NULL != msg->transmit_cont)
- msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
+ msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK,
+ msg->size, msg->size + s->overhead);
+ s->overhead = 0;
GNUNET_free (msg);
}
+
+ GNUNET_asprintf (&stat_txt, "# bytes currently in %s_client buffers", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, -len, GNUNET_NO);
+ GNUNET_free (stat_txt);
+
+ GNUNET_asprintf (&stat_txt, "# bytes transmitted via %s_client", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, len, GNUNET_NO);
+ GNUNET_free (stat_txt);
+
client_reschedule_session_timeout (s);
return len;
}
struct HTTP_Client_Plugin *plugin;
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Information atsi[2];
+ char *stat_txt;
if (GNUNET_YES != client_exist_session(p, s))
{
GNUNET_break (0);
(const struct GNUNET_ATS_Information *) &atsi, 2,
s, s->addr, s->addrlen);
+ GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol);
+ GNUNET_STATISTICS_update (plugin->env->stats,
+ stat_txt, ntohs(message->size), GNUNET_NO);
+ GNUNET_free (stat_txt);
+
s->next_receive =
GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
struct Session *s = cls;
struct GNUNET_TIME_Absolute now;
size_t len = size * nmemb;
- struct HTTP_Client_Plugin *plugin = s->plugin;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Received %u bytes from peer `%s'\n", len,
- GNUNET_i2s (&s->target));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p / connection %p: Received %u bytes from peer `%s'\n",
+ s, s->client_get,
+ len, GNUNET_i2s (&s->target));
now = GNUNET_TIME_absolute_get ();
if (now.abs_value < s->next_receive.abs_value)
{
struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
struct GNUNET_TIME_Relative delta =
GNUNET_TIME_absolute_get_difference (now, s->next_receive);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "No inbound bandwidth for session %p available! Next read was delayed for %llu ms\n",
- s, delta.rel_value);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p / connection %p: No inbound bandwidth available! Next read was delayed for %llu ms\n",
+ s, s->client_get, delta.rel_value);
if (s->recv_wakeup_task != GNUNET_SCHEDULER_NO_TASK)
{
GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
}
s->recv_wakeup_task =
GNUNET_SCHEDULER_add_delayed (delta, &client_wake_up, s);
- return CURLPAUSE_ALL;
+ return CURL_WRITEFUNC_PAUSE;
}
if (NULL == s->msg_tk)
s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);
{
struct HTTP_Client_Plugin *plugin = cls;
int running;
- int http_statuscode;
+ long http_statuscode;
CURLMcode mret;
GNUNET_assert (cls != NULL);
}
curl_multi_remove_handle (plugin->curl_multi_handle, easy_h);
curl_easy_cleanup (easy_h);
+ s->put_tmp_disconnecting = GNUNET_NO;
+ s->put_tmp_disconnected = GNUNET_YES;
s->client_put = NULL;
+ s->put.easyhandle = NULL;
+ s->put.s = NULL;
+
+ /*
+ * Handling a rare case:
+ * plugin_send was called during temporary put disconnect,
+ * reconnect required after connection was disconnected
+ */
+ if (GNUNET_YES == s->put_reconnect_required)
+ {
+ s->put_reconnect_required = GNUNET_NO;
+ client_connect_put(s);
+ }
}
if (easy_h == s->client_get)
{
"Session %p/connection %p: GET connection to `%s' ended normal\n",
s, msg->easy_handle, GNUNET_i2s (&s->target));
/* Disconnect other transmission direction and tell transport */
+ s->get.easyhandle = NULL;
+ s->get.s = NULL;
client_disconnect (s);
}
}
CURLMcode mret;
/* create get connection */
s->client_get = curl_easy_init ();
+ s->get.s = s;
+ s->get.easyhandle = s->client_get;
#if VERBOSE_CURL
curl_easy_setopt (s->client_get, CURLOPT_VERBOSE, 1L);
curl_easy_setopt (s->client_get, CURLOPT_DEBUGFUNCTION, &client_log);
- curl_easy_setopt (s->client_get, CURLOPT_DEBUGDATA, s->client_get);
+ curl_easy_setopt (s->client_get, CURLOPT_DEBUGDATA, &s->get);
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
s, curl_multi_strerror (mret));
curl_easy_cleanup (s->client_get);
s->client_get = NULL;
+ s->get.s = NULL;
+ s->get.easyhandle = NULL;
GNUNET_break (0);
return GNUNET_SYSERR;
}
{
CURLMcode mret;
/* create put connection */
- if (NULL == s->client_put)
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
"Session %p : Init PUT handle \n", s);
- s->client_put = curl_easy_init ();
- }
- else
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Session %p : Reusing PUT handle %p \n", s, s->client_put);
- }
+ s->client_put = curl_easy_init ();
+ s->put.s = s;
+ s->put.easyhandle = s->client_put;
#if VERBOSE_CURL
curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L);
curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log);
- curl_easy_setopt (s->client_put, CURLOPT_DEBUGDATA, s->client_put);
+ curl_easy_setopt (s->client_put, CURLOPT_DEBUGDATA, &s->put);
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
s, curl_multi_strerror (mret));
curl_easy_cleanup (s->client_put);
s->client_put = NULL;
+ s->put.easyhandle = NULL;
+ s->put.s = NULL;
return GNUNET_SYSERR;
}
return GNUNET_OK;
s->ats_address_network_type = ats.value;
s->put_paused = GNUNET_NO;
s->put_tmp_disconnecting = GNUNET_NO;
-
+ s->put_tmp_disconnected = GNUNET_NO;
client_start_session_timeout (s);
/* add new session */
projects / oweals / gnunet.git / blobdiff