*/
int put_tmp_disconnected;
+ /**
+ * We received data to send while disconnecting, reconnect immediately
+ */
+ int put_reconnect_required;
+
/**
* Client receive handle
*/
* 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
return GNUNET_SYSERR;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Session %p/connection %p: Sending message with %u to peer `%s' with \n",
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "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);
- if (GNUNET_YES == s->put_tmp_disconnected)
+ if (GNUNET_YES == s->put_tmp_disconnecting)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
- "Session %p: Reconnecting PUT connection\n",
- s);
- s->put_tmp_disconnected = 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;
- GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
"Session %p/connection %p: unpausing connection\n",
s, s->client_put);
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;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
"Session %p/connection %p: disconnect due to inactivity\n",
s, s->client_put);
- s->put_tmp_disconnecting = GNUNET_NO;
- s->put_tmp_disconnected = GNUNET_YES;
return 0;
}
{
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;
+
+ /*
+ * 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)
{
{
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 ();
#if VERBOSE_CURL
curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L);
curl_easy_setopt (s->client_put, CURLOPT_DEBUGFUNCTION, &client_log);