*/
static struct GNUNET_SERVER_Handle *GST_server;
-/**
- * Our public key.
- */
-struct GNUNET_CRYPTO_EccPublicKey GST_my_public_key;
-
/**
* Our private key.
*/
-struct GNUNET_CRYPTO_EccPrivateKey *GST_my_private_key;
+struct GNUNET_CRYPTO_EddsaPrivateKey *GST_my_private_key;
/**
* ATS handle.
gettext_noop
("# bytes total received"),
ntohs (message->size), GNUNET_NO);
+ GST_neighbours_notify_data_recv (peer, &address, session, message);
switch (type)
{
gettext_noop
("# bytes payload received"),
ntohs (message->size), GNUNET_NO);
+ 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 %s\n",
- GNUNET_i2s (peer),
+ GNUNET_i2s (peer),
GNUNET_STRINGS_relative_time_to_string (ret, GNUNET_YES));
return ret;
}
struct GNUNET_ATS_Information *ats_new;
if (GNUNET_NO == GNUNET_ATS_session_known (GST_ats, address, session))
- return;
+ 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))
+ /* 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_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);
+ GNUNET_free(ats_new);
}
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 address length
+ * @param session the new session
+ * @param ats ats information
+ * @param ats_count number of 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)
+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;
+ if (NULL == peer)
+ {
+ GNUNET_break(0);
+ return;
+ }
+ if (NULL == plugin)
+ {
+ 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);
+ 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);
+ if (0 < ats_count)
+ GST_ats_update_metrics (peer, 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
*/
/* ATS tells me to disconnect from peer */
if ((bw_in == 0) && (bw_out == 0))
{
- 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);
}
if (NULL != GST_my_private_key)
{
- GNUNET_CRYPTO_ecc_key_free (GST_my_private_key);
+ GNUNET_free (GST_my_private_key);
GST_my_private_key = NULL;
}
GST_server = NULL;
const struct GNUNET_CONFIGURATION_Handle *c)
{
char *keyfile;
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
long long unsigned int max_fd_cfg;
int max_fd_rlimit;
int max_fd;
hello_expiration = GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION;
}
GST_server = server;
- pk = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ 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);
GST_peerinfo = GNUNET_PEERINFO_connect (GST_cfg);
- GNUNET_CRYPTO_ecc_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_log (GNUNET_ERROR_TYPE_INFO,