#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done
#endif
-#define VERBOSE_CURL GNUNET_NO
+#define VERBOSE_CURL GNUNET_YES
+
+#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+
+#define ENABLE_PUT GNUNET_YES
+#define ENABLE_GET GNUNET_YES
#include "platform.h"
#include "gnunet_protocols.h"
void *transmit_cont_cls;
};
-
/**
* Session handle for connections.
*/
*/
struct Session *prev;
+ /**
+ * The URL to connect to
+ */
+ char *url;
+
/**
* Address
*/
*/
struct HTTP_Client_Plugin *plugin;
- /**
- * Is client send handle paused since there are no data to send?
- * GNUNET_YES/NO
- */
- int client_put_paused;
-
/**
* Was session given to transport service?
*/
*/
void *client_put;
+ int put_paused;
+
+ int put_tmp_disconnecting;
+
/**
* Client receive handle
*/
*/
struct GNUNET_SERVER_MessageStreamTokenizer *msg_tk;
+ /**
+ * Session timeout task
+ */
+ GNUNET_SCHEDULER_TaskIdentifier put_disconnect_task;
+
/**
* Session timeout task
*/
static int
client_schedule (struct HTTP_Client_Plugin *plugin, int now);
+static int
+client_connect_put (struct Session *s);
/**
* Does a session s exists?
*/
static ssize_t
http_client_plugin_send (void *cls,
- struct Session *session,
+ struct Session *s,
const char *msgbuf, size_t msgbuf_size,
unsigned int priority,
struct GNUNET_TIME_Relative to,
struct HTTP_Message *msg;
GNUNET_assert (plugin != NULL);
- GNUNET_assert (session != NULL);
+ GNUNET_assert (s != NULL);
/* lookup if session is really existing */
- if (GNUNET_YES != client_exist_session (plugin, session))
+ if (GNUNET_YES != client_exist_session (plugin, s))
{
GNUNET_break (0);
return GNUNET_SYSERR;
}
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
"Session %p/connection %p: Sending message with %u to peer `%s' with \n",
- session, session->client_put,
- msgbuf_size, GNUNET_i2s (&session->target));
+ s, s->client_put,
+ msgbuf_size, GNUNET_i2s (&s->target));
/* create new message and schedule */
msg = GNUNET_malloc (sizeof (struct HTTP_Message) + msgbuf_size);
msg->transmit_cont = cont;
msg->transmit_cont_cls = cont_cls;
memcpy (msg->buf, msgbuf, msgbuf_size);
- GNUNET_CONTAINER_DLL_insert_tail (session->msg_head, session->msg_tail, msg);
+ GNUNET_CONTAINER_DLL_insert_tail (s->msg_head, s->msg_tail, msg);
- if (session->client_put_paused == GNUNET_YES)
+ if (GNUNET_YES == s->put_tmp_disconnecting)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
+ 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;
+ }
+ }
+
+ if (GNUNET_YES == s->put_paused)
+ {
+ 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_DEBUG, s->plugin->name,
"Session %p/connection %p: unpausing connection\n",
- session, session->client_put);
- session->client_put_paused = GNUNET_NO;
- curl_easy_pause (session->client_put, CURLPAUSE_CONT);
+ s, s->client_put);
+ s->put_paused = GNUNET_NO;
+ curl_easy_pause (s->client_put, CURLPAUSE_CONT);
}
- client_schedule (session->plugin, GNUNET_YES);
- client_reschedule_session_timeout (session);
+ client_schedule (s->plugin, GNUNET_YES);
+ client_reschedule_session_timeout (s);
return msgbuf_size;
}
client_stop_session_timeout (s);
+ if (GNUNET_SCHEDULER_NO_TASK != s->put_disconnect_task)
+ {
+ GNUNET_SCHEDULER_cancel (s->put_disconnect_task);
+ s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
next = s->msg_head;
s->msg_tk = NULL;
}
GNUNET_free (s->addr);
+ GNUNET_free (s->url);
GNUNET_free (s);
}
return NULL;
}
+static void
+client_put_disconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct Session *s = cls;
+ s->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p/connection %p: will be disconnected due to no activity\n",
+ s, s->client_put);
+ s->put_paused = GNUNET_NO;
+ s->put_tmp_disconnecting = GNUNET_YES;
+ curl_easy_pause (s->client_put, CURLPAUSE_CONT);
+ client_schedule (s->plugin, GNUNET_YES);
+}
+
+
/**
* Callback method used with libcurl
GNUNET_break (0);
return 0;
}
+ if (GNUNET_YES == s->put_tmp_disconnecting)
+ {
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p/connection %p: disconnect due to inactivity\n",
+ s, s->client_put);
+ return 0;
+ }
+
if (NULL == msg)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Session %p/connection %p: nothing to send, suspending\n",
s, s->client_put);
- s->client_put_paused = GNUNET_YES;
+ s->put_disconnect_task = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT, &client_put_disconnect, s);
+ s->put_paused = GNUNET_YES;
return CURL_READFUNC_PAUSE;
}
/* data to send */
/**
- * Callback for message stream tokenixer
+ * Callback for message stream tokenizer
*
* @param cls the session
* @param client not used
struct HTTP_Client_Plugin *plugin;
struct GNUNET_TIME_Relative delay;
struct GNUNET_ATS_Information atsi[2];
-
if (GNUNET_YES != client_exist_session(p, s))
{
GNUNET_break (0);
}
plugin = s->plugin;
-
atsi[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
atsi[0].value = htonl (1);
atsi[1].type = htonl (GNUNET_ATS_NETWORK_TYPE);
delay = s->plugin->env->receive (plugin->env->cls, &s->target, message,
(const struct GNUNET_ATS_Information *) &atsi, 2,
s, s->addr, s->addrlen);
+
s->next_receive =
GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
}
+/**
+ * Callback method used with libcurl when data for a PUT connection are
+ * received. We do not expect data here, so we just dismiss it
+ *
+ * @param stream pointer where to write data
+ * @param size size of an individual element
+ * @param nmemb count of elements that can be written to the buffer
+ * @param cls destination pointer, passed to the libcurl handle
+ * @return bytes read from stream
+ */
+static size_t
+client_receive_put (void *stream, size_t size, size_t nmemb, void *cls)
+{
+ return size * nmemb;
+}
+
/**
- * Callback method used with libcurl
- * Method is called when libcurl needs to write data during sending
+ * Callback method used with libcurl when data for a GET connection are
+ * received. Forward to MST
*
* @param stream pointer where to write data
* @param size size of an individual element
s->msg_tk = GNUNET_SERVER_mst_create (&client_receive_mst_cb, s);
GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
return len;
-
}
{
struct HTTP_Client_Plugin *plugin = cls;
int running;
+ int http_statuscode;
CURLMcode mret;
GNUNET_assert (cls != NULL);
GNUNET_assert (s != NULL);
if (msg->msg == CURLMSG_DONE)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p/connection %p: connection to `%s' ended with reason %i: `%s'\n",
- s, msg->easy_handle, GNUNET_i2s (&s->target),
- msg->data.result,
- curl_easy_strerror (msg->data.result));
-
- /* Disconnect other transmission direction and tell transport */
- client_disconnect (s);
+ curl_easy_getinfo (easy_h, CURLINFO_RESPONSE_CODE, &http_statuscode);
+ if (easy_h == s->client_put)
+ {
+ if ((0 != msg->data.result) || (http_statuscode != 200))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p/connection %p: PUT connection to `%s' ended with status %i reason %i: `%s'\n",
+ s, msg->easy_handle, GNUNET_i2s (&s->target),
+ http_statuscode,
+ msg->data.result,
+ curl_easy_strerror (msg->data.result));
+ }
+ else
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p/connection %p: PUT connection to `%s' ended normal\n",
+ s, msg->easy_handle, GNUNET_i2s (&s->target));
+ if (s->client_get == NULL)
+ {
+ /* Disconnect other transmission direction and tell transport */
+ }
+ curl_multi_remove_handle (plugin->curl_multi_handle, easy_h);
+ curl_easy_cleanup (easy_h);
+ s->client_put = NULL;
+ }
+ if (easy_h == s->client_get)
+ {
+ if ((0 != msg->data.result) || (http_statuscode != 200))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Session %p/connection %p: GET connection to `%s' ended with status %i reason %i: `%s'\n",
+ s, msg->easy_handle, GNUNET_i2s (&s->target),
+ http_statuscode,
+ msg->data.result,
+ curl_easy_strerror (msg->data.result));
+
+ }
+ else
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "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 */
+ client_disconnect (s);
+ }
}
}
}
}
static int
-client_connect (struct Session *s)
+client_connect_get (struct Session *s)
{
-
- struct HTTP_Client_Plugin *plugin = s->plugin;
- int res = GNUNET_OK;
- char *url;
CURLMcode mret;
-
- /* create url */
- if (NULL == http_common_plugin_address_to_string (NULL, s->addr, s->addrlen))
- {
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Invalid address peer `%s'\n",
- GNUNET_i2s (&s->target));
- return GNUNET_SYSERR;
- }
-
- GNUNET_asprintf (&url, "%s/%s;%u",
- http_common_plugin_address_to_string (plugin, s->addr, s->addrlen),
- GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
- plugin->last_tag);
- plugin->last_tag++;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Initiating outbound session peer `%s' using address `%s'\n",
- GNUNET_i2s (&s->target), url);
-
/* create get connection */
s->client_get = curl_easy_init ();
#if VERBOSE_CURL
curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
#endif
- curl_easy_setopt (s->client_get, CURLOPT_URL, url);
+ curl_easy_setopt (s->client_get, CURLOPT_URL, s->url);
//curl_easy_setopt (s->client_get, CURLOPT_HEADERFUNCTION, &curl_get_header_cb);
//curl_easy_setopt (s->client_get, CURLOPT_WRITEHEADER, ps);
curl_easy_setopt (s->client_get, CURLOPT_READFUNCTION, client_send_cb);
#if CURL_TCP_NODELAY
curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
#endif
+ mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
+ if (mret != CURLM_OK)
+ {
+ curl_easy_cleanup (s->client_get);
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+}
+
+static int
+client_connect_put (struct Session *s)
+{
+ CURLMcode mret;
/* create put connection */
- s->client_put = curl_easy_init ();
+ if (NULL == 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);
curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
#endif
- curl_easy_setopt (s->client_put, CURLOPT_URL, url);
+ curl_easy_setopt (s->client_put, CURLOPT_URL, s->url);
curl_easy_setopt (s->client_put, CURLOPT_UPLOAD, 1L);
- /*
- struct curl_slist *m_headerlist;
- m_headerlist = NULL;
- m_headerlist = curl_slist_append(m_headerlist, "Transfer-Encoding: chunked");
- curl_easy_setopt(s->client_put, CURLOPT_HTTPHEADER, m_headerlist);*/
//curl_easy_setopt (s->client_put, CURLOPT_HEADERFUNCTION, &client_curl_header);
//curl_easy_setopt (s->client_put, CURLOPT_WRITEHEADER, ps);
curl_easy_setopt (s->client_put, CURLOPT_READFUNCTION, client_send_cb);
curl_easy_setopt (s->client_put, CURLOPT_READDATA, s);
- curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive);
+ curl_easy_setopt (s->client_put, CURLOPT_WRITEFUNCTION, client_receive_put);
curl_easy_setopt (s->client_put, CURLOPT_WRITEDATA, s);
/* No timeout by default, timeout done with session timeout */
curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0);
#if CURL_TCP_NODELAY
curl_easy_setopt (s->client_put, CURLOPT_TCP_NODELAY, 1);
#endif
- GNUNET_free (url);
-
- mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_get);
+ mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_put);
if (mret != CURLM_OK)
{
- curl_easy_cleanup (s->client_get);
- GNUNET_break (0);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ "Failed to add curl handle to multihandle: `%s'\n",
+ curl_multi_strerror (mret));
+
+ curl_easy_cleanup (s->client_put);
+ s->client_put = NULL;
return GNUNET_SYSERR;
}
+ return GNUNET_OK;
+}
- mret = curl_multi_add_handle (plugin->curl_multi_handle, s->client_put);
- if (mret != CURLM_OK)
+static int
+client_connect (struct Session *s)
+{
+
+ struct HTTP_Client_Plugin *plugin = s->plugin;
+ int res = GNUNET_OK;
+
+
+ /* create url */
+ if (NULL == http_common_plugin_address_to_string (NULL, s->addr, s->addrlen))
{
- curl_multi_remove_handle (plugin->curl_multi_handle, s->client_get);
- curl_easy_cleanup (s->client_get);
- curl_easy_cleanup (s->client_put);
- GNUNET_break (0);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Invalid address peer `%s'\n",
+ GNUNET_i2s (&s->target));
return GNUNET_SYSERR;
}
+ GNUNET_asprintf (&s->url, "%s/%s;%u",
+ http_common_plugin_address_to_string (plugin, s->addr, s->addrlen),
+ GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
+ plugin->last_tag);
+
+ plugin->last_tag++;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Initiating outbound session peer `%s' using address `%s'\n",
+ GNUNET_i2s (&s->target), s->url);
+
+ if ((GNUNET_SYSERR == client_connect_get (s)) ||
+ (GNUNET_SYSERR == client_connect_put (s)))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p: connected with connections GET %p and PUT %p\n",
- s, s->client_get, s->client_put);
+ "Session %p: connected with connections GET %p and PUT %p\n",
+ s, s->client_get, s->client_put);
/* Perform connect */
plugin->cur_connections += 2;
memcpy (s->addr, address->address, address->address_length);
s->addrlen = address->address_length;
s->ats_address_network_type = ats.value;
+ s->put_paused = GNUNET_NO;
+ s->put_tmp_disconnecting = GNUNET_NO;
client_start_session_timeout (s);