/*
This file is part of GNUnet.
- Copyright (C) 2010,2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010,2011 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* Session for #GST_blacklist_abort_matching(), can be NULL.
*/
- struct Session *session;
+ struct GNUNET_ATS_Session *session;
/**
* Current transmission request handle for this client, or NULL if no
* Perform next action in the blacklist check.
*
* @param cls the `struct BlacklistCheck*`
- * @param tc unused
*/
static void
-do_blacklist_check (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+do_blacklist_check (void *cls);
/**
* @return number of bytes copied to @a buf
*/
static size_t
-transmit_blacklist_message (void *cls,
+transmit_blacklist_message (void *cls,
size_t size,
void *buf)
{
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Sending blacklist test for peer `%s' to client %p\n",
- GNUNET_i2s (&bc->peer),
+ GNUNET_i2s (&bc->peer),
bc->bl_pos->client);
bl = bc->bl_pos;
bm.header.size = htons (sizeof (struct BlacklistMessage));
bm.is_allowed = htonl (0);
bm.peer = bc->peer;
memcpy (buf,
- &bm,
+ &bm,
sizeof (bm));
if (GNUNET_YES == bl->call_receive_done)
{
* Perform next action in the blacklist check.
*
* @param cls the `struct GST_BlacklistCheck *`
- * @param tc unused
*/
static void
-do_blacklist_check (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_blacklist_check (void *cls)
{
struct GST_BlacklistCheck *bc = cls;
struct Blacklisters *bl;
"No other blacklist clients active, will allow neighbour `%s'\n",
GNUNET_i2s (&bc->peer));
- bc->cont (bc->cont_cls,
+ bc->cont (bc->cont_cls,
&bc->peer,
bc->address,
bc->session,
GNUNET_SERVER_notify_transmit_ready (bl->client,
sizeof (struct BlacklistMessage),
GNUNET_TIME_UNIT_FOREVER_REL,
- &transmit_blacklist_message,
+ &transmit_blacklist_message,
bc);
}
confirm_or_drop_neighbour (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct GNUNET_ATS_Session *session,
int allowed)
{
if (GNUNET_OK == allowed)
return; /* we're done */
GNUNET_STATISTICS_update (GST_stats,
- gettext_noop ("# disconnects due to blacklist"),
+ gettext_noop ("# disconnects due to blacklist"),
1,
GNUNET_NO);
GST_neighbours_force_disconnect (peer);
GNUNET_CONTAINER_DLL_remove (bc_head,
bc_tail,
bc);
- bc->cont (bc->cont_cls,
+ bc->cont (bc->cont_cls,
&bc->peer,
bc->address,
bc->session,
GNUNET_OK);
bl->call_receive_done = GNUNET_NO;
bc->bl_pos = bl->next;
- bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
+ bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
bc);
}
}
for (bc = bc_head; bc != NULL; bc = bc->next)
if ((bc->bl_pos == bl) && (NULL == bc->task))
{
- bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
+ bc->task = GNUNET_SCHEDULER_add_now (&do_blacklist_check,
bc);
break;
}
*/
void
GST_blacklist_abort_matching (const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
struct GST_BlacklistCheck *bc;
struct GST_BlacklistCheck *n;
- n = bc_head;
+ n = bc_head;
while (NULL != (bc = n))
{
n = bc->next;
GST_BlacklistTestContinuation cont,
void *cont_cls,
const struct GNUNET_HELLO_Address *address,
- struct Session *session)
+ struct GNUNET_ATS_Session *session)
{
struct GST_BlacklistCheck *bc;
/* Disallowed by config, disapprove instantly */
GNUNET_STATISTICS_update (GST_stats,
gettext_noop ("# disconnects due to blacklist"),
- 1,
+ 1,
GNUNET_NO);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Disallowing connection to peer `%s' on transport %s\n"),
GNUNET_i2s (peer),
(NULL != transport_name) ? transport_name : "unspecified");
if (NULL != cont)
- cont (cont_cls,
- peer,
+ cont (cont_cls,
+ peer,
address,
session,
GNUNET_NO);
/* need to query blacklist clients */
bc = GNUNET_new (struct GST_BlacklistCheck);
- GNUNET_CONTAINER_DLL_insert (bc_head,
+ GNUNET_CONTAINER_DLL_insert (bc_head,
bc_tail,
bc);
bc->peer = *peer;