#include "gnunet-service-transport_neighbours.h"
#include "gnunet-service-transport_plugins.h"
#include "gnunet-service-transport_validation.h"
+#include "gnunet-service-transport_manipulation.h"
#include "transport.h"
+
+/**
+ * Information we need for an asynchronous session kill.
+ */
+struct SessionKiller
+{
+ /**
+ * Kept in a DLL.
+ */
+ struct SessionKiller *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct SessionKiller *prev;
+
+ /**
+ * Session to kill.
+ */
+ struct Session *session;
+
+ /**
+ * Plugin for the session.
+ */
+ struct GNUNET_TRANSPORT_PluginFunctions *plugin;
+
+ /**
+ * The kill task.
+ */
+ GNUNET_SCHEDULER_TaskIdentifier task;
+};
+
+
/* globals */
/**
*/
struct GNUNET_PEERINFO_Handle *GST_peerinfo;
-/**
- * Hostkey generation context
- */
-struct GNUNET_CRYPTO_RsaKeyGenerationContext *GST_keygen;
-
/**
* Handle to our service's server.
*/
static struct GNUNET_SERVER_Handle *GST_server;
-/**
- * Our public key.
- */
-struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded GST_my_public_key;
-
/**
* Our private key.
*/
-struct GNUNET_CRYPTO_RsaPrivateKey *GST_my_private_key;
+struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key;
/**
* ATS handle.
*/
struct GNUNET_ATS_SchedulingHandle *GST_ats;
+/**
+ * Hello address expiration
+ */
+struct GNUNET_TIME_Relative hello_expiration;
+
/**
* DEBUGGING connection counter
*/
static int connections;
/**
- * Hello address expiration
+ * Head of DLL of asynchronous tasks to kill sessions.
*/
-struct GNUNET_TIME_Relative hello_expiration;
+static struct SessionKiller *sk_head;
+
+/**
+ * Tail of DLL of asynchronous tasks to kill sessions.
+ */
+static struct SessionKiller *sk_tail;
/**
*
* @param cls the 'HELLO' message
* @param target a connected neighbour
- * @param ats performance information (unused)
- * @param ats_count number of records in ats (unused)
* @param address the address
+ * @param state current state this peer is in
+ * @param state_timeout timeout for the current state of the peer
* @param bandwidth_in inbound quota in NBO
* @param bandwidth_out outbound quota in NBO
*/
static void
transmit_our_hello (void *cls, const struct GNUNET_PeerIdentity *target,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count,
const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
const struct GNUNET_MessageHeader *hello = cls;
- GST_neighbours_send (target, (const char *) hello, ntohs (hello->size),
+ if ( GNUNET_NO == GST_neighbours_test_connected(target) )
+ return;
+
+ GST_neighbours_send (target,
+ hello,
+ ntohs (hello->size),
hello_expiration, NULL, NULL);
}
* @param hello new HELLO
*/
static void
-process_hello_update (void *cls, const struct GNUNET_MessageHeader *hello)
+process_hello_update (void *cls,
+ const struct GNUNET_MessageHeader *hello)
{
GST_clients_broadcast (hello, GNUNET_NO);
GST_neighbours_iterate (&transmit_our_hello, (void *) hello);
}
-
/**
* We received some payload. Prepare to pass it on to our clients.
*
* @param address the address
* @param session session used
* @param message the message to process
- * @param ats performance information
- * @param ats_count number of records in ats
* @return how long the plugin should wait until receiving more data
*/
static struct GNUNET_TIME_Relative
process_payload (const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
struct Session *session,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
+ const struct GNUNET_MessageHeader *message)
{
struct GNUNET_TIME_Relative ret;
int do_forward;
struct InboundMessage *im;
size_t msg_size = ntohs (message->size);
size_t size =
- sizeof (struct InboundMessage) + msg_size +
- sizeof (struct GNUNET_ATS_Information) * (ats_count + 1);
+ sizeof (struct InboundMessage) + msg_size;
char buf[size] GNUNET_ALIGN;
- struct GNUNET_ATS_Information *ap;
- ret = GNUNET_TIME_UNIT_ZERO;
do_forward = GNUNET_SYSERR;
ret = GST_neighbours_calculate_receive_delay (peer, msg_size, &do_forward);
-
- if (!GST_neighbours_test_connected (peer))
+ if (! GST_neighbours_test_connected (peer))
{
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Discarded %u bytes type %u payload from peer `%s'\n", msg_size,
+ "Discarded %u bytes type %u payload from peer `%s'\n",
+ msg_size,
ntohs (message->type), GNUNET_i2s (peer));
-
GNUNET_STATISTICS_update (GST_stats,
gettext_noop
- ("# bytes payload discarded due to not connected peer "),
+ ("# bytes payload discarded due to not connected peer"),
msg_size, GNUNET_NO);
return ret;
}
- if (do_forward != GNUNET_YES)
+ GST_ats_add_address (address, session, NULL, 0);
+
+ if (GNUNET_YES != do_forward)
return ret;
im = (struct InboundMessage *) buf;
im->header.size = htons (size);
im->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_RECV);
- im->ats_count = htonl (ats_count + 1);
im->peer = *peer;
- ap = (struct GNUNET_ATS_Information *) &im[1];
- memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
- ap[ats_count].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
- ap[ats_count].value =
- htonl ((uint32_t) GST_neighbour_get_latency (peer).rel_value);
- memcpy (&ap[ats_count + 1], message, ntohs (message->size));
-
- GNUNET_ATS_address_add (GST_ats, address, session, ap, ats_count + 1);
- GNUNET_ATS_address_update (GST_ats, address, session, ap, ats_count + 1);
+ memcpy (&im[1], message, ntohs (message->size));
GST_clients_broadcast (&im->header, GNUNET_YES);
-
return ret;
}
+/**
+ * Task to asynchronously terminate a session.
+ *
+ * @param cls the `struct SessionKiller` with the information for the kill
+ * @param tc scheduler context
+ */
+static void
+kill_session_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct SessionKiller *sk = cls;
+
+ sk->task = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
+ sk->plugin->disconnect_session (sk->plugin->cls,
+ sk->session);
+ GNUNET_free (sk);
+}
+
+
+/**
+ * Force plugin to terminate session due to communication
+ * issue.
+ *
+ * @param plugin_name name of the plugin
+ * @param session session to termiante
+ */
+static void
+kill_session (const char *plugin_name,
+ struct Session *session)
+{
+ struct GNUNET_TRANSPORT_PluginFunctions *plugin;
+ struct SessionKiller *sk;
+
+ for (sk = sk_head; NULL != sk; sk = sk->next)
+ if (sk->session == session)
+ return;
+ plugin = GST_plugins_find (plugin_name);
+ if (NULL == plugin)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ /* need to issue disconnect asynchronously */
+ sk = GNUNET_new (struct SessionKiller);
+ sk->session = session;
+ sk->plugin = plugin;
+ sk->task = GNUNET_SCHEDULER_add_now (&kill_session_task,
+ sk);
+ GNUNET_CONTAINER_DLL_insert (sk_head, sk_tail, sk);
+}
+
+
/**
* Function called by the transport for each received message.
- * This function should also be called with "NULL" for the
- * message to signal that the other peer disconnected.
*
* @param cls closure, const char* with the name of the plugin we received the message from
* @param peer (claimed) identity of the other peer
* @param message the message, NULL if we only care about
- * learning about the delay until we should receive again -- FIXME!
- * @param ats performance information
- * @param ats_count number of records in ats
+ * learning about the delay until we should receive again
* @param session identifier used for this session (NULL for plugins
* that do not offer bi-directional communication to the sender
* using the same "connection")
* for inbound TCP/UDP connections since it it not clear
* that we could establish ourselves a connection to that
* IP address and get the same system)
- * @param sender_address_len number of bytes in sender_address
+ * @param sender_address_len number of bytes in @a sender_address
* @return how long the plugin should wait until receiving more data
* (plugins that do not support this, can ignore the return value)
*/
-static struct GNUNET_TIME_Relative
-plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_MessageHeader *message,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count, struct Session *session,
- const char *sender_address,
- uint16_t sender_address_len)
+struct GNUNET_TIME_Relative
+GST_receive_callback (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_MessageHeader *message,
+ struct Session *session,
+ const char *sender_address,
+ uint16_t sender_address_len)
{
const char *plugin_name = cls;
struct GNUNET_TIME_Relative ret;
if (NULL == message)
goto end;
type = ntohs (message->type);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received Message with type %u from peer `%s'\n", type, GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received Message with type %u from peer `%s'\n",
+ type,
+ GNUNET_i2s (peer));
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop
- ("# bytes total received"),
+ gettext_noop
+ ("# bytes total received"),
ntohs (message->size), GNUNET_NO);
+ GST_neighbours_notify_data_recv (peer, &address, session, message);
switch (type)
{
+ case GNUNET_MESSAGE_TYPE_HELLO_LEGACY:
+ /* Legacy HELLO message, discard */
+ return ret;
case GNUNET_MESSAGE_TYPE_HELLO:
- GST_validation_handle_hello (message);
+ if (GNUNET_OK !=
+ GST_validation_handle_hello (message))
+ {
+ GNUNET_break_op (0);
+ kill_session (plugin_name, session);
+ }
return ret;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PING:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Processing `%s' from `%s'\n", "PING",
(sender_address !=
- NULL) ? GST_plugins_a2s (&address) : "<inbound>");
- GST_validation_handle_ping (peer, message, &address, session);
+ NULL) ? GST_plugins_a2s (&address) : TRANSPORT_SESSION_INBOUND_STRING);
+ if (GNUNET_OK !=
+ GST_validation_handle_ping (peer, message, &address, session))
+ kill_session (plugin_name, session);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Processing `%s' from `%s'\n", "PONG",
(sender_address !=
- NULL) ? GST_plugins_a2s (&address) : "<inbound>");
- GST_validation_handle_pong (peer, message);
+ NULL) ? GST_plugins_a2s (&address) : TRANSPORT_SESSION_INBOUND_STRING);
+ if (GNUNET_OK !=
+ GST_validation_handle_pong (peer, message))
+ {
+ GNUNET_break_op (0);
+ kill_session (plugin_name, session);
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT:
- GST_neighbours_handle_connect (message, peer, &address, session, ats,
- ats_count);
+ if (GNUNET_OK !=
+ GST_neighbours_handle_connect (message, peer, &address, session))
+ {
+ GNUNET_break_op (0);
+ kill_session (plugin_name, session);
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK:
- GST_neighbours_handle_connect_ack (message, peer, &address, session, ats,
- ats_count);
+ if (GNUNET_OK !=
+ GST_neighbours_handle_connect_ack (message, peer, &address, session))
+ {
+ kill_session (plugin_name, session);
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_ACK:
- GST_neighbours_handle_session_ack (message, peer, &address, session, ats,
- ats_count);
+ if (GNUNET_OK !=
+ GST_neighbours_handle_session_ack (message, peer, &address, session))
+ {
+ GNUNET_break_op (0);
+ kill_session (plugin_name, session);
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT:
GST_neighbours_handle_disconnect_message (peer, message);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE:
- GST_neighbours_keepalive (peer);
+ GST_neighbours_keepalive (peer, message);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_KEEPALIVE_RESPONSE:
- GST_neighbours_keepalive_response (peer, ats, ats_count);
+ GST_neighbours_keepalive_response (peer, message);
break;
default:
/* should be payload */
gettext_noop
("# bytes payload received"),
ntohs (message->size), GNUNET_NO);
- ret = process_payload (peer, &address, session, message, ats, ats_count);
+ GST_neighbours_notify_payload_recv (peer, &address, session, message);
+ ret = process_payload (peer, &address, session, message);
break;
}
end:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Allowing receive from peer %s to continue in %llu ms\n",
- GNUNET_i2s (peer), (unsigned long long) ret.rel_value);
+ "Allowing receive from peer %s to continue in %s\n",
+ GNUNET_i2s (peer),
+ GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
return ret;
}
* set of valid addresses?
* @param addr one of the addresses of the host
* the specific address format depends on the transport
- * @param addrlen length of the address
+ * @param addrlen length of the @a addr
* @param dest_plugin destination plugin to use this address with
*/
static void
{
const char *transport_name = cls;
struct GNUNET_HELLO_Address address;
+ struct SessionKiller *sk;
GNUNET_assert (strlen (transport_name) > 0);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Session %p to peer `%s' ended \n",
- session, GNUNET_i2s (peer));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Session %p to peer `%s' ended \n",
+ session,
+ GNUNET_i2s (peer));
if (NULL != session)
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"transport-ats",
/* Tell ATS that session has ended */
GNUNET_ATS_address_destroyed (GST_ats, &address, session);
+ for (sk = sk_head; NULL != sk; sk = sk->next)
+ {
+ if (sk->session == session)
+ {
+ GNUNET_CONTAINER_DLL_remove (sk_head, sk_tail, sk);
+ GNUNET_SCHEDULER_cancel (sk->task);
+ GNUNET_free (sk);
+ break;
+ }
+ }
}
size_t addrlen)
{
struct GNUNET_ATS_Information ats;
+
ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
ats.value = htonl (GNUNET_ATS_NET_UNSPECIFIED);
- if (GST_ats == NULL)
+ if (NULL == GST_ats)
{
GNUNET_break (0);
return ats;
((addr->sa_family != AF_INET6) && (addrlen != sizeof (struct sockaddr_in6))) &&
(addr->sa_family != AF_UNIX))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Malformed address with length %u `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Malformed address with length %u `%s'\n",
addrlen,
- GNUNET_a2s(addr, addrlen));
+ GNUNET_a2s (addr, addrlen));
GNUNET_break (0);
return ats;
}
- return GNUNET_ATS_address_get_type(GST_ats, addr, addrlen);
+ return GNUNET_ATS_address_get_type (GST_ats, addr, addrlen);
+}
+
+
+/**
+ * Notify ATS about the new address including the network this address is
+ * located in.
+ *
+ * @param address the address
+ * @param session the session
+ * @param ats ats information
+ * @param ats_count number of @a ats information
+ */
+void
+GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
+ struct GNUNET_ATS_Information ats2[ats_count + 1];
+ uint32_t net;
+
+ /* valid new address, let ATS know! */
+ if (NULL == address->transport_name)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (NULL == (papi = GST_plugins_find (address->transport_name)))
+ {
+ /* we don't have the plugin for this address */
+ GNUNET_break (0);
+ return;
+ }
+
+ if (GNUNET_YES == GNUNET_ATS_session_known (GST_ats, address, session))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "ATS already knows the address, not passing it on again\n");
+ return;
+ }
+
+ net = papi->get_network (NULL, session);
+ if (GNUNET_ATS_NET_UNSPECIFIED == net)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not obtain a valid network for `%s' %s (%s)\n"),
+ GNUNET_i2s (&address->peer),
+ GST_plugins_a2s (address),
+ address->transport_name);
+ GNUNET_break (0);
+ }
+ ats2[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats2[0].value = htonl(net);
+ memcpy (&ats2[1], ats, sizeof (struct GNUNET_ATS_Information) * ats_count);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying ATS about peer `%s''s new address `%s' session %p in network %s\n",
+ GNUNET_i2s (&address->peer),
+ (0 == address->address_length) ? "<inbound>" : GST_plugins_a2s (address),
+ session,
+ GNUNET_ATS_print_network_type(net));
+ GNUNET_ATS_address_add (GST_ats,
+ address, session,
+ ats2, ats_count + 1);
+}
+
+
+/**
+ * Notify ATS about property changes to an address
+ *
+ * @param peer the peer
+ * @param address the address
+ * @param session the session
+ * @param ats performance information
+ * @param ats_count number of elements in @a ats
+ */
+void
+GST_ats_update_metrics (const struct GNUNET_PeerIdentity *peer,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
+ struct GNUNET_ATS_Information *ats_new;
+
+ if (GNUNET_NO == GNUNET_ATS_session_known (GST_ats, address, session))
+ return;
+
+ /* Call to manipulation to manipulate ATS information */
+ ats_new = GST_manipulation_manipulate_metrics (peer, address, session, ats,
+ ats_count);
+ if (NULL == ats_new)
+ {
+ GNUNET_break(0);
+ return;
+ }
+ if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats,
+ address, session, ats_new, ats_count))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Address or session unknown: failed to update properties for peer `%s' plugin `%s' address `%s' session %p\n"),
+ GNUNET_i2s (peer),
+ address->transport_name,
+ GST_plugins_a2s (address),
+ session);
+ }
+ GNUNET_free (ats_new);
+}
+
+
+/**
+ * Function that will be called to figure if an address is an loopback,
+ * LAN, WAN etc. address
+ *
+ * @param cls closure
+ * @param peer the peer
+ * @param address binary address
+ * @param address_len length of the @a address
+ * @param session the session
+ * @param ats the ats information to update
+ * @param ats_count the number of @a ats elements
+ */
+static void
+plugin_env_update_metrics (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const void *address,
+ uint16_t address_len,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
+ const char *plugin_name = cls;
+ struct GNUNET_HELLO_Address haddress;
+
+ if ((NULL == ats) || (0 == ats_count))
+ return;
+ GNUNET_assert (NULL != GST_ats);
+
+ haddress.peer = *peer;
+ haddress.address = address;
+ haddress.address_length = address_len;
+ haddress.transport_name = plugin_name;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating metrics for peer `%s' address %s session %p\n",
+ GNUNET_i2s (peer),
+ GST_plugins_a2s (&haddress),
+ session);
+ GST_ats_update_metrics (peer, &haddress, session, ats, ats_count);
+}
+
+
+/**
+ * Plugin tells transport service about a new (inbound) session
+ *
+ * @param cls unused
+ * @param peer the peer
+ * @param plugin plugin name
+ * @param address address
+ * @param address_len @a address length
+ * @param session the new session
+ * @param ats ats information
+ * @param ats_count number of @a ats information
+ */
+static void
+plugin_env_session_start (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *plugin,
+ const void *address, uint16_t address_len,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
+ struct GNUNET_HELLO_Address *addr;
+
+ if (NULL == peer)
+ {
+ GNUNET_break(0);
+ return;
+ }
+ if (NULL == plugin)
+ {
+ GNUNET_break(0);
+ return;
+ }
+ if (NULL == session)
+ {
+ GNUNET_break(0);
+ return;
+ }
+
+ addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notification from plugin `%s' about new session %p from peer `%s' address `%s'\n",
+ plugin,
+ session,
+ GNUNET_i2s (peer),
+ GST_plugins_a2s (addr));
+ GST_ats_add_address (addr, session, ats, ats_count);
+ GNUNET_free(addr);
}
* @param cls closure
* @param address address to use (for peer given in address)
* @param session session to use (if available)
- * @param bandwidth_out assigned outbound bandwidth for the connection, 0 to disconnect from peer
- * @param bandwidth_in assigned inbound bandwidth for the connection, 0 to disconnect from peer
+ * @param bandwidth_out assigned outbound bandwidth for the connection in NBO,
+ * 0 to disconnect from peer
+ * @param bandwidth_in assigned inbound bandwidth for the connection in NBO,
+ * 0 to disconnect from peer
* @param ats ATS information
- * @param ats_count number of ATS elements
+ * @param ats_count number of @a ats elements
*/
static void
ats_request_address_change (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
struct Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
uint32_t bw_out = ntohl (bandwidth_out.value__);
/* ATS tells me to disconnect from peer */
- if ((bw_in == 0) && (bw_out == 0))
+ if ((0 == bw_in) && (0 == bw_out))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"ATS tells me to disconnect from peer `%s'\n",
GNUNET_i2s (&address->peer));
GST_neighbours_force_disconnect (&address->peer);
return;
}
+
GST_neighbours_switch_to_address (&address->peer, address, session, ats,
- ats_count, bandwidth_in,
- bandwidth_out);
+ ats_count, bandwidth_in,
+ bandwidth_out);
}
*
* @param cls closure
* @param peer the peer that connected
- * @param ats performance data
- * @param ats_count number of entries in ats
* @param bandwidth_in inbound bandwidth in NBO
* @param bandwidth_out outbound bandwidth in NBO
*/
static void
neighbours_connect_notification (void *cls,
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
- size_t len =
- sizeof (struct ConnectInfoMessage) +
- ats_count * sizeof (struct GNUNET_ATS_Information);
+ size_t len = sizeof (struct ConnectInfoMessage);
char buf[len] GNUNET_ALIGN;
struct ConnectInfoMessage *connect_msg = (struct ConnectInfoMessage *) buf;
- struct GNUNET_ATS_Information *ap;
connections++;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"We are now connected to peer `%s' and %u peers in total\n",
GNUNET_i2s (peer), connections);
-
connect_msg->header.size = htons (sizeof (buf));
connect_msg->header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_CONNECT);
- connect_msg->ats_count = htonl (ats_count);
connect_msg->id = *peer;
connect_msg->quota_in = bandwidth_in;
connect_msg->quota_out = bandwidth_out;
- ap = (struct GNUNET_ATS_Information *) &connect_msg[1];
- memcpy (ap, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
GST_clients_broadcast (&connect_msg->header, GNUNET_NO);
}
"Peer `%s' disconnected and we are connected to %u peers\n",
GNUNET_i2s (peer), connections);
+ GST_manipulation_peer_disconnect (peer);
disconnect_msg.header.size = htons (sizeof (struct DisconnectInfoMessage));
disconnect_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_DISCONNECT);
disconnect_msg.reserved = htonl (0);
* @param cls closure
* @param peer peer this update is about (never NULL)
* @param address address, NULL on disconnect
+ * @param state current state this peer is in
+ * @param state_timeout timeout for the current state of the peer
+ * @param bandwidth_in bandwidth assigned inbound
+ * @param bandwidth_out bandwidth assigned outbound
*/
static void
-neighbours_address_notification (void *cls,
+neighbours_changed_notification (void *cls,
const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Address *address)
+ const struct GNUNET_HELLO_Address *address,
+ enum GNUNET_TRANSPORT_PeerState state,
+ struct GNUNET_TIME_Absolute state_timeout,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out)
{
- GST_clients_broadcast_address_notification (peer, address);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Notifying about change for peer `%s' with address `%s' in state `%s' timing out at %s\n",
+ GNUNET_i2s (peer),
+ (NULL != address) ? GST_plugins_a2s (address) : "<none>",
+ GNUNET_TRANSPORT_p2s(state),
+ GNUNET_STRINGS_absolute_time_to_string(state_timeout));
+
+ GST_clients_broadcast_peer_notification (peer, address, state, state_timeout);
}
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != GST_keygen)
- {
- GNUNET_CRYPTO_rsa_key_create_stop (GST_keygen);
- GST_keygen = NULL;
- }
GST_neighbours_stop ();
GST_validation_stop ();
GST_plugins_unload ();
GST_clients_stop ();
GST_blacklist_stop ();
GST_hello_stop ();
+ GST_manipulation_stop ();
if (NULL != GST_peerinfo)
{
}
if (NULL != GST_my_private_key)
{
- GNUNET_CRYPTO_rsa_key_free (GST_my_private_key);
+ GNUNET_free (GST_my_private_key);
GST_my_private_key = NULL;
}
GST_server = NULL;
/**
- * Callback for hostkey read/generation
+ * Initiate transport service.
*
- * @param cls NULL
- * @param pk the private key
- * @param emsg error message
+ * @param cls closure
+ * @param server the initialized server
+ * @param c configuration to use
*/
static void
-key_generation_cb (void *cls,
- struct GNUNET_CRYPTO_RsaPrivateKey *pk,
- const char *emsg)
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded tmp;
+ char *keyfile;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
long long unsigned int max_fd_cfg;
int max_fd_rlimit;
int max_fd;
+ int friend_only;
- GST_keygen = NULL;
- if (NULL == pk)
+ /* setup globals */
+ GST_cfg = c;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (c, "PEER", "PRIVATE_KEY",
+ &keyfile))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Transport service could not access hostkey: %s. Exiting.\n"),
- emsg);
+ _("Transport service is lacking key configuration settings. Exiting.\n"));
GNUNET_SCHEDULER_shutdown ();
return;
}
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_time (c, "transport", "HELLO_EXPIRATION",
+ &hello_expiration))
+ {
+ hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
+ }
+ GST_server = server;
+ pk = GNUNET_CRYPTO_eddsa_key_create_from_file (keyfile);
+ GNUNET_free (keyfile);
+ GNUNET_assert (NULL != pk);
GST_my_private_key = pk;
GST_stats = GNUNET_STATISTICS_create ("transport", GST_cfg);
- if (NULL == GST_stats)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Could not access STATISTICS service. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
- memset (&GST_my_public_key, '\0', sizeof (GST_my_public_key));
- memset (&tmp, '\0', sizeof (tmp));
- GNUNET_CRYPTO_rsa_key_get_public (GST_my_private_key, &GST_my_public_key);
- GNUNET_CRYPTO_hash (&GST_my_public_key, sizeof (GST_my_public_key),
- &GST_my_identity.hashPubKey);
-
+ GNUNET_CRYPTO_eddsa_key_get_public (GST_my_private_key,
+ &GST_my_identity.public_key);
GNUNET_assert (NULL != GST_my_private_key);
- GNUNET_assert (0 != memcmp (&GST_my_public_key, &tmp, sizeof (GST_my_public_key)));
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "My identity is `%4s'\n", GNUNET_i2s (&GST_my_identity));
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
max_fd_rlimit = 0;
max_fd_cfg = 0;
- max_fd = 0;
#if HAVE_GETRLIMIT
struct rlimit r_file;
if (0 == getrlimit (RLIMIT_NOFILE, &r_file))
{
- max_fd_rlimit = r_file.rlim_cur;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Maximum number of open files was: %u/%u\n", r_file.rlim_cur,
- r_file.rlim_max);
+ max_fd_rlimit = r_file.rlim_cur;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Maximum number of open files was: %u/%u\n",
+ r_file.rlim_cur,
+ r_file.rlim_max);
}
max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */
#endif
"Limiting number of sockets to %u: validation %u, neighbors: %u\n",
max_fd, (max_fd / 3) , (max_fd / 3) * 2);
+ friend_only = GNUNET_CONFIGURATION_get_value_yesno(GST_cfg, "topology","FRIENDS-ONLY");
+ if (GNUNET_SYSERR == friend_only)
+ friend_only = GNUNET_NO; /* According to topology defaults */
/* start subsystems */
- GST_hello_start (&process_hello_update, NULL);
+ GST_hello_start (friend_only, &process_hello_update, NULL);
GNUNET_assert (NULL != GST_hello_get());
- GST_blacklist_start (GST_server);
+ GST_blacklist_start (GST_server, GST_cfg, &GST_my_identity);
GST_ats =
GNUNET_ATS_scheduling_init (GST_cfg, &ats_request_address_change, NULL);
- GST_plugins_load (&plugin_env_receive_callback,
+ GST_manipulation_init (GST_cfg);
+ GST_plugins_load (&GST_manipulation_recv,
&plugin_env_address_change_notification,
+ &plugin_env_session_start,
&plugin_env_session_end,
- &plugin_env_address_to_type);
+ &plugin_env_address_to_type,
+ &plugin_env_update_metrics);
GST_neighbours_start (NULL,
&neighbours_connect_notification,
&neighbours_disconnect_notification,
- &neighbours_address_notification,
+ &neighbours_changed_notification,
(max_fd / 3) * 2);
GST_clients_start (GST_server);
GST_validation_start ((max_fd / 3));
- if (NULL != GST_server)
- GNUNET_SERVER_resume (GST_server);
-}
-
-
-/**
- * Initiate transport service.
- *
- * @param cls closure
- * @param server the initialized server
- * @param c configuration to use
- */
-static void
-run (void *cls, struct GNUNET_SERVER_Handle *server,
- const struct GNUNET_CONFIGURATION_Handle *c)
-{
- char *keyfile;
-
- /* setup globals */
- GST_cfg = c;
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (c, "GNUNETD", "HOSTKEY",
- &keyfile))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Transport service is lacking key configuration settings. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_time (c, "transport", "HELLO_EXPIRATION",
- &hello_expiration))
- {
- hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
- }
- GST_server = server;
- GNUNET_SERVER_suspend (server);
- GST_keygen = GNUNET_CRYPTO_rsa_key_create_start (keyfile, &key_generation_cb, NULL);
- GNUNET_free (keyfile);
- if (NULL == GST_keygen)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Transport service is unable to access hostkey. Exiting.\n"));
- GNUNET_SCHEDULER_shutdown ();
- }
}
projects / oweals / gnunet.git / blobdiff