* @param cls the 'HELLO' message
* @param target a connected neighbour
* @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_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);
return ret;
}
- GST_ats_add_address ((struct GNUNET_HELLO_Address *) address, session);
+ GST_ats_add_address (address, session, NULL, 0);
if (GNUNET_YES != do_forward)
return ret;
if (GNUNET_OK !=
GST_neighbours_handle_connect_ack (message, peer, &address, session))
{
- GNUNET_break_op (0);
kill_session (plugin_name, session);
}
break;
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);
+ GST_neighbours_keepalive_response (peer, message);
break;
default:
/* should be payload */
*
* @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)
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
{
struct GNUNET_TRANSPORT_PluginFunctions *papi;
- struct GNUNET_ATS_Information ats;
+ struct GNUNET_ATS_Information ats2[ats_count + 1];
uint32_t net;
/* valid new address, let ATS know! */
}
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)
address->transport_name);
GNUNET_break (0);
}
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl(net);
+ 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),
session,
GNUNET_ATS_print_network_type(net));
GNUNET_ATS_address_add (GST_ats,
- address, session, &ats, 1);
+ address, session,
+ ats2, ats_count + 1);
}
}
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_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);
}
*/
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_INFO,
"ATS tells me to disconnect from peer `%s'\n",
GST_neighbours_force_disconnect (&address->peer);
return;
}
+
GST_neighbours_switch_to_address (&address->peer, address, session, ats,
ats_count, bandwidth_in,
bandwidth_out);
* @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);
}
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));
projects / oweals / gnunet.git / blobdiff