*/
#if BUILD_HTTPS
+#define PLUGIN_NAME "https_client"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_https_client_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_https_client_done
#else
+#define PLUGIN_NAME "http_client"
#define LIBGNUNET_PLUGIN_TRANSPORT_INIT libgnunet_plugin_transport_http_client_init
#define LIBGNUNET_PLUGIN_TRANSPORT_DONE libgnunet_plugin_transport_http_client_done
#endif
/**
* Address
*/
- void *addr;
+ struct HttpAddress *addr;
/**
* Address length
*/
char *protocol;
+ /**
+ * My options to be included in the address
+ */
+ uint32_t options;
+
/**
* Maximum number of sockets the plugin can use
* Each http inbound /outbound connections are two connections
struct Session *s = cls;
struct HTTP_Client_Plugin *plugin;
struct GNUNET_TIME_Relative delay;
- struct GNUNET_ATS_Information atsi[2];
+ struct GNUNET_ATS_Information atsi;
char *stat_txt;
if (GNUNET_YES != client_exist_session(p, s))
{
}
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);
- atsi[1].value = s->ats_address_network_type;
+ atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ atsi.value = s->ats_address_network_type;
GNUNET_break (s->ats_address_network_type != ntohl (GNUNET_ATS_NET_UNSPECIFIED));
-
delay = s->plugin->env->receive (plugin->env->cls, &s->target, message,
- (const struct GNUNET_ATS_Information *) &atsi, 2,
- s, s->addr, s->addrlen);
+ s, (const char *) s->addr, s->addrlen);
+
+ plugin->env->update_address_metrics (plugin->env->cls,
+ &s->target,
+ s->addr,
+ s->addrlen,
+ s,
+ &atsi, 1);
GNUNET_asprintf (&stat_txt, "# bytes received via %s_client", plugin->protocol);
GNUNET_STATISTICS_update (plugin->env->stats,
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Client: peer `%s' address `%s' next read delayed for %llu ms\n",
- GNUNET_i2s (&s->target), GNUNET_a2s (s->addr, s->addrlen),
+ GNUNET_i2s (&s->target),
+ http_common_plugin_address_to_string (NULL, s->plugin->protocol, s->addr, s->addrlen),
delay);
}
client_reschedule_session_timeout (s);
if (GNUNET_YES == s->put_reconnect_required)
{
s->put_reconnect_required = GNUNET_NO;
- client_connect_put(s);
+ if (GNUNET_SYSERR == client_connect_put(s))
+ {
+ GNUNET_break (s->client_put == NULL);
+ GNUNET_break (s->put_tmp_disconnected == GNUNET_NO);
+ }
}
}
if (easy_h == s->client_get)
static int
client_connect_get (struct Session *s)
{
+
CURLMcode mret;
/* create get connection */
s->client_get = curl_easy_init ();
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_get, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
+ if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
+ (ntohl (s->addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ {
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 1L);
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 2L);
+ }
+ else
+ {
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (s->client_get, CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
+ curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+#else
+ curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
+ curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
#endif
+
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);
#if CURL_TCP_NODELAY
curl_easy_setopt (ps->recv_endpoint, CURLOPT_TCP_NODELAY, 1);
#endif
+ curl_easy_setopt (s->client_get, CURLOPT_FOLLOWLOCATION, 0);
+
mret = curl_multi_add_handle (s->plugin->curl_multi_handle, s->client_get);
if (mret != CURLM_OK)
{
#endif
#if BUILD_HTTPS
curl_easy_setopt (s->client_put, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1);
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
- curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
+ if (HTTP_OPTIONS_VERIFY_CERTIFICATE ==
+ (ntohl (s->addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+ {
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 1L);
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 2L);
+ }
+ else
+ {
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYPEER, 0);
+ curl_easy_setopt (s->client_put, CURLOPT_SSL_VERIFYHOST, 0);
+ }
+ curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
+ curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS);
+#else
+ curl_easy_setopt (s->client_get, CURLOPT_PROTOCOLS, CURLPROTO_HTTP);
+ curl_easy_setopt (s->client_get, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP);
#endif
curl_easy_setopt (s->client_put, CURLOPT_URL, s->url);
curl_easy_setopt (s->client_put, CURLOPT_UPLOAD, 1L);
s->client_put = NULL;
s->put.easyhandle = NULL;
s->put.s = NULL;
+ s->put_tmp_disconnected = GNUNET_YES;
return GNUNET_SYSERR;
}
+ s->put_tmp_disconnected = GNUNET_NO;
return GNUNET_OK;
}
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))
+ if (NULL == http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen))
{
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
"Invalid address peer `%s'\n",
}
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);
+ http_common_plugin_address_to_url (NULL, s->addr, s->addrlen),
+ GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
+ plugin->last_tag);
plugin->last_tag++;
}
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+http_client_get_network (void *cls,
+ struct Session *session)
+{
+ GNUNET_assert (NULL != session);
+ return ntohl (session->ats_address_network_type);
+}
+
+
/**
* Creates a new outbound session the transport service will use to send data to the
* peer
return NULL;
}
+ /* Determine network location */
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;
{
salen = sizeof (struct sockaddr_in);
}
- else if (AF_INET == sa->sa_family)
+ else if (AF_INET6 == sa->sa_family)
{
salen = sizeof (struct sockaddr_in6);
}
ats = plugin->env->get_address_type (plugin->env->cls, sa, salen);
+ //fprintf (stderr, "Address %s is in %s\n", GNUNET_a2s (sa,salen), GNUNET_ATS_print_network_type(ntohl(ats.value)));
GNUNET_free (sa);
}
+
else if (GNUNET_NO == res)
{
- ats.value = htonl (GNUNET_ATS_COST_WAN);
+ /* Cannot convert to sockaddr -> is external hostname */
+ ats.value = htonl (GNUNET_ATS_NET_WAN);
}
if (GNUNET_ATS_NET_UNSPECIFIED == ntohl(ats.value))
s->put_tmp_disconnected = GNUNET_NO;
client_start_session_timeout (s);
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+ "Created new session %p for `%s' address `%s''\n",
+ s,
+ http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen),
+ GNUNET_i2s (&s->target));
+
/* add new session */
GNUNET_CONTAINER_DLL_insert (plugin->head, plugin->tail, s);
{
GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
"Cannot connect to peer `%s' address `%s''\n",
- http_common_plugin_address_to_string (NULL, s->addr, s->addrlen),
+ http_common_plugin_address_to_string (NULL, plugin->protocol, s->addr, s->addrlen),
GNUNET_i2s (&s->target));
client_delete_session (s);
return NULL;
return GNUNET_OK;
}
+const char *http_plugin_address_to_string (void *cls,
+ const void *addr,
+ size_t addrlen)
+{
+ return http_common_plugin_address_to_string (cls, PLUGIN_NAME, addr, addrlen);
+}
+
/**
* Entry point for the plugin.
*/
initialze the plugin or the API */
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
api->cls = NULL;
- api->address_to_string = &http_common_plugin_address_to_string;
+ api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
return api;
api->disconnect = &http_client_plugin_disconnect;
api->check_address = &http_client_plugin_address_suggested;
api->get_session = &http_client_plugin_get_session;
- api->address_to_string = &http_common_plugin_address_to_string;
+ api->address_to_string = &http_plugin_address_to_string;
api->string_to_address = &http_common_plugin_string_to_address;
api->address_pretty_printer = &http_common_plugin_address_pretty_printer;
-
+ api->get_network = &http_client_get_network;
#if BUILD_HTTPS
plugin->name = "transport-https_client";
plugin->protocol = "http";
#endif
plugin->last_tag = 1;
+ plugin->options = 0; /* Setup options */
if (GNUNET_SYSERR == client_configure_plugin (plugin))
{
projects / oweals / gnunet.git / blobdiff