GNUNET_free(sk);
}
+static void
+cancel_pending_blacklist_checks (const struct GNUNET_HELLO_Address *address, struct Session *session)
+{
+ struct BlacklistCheckContext *blctx;
+ struct BlacklistCheckContext *next;
+ next = bc_head;
+ for (blctx = next; NULL != blctx; blctx = next)
+ {
+ next = blctx->next;
+ if ((NULL != blctx->address) && (0 == GNUNET_HELLO_address_cmp(blctx->address, address)) && (blctx->session == session))
+ {
+ GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+ if (NULL != blctx->blc)
+ {
+ GST_blacklist_test_cancel (blctx->blc);
+ blctx->blc = NULL;
+ }
+ GNUNET_HELLO_address_free (blctx->address);
+ GNUNET_free_non_null (blctx->msg);
+ GNUNET_free_non_null (blctx->ats);
+ GNUNET_free (blctx);
+ }
+ }
+}
+
/**
* Force plugin to terminate session due to communication
* issue.
GNUNET_CONTAINER_DLL_insert(sk_head, sk_tail, sk);
}
+
+
/**
* Black list check result for try_connect call
* If connection to the peer is allowed request adddress and
* @param result the result
*/
static void
-connect_address_bl_check_cont (void *cls,
+connect_bl_check_cont (void *cls,
const struct GNUNET_PeerIdentity *peer, int result)
{
struct BlacklistCheckContext *blctx = cls;
+ GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+ blctx->blc = NULL;
+
if (GNUNET_OK == result)
{
- GST_ats_add_address (blctx->address, blctx->session, NULL, 0);
+ /* Blacklist allows to speak to this peer, forward CONNECT to neighbours */
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Received CONNECT message from peer `%s' with `%s' %p\n",
+ GNUNET_i2s (peer), GST_plugins_a2s (blctx->address), blctx->session);
+
+ if (GNUNET_OK != GST_neighbours_handle_connect (blctx->msg,
+ &blctx->address->peer))
+ {
+ cancel_pending_blacklist_checks (blctx->address, blctx->session);
+ kill_session (blctx->address->transport_name, blctx->session);
+ }
}
else
{
+ /* Blacklist denies to speak to this peer */
+
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Discarding CONNECT message from `%s' due to denied blacklist check\n",
+ GNUNET_i2s (peer));
+ cancel_pending_blacklist_checks (blctx->address, blctx->session);
kill_session (blctx->address->transport_name, blctx->session);
}
- GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
- GNUNET_HELLO_address_free (blctx->address);
+ if (NULL != blctx->address)
+ GNUNET_HELLO_address_free (blctx->address);
+ GNUNET_free (blctx->msg);
GNUNET_free (blctx);
}
* @param result the result
*/
static void
-connect_bl_check_cont (void *cls,
+connect_transport_bl_check_cont (void *cls,
const struct GNUNET_PeerIdentity *peer, int result)
{
struct BlacklistCheckContext *blctx = cls;
- struct BlacklistCheckContext *blctx_address;
- struct GST_BlacklistCheck *blc;
- if (GNUNET_OK == result)
- {
- /* Check if incoming address can be used to communicate */
- blctx_address = GNUNET_new (struct BlacklistCheckContext);
- blctx_address->address = GNUNET_HELLO_address_copy (blctx->address);
- blctx_address->session = blctx->session;
-
- GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, blctx_address);
- if (NULL != (blc = GST_blacklist_test_allowed (&blctx_address->address->peer,
- blctx_address->address->transport_name,
- &connect_address_bl_check_cont, blctx_address)))
- {
- blctx_address->blc = blc;
- }
- /* Blacklist allows to speak to this peer, forward CONNECT to neighbours */
- if (GNUNET_OK != GST_neighbours_handle_connect (blctx->msg,
- &blctx->address->peer, blctx->address, blctx->session))
- {
- kill_session (blctx->address->transport_name, blctx->session);
- }
- }
- else
+ GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+ blctx->blc = NULL;
+
+ if (GNUNET_OK == result)
{
- /* Blacklist denies to speak to this peer */
- kill_session (blctx->address->transport_name, blctx->session);
+ /* Blacklist allows to speak to this transport */
+ GST_ats_add_address(blctx->address, blctx->session, blctx->ats, blctx->ats_count);
}
- GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
if (NULL != blctx->address)
GNUNET_HELLO_address_free (blctx->address);
GNUNET_free (blctx->msg);
GNUNET_free (blctx);
}
+
/**
* Function called by the transport for each received message.
*
if (GNUNET_OK != GST_validation_handle_hello (message))
{
GNUNET_break_op(0);
- kill_session (plugin_name, session);
+ cancel_pending_blacklist_checks (address, session);
}
return ret;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PING:
"Processing `%s' from `%s'\n", "PING", GST_plugins_a2s (address));
if (GNUNET_OK
!= GST_validation_handle_ping (&address->peer, message, address, session))
+ {
+ cancel_pending_blacklist_checks (address, session);
kill_session (plugin_name, session);
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_PONG:
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
if (GNUNET_OK != GST_validation_handle_pong (&address->peer, message))
{
GNUNET_break_op(0);
+ cancel_pending_blacklist_checks (address, session);
kill_session (plugin_name, session);
}
break;
{
blctx->blc = blc;
}
+
+ blctx = GNUNET_new (struct BlacklistCheckContext);
+ blctx->address = GNUNET_HELLO_address_copy (address);
+ blctx->session = session;
+ blctx->msg = GNUNET_malloc (ntohs(message->size));
+ memcpy (blctx->msg, message, ntohs(message->size));
+ GNUNET_CONTAINER_DLL_insert (bc_head, bc_tail, blctx);
+ if (NULL != (blc = GST_blacklist_test_allowed (&address->peer,
+ address->transport_name, &connect_transport_bl_check_cont, blctx)))
+ {
+ blctx->blc = blc;
+ }
break;
case GNUNET_MESSAGE_TYPE_TRANSPORT_SESSION_CONNECT_ACK:
if (GNUNET_OK != GST_neighbours_handle_connect_ack (message,
&address->peer, address, session))
{
+ cancel_pending_blacklist_checks (address, session);
kill_session (plugin_name, session);
}
break;
!= GST_neighbours_handle_session_ack (message, &address->peer, address, session))
{
GNUNET_break_op(0);
+ cancel_pending_blacklist_checks (address, session);
kill_session (plugin_name, session);
}
break;
plugin_env_address_change_notification (void *cls, int add_remove,
const struct GNUNET_HELLO_Address *address)
{
+ static int addresses = 0;
+ struct GNUNET_STATISTICS_Handle *cfg = GST_stats;
+
+ if (GNUNET_YES == add_remove)
+ {
+ addresses ++;
+ GNUNET_STATISTICS_update (cfg, "# transport addresses", 1, GNUNET_NO);
+ }
+ else if (GNUNET_NO == add_remove)
+ {
+ if (0 == addresses)
+ GNUNET_break (0);
+ else
+ {
+ addresses --;
+ GNUNET_STATISTICS_update (cfg, "# transport addresses", -1, GNUNET_NO);
+ }
+ }
+
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ "Transport now has %u addresses to communicate\n", addresses);
+
GST_hello_modify_addresses (add_remove, address);
}
/* Tell ATS that session has ended */
GNUNET_ATS_address_destroyed (GST_ats, address, session);
+
+ cancel_pending_blacklist_checks (address, session);
+
for (sk = sk_head; NULL != sk; sk = sk->next)
{
if (sk->session == session)
return;
}
- net = papi->get_network (NULL, session);
+ net = papi->get_network (papi->cls, session);
if (GNUNET_ATS_NET_UNSPECIFIED == net)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ 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);
+ return;
}
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,
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO,
"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),
{
struct BlacklistCheckContext *blctx = cls;
+ GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
+ blctx->blc = NULL;
+
if (GNUNET_OK == result)
{
GST_ats_add_address (blctx->address, blctx->session,
}
else
{
+ cancel_pending_blacklist_checks (blctx->address, blctx->session);
kill_session (blctx->address->transport_name, blctx->session);
}
- GNUNET_CONTAINER_DLL_remove (bc_head, bc_tail, blctx);
GNUNET_HELLO_address_free (blctx->address);
GNUNET_free_non_null (blctx->ats);
GNUNET_free (blctx);
projects / oweals / gnunet.git / blobdiff