#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done
#endif
-
-#define VERBOSE_CURL GNUNET_YES
+#define VERBOSE_CURL GNUNET_NO
#include "platform.h"
#include "gnunet_protocols.h"
-#include "gnunet_connection_lib.h"
+#include "gnunet_common.h"
#include "gnunet_server_lib.h"
-#include "gnunet_service_lib.h"
-#include "gnunet_statistics_service.h"
-#include "gnunet_transport_service.h"
#include "gnunet_transport_plugin.h"
#include "plugin_transport_http_common.h"
#include <curl/curl.h>
/**
* Was session given to transport service?
*/
- int session_passed;
+ // int session_passed;
/**
* Client send handle
struct GNUNET_TIME_Absolute next_receive;
};
+
/**
* Encapsulation of all of the state of the plugin.
*/
GNUNET_SCHEDULER_TaskIdentifier client_perform_task;
};
+
/**
* Encapsulation of all of the state of the plugin.
*/
struct HTTP_Client_Plugin *p;
+
/**
- * Start session timeout
+ * Start session timeout for a session
+ * @param s the session
*/
static void
client_start_session_timeout (struct Session *s);
+
/**
- * Increment session timeout due to activity
+ * Increment session timeout due to activity for a session
+ * @param s the session
*/
static void
client_reschedule_session_timeout (struct Session *s);
+
/**
- * Cancel timeout
+ * Cancel timeout for a session
+ * @param s the session
*/
static void
client_stop_session_timeout (struct Session *s);
+
/**
* Function setting up file descriptors and scheduling task to run
*
client_schedule (struct HTTP_Client_Plugin *plugin, int now);
-int
+/**
+ * Does a session s exists?
+ *
+ * @param plugin the plugin
+ * @param s desired session
+ * @return GNUNET_YES or GNUNET_NO
+ */
+static int
client_exist_session (struct HTTP_Client_Plugin *plugin, struct Session *s)
{
struct Session * head;
#if VERBOSE_CURL
/**
* Function to log curl debug messages with GNUNET_log
+ *
* @param curl handle
* @param type curl_infotype
* @param data data
static int
client_log (CURL * curl, curl_infotype type, char *data, size_t size, void *cls)
{
- if (type == CURLINFO_TEXT)
+ char *ttype;
+ if ((type == CURLINFO_TEXT) || (type == CURLINFO_HEADER_IN) || (type == CURLINFO_HEADER_OUT))
{
char text[size + 2];
+ switch (type) {
+ case CURLINFO_TEXT:
+ ttype = "TEXT";
+ break;
+ case CURLINFO_HEADER_IN:
+ ttype = "HEADER_IN";
+ break;
+ case CURLINFO_HEADER_OUT:
+ ttype = "HEADER_OUT";
+ break;
+ default:
+ break;
+ }
+
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", cls, text);
+ "Connection %p %s: %s", cls, ttype, text);
#else
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "transport-http_client",
- "Connection %p: - %s", cls, text);
+ "Connection %p %s: %s", cls, ttype, text);
#endif
}
return 0;
}
#endif
+
/**
* Function that can be used by the transport service to transmit
* a message using the plugin. Note that in the case of a
{
struct HTTP_Client_Plugin *plugin = cls;
struct HTTP_Message *msg;
- size_t res = -1;
GNUNET_assert (plugin != NULL);
GNUNET_assert (session != NULL);
}
client_schedule (session->plugin, GNUNET_YES);
client_reschedule_session_timeout (session);
-
- return res;
+ return msgbuf_size;
}
-void
+/**
+ * Delete session s
+ *
+ * @param s the session to delete
+ */
+static void
client_delete_session (struct Session *s)
{
struct HTTP_Client_Plugin *plugin = s->plugin;
- struct HTTP_Message *pos = s->msg_head;
- struct HTTP_Message *next = NULL;
+ struct HTTP_Message *pos;
+ struct HTTP_Message *next;
client_stop_session_timeout (s);
GNUNET_CONTAINER_DLL_remove (plugin->head, plugin->tail, s);
+ next = s->msg_head;
while (NULL != (pos = next))
{
next = pos->next;
if (s->client_put != NULL)
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- "Session %p/connection %p: disconnecting PUT connectionto peer `%s'\n",
+ "Session %p/connection %p: disconnecting PUT connection to peer `%s'\n",
s, s->client_put, GNUNET_i2s (&s->target));
/* remove curl handle from multi handle */
}
+
static struct Session *
client_lookup_session (struct HTTP_Client_Plugin *plugin,
const struct GNUNET_HELLO_Address *address)
return NULL;
}
+
/**
* Callback method used with libcurl
* Method is called when libcurl needs to read data during sending
}
+/**
+ * Wake up a curl handle which was suspended
+ *
+ * @param cls the session
+ * @param tc task context
+ */
static void
client_wake_up (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
}
-
+/**
+ * Callback for message stream tokenixer
+ *
+ * @param cls the session
+ * @param client not used
+ * @param message the message received
+ * @return always GNUNET_OK
+ */
static int
client_receive_mst_cb (void *cls, void *client,
const struct GNUNET_MessageHeader *message)
}
+
/**
* Task performing curl operations
*
static void
client_run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
/**
* Function setting up file descriptors and scheduling task to run
*
}
-
/**
* Task performing curl operations
*
client_schedule (plugin, GNUNET_NO);
}
-
static int
client_connect (struct Session *s)
{
curl_easy_setopt (s->client_get, CURLOPT_READDATA, s);
curl_easy_setopt (s->client_get, CURLOPT_WRITEFUNCTION, client_receive);
curl_easy_setopt (s->client_get, CURLOPT_WRITEDATA, s);
- curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT_MS,
- (long) CLIENT_SESSION_TIMEOUT.rel_value);
+ /* No timeout by default, timeout done with session timeout */
+ curl_easy_setopt (s->client_get, CURLOPT_TIMEOUT, 0);
curl_easy_setopt (s->client_get, CURLOPT_PRIVATE, s);
curl_easy_setopt (s->client_get, CURLOPT_CONNECTTIMEOUT_MS,
(long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);
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_PUT, 1L);
- //curl_easy_setopt (s->client_put, CURLOPT_HEADERFUNCTION, &curl_put_header_cb);
+ 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_WRITEDATA, s);
- curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT_MS,
- (long) CLIENT_SESSION_TIMEOUT.rel_value);
+ /* No timeout by default, timeout done with session timeout */
+ curl_easy_setopt (s->client_put, CURLOPT_TIMEOUT, 0);
curl_easy_setopt (s->client_put, CURLOPT_PRIVATE, s);
curl_easy_setopt (s->client_put, CURLOPT_CONNECTTIMEOUT_MS,
(long) HTTP_CLIENT_NOT_VALIDATED_TIMEOUT.rel_value);
{
struct HTTP_Client_Plugin *plugin = cls;
struct Session * s = NULL;
+ struct sockaddr *sa;
+ struct GNUNET_ATS_Information ats;
+ size_t salen = 0;
+ int res;
GNUNET_assert (plugin != NULL);
GNUNET_assert (address != NULL);
GNUNET_assert (address->address != NULL);
-
/* find existing session */
s = client_lookup_session (plugin, address);
if (s != NULL)
return NULL;
}
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
+ sa = http_common_socket_from_address (address->address, address->address_length, &res);
+
+ if (GNUNET_SYSERR == res)
+ {
+ return NULL;
+ }
+ else if (GNUNET_YES == res)
+ {
+ GNUNET_assert (NULL != sa);
+ if (AF_INET == sa->sa_family)
+ {
+ salen = sizeof (struct sockaddr_in);
+ }
+ else if (AF_INET == sa->sa_family)
+ {
+ salen = sizeof (struct sockaddr_in6);
+ }
+ ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+ GNUNET_free (sa);
+ }
+ else if (GNUNET_NO == res)
+ {
+ ats.value = htonl (GNUNET_ATS_COST_WAN);
+ }
+
+ if (GNUNET_ATS_NET_UNSPECIFIED == ntohl(ats.value))
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+
s = GNUNET_malloc (sizeof (struct Session));
memcpy (&s->target, &address->peer, sizeof (struct GNUNET_PeerIdentity));
s->plugin = plugin;
s->addr = GNUNET_malloc (address->address_length);
memcpy (s->addr, address->address, address->address_length);
s->addrlen = address->address_length;
- //s->ats_address_network_type = ats.value;
- GNUNET_break (0);
+ s->ats_address_network_type = ats.value;
client_start_session_timeout (s);
return s;
}
+
+/**
+ * Setup http_client plugin
+ *
+ * @param plugin the plugin handle
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
static int
client_start (struct HTTP_Client_Plugin *plugin)
{
GNUNET_assert (GNUNET_OK == client_disconnect (s));
}
+
/**
-* Start session timeout
-*/
+ * Start session timeout for session s
+ *
+ * @param s the session
+ */
static void
client_start_session_timeout (struct Session *s)
{
s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value);
}
+
/**
-* Increment session timeout due to activity
-*/
+ * Increment session timeout due to activity for session s
+ *
+ * param s the session
+ */
static void
client_reschedule_session_timeout (struct Session *s)
{
s, (unsigned long long) CLIENT_SESSION_TIMEOUT.rel_value);
}
+
/**
-* Cancel timeout
-*/
+ * Cancel timeout due to activity for session s
+ *
+ * param s the session
+ */
static void
client_stop_session_timeout (struct Session *s)
{
return GNUNET_NO;
}
+
/**
* Exit point from the plugin.
+ *
+ * @param cls api as closure
+ * @return NULL
*/
void *
LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
struct Session *pos;
struct Session *next;
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
- _("Shutting down plugin `%s'\n"),
- plugin->name);
-
if (NULL == api->cls)
{
/* Stub shutdown */
return NULL;
}
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ _("Shutting down plugin `%s'\n"),
+ plugin->name);
+
+
next = plugin->head;
while (NULL != (pos = next))
{
}
+/**
+ * Configure plugin
+ *
+ * @param plugin the plugin handle
+ * @return GNUNET_OK on success, GNUNET_SYSERR on failure
+ */
static int
client_configure_plugin (struct HTTP_Client_Plugin *plugin)
{
projects / oweals / gnunet.git / blobdiff