#include "gnunet-service-ats_reservations.h"
#include "ats.h"
-
/**
* We keep clients that are interested in performance in a linked list.
*/
int all;
+ uint32_t id;
+
unsigned int msg_type;
};
+/**
+ * Address handle
+ */
+static struct GAS_Addresses_Handle *GSA_addresses;
/**
* Head of linked list of all clients to this service.
GAS_performance_remove_client (struct GNUNET_SERVER_Client *client)
{
struct PerformanceClient *pc;
+
pc = find_client (client);
if (NULL == pc)
return;
GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
- GNUNET_SERVER_client_drop (client);
+ GAS_addresses_preference_client_disconnect (GSA_addresses, client);
GNUNET_free (pc);
}
* @param plugin_name 0-termintated string specifying the transport plugin
* @param plugin_addr binary address for the plugin to use
* @param plugin_addr_len number of bytes in plugin_addr
+ * @param active is this address active
* @param atsi performance data for the address
* @param atsi_count number of performance records in 'ats'
* @param bandwidth_out assigned outbound bandwidth
msg = (struct PeerInformationMessage *) buf;
msg->header.size = htons (msize);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_PEER_INFORMATION);
+ msg->id = htonl (0);
msg->ats_count = htonl (atsi_count);
msg->peer = *peer;
msg->address_length = htons (plugin_addr_len);
* @param plugin_name 0-termintated string specifying the transport plugin
* @param plugin_addr binary address for the plugin to use
* @param plugin_addr_len number of bytes in plugin_addr
+ * @param active is this address active
* @param atsi performance data for the address
* @param atsi_count number of performance records in 'ats'
* @param bandwidth_out assigned outbound bandwidth
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
struct PerformanceClient *pc;
-
for (pc = pc_head; pc != NULL; pc = pc->next)
if (pc->flag == START_FLAG_PERFORMANCE_WITH_PIC)
{
if (NULL == id)
return;
- if (GNUNET_NO == active)
- return;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n",
GNUNET_i2s (id),
ntohl (bandwidth_in.value__));
GAS_performance_notify_client(pc,
id,
- plugin_name, plugin_addr, plugin_addr_len,
+ plugin_name,
+ plugin_addr,
+ plugin_addr_len,
active,
atsi, atsi_count,
bandwidth_out, bandwidth_in);
if (NULL != id)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
- GAS_addresses_get_peer_info (id, &peerinfo_it, pc);
+ GAS_addresses_get_peer_info (GSA_addresses, id, &peerinfo_it, pc);
}
}
pc = GNUNET_malloc (sizeof (struct PerformanceClient));
pc->client = client;
pc->flag = flag;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding performance client %s PIC\n",
+ (flag == START_FLAG_PERFORMANCE_WITH_PIC) ? "with" : "without");
+
GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_SERVER_client_keep (client);
GNUNET_CONTAINER_DLL_insert (pc_head, pc_tail, pc);
/* Send information about clients */
- GAS_addresses_iterate_peers (&peer_it, pc);
+ GAS_addresses_iterate_peers (GSA_addresses, &peer_it, pc);
}
+static void transmit_req_addr (struct AddressIteration *ai,
+ const struct GNUNET_PeerIdentity *id,
+ const char *plugin_name,
+ const void *plugin_addr, size_t plugin_addr_len,
+ const int active,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
-static void
-req_addr_peerinfo_it (void *cls,
- const struct GNUNET_PeerIdentity *id,
- const char *plugin_name,
- const void *plugin_addr, size_t plugin_addr_len,
- const int active,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t atsi_count,
- struct GNUNET_BANDWIDTH_Value32NBO
- bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
- struct AddressIteration *ai = cls;
+ struct GNUNET_ATS_Information *atsp;
struct PeerInformationMessage *msg;
+ char *addrp;
size_t plugin_name_length;
size_t msize;
- struct GNUNET_ATS_Information *atsp;
- char *addrp;
-
-
- GNUNET_assert (NULL != ai);
- GNUNET_assert (NULL != ai->pc);
- if (NULL == find_client (ai->pc->client))
- return; /* Client disconnected */
- if ((NULL == id) && (NULL == id) && (NULL == id))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Address iteration done\n");
- return;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n",
- GNUNET_i2s (id),
- plugin_name,
- ntohl (bandwidth_out.value__),
- ntohl (bandwidth_in.value__));
-
- /* Transmit result */
-
- plugin_name_length = strlen (plugin_name) + 1;
+ if (NULL != plugin_name)
+ plugin_name_length = strlen (plugin_name) + 1;
+ else
+ plugin_name_length = 0;
msize = sizeof (struct PeerInformationMessage) +
atsi_count * sizeof (struct GNUNET_ATS_Information) +
plugin_addr_len + plugin_name_length;
msg->header.size = htons (msize);
msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESSLIST_RESPONSE);
msg->ats_count = htonl (atsi_count);
- msg->peer = *id;
+ msg->id = htonl (ai->id);
+ if (NULL != id)
+ msg->peer = *id;
+ else
+ memset (&msg->peer, '\0', sizeof (struct GNUNET_PeerIdentity));
msg->address_length = htons (plugin_addr_len);
msg->address_active = ntohl (active);
msg->plugin_name_length = htons (plugin_name_length);
atsp = (struct GNUNET_ATS_Information *) &msg[1];
memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count);
addrp = (char *) &atsp[atsi_count];
- memcpy (addrp, plugin_addr, plugin_addr_len);
- strcpy (&addrp[plugin_addr_len], plugin_name);
+ if (NULL != plugin_addr)
+ memcpy (addrp, plugin_addr, plugin_addr_len);
+ if (NULL != plugin_name)
+ strcpy (&addrp[plugin_addr_len], plugin_name);
GNUNET_SERVER_notification_context_unicast (nc, ai->pc->client, &msg->header,
- GNUNET_YES);
+ GNUNET_NO);
+}
+
+static void
+req_addr_peerinfo_it (void *cls,
+ const struct GNUNET_PeerIdentity *id,
+ const char *plugin_name,
+ const void *plugin_addr, size_t plugin_addr_len,
+ const int active,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+{
+ struct AddressIteration *ai = cls;
+
+ GNUNET_assert (NULL != ai);
+ GNUNET_assert (NULL != ai->pc);
+ if (NULL == find_client (ai->pc->client))
+ return; /* Client disconnected */
+
+ if ((NULL == id) && (NULL == plugin_name) && (NULL == plugin_addr))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Address iteration done\n");
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Callback for %s peer `%s' plugin `%s' BW out %u, BW in %u \n",
+ (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
+ GNUNET_i2s (id),
+ plugin_name,
+ (unsigned int) ntohl (bandwidth_out.value__),
+ (unsigned int) ntohl (bandwidth_in.value__));
+
+ /* Transmit result */
+ if ((GNUNET_YES == ai->all) || (GNUNET_YES == active))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending result for %s peer `%s' plugin `%s' BW out %u, BW in %u \n",
+ (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
+ GNUNET_i2s (id),
+ plugin_name,
+ (unsigned int) ntohl (bandwidth_out.value__),
+ (unsigned int) ntohl (bandwidth_in.value__));
+ transmit_req_addr (cls,
+ id,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ active,
+ atsi,
+ atsi_count,
+ bandwidth_out, bandwidth_in);
+ }
}
struct AddressIteration *ai = cls;
if (NULL != id)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Callback for peer `%s'\n", GNUNET_i2s (id));
- GAS_addresses_get_peer_info (id, &req_addr_peerinfo_it, ai);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Callback for peer `%s'\n", GNUNET_i2s (id));
+ GAS_addresses_get_peer_info (GSA_addresses, id, &req_addr_peerinfo_it, ai);
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peer iteration done\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer iteration done\n");
}
}
+
/**
* Handle 'address list request' messages from clients.
*
struct AddressIteration ai;
struct AddressListRequestMessage * alrm = (struct AddressListRequestMessage *) message;
struct GNUNET_PeerIdentity allzeros;
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_zero;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
"ADDRESSLIST_REQUEST");
}
ai.all = ntohl (alrm->all);
+ ai.id = ntohl (alrm->id);
ai.pc = pc;
memset (&allzeros, '\0', sizeof (struct GNUNET_PeerIdentity));
+ bandwidth_zero.value__ = htonl (0);
if (0 == memcmp (&alrm->peer, &allzeros, sizeof (struct GNUNET_PeerIdentity)))
{
/* Return addresses for all peers */
- GAS_addresses_iterate_peers (&req_addr_peer_it, &ai);
+ GAS_addresses_iterate_peers (GSA_addresses, &req_addr_peer_it, &ai);
+ transmit_req_addr (&ai, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, bandwidth_zero, bandwidth_zero);
}
else
{
/* Return addresses for a specific peer */
- GAS_addresses_get_peer_info (&alrm->peer, &req_addr_peerinfo_it, &ai);
+ GAS_addresses_get_peer_info (GSA_addresses, &alrm->peer, &req_addr_peerinfo_it, &ai);
+ transmit_req_addr (&ai, NULL, NULL, NULL, 0, GNUNET_NO, NULL, 0, bandwidth_zero, bandwidth_zero);
}
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
}
+void
+GAS_handle_performance_update (struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ const int active,
+ struct GNUNET_ATS_Information *ats,
+ uint32_t ats_count,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_in)
+{
+/* Notify here */
+ GAS_performance_notify_all_clients (peer,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ active,
+ ats, ats_count,
+ bandwidth_out, bandwidth_in);
+
+#if 0
+ struct PerformanceClient *cur;
+ struct PerformanceMonitorClient *curm;
+ struct MonitorResponseMessage *mrm;
+ size_t msglen;
+
+ msglen = sizeof (struct MonitorResponseMessage) +
+ ats_count * sizeof (struct GNUNET_ATS_Information);
+ mrm = GNUNET_malloc (msglen);
+
+ mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
+ mrm->header.size = htons (msglen);
+ mrm->ats_count = htonl (ats_count);
+ mrm->peer = *peer;
+ memcpy (&mrm[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
+
+ for (cur = pc_head; NULL != cur; cur = cur->next)
+ for (curm = cur->pm_head; NULL != curm; curm = curm->next)
+ {
+ /* Notify client about update */
+ mrm->id = htonl (curm->id);
+ GNUNET_SERVER_notification_context_unicast (nc,
+ cur->client,
+ (struct GNUNET_MessageHeader *) mrm,
+ GNUNET_YES);
+ }
+ GNUNET_free (mrm);
+#endif
+}
+
/**
* Handle 'reservation request' messages from clients.
"RESERVATION_REQUEST");
amount = (int32_t) ntohl (msg->amount);
res_delay = GAS_reservations_reserve (&msg->peer, amount);
- if (res_delay.rel_value > 0)
+ if (res_delay.rel_value_us > 0)
amount = 0;
result.header.size = htons (sizeof (struct ReservationResultMessage));
result.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT);
* @param message the request message
*/
void
-GAS_handle_preference_change (void *cls, struct GNUNET_SERVER_Client *client,
+GAS_handle_preference_change (void *cls,
+ struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
const struct ChangePreferenceMessage *msg;
1, GNUNET_NO);
pi = (const struct PreferenceInformation *) &msg[1];
for (i = 0; i < nump; i++)
- GAS_addresses_change_preference (&msg->peer,
+ GAS_addresses_preference_change (GSA_addresses,
+ client,
+ &msg->peer,
+ (enum GNUNET_ATS_PreferenceKind)
+ ntohl (pi[i].preference_kind),
+ pi[i].preference_value);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
+ * Handle 'preference feedback' messages from clients.
+ *
+ * @param cls unused, NULL
+ * @param client client that sent the request
+ * @param message the request message
+ */
+void
+GAS_handle_preference_feedback (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct FeedbackPreferenceMessage *msg;
+ const struct PreferenceInformation *pi;
+ uint16_t msize;
+ uint32_t nump;
+ uint32_t i;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
+ "PREFERENCE_FEEDBACK");
+ msize = ntohs (message->size);
+ if (msize < sizeof (struct FeedbackPreferenceMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ msg = (const struct FeedbackPreferenceMessage *) message;
+ nump = ntohl (msg->num_feedback);
+ if (msize !=
+ sizeof (struct FeedbackPreferenceMessage) +
+ nump * sizeof (struct PreferenceInformation))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_STATISTICS_update (GSA_stats, "# preference feedbacks requests processed",
+ 1, GNUNET_NO);
+ pi = (const struct PreferenceInformation *) &msg[1];
+ for (i = 0; i < nump; i++)
+ GAS_addresses_preference_feedback (GSA_addresses,
+ client,
+ &msg->peer,
+ GNUNET_TIME_relative_ntoh(msg->scope),
(enum GNUNET_ATS_PreferenceKind)
ntohl (pi[i].preference_kind),
pi[i].preference_value);
}
+
/**
* Initialize performance subsystem.
*
* @param server handle to our server
+ * @param addresses the address handle to use
*/
void
-GAS_performance_init (struct GNUNET_SERVER_Handle *server)
+GAS_performance_init (struct GNUNET_SERVER_Handle *server,
+ struct GAS_Addresses_Handle *addresses)
{
+ GSA_addresses = addresses;
nc = GNUNET_SERVER_notification_context_create (server, 128);
}
projects / oweals / gnunet.git / blobdiff