#define VERBOSE_CURL GNUNET_YES
-#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
+#define PUT_DISCONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
#define ENABLE_PUT GNUNET_YES
#define ENABLE_GET GNUNET_YES
void *transmit_cont_cls;
};
-
/**
* Session handle for connections.
*/
struct HTTP_Client_Plugin *plugin;
/**
- * Is client send handle paused since there are no data to send?
- * GNUNET_YES/NO
+ * Was session given to transport service?
*/
- int client_put_paused;
+ // int session_passed;
/**
- * Is client send handle to be disconnected due to inactivity
+ * Client send handle
*/
- int client_put_disconnect;
+ void *client_put;
+
/**
- * Was session given to transport service?
+ * Is the client PUT handle currently paused
*/
- // int session_passed;
+ int put_paused;
/**
- * Client send handle
+ * Is the client PUT handle disconnect in progress?
*/
- void *client_put;
+ 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
* 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
*/
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_Client_Plugin *plugin = cls;
struct HTTP_Message *msg;
+ char *stat_txt;
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,
- "Session %p/connection %p: Sending message with %u to peer `%s' with \n",
- session, session->client_put,
- msgbuf_size, GNUNET_i2s (&session->target));
+ 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));
/* 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 (GNUNET_YES == session->client_put_disconnect)
+ 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)
{
- session->client_put_disconnect = GNUNET_NO;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
- "Session %p: Reconnecting PUT connection\n",
- session);
- client_connect_put (session);
+ /* 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 == session->client_put_paused)
+ else if (GNUNET_YES == s->put_paused)
{
- GNUNET_assert (session->put_disconnect_task != GNUNET_SCHEDULER_NO_TASK);
- GNUNET_SCHEDULER_cancel (session->put_disconnect_task);
- session->put_disconnect_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, session->plugin->name,
+ /* 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_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);
+ 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: will be disconnected due to no activity\n",
s, s->client_put);
- s->client_put_disconnect = GNUNET_YES;
- s->client_put_paused = GNUNET_NO;
+ 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
* Method is called when libcurl needs to read data during sending
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))
{
GNUNET_break (0);
return 0;
}
- if (GNUNET_YES == s->client_put_disconnect)
+ 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);
"Session %p/connection %p: nothing to send, suspending\n",
s, s->client_put);
s->put_disconnect_task = GNUNET_SCHEDULER_add_delayed (PUT_DISCONNECT_TIMEOUT, &client_put_disconnect, s);
- s->client_put_disconnect = GNUNET_NO;
- s->client_put_paused = GNUNET_YES;
+ s->put_paused = GNUNET_YES;
return CURL_READFUNC_PAUSE;
}
/* data to send */
msg->transmit_cont (msg->transmit_cont_cls, &s->target, GNUNET_OK);
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];
- //GNUNET_break (0);
+ char *stat_txt;
if (GNUNET_YES != client_exist_session(p, s))
{
GNUNET_break (0);
return GNUNET_OK;
}
plugin = s->plugin;
- //GNUNET_break (0);
+
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);
+
+ 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);
}
+/**
+ * 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
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));
+ "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_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);
+ "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);
- //GNUNET_break (0);
- int res = GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
- //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MST RESULT : %u \n" , res);
- //GNUNET_break (0);
+ GNUNET_SERVER_mst_receive (s->msg_tk, s, stream, len, GNUNET_NO, GNUNET_NO);
return len;
-
}
{
struct HTTP_Client_Plugin *plugin = cls;
int running;
+ long http_statuscode;
CURLMcode mret;
GNUNET_assert (cls != NULL);
GNUNET_assert (s != NULL);
if (msg->msg == CURLMSG_DONE)
{
+ curl_easy_getinfo (easy_h, CURLINFO_RESPONSE_CODE, &http_statuscode);
if (easy_h == s->client_put)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p/connection %p: PUT 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));
+ 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 */
- //client_disconnect (s);
+ }
+ 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)
{
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p/connection %p: GET connection to `%s' ended with reason %i: `%s'\n",
+ 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);
}
mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
if (mret != CURLM_OK)
{
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ "Session %p : Failed to add GET handle to multihandle: `%s'\n",
+ s, curl_multi_strerror (mret));
curl_easy_cleanup (s->client_get);
+ s->client_get = NULL;
GNUNET_break (0);
return GNUNET_SYSERR;
}
{
CURLMcode mret;
/* create put connection */
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
+ "Session %p : Init PUT handle \n", s);
s->client_put = curl_easy_init ();
#if VERBOSE_CURL
curl_easy_setopt (s->client_put, CURLOPT_VERBOSE, 1L);
#endif
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
-
mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_put);
if (mret != CURLM_OK)
{
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, s->plugin->name,
+ "Session %p : Failed to add PUT handle to multihandle: `%s'\n",
+ s, curl_multi_strerror (mret));
curl_easy_cleanup (s->client_put);
- GNUNET_break (0);
+ s->client_put = NULL;
return GNUNET_SYSERR;
}
return GNUNET_OK;
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;
+ s->put_tmp_disconnected = GNUNET_NO;
client_start_session_timeout (s);
/* add new session */
projects / oweals / gnunet.git / blobdiff