socklen_t length;
};
+/**
+ * Handle for address suggestions
+ */
+struct GNUNET_ATS_SuggestHandle
+{
+ struct GNUNET_ATS_SuggestHandle *prev;
+ struct GNUNET_ATS_SuggestHandle *next;
+ struct GNUNET_PeerIdentity id;
+};
/**
*/
void *suggest_cb_cls;
+ /**
+ * DLL for suggestions head
+ */
+ struct GNUNET_ATS_SuggestHandle *sug_head;
+
+ /**
+ * DLL for suggestions tail
+ */
+ struct GNUNET_ATS_SuggestHandle *sug_tail;
+
/**
* Connection to ATS service.
*/
ret += p->size;
size -= p->size;
GNUNET_CONTAINER_DLL_remove (sh->pending_head, sh->pending_tail, p);
- if (GNUNET_YES == p->is_init)
- GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
- GNUNET_TIME_UNIT_FOREVER_REL);
GNUNET_free (p);
}
do_transmit (sh);
sh->reconnect = GNUNET_YES;
return NULL;
}
+ /* This check exploits the fact that first field of a session object
+ * is peer identity.
+ */
+ if (0 !=
+ memcmp (peer, sh->session_array[session_id].session,
+ sizeof (struct GNUNET_PeerIdentity)))
+ {
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "Session %p belongs to peer `%s'\n",
+ sh->session_array[session_id].session, GNUNET_i2s_full ((struct GNUNET_PeerIdentity *) &sh->session_array[session_id].peer));
+/*
+ GNUNET_break (0);
+ sh->reconnect = GNUNET_YES;
+ return NULL;
+*/
+ }
return sh->session_array[session_id].session;
}
sh->session_array_size * 2);
}
GNUNET_assert (f > 0);
- GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
- "Session %p for peer `%s' stored in slot %u \n",
- session, GNUNET_i2s (peer), f);
sh->session_array[f].session = session;
sh->session_array[f].peer = *peer;
sh->session_array[f].slot_used = GNUNET_YES;
const struct GNUNET_PeerIdentity *peer)
{
unsigned int i;
- unsigned int f;
char * p2;
GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
if (NULL == session)
return NOT_FOUND;
- f = 0;
for (i = 1; i < sh->session_array_size; i++)
{
if (session == sh->session_array[i].session)
return;
}
}
+
+ if (NULL == sh->suggest_cb)
+ return;
+
address.peer = m->peer;
address.address = plugin_address;
address.address_length = plugin_address_length;
address.transport_name = plugin_name;
+ address.local_info = ntohl(m->address_local_info);
if ((s == NULL) && (0 == address.address_length))
{
return;
}
- sh->suggest_cb (sh->suggest_cb_cls, &address, s, m->bandwidth_out,
+ sh->suggest_cb (sh->suggest_cb_cls,
+ (const struct GNUNET_PeerIdentity *) &m->peer,
+ &address, s, m->bandwidth_out,
m->bandwidth_in, atsi, ats_count);
GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
GNUNET_assert (NULL == sh->client);
sh->client = GNUNET_CLIENT_connect ("ats", sh->cfg);
GNUNET_assert (NULL != sh->client);
+ GNUNET_CLIENT_receive (sh->client, &process_ats_message, sh,
+ GNUNET_TIME_UNIT_FOREVER_REL);
if ((NULL == (p = sh->pending_head)) || (GNUNET_YES != p->is_init))
{
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sh);
}
+/**
+ * Convert a GNUNET_ATS_NetworkType to a string
+ *
+ * @param net the network type
+ * @return a string or NULL if invalid
+ */
+const char *
+GNUNET_ATS_print_network_type (uint32_t net)
+{
+ char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
+ if (net < GNUNET_ATS_NetworkTypeCount)
+ return networks[net];
+ return NULL;
+}
+
+/**
+ * Convert a ATS property to a string
+ *
+ * @param type the atsi type
+ * @return a string or NULL if invalid
+ */
+const char *
+GNUNET_ATS_print_property_type (uint32_t type)
+{
+ char *props[GNUNET_ATS_PropertyCount] = GNUNET_ATS_PropertyStrings;
+ if ((type > 0) && (type < GNUNET_ATS_PropertyCount))
+ return props[type];
+ return NULL;
+}
+
/**
* Returns where the address is located: LAN or WAN or ...
GNUNET_ATS_address_get_type (struct GNUNET_ATS_SchedulingHandle * sh, const struct sockaddr * addr, socklen_t addrlen)
{
GNUNET_assert (sh != NULL);
- struct GNUNET_ATS_Information ats;
struct ATS_Network * cur = sh->net_head;
+
int type = GNUNET_ATS_NET_UNSPECIFIED;
+ struct GNUNET_ATS_Information ats;
if (addr->sa_family == AF_UNIX)
{
struct sockaddr_in * mask4 = (struct sockaddr_in *) cur->netmask;
if (((a4->sin_addr.s_addr & mask4->sin_addr.s_addr)) == net4->sin_addr.s_addr)
- {
- 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);
type = GNUNET_ATS_NET_LAN;
- }
}
if (addr->sa_family == AF_INET6)
{
res = GNUNET_NO;
if (res == GNUNET_YES)
- {
- 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);
- GNUNET_free (net);
type = GNUNET_ATS_NET_LAN;
- }
}
cur = cur->next;
}
type = GNUNET_ATS_NET_WAN;
ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
ats.value = htonl (type);
- return (const struct GNUNET_ATS_Information) ats;
+
+ GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+ "`%s' is in network `%s'\n",
+ GNUNET_a2s ((const struct sockaddr *) addr, addrlen),
+ GNUNET_ATS_print_network_type(type));
+ return ats;
}
{
struct GNUNET_ATS_SchedulingHandle *sh;
- sh = GNUNET_malloc (sizeof (struct GNUNET_ATS_SchedulingHandle));
+ sh = GNUNET_new (struct GNUNET_ATS_SchedulingHandle);
sh->cfg = cfg;
sh->suggest_cb = suggest_cb;
sh->suggest_cb_cls = suggest_cb_cls;
GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh)
{
struct PendingMessage *p;
-
+ struct GNUNET_ATS_SuggestHandle *cur;
+ struct GNUNET_ATS_SuggestHandle *next;
while (NULL != (p = sh->pending_head))
{
GNUNET_CONTAINER_DLL_remove (sh->pending_head, sh->pending_tail, p);
sh->task = GNUNET_SCHEDULER_NO_TASK;
}
+ next = sh->sug_head;
+ while (NULL != (cur = next))
+ {
+ next = cur->next;
+ GNUNET_CONTAINER_DLL_remove (sh->sug_head, sh->sug_tail, cur);
+ GNUNET_free (cur);
+ }
+
delete_networks (sh);
if (sh->interface_task != GNUNET_SCHEDULER_NO_TASK)
{
}
/**
- * We would like to establish a new connection with a peer. ATS
- * should suggest a good address to begin with.
+ * We would like to receive address suggestions for a peer. ATS will
+ * respond with a call to the continuation immediately containing an address or
+ * no address if none is available. ATS can suggest more addresses until we call
+ * #GNUNET_ATS_suggest_address_cancel.
+ *
*
* @param sh handle
* @param peer identity of the peer we need an address for
+ * @param cont the continuation to call with the address
+ * @param cont_cls the cls for the continuation
+ * @return suggest handle
*/
-void
+struct GNUNET_ATS_SuggestHandle *
GNUNET_ATS_suggest_address (struct GNUNET_ATS_SchedulingHandle *sh,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ GNUNET_ATS_AddressSuggestionCallback cont,
+ void *cont_cls)
{
struct PendingMessage *p;
struct RequestAddressMessage *m;
+ struct GNUNET_ATS_SuggestHandle *s;
// FIXME: ATS needs to remember this in case of
// a disconnect!
m->peer = *peer;
GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
do_transmit (sh);
+ s = GNUNET_new (struct GNUNET_ATS_SuggestHandle);
+ s->id = (*peer);
+ GNUNET_CONTAINER_DLL_insert_tail (sh->sug_head, sh->sug_tail, s);
+ return s;
}
{
struct PendingMessage *p;
struct RequestAddressMessage *m;
+ struct GNUNET_ATS_SuggestHandle *s;
+
+ for (s = sh->sug_head; NULL != s; s = s->next)
+ if (0 == memcmp(peer, &s->id, sizeof (s->id)))
+ break;
+ if (NULL == s)
+ {
+ GNUNET_break (0);
+ return;
+ }
+ else
+ {
+ GNUNET_CONTAINER_DLL_remove (sh->sug_head, sh->sug_tail, s);
+ GNUNET_free (s);
+ }
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct RequestAddressMessage));
}
+/**
+ * Test if a address and a session is known to ATS
+ *
+ * @param sh the scheduling handle
+ * @param address the address
+ * @param session the session
+ * @return GNUNET_YES or GNUNET_NO
+ */
+int
+GNUNET_ATS_session_known (struct GNUNET_ATS_SchedulingHandle *sh,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session)
+{
+ int s;
+ if (NULL != session)
+ {
+ if (NOT_FOUND != (s = find_session_id (sh, session, &address->peer)))
+ {
+ /* Existing */
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
+ }
+ return GNUNET_NO;
+}
+
/**
* 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 session session handle, can be NULL
* @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
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 +
+ 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) ||
return GNUNET_SYSERR;
}
+ if (NULL != session)
+ {
+ if (NOT_FOUND != (s = find_session_id (sh, session, &address->peer)))
+ {
+ /* Already existing, nothing todo */
+ return GNUNET_SYSERR;
+ }
+ s = find_empty_session_slot (sh, session, &address->peer);
+ GNUNET_break (NOT_FOUND != s);
+ }
+
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
p->size = msize;
p->is_init = GNUNET_NO;
m->ats_count = htonl (ats_count);
m->peer = address->peer;
m->address_length = htons (address->address_length);
+ m->address_local_info = htonl ((uint32_t) address->local_info);
m->plugin_name_length = htons (namelen);
- if (NULL != session)
- {
- s = find_session_id (sh, session, &address->peer);
- if (NOT_FOUND != s)
- {
- /* Already existing */
- GNUNET_break (0);
- 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,
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);
+ if (NULL != address->transport_name)
+ 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;
*
* @param sh handle
* @param address the address
- * @param session session handle (if available)
+ * @param session session handle, can be NULL
* @param ats performance data for the address
* @param ats_count number of performance records in 'ats'
+ * @return GNUNET_YES on success, GNUNET_NO if address or session are unknown,
+ * GNUNET_SYSERR on hard failure
*/
-void
+int
GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
const struct GNUNET_HELLO_Address *address,
struct Session *session,
size_t msize;
uint32_t s = 0;
- if (address == NULL)
+ if (NULL == address)
{
GNUNET_break (0);
- return;
+ return GNUNET_SYSERR;
}
- if ((address == NULL) && (session == NULL))
+ if (NULL == sh)
{
GNUNET_break (0);
- return;
+ return GNUNET_SYSERR;
}
- namelen =
- (address->transport_name ==
+ namelen = (address->transport_name ==
NULL) ? 0 : strlen (address->transport_name) + 1;
msize =
sizeof (struct AddressUpdateMessage) + address->address_length +
GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)))
{
GNUNET_break (0);
- return;
+ return GNUNET_SYSERR;
+ }
+
+ if (NULL != session)
+ {
+ s = find_session_id (sh, session, &address->peer);
+ if (NOT_FOUND == s)
+ return GNUNET_NO;
}
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
m->ats_count = htonl (ats_count);
m->peer = address->peer;
m->address_length = htons (address->address_length);
+ m->address_local_info = htonl ((uint32_t) address->local_info);
m->plugin_name_length = htons (namelen);
- if (NULL != session)
- {
- s = find_session_id (sh, session, &address->peer);
- if (NOT_FOUND == s)
- {
- /* new session without slot, find one */
- s = find_empty_session_slot (sh, session, &address->peer);
- GNUNET_break (NOT_FOUND != s);
- return;
- }
- }
+
m->session_id = htonl (s);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying to update address for peer `%s', plugin `%s', session %p id %u\n",
+ "Updating address for peer `%s', plugin `%s', session %p id %u\n",
GNUNET_i2s (&address->peer),
address->transport_name, session, s);
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;
+ return GNUNET_YES;
}
*
* @param sh handle
* @param address the address
- * @param session session handle
+ * @param session session handle, can be NULL
* @param in_use GNUNET_YES if this address is now used, GNUNET_NO
* if address is not used any more
*/
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Trying to set address to %s for peer `%s', plugin `%s', session %p\n",
- GNUNET_i2s (&address->peer),
- (GNUNET_NO == in_use) ? "NO" : "YES",
- address->transport_name, session);
-
- p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
- p->size = msize;
- p->is_init = GNUNET_NO;
- m = (struct AddressUseMessage *) &p[1];
- m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE);
- m->header.size = htons (msize);
- m->peer = address->peer;
- m->in_use = htons (in_use);
- m->address_length = htons (address->address_length);
- m->plugin_name_length = htons (namelen);
if (session != NULL)
{
s = find_session_id (sh, session, &address->peer);
}
}
+ p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
+ p->size = msize;
+ p->is_init = GNUNET_NO;
+ m = (struct AddressUseMessage *) &p[1];
+ m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_IN_USE);
+ m->header.size = htons (msize);
+ m->peer = address->peer;
+ m->in_use = htons (in_use);
+ m->address_length = htons (address->address_length);
+ m->address_local_info = htonl ((uint32_t) address->local_info);
+ m->plugin_name_length = htons (namelen);
+
+ 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);
*
* @param sh handle
* @param address the address
- * @param session session handle that is no longer valid
+ * @param session session handle that is no longer valid, can be NULL
*/
void
GNUNET_ATS_address_destroyed (struct GNUNET_ATS_SchedulingHandle *sh,
size_t msize;
uint32_t s = 0;
+ if (address == NULL)
+ {
+ GNUNET_break (0);
+ return;
+ }
+
GNUNET_assert (address->transport_name != NULL);
namelen = strlen (address->transport_name) + 1;
GNUNET_assert (namelen > 1);
return;
}
+ 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;
+ }
+
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
p->size = msize;
p->is_init = GNUNET_NO;
m->reserved = htonl (0);
m->peer = address->peer;
m->address_length = htons (address->address_length);
+ m->address_local_info = htonl ((uint32_t) address->local_info);
m->plugin_name_length = htons (namelen);
- 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;
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Deleting address for peer `%s', plugin `%s', session %p\n",
- GNUNET_i2s (&address->peer), address->transport_name, session);
- }
+ 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];
projects / oweals / gnunet.git / blobdiff