X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fats%2Fgnunet-service-ats_scheduling.c;h=4a20f909dbc496a8e915d5224ee98551fcd0f86b;hb=bace3fe85e0dccc59a1d2352e028021e528608b5;hp=3d53c1e42953877f69c9df6ce595be0560d65b0c;hpb=c0d32e08cddf59b933cecd744c6cd582ec566694;p=oweals%2Fgnunet.git diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 3d53c1e42..4a20f909d 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -25,6 +25,7 @@ * @author Christian Grothoff */ #include "platform.h" +#include "gnunet-service-ats.h" #include "gnunet-service-ats_addresses.h" #include "gnunet-service-ats_scheduling.h" #include "ats.h" @@ -41,11 +42,16 @@ static struct GNUNET_SERVER_NotificationContext *nc; static struct GNUNET_SERVER_Client *my_client; +/** + * Handle to address subsystem + */ +static struct GAS_Addresses_Handle *address_handle; + /** * Register a new scheduling client. * * @param client handle of the new client - * @return GNUNET_OK on success, GNUNET_SYSERR on error + * @return GNUNET_OK on success, GNUNET_SYSERR on error */ int GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client) @@ -53,12 +59,11 @@ GAS_scheduling_add_client (struct GNUNET_SERVER_Client *client) if (my_client != NULL) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "This ATS already has a scheduling client, refusing new scheduling client for now.\n"); + "This ATS already has a scheduling client, refusing new scheduling client for now.\n"); return GNUNET_SYSERR; } my_client = client; GNUNET_SERVER_notification_context_add (nc, client); - GNUNET_SERVER_client_keep (client); return GNUNET_OK; } @@ -74,8 +79,7 @@ GAS_scheduling_remove_client (struct GNUNET_SERVER_Client *client) { if (my_client != client) return; - GAS_addresses_destroy_all (); - GNUNET_SERVER_client_drop (client); + GAS_addresses_destroy_all (address_handle); my_client = NULL; } @@ -95,28 +99,37 @@ GAS_scheduling_remove_client (struct GNUNET_SERVER_Client *client) * @param bandwidth_in assigned inbound bandwidth */ void -GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *peer, - const char *plugin_name, - const void *plugin_addr, size_t plugin_addr_len, - uint32_t session_id, - const struct GNUNET_ATS_Information *atsi, - uint32_t atsi_count, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) +GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity + *peer, const char *plugin_name, + const void *plugin_addr, + size_t plugin_addr_len, + uint32_t session_id, + const struct GNUNET_ATS_Information + *atsi, uint32_t atsi_count, + struct GNUNET_BANDWIDTH_Value32NBO + bandwidth_out, + struct GNUNET_BANDWIDTH_Value32NBO + bandwidth_in) { struct AddressSuggestionMessage *msg; size_t plugin_name_length = strlen (plugin_name) + 1; - size_t msize = sizeof (struct AddressSuggestionMessage) + atsi_count * sizeof (struct GNUNET_ATS_Information) - + plugin_addr_len + plugin_name_length; - char buf[msize]; + size_t msize = + sizeof (struct AddressSuggestionMessage) + + atsi_count * sizeof (struct GNUNET_ATS_Information) + plugin_addr_len + + plugin_name_length; + char buf[msize] GNUNET_ALIGN; struct GNUNET_ATS_Information *atsp; char *addrp; if (my_client == NULL) return; + GNUNET_STATISTICS_update (GSA_stats, "# address suggestions made", 1, + GNUNET_NO); GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE); - GNUNET_assert (atsi_count < GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)); - msg = (struct AddressSuggestionMessage*) buf; + GNUNET_assert (atsi_count < + GNUNET_SERVER_MAX_MESSAGE_SIZE / + sizeof (struct GNUNET_ATS_Information)); + msg = (struct AddressSuggestionMessage *) buf; msg->header.size = htons (msize); msg->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION); msg->ats_count = htonl (atsi_count); @@ -126,15 +139,19 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe msg->session_id = htonl (session_id); msg->bandwidth_out = bandwidth_out; msg->bandwidth_in = bandwidth_in; - atsp = (struct GNUNET_ATS_Information* ) &msg[1]; + atsp = (struct GNUNET_ATS_Information *) &msg[1]; memcpy (atsp, atsi, sizeof (struct GNUNET_ATS_Information) * atsi_count); - addrp = (char*) &atsp[atsi_count]; + addrp = (char *) &atsp[atsi_count]; memcpy (addrp, plugin_addr, plugin_addr_len); strcpy (&addrp[plugin_addr_len], plugin_name); - GNUNET_SERVER_notification_context_unicast (nc, - my_client, - &msg->header, - GNUNET_YES); + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ATS sends quota for peer `%s': (in/out) %u/%u\n", + GNUNET_i2s (peer), ntohl (bandwidth_in.value__), + ntohl (bandwidth_out.value__)); + + GNUNET_SERVER_notification_context_unicast (nc, my_client, &msg->header, + GNUNET_YES); } @@ -147,14 +164,120 @@ GAS_scheduling_transmit_address_suggestion (const struct GNUNET_PeerIdentity *pe */ void GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message) +{ + const struct RequestAddressMessage *msg = + (const struct RequestAddressMessage *) message; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", + "REQUEST_ADDRESS"); + GNUNET_break (0 == ntohl (msg->reserved)); + GAS_addresses_request_address (address_handle, &msg->peer); + GNUNET_SERVER_receive_done (client, GNUNET_OK); +} + +/** + * Handle 'request address' messages from clients. + * + * @param cls unused, NULL + * @param client client that sent the request + * @param message the request message + */ +void +GAS_handle_request_address_cancel (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) { - const struct RequestAddressMessage * msg = (const struct RequestAddressMessage *) message; + const struct RequestAddressMessage *msg = + (const struct RequestAddressMessage *) message; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", "REQUEST_ADDRESS"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", + "REQUEST_ADDRESS_CANCEL"); GNUNET_break (0 == ntohl (msg->reserved)); - GAS_addresses_request_address (&msg->peer); + + GAS_addresses_request_address_cancel (address_handle, &msg->peer); + + GNUNET_SERVER_receive_done (client, GNUNET_OK); +} + +/** + * Handle 'reset backoff' messages from clients. + * + * @param cls unused, NULL + * @param client client that sent the request + * @param message the request message + */ +void +GAS_handle_reset_backoff (void *cls, + struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + const struct ResetBackoffMessage *msg = + (const struct ResetBackoffMessage *) message; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", + "RESET_BACKOFF"); + GNUNET_break (0 == ntohl (msg->reserved)); + GAS_addresses_handle_backoff_reset (address_handle, &msg->peer); + GNUNET_SERVER_receive_done (client, GNUNET_OK); +} + +/** + * Handle 'address add' messages from clients. + * + * @param cls unused, NULL + * @param client client that sent the request + * @param message the request message + */ +void +GAS_handle_address_add (void *cls, struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + const struct AddressUpdateMessage *m; + const struct GNUNET_ATS_Information *atsi; + const char *address; + const char *plugin_name; + uint16_t address_length; + uint16_t plugin_name_length; + uint32_t ats_count; + uint16_t size; + + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", + "ADDRESS_ADD"); + size = ntohs (message->size); + if (size < sizeof (struct AddressUpdateMessage)) + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + return; + } + m = (const struct AddressUpdateMessage *) message; + ats_count = ntohl (m->ats_count); + address_length = ntohs (m->address_length); + plugin_name_length = ntohs (m->plugin_name_length); + atsi = (const struct GNUNET_ATS_Information *) &m[1]; + address = (const char *) &atsi[ats_count]; + if (plugin_name_length != 0) + plugin_name = &address[address_length]; + else + plugin_name = ""; + + if ((address_length + plugin_name_length + + ats_count * sizeof (struct GNUNET_ATS_Information) + + sizeof (struct AddressUpdateMessage) != ntohs (message->size)) || + (ats_count > + GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) || + ((plugin_name_length > 0) && (plugin_name[plugin_name_length - 1] != '\0'))) + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + return; + } + GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, + GNUNET_NO); + GAS_addresses_add (address_handle, &m->peer, plugin_name, address, address_length, + ntohl (m->session_id), atsi, ats_count); GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -168,9 +291,9 @@ GAS_handle_request_address (void *cls, struct GNUNET_SERVER_Client *client, */ void GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) + const struct GNUNET_MessageHeader *message) { - const struct AddressUpdateMessage * m; + const struct AddressUpdateMessage *m; const struct GNUNET_ATS_Information *atsi; const char *address; const char *plugin_name; @@ -179,48 +302,113 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client, uint32_t ats_count; uint16_t size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received `%s' message\n", - "ADDRESS_UPDATE"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n", + "ADDRESS_UPDATE"); size = ntohs (message->size); - if (size <= sizeof (struct AddressUpdateMessage)) + if (size < sizeof (struct AddressUpdateMessage)) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - m = (const struct AddressUpdateMessage*) message; + m = (const struct AddressUpdateMessage *) message; ats_count = ntohl (m->ats_count); address_length = ntohs (m->address_length); - plugin_name_length = ntohs (m->plugin_name_length); - atsi = (const struct GNUNET_ATS_Information*) &m[1]; - address = (const char*) &atsi[ats_count]; + plugin_name_length = ntohs (m->plugin_name_length); + atsi = (const struct GNUNET_ATS_Information *) &m[1]; + address = (const char *) &atsi[ats_count]; if (plugin_name_length != 0) plugin_name = &address[address_length]; else plugin_name = ""; - if ( (address_length + - plugin_name_length + - ats_count * sizeof (struct GNUNET_ATS_Information) + - sizeof (struct AddressUpdateMessage) != ntohs (message->size)) || - (ats_count > GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) || - (plugin_name[plugin_name_length - 1] != '\0') ) + + if ((address_length + plugin_name_length + + ats_count * sizeof (struct GNUNET_ATS_Information) + + sizeof (struct AddressUpdateMessage) != ntohs (message->size)) || + (ats_count > + GNUNET_SERVER_MAX_MESSAGE_SIZE / sizeof (struct GNUNET_ATS_Information)) || + ((plugin_name_length > 0) && (plugin_name[plugin_name_length - 1] != '\0'))) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - GAS_addresses_update (&m->peer, - plugin_name, - address, - address_length, - ntohl (m->session_id), - atsi, - ats_count); + GNUNET_STATISTICS_update (GSA_stats, "# address updates received", 1, + GNUNET_NO); + GAS_addresses_update (address_handle, &m->peer, plugin_name, address, address_length, + ntohl (m->session_id), atsi, ats_count); GNUNET_SERVER_receive_done (client, GNUNET_OK); } +/** + * Handle 'address in use' messages from clients. + * + * @param cls unused, NULL + * @param client client that sent the request + * @param message the request message + */ +void +GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client, + const struct GNUNET_MessageHeader *message) +{ + const struct AddressUseMessage *m; + const char *address; + const char *plugin_name; + int res; + uint16_t address_length; + uint16_t plugin_name_length; + + uint16_t size; + uint16_t in_use; + + size = ntohs (message->size); + if (size < sizeof (struct AddressUseMessage)) + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + return; + } + m = (const struct AddressUseMessage *) message; + + address_length = ntohs (m->address_length); + plugin_name_length = ntohs (m->plugin_name_length); + + address = (const char *) &m[1]; + if (plugin_name_length != 0) + plugin_name = &address[address_length]; + else + plugin_name = ""; + + if ((address_length + plugin_name_length + + sizeof (struct AddressUseMessage) != ntohs (message->size)) || + ((plugin_name_length > 0) && + (plugin_name[plugin_name_length - 1] != '\0'))) + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + return; + } + + in_use = ntohs (m->in_use); + res = GAS_addresses_in_use (address_handle, + &m->peer, + plugin_name, + address, + address_length, + ntohl (m->session_id), + in_use); + + if (res == GNUNET_OK) + GNUNET_SERVER_receive_done (client, GNUNET_OK); + else + { + GNUNET_break (0); + GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + } + +} + /** * Handle 'address destroyed' messages from clients. * @@ -230,56 +418,62 @@ GAS_handle_address_update (void *cls, struct GNUNET_SERVER_Client *client, */ void GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, - const struct GNUNET_MessageHeader *message) - + const struct GNUNET_MessageHeader *message) { - const struct AddressDestroyedMessage * m; + const struct AddressDestroyedMessage *m; + struct SessionReleaseMessage srm; const char *address; const char *plugin_name; uint16_t address_length; uint16_t plugin_name_length; uint16_t size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received `%s' message of size %u %u\n", - "ADDRESS_DESTROYED", ntohs (message->size), sizeof (struct AddressDestroyedMessage)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message of size %u %u\n", + "ADDRESS_DESTROYED", ntohs (message->size), + sizeof (struct AddressDestroyedMessage)); size = ntohs (message->size); - if ( (size < sizeof (struct AddressDestroyedMessage)) || - (client != my_client) ) + if ((size < sizeof (struct AddressDestroyedMessage)) || (client != my_client)) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - m = (const struct AddressDestroyedMessage*) message; + m = (const struct AddressDestroyedMessage *) message; GNUNET_break (0 == ntohl (m->reserved)); address_length = ntohs (m->address_length); - plugin_name_length = ntohs (m->plugin_name_length); - address = (const char*) &m[1]; + plugin_name_length = ntohs (m->plugin_name_length); + address = (const char *) &m[1]; if (plugin_name_length != 0) plugin_name = &address[address_length]; else plugin_name = ""; - if ( (address_length + - plugin_name_length + - sizeof (struct AddressDestroyedMessage) != ntohs (message->size))) + if ((address_length + plugin_name_length + + sizeof (struct AddressDestroyedMessage) != ntohs (message->size))) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; - } - if ( (plugin_name_length != 0) && - (plugin_name[plugin_name_length - 1] != '\0') ) + } + if ((plugin_name_length == 0) || + (plugin_name[plugin_name_length - 1] != '\0')) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - GAS_addresses_destroy (&m->peer, - plugin_name, - address, - address_length, - ntohl (m->session_id)); + GNUNET_STATISTICS_update (GSA_stats, "# addresses destroyed", 1, GNUNET_NO); + GAS_addresses_destroy (address_handle, &m->peer, plugin_name, + address, address_length, + ntohl (m->session_id)); + if (0 != ntohl (m->session_id)) + { + srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE); + srm.header.size = ntohs (sizeof (struct SessionReleaseMessage)); + srm.session_id = m->session_id; + srm.peer = m->peer; + GNUNET_SERVER_notification_context_unicast (nc, client, &srm.header, + GNUNET_NO); + } GNUNET_SERVER_receive_done (client, GNUNET_OK); } @@ -288,10 +482,12 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, * Initialize scheduling subsystem. * * @param server handle to our server + * @param ah the address handle to use */ void -GAS_scheduling_init (struct GNUNET_SERVER_Handle *server) +GAS_scheduling_init (struct GNUNET_SERVER_Handle *server, struct GAS_Addresses_Handle *ah) { + address_handle = ah; nc = GNUNET_SERVER_notification_context_create (server, 128); } @@ -302,8 +498,13 @@ GAS_scheduling_init (struct GNUNET_SERVER_Handle *server) void GAS_scheduling_done () { + if (NULL != my_client) + { + my_client = NULL; + } GNUNET_SERVER_notification_context_destroy (nc); nc = NULL; + }