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].session));
+/*
+ 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)
}
+/**
+ * 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, 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
+ */
+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;
+ }
+
+ 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;
+ }
+
+ 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);
+ }
+
+ 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);
+ 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);
+ 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;
+
+}
+
+
/**
* We have updated performance statistics for a given address. Note
* that this function can be called for addresses that are currently
*
* @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'
*/
GNUNET_break (0);
return;
}
- if ((address == NULL) && (session == NULL))
- {
- GNUNET_break (0);
- return;
- }
namelen =
(address->transport_name ==
return;
}
+ 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;
+ }
+ }
+
p = GNUNET_malloc (sizeof (struct PendingMessage) + msize);
p->size = msize;
p->is_init = GNUNET_NO;
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)
- {
- /* 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,
+ "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];
*
* @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;
}
- 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->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->address_length = htons (address->address_length);
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_ERROR,
- "Trying to delete unknown address for peer `%s', plugin `%s', session %p\n",
- GNUNET_i2s (&address->peer), address->transport_name, session);
- GNUNET_break (0);
- 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];