*/
struct GNUNET_PEERINFO_Handle *GST_peerinfo;
-/**
- * Hostkey generation context
- */
-struct GNUNET_CRYPTO_EccKeyGenerationContext *GST_keygen;
-
/**
* Handle to our service's server.
*/
return ret;
}
+ GST_ats_add_address ((struct GNUNET_HELLO_Address *) address, session);
+
if (do_forward != GNUNET_YES)
return ret;
im = (struct InboundMessage *) buf;
im->peer = *peer;
memcpy (&im[1], message, ntohs (message->size));
- GNUNET_ATS_address_add (GST_ats, address, session, NULL, 0);
GST_clients_broadcast (&im->header, GNUNET_YES);
return ret;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
"Processing `%s' from `%s'\n", "PING",
(sender_address !=
- NULL) ? GST_plugins_a2s (&address) : "<inbound>");
+ NULL) ? GST_plugins_a2s (&address) : TRANSPORT_SESSION_INBOUND_STRING);
GST_validation_handle_ping (peer, message, &address, 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>");
+ NULL) ? GST_plugins_a2s (&address) : TRANSPORT_SESSION_INBOUND_STRING);
GST_validation_handle_pong (peer, message);
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT:
}
+/**
+ * Notify ATS about the new address including the network this address is
+ * located in.
+ *
+ * @param address the address
+ * @param session the session
+ */
+void
+GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
+ struct Session *session)
+{
+ struct GNUNET_TRANSPORT_PluginFunctions *papi;
+ struct GNUNET_ATS_Information ats;
+ 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))
+ return;
+
+ net = papi->get_network (NULL, (void *) session);
+ if (GNUNET_ATS_NET_UNSPECIFIED == net)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not obtain a valid network for `%s' %s\n"),
+ GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
+ GNUNET_break (0);
+ }
+ ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+ ats.value = htonl(net);
+ 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, &ats, 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 ats
+ */
void
-GST_update_ats_metrics (const struct GNUNET_PeerIdentity *peer,
+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;
}
- GNUNET_ATS_address_update (GST_ats, address, session, ats_new, ats_count);
+ 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);
}
return;
GNUNET_assert (NULL != GST_ats);
+
haddress.peer = *peer;
haddress.address = address;
haddress.address_length = address_len;
haddress.transport_name = plugin_name;
- GST_update_ats_metrics (peer, &haddress, session, ats, ats_count);
+ 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);
}
+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)
+{
+ if (NULL == peer)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (NULL == plugin)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if ((address_len != 0) && (NULL == address))
+ {
+ GNUNET_break (0);
+ return;
+ }
+ if (NULL == session)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
+ struct GNUNET_HELLO_Address *addr;
+ 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);
+
+ if (0 < ats_count)
+ GST_ats_update_metrics (peer, addr, session, ats, ats_count);
+ GNUNET_free (addr);
+}
/**
* Function called by ATS to notify the callee that the
"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);
static void
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != GST_keygen)
- {
- GNUNET_CRYPTO_ecc_key_create_stop (GST_keygen);
- GST_keygen = NULL;
- }
GST_neighbours_stop ();
GST_validation_stop ();
GST_plugins_unload ();
/**
- * 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_EccPrivateKey *pk,
- const char *emsg)
+run (void *cls, struct GNUNET_SERVER_Handle *server,
+ const struct GNUNET_CONFIGURATION_Handle *c)
{
+ char *keyfile;
+ struct GNUNET_CRYPTO_EccPrivateKey *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_ecc_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);
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
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_update_metrics);
(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, "PEER", "PRIVATE_KEY",
- &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_ecc_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