#include "gnunet_ats_service.h"
#include "ats.h"
-#define DEBUG_ATS GNUNET_EXTRA_LOGGING
#define INTERFACE_PROCESSING_INTERVALL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
+#define NOT_FOUND 0
+
/**
* Message in linked list we should send to the ATS service. The
* actual binary message follows this struct.
*/
struct ATS_Network * net_tail;
-
/**
* Array of session objects (we need to translate them to numbers and back
* for the protocol; the offset in the array is the session number on the
/**
* Task retrieving interfaces from the system
*/
-
GNUNET_SCHEDULER_TaskIdentifier interface_task;
force_reconnect (struct GNUNET_ATS_SchedulingHandle *sh)
{
sh->reconnect = GNUNET_NO;
- GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sh->client);
sh->client = NULL;
sh->task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &reconnect_task,
find_session (struct GNUNET_ATS_SchedulingHandle *sh, uint32_t session_id,
const struct GNUNET_PeerIdentity *peer)
{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Find session %u from peer %s in %p\n",
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "Find session %u from peer %s in %p\n",
(unsigned int) session_id, GNUNET_i2s (peer), sh);
-#endif
+
if (session_id >= sh->session_array_size)
{
GNUNET_break (0);
/**
- * Get the ID for the given session object. If we do not have an ID for
- * the given session object, allocate one.
+ * Get an available session ID for the given session object.
*
* @param sh our handle
* @param session session object
* @return the session id
*/
static uint32_t
-get_session_id (struct GNUNET_ATS_SchedulingHandle *sh, struct Session *session,
+find_empty_session_slot (struct GNUNET_ATS_SchedulingHandle *sh, struct Session *session,
const struct GNUNET_PeerIdentity *peer)
{
unsigned int i;
unsigned int f;
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
"Get session ID for session %p from peer %s in %p\n", session,
GNUNET_i2s (peer), sh);
-#endif
+
if (NULL == session)
- return 0;
+ return NOT_FOUND;
f = 0;
for (i = 1; i < sh->session_array_size; i++)
{
- if (session == sh->session_array[i].session)
- {
- GNUNET_assert (0 ==
- memcmp (peer, &sh->session_array[i].peer,
- sizeof (struct GNUNET_PeerIdentity)));
- return i;
- }
if ((f == 0) && (sh->session_array[i].slot_used == GNUNET_NO))
f = i;
}
sh->session_array[f].session = session;
sh->session_array[f].peer = *peer;
sh->session_array[f].slot_used = GNUNET_YES;
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
"Assigning session ID %u for session %p of peer %s in %p\n", f,
session, GNUNET_i2s (peer), sh);
-#endif
+
return f;
}
+/**
+ * Get the ID for the given session object.
+ *
+ * @param sh our handle
+ * @param session session object
+ * @param peer peer the session belongs to
+ * @return the session id or NOT_FOUND for error
+ */
+static uint32_t
+find_session_id (struct GNUNET_ATS_SchedulingHandle *sh, struct Session *session,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ unsigned int i;
+ unsigned int f;
+ char * p2;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "Get session ID for session %p from peer %s in %p\n", session,
+ GNUNET_i2s (peer), sh);
+
+ if (NULL == session)
+ return NOT_FOUND;
+ f = 0;
+ for (i = 1; i < sh->session_array_size; i++)
+ {
+ if (session == sh->session_array[i].session)
+ {
+ if (0 != memcmp (peer, &sh->session_array[i].peer,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ p2 = strdup (GNUNET_i2s (&sh->session_array[i].peer));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "ats-scheduling-api",
+ "Session %p did not match: old session was for peer `%s' new session is for `%s'\n",
+ session, GNUNET_i2s (peer), p2);
+ GNUNET_free (p2);
+ return NOT_FOUND;
+ }
+ return i;
+ }
+ }
+ return NOT_FOUND;
+}
+
+
/**
* Remove the session of the given session ID from the session
* table (it is no longer valid).
remove_session (struct GNUNET_ATS_SchedulingHandle *sh, uint32_t session_id,
const struct GNUNET_PeerIdentity *peer)
{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Remove sessionID %u from peer %s in %p\n",
+ GNUNET_assert (peer != NULL);
+ GNUNET_assert (sh != NULL);
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "Release sessionID %u from peer %s in %p\n",
(unsigned int) session_id, GNUNET_i2s (peer), sh);
-#endif
+
if (0 == session_id)
return;
+
GNUNET_assert (session_id < sh->session_array_size);
GNUNET_assert (GNUNET_YES == sh->session_array[session_id].slot_used);
- GNUNET_assert (0 ==
- memcmp (peer, &sh->session_array[session_id].peer,
- sizeof (struct GNUNET_PeerIdentity)));
+ GNUNET_assert (0 == memcmp (peer,
+ &sh->session_array[session_id].peer,
+ sizeof (struct GNUNET_PeerIdentity)));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "Session %p for peer `%s' removed from slot %u \n",
+ sh->session_array[session_id].session,
+ GNUNET_i2s (peer),
+ session_id);
sh->session_array[session_id].session = NULL;
+
}
release_session (struct GNUNET_ATS_SchedulingHandle *sh, uint32_t session_id,
const struct GNUNET_PeerIdentity *peer)
{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
"Release sessionID %u from peer %s in %p\n",
(unsigned int) session_id, GNUNET_i2s (peer), sh);
-#endif
+
if (session_id >= sh->session_array_size)
{
GNUNET_break (0);
s = find_session (sh, session_id, &m->peer);
if (s == NULL)
{
-#if DEBUG_ATS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
"ATS tries to use outdated session `%s'\n",
GNUNET_i2s (&m->peer));
-#endif
GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
GNUNET_TIME_UNIT_FOREVER_REL);
return;
do_transmit (sh);
}
+
/**
* delete the current network list
*/
-
static void
delete_networks (struct GNUNET_ATS_SchedulingHandle *sh)
{
net->netmask = (struct sockaddr *) &tmp[1];
net->length = addrlen;
+ memset (&network4, 0, sizeof (network4));
network4.sin_family = AF_INET;
- network4.sin_port = htons (0);
#if HAVE_SOCKADDR_IN_SIN_LEN
network4.sin_len = sizeof (network4);
#endif
if (net != NULL)
{
#if VERBOSE_ATS
- char * netmask = strdup (GNUNET_a2s((struct sockaddr *) net->netmask, addrlen));
+ char * netmask = GNUNET_strdup (GNUNET_a2s((struct sockaddr *) net->netmask, addrlen));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding network `%s', netmask `%s'\n",
GNUNET_a2s((struct sockaddr *) net->network, addrlen),
netmask);
}
-
/**
* Periodically get list of addresses
* @param cls closure
sh);
}
+
/**
* Returns where the address is located: LAN or WAN or ...
+ *
+ * @param sh the scheduling handle
* @param addr address
* @param addrlen address length
* @return location as GNUNET_ATS_Information
*/
-
struct GNUNET_ATS_Information
GNUNET_ATS_address_get_type (struct GNUNET_ATS_SchedulingHandle * sh, const struct sockaddr * addr, socklen_t addrlen)
{
if (((a4->sin_addr.s_addr & mask4->sin_addr.s_addr)) == net4->sin_addr.s_addr)
{
- char * net = strdup (GNUNET_a2s ((const struct sockaddr *) net4, addrlen));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' is in network `%s'\n",
+ char * net = GNUNET_strdup (GNUNET_a2s ((const struct sockaddr *) net4, addrlen));
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "`%s' is in network `%s'\n",
GNUNET_a2s ((const struct sockaddr *)a4, addrlen),
net);
GNUNET_free (net);
if (res == GNUNET_YES)
{
- char * net = strdup (GNUNET_a2s ((const struct sockaddr *) net6, addrlen));
+ char * net = GNUNET_strdup (GNUNET_a2s ((const struct sockaddr *) net6, addrlen));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' is in network `%s'\n",
GNUNET_a2s ((const struct sockaddr *) a6, addrlen),
net);
/* no local network found for this address, default: WAN */
if (type == GNUNET_ATS_NET_UNSPECIFIED)
type = GNUNET_ATS_NET_WAN;
-
-#if VERBOSE
- const char * range;
- switch (type) {
- case GNUNET_ATS_NET_WAN:
- range = "WAN";
- break;
- case GNUNET_ATS_NET_LAN:
- range = "LAN";
- break;
- case GNUNET_ATS_NET_LOOPBACK:
- range = "LOOPBACK";
- break;
- default:
-
- break;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "`%s' is in network `%s'\n",
- GNUNET_a2s ((const struct sockaddr *) addr, addrlen),
- range);
-#endif
-
ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
ats.value = htonl (type);
- return ats;
+ return (const struct GNUNET_ATS_Information) ats;
}
+
/**
* Initialize the ATS subsystem.
*
}
if (NULL != sh->client)
{
- GNUNET_CLIENT_disconnect (sh->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sh->client);
sh->client = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != sh->task)
sh = NULL;
}
+/**
+ * We would like to reset the address suggestion block time for this
+ * peer
+ *
+ * @param sh handle
+ * @param peer identity of the peer we want to reset
+ */
+void
+GNUNET_ATS_reset_backoff (struct GNUNET_ATS_SchedulingHandle *sh,
+ const struct GNUNET_PeerIdentity *peer)
+{
+ struct PendingMessage *p;
+ struct ResetBackoffMessage *m;
+
+ p = GNUNET_malloc (sizeof (struct PendingMessage) +
+ sizeof (struct ResetBackoffMessage));
+ p->size = sizeof (struct ResetBackoffMessage);
+ p->is_init = GNUNET_NO;
+ m = (struct ResetBackoffMessage *) &p[1];
+ m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESET_BACKOFF);
+ m->header.size = htons (sizeof (struct ResetBackoffMessage));
+ m->reserved = htonl (0);
+ m->peer = *peer;
+ GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
+ do_transmit (sh);
+}
/**
* We would like to establish a new connection with a peer. ATS
struct PendingMessage *p;
struct RequestAddressMessage *m;
+ // FIXME: ATS needs to remember this in case of
+ // a disconnect!
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct RequestAddressMessage));
p->size = sizeof (struct RequestAddressMessage);
do_transmit (sh);
}
+
+/**
+ * We have a new address ATS should know. Addresses have to be added with this
+ * function before they can be: updated, set in use and destroyed
+ *
+ * @param sh handle
+ * @param address the address
+ * @param session session handle (if available)
+ * @param ats performance data for the address
+ * @param ats_count number of performance records in 'ats'
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int
+GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count)
+{
+
+ struct PendingMessage *p;
+ struct AddressUpdateMessage *m;
+ struct GNUNET_ATS_Information *am;
+ char *pm;
+ size_t namelen;
+ size_t msize;
+ uint32_t s = 0;
+
+ if (address == NULL)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ if ((address == NULL) && (session == NULL))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
+ namelen =
+ (address->transport_name ==
+ NULL) ? 0 : strlen (address->transport_name) + 1;
+ msize =
+ sizeof (struct AddressUpdateMessage) + address->address_length +
+ ats_count * sizeof (struct GNUNET_ATS_Information) + namelen;
+ if ((msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ (address->address_length >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ (namelen >= GNUNET_SERVER_MAX_MESSAGE_SIZE) ||
+ (ats_count >=
+ GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+
+ p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ p->size = msize;
+ p->is_init = GNUNET_NO;
+ m = (struct AddressUpdateMessage *) &p[1];
+ m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_ADD);
+ m->header.size = htons (msize);
+ m->ats_count = htonl (ats_count);
+ m->peer = address->peer;
+ m->address_length = htons (address->address_length);
+ m->plugin_name_length = htons (namelen);
+ if (NULL != session)
+ {
+ s = find_session_id (sh, session, &address->peer);
+ if (NOT_FOUND != s)
+ {
+ /* Already existing, nothing todo */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding duplicate address for peer `%s', plugin `%s', session %p id %u\n",
+ GNUNET_i2s (&address->peer),
+ address->transport_name, session, s);
+ return GNUNET_SYSERR;
+ }
+ s = find_empty_session_slot (sh, session, &address->peer);
+ GNUNET_break (NOT_FOUND != s);
+ }
+ m->session_id = htonl (s);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding address for peer `%s', plugin `%s', session %p id %u\n",
+ GNUNET_i2s (&address->peer),
+ address->transport_name, session, s);
+
+ am = (struct GNUNET_ATS_Information *) &m[1];
+ memcpy (am, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
+ pm = (char *) &am[ats_count];
+ memcpy (pm, address->address, address->address_length);
+ memcpy (&pm[address->address_length], address->transport_name, namelen);
+ GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
+ do_transmit (sh);
+ return GNUNET_OK;
+
+}
+
+
/**
* We have updated performance statistics for a given address. Note
* that this function can be called for addresses that are currently
char *pm;
size_t namelen;
size_t msize;
+ uint32_t s = 0;
+ if (address == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
if ((address == NULL) && (session == NULL))
{
GNUNET_break (0);
m->peer = address->peer;
m->address_length = htons (address->address_length);
m->plugin_name_length = htons (namelen);
- m->session_id = htonl (get_session_id (sh, session, &address->peer));
+ if (NULL != session)
+ {
+ s = find_session_id (sh, session, &address->peer);
+ if (NOT_FOUND == s)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Update for unknown address for peer `%s', plugin `%s', session %p id %u\n",
+ GNUNET_i2s (&address->peer),
+ address->transport_name, session, s);
+
+ GNUNET_break (0);
+ return;
+ }
+ }
+ m->session_id = htonl (s);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Updating address for peer `%s', plugin `%s', session %p id %u\n",
+ GNUNET_i2s (&address->peer),
+ address->transport_name, session, s);
+
am = (struct GNUNET_ATS_Information *) &m[1];
memcpy (am, ats, ats_count * sizeof (struct GNUNET_ATS_Information));
pm = (char *) &am[ats_count];
memcpy (&pm[address->address_length], address->transport_name, namelen);
GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
do_transmit (sh);
+ return;
}
char *pm;
size_t namelen;
size_t msize;
+ uint32_t s = 0;
GNUNET_assert (NULL != address);
namelen =
m->in_use = htons (in_use);
m->address_length = htons (address->address_length);
m->plugin_name_length = htons (namelen);
- m->session_id = htonl (get_session_id (sh, session, &address->peer));
+ if (session != NULL)
+ {
+ s = find_session_id (sh, session, &address->peer);
+ if ((s == NOT_FOUND) && (GNUNET_NO == in_use))
+ {
+ /* trying to set unknown address to NO */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Trying to set unknown address to unused for peer `%s', plugin `%s', session %p\n",
+ GNUNET_i2s (&address->peer), address->transport_name, session);
+ GNUNET_break (0);
+ return;
+ }
+ if ((s == NOT_FOUND) && (GNUNET_YES == in_use))
+ {
+ /* trying to set new address to YES */
+ s = find_empty_session_slot (sh, session, &address->peer);
+ GNUNET_assert (NOT_FOUND != s);
+ }
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Setting address used to %s for peer `%s', plugin `%s', session %p\n",
+ (GNUNET_YES == in_use) ? "YES" : "NO",
+ GNUNET_i2s (&address->peer), address->transport_name, session);
+
+ m->session_id = htonl (s);
pm = (char *) &m[1];
memcpy (pm, address->address, address->address_length);
memcpy (&pm[address->address_length], address->transport_name, namelen);
GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
-
do_transmit (sh);
+ return;
}
+
/**
* A session got destroyed, stop including it as a valid address.
*
char *pm;
size_t namelen;
size_t msize;
- uint32_t session_id;
+ uint32_t s = 0;
GNUNET_assert (address->transport_name != NULL);
namelen = strlen (address->transport_name) + 1;
m->peer = address->peer;
m->address_length = htons (address->address_length);
m->plugin_name_length = htons (namelen);
- session_id = get_session_id (sh, session, &address->peer);
- m->session_id = htonl (session_id);
+
+ s = find_session_id (sh, session, &address->peer);
+ if ((NULL != session) && (NOT_FOUND == s))
+ {
+ /* trying to delete unknown address */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Trying to delete unknown address for peer `%s', plugin `%s', session %p\n",
+ GNUNET_i2s (&address->peer), address->transport_name, session);
+ return;
+ }
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Deleting address for peer `%s', plugin `%s', session %p\n",
+ GNUNET_i2s (&address->peer), address->transport_name, session);
+
+ m->session_id = htonl (s);
pm = (char *) &m[1];
memcpy (pm, address->address, address->address_length);
memcpy (&pm[address->address_length], address->transport_name, namelen);
GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
do_transmit (sh);
- remove_session (sh, session_id, &address->peer);
+ remove_session (sh, s, &address->peer);
}
/* end of ats_api_scheduling.c */
projects / oweals / gnunet.git / blobdiff