/**
* Public key of the sender.
*/
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded public_key;
+ struct GNUNET_CRYPTO_EccPublicKey public_key;
/**
* Signature of the peer that sends us the disconnect. Only
disconnect_msg.reserved = htonl (0);
disconnect_msg.purpose.size =
htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
sizeof (struct GNUNET_TIME_AbsoluteNBO));
disconnect_msg.purpose.purpose =
htonl (GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT);
else
latency = n->latency.rel_value;
ats.value = htonl (latency);
- GST_update_ats_metrics (&n->id,
+ GST_ats_update_metrics (&n->id,
n->primary_address.address,
n->primary_address.session,
&ats, 1);
{
struct BlackListCheckContext *bcc = cls;
struct NeighbourMapEntry *n;
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_ATS_Information ats;
- int net;
bcc->bc = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
break;
case S_CONNECT_RECV_BLACKLIST_INBOUND:
if (GNUNET_OK == result)
- {
- /* valid new address, let ATS know! */
- GNUNET_assert (bcc->na.address->transport_name != NULL);
- if (NULL == (papi = GST_plugins_find (bcc->na.address->transport_name)))
- {
- /* we don't have the plugin for this address */
- GNUNET_break (0);
- }
- else
- {
- if (NULL != papi->get_network)
- {
- net = papi->get_network (NULL, bcc->na.session);
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = net;
-// GNUNET_break (0);
-// fprintf (stderr, "NET: %u\n", ntohl(net));
- GNUNET_ATS_address_add (GST_ats,
- bcc->na.address,
- bcc->na.session,
- &ats, 1);
- }
- else
- GNUNET_break (0);
- }
- }
+ GST_ats_add_address (bcc->na.address, bcc->na.session);
+
n->state = S_CONNECT_RECV_ATS;
n->timeout = GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT);
GNUNET_ATS_reset_backoff (GST_ats, peer);
const struct SessionConnectMessage *scm;
struct GNUNET_TIME_Absolute ts;
struct NeighbourMapEntry *n;
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_ATS_Information ats;
- int net;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received CONNECT_ACK message from peer `%s'\n",
n->primary_address.bandwidth_in,
n->primary_address.bandwidth_out);
/* Tell ATS that the outbound session we created to send CONNECT was successfull */
- GNUNET_assert (n->primary_address.address->transport_name != NULL);
- if (NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)))
- {
- /* we don't have the plugin for this address */
- GNUNET_break (0);
- }
- else
- {
- if (NULL != papi->get_network)
- {
- net = papi->get_network (NULL, n->primary_address.session);
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = net;
-// GNUNET_break (0);
-// fprintf (stderr, "NET: %u\n", ntohl(net));
- GNUNET_ATS_address_add (GST_ats,
- n->primary_address.address,
- n->primary_address.session,
- &ats, 1);
- }
- else
- GNUNET_break (0);
- }
+ GST_ats_add_address (n->primary_address.address, n->primary_address.session);
set_address (&n->primary_address,
n->primary_address.address,
n->primary_address.session,
n->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
GNUNET_break (GNUNET_NO == n->alternative_address.ats_active);
- GNUNET_assert (n->alternative_address.address->transport_name != NULL);
- if (NULL == (papi = GST_plugins_find (n->alternative_address.address->transport_name)))
- {
- /* we don't have the plugin for this address */
- GNUNET_break (0);
- }
- else
- {
- if (NULL != papi->get_network)
- {
- net = papi->get_network (NULL, n->alternative_address.session);
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = net;
-// GNUNET_break (0);
-// fprintf (stderr, "NET: %u\n", ntohl(net));
- GNUNET_ATS_address_add (GST_ats,
- n->alternative_address.address,
- n->alternative_address.session,
- &ats, 1);
- }
- else
- GNUNET_break (0);
- }
-
+ GST_ats_add_address (n->alternative_address.address, n->alternative_address.session);
set_address (&n->primary_address,
n->alternative_address.address,
n->alternative_address.session,
n->primary_address.bandwidth_in,
n->primary_address.bandwidth_out);
- GNUNET_assert (n->primary_address.address->transport_name != NULL);
- struct GNUNET_TRANSPORT_PluginFunctions *papi;
- if (NULL == (papi = GST_plugins_find (n->primary_address.address->transport_name)))
- {
- /* we don't have the plugin for this address */
- GNUNET_break (0);
- }
- else
- {
- if (NULL != papi->get_network)
- {
- int net = papi->get_network (NULL, n->primary_address.session);
- struct GNUNET_ATS_Information ats;
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = net;
-// GNUNET_break (0);
-// fprintf (stderr, "NET: %u\n", ntohl(net));
- GNUNET_ATS_address_add (GST_ats,
- n->primary_address.address,
- n->primary_address.session,
- &ats, 1);
- }
- else
- GNUNET_break (0);
- }
+ GST_ats_add_address (n->primary_address.address, n->primary_address.session);
set_address (&n->primary_address,
n->primary_address.address,
n->primary_address.session,
return;
}
GNUNET_CRYPTO_hash (&sdm->public_key,
- sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded),
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey),
&hc);
if (0 != memcmp (peer, &hc, sizeof (struct GNUNET_PeerIdentity)))
{
}
if (ntohl (sdm->purpose.size) !=
sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) +
+ sizeof (struct GNUNET_CRYPTO_EccPublicKey) +
sizeof (struct GNUNET_TIME_AbsoluteNBO))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "%s message from peer `%s' has invalid size \n",
+ "DISCONNECT",
+ GNUNET_i2s (peer));
GNUNET_break_op (0);
return;
}
(GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_DISCONNECT, &sdm->purpose,
&sdm->signature, &sdm->public_key))
{
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "%s message from peer `%s' cannot be verified \n",
+ "DISCONNECT",
+ GNUNET_i2s (peer));
GNUNET_break_op (0);
return;
}