From 9cd0d5068f3341fe8451a61872894f28a5ac9047 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 18 Oct 2015 12:33:21 +0000 Subject: rename 'struct Session' to 'struct GNUNET_ATS_Session' to satisfy naming conventions --- src/ats/ats.h | 2 +- src/ats/ats_api_scheduling.c | 16 ++++++++-------- src/ats/gnunet-service-ats_scheduling.c | 4 ++-- src/ats/test_ats_lib.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/ats') diff --git a/src/ats/ats.h b/src/ats/ats.h index 7cad9e98e..3a7f28a64 100644 --- a/src/ats/ats.h +++ b/src/ats/ats.h @@ -218,7 +218,7 @@ struct AddressDestroyedMessage * Message sent by ATS service to client to confirm that it is done * using the given session ID. */ -struct SessionReleaseMessage +struct GNUNET_ATS_SessionReleaseMessage { /** * Type is #GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE. diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index a5dd0827c..d7a5a83a1 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -70,7 +70,7 @@ struct GNUNET_ATS_AddressRecord * Session handle. NULL if we have an address but no * active session for this address. */ - struct Session *session; + struct GNUNET_ATS_Session *session; /** * Performance data about the address. @@ -295,7 +295,7 @@ find_empty_session_slot (struct GNUNET_ATS_SchedulingHandle *sh) */ static uint32_t find_session_id (struct GNUNET_ATS_SchedulingHandle *sh, - struct Session *session, + struct GNUNET_ATS_Session *session, const struct GNUNET_HELLO_Address *address) { uint32_t i; @@ -367,9 +367,9 @@ process_ats_session_release_message (void *cls, const struct GNUNET_MessageHeader *msg) { struct GNUNET_ATS_SchedulingHandle *sh = cls; - const struct SessionReleaseMessage *srm; + const struct GNUNET_ATS_SessionReleaseMessage *srm; - srm = (const struct SessionReleaseMessage *) msg; + srm = (const struct GNUNET_ATS_SessionReleaseMessage *) msg; /* Note: peer field in srm not necessary right now, but might be good to have in the future */ release_session (sh, @@ -534,7 +534,7 @@ reconnect (struct GNUNET_ATS_SchedulingHandle *sh) static const struct GNUNET_MQ_MessageHandler handlers[] = { { &process_ats_session_release_message, GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE, - sizeof (struct SessionReleaseMessage) }, + sizeof (struct GNUNET_ATS_SessionReleaseMessage) }, { &process_ats_address_suggestion_message, GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION, sizeof (struct AddressSuggestionMessage) }, @@ -659,7 +659,7 @@ GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh) struct GNUNET_ATS_AddressRecord * GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, const struct GNUNET_HELLO_Address *address, - struct Session *session, + struct GNUNET_ATS_Session *session, const struct GNUNET_ATS_Properties *prop) { struct GNUNET_ATS_AddressRecord *ar; @@ -716,7 +716,7 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, */ void GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, - struct Session *session) + struct GNUNET_ATS_Session *session) { GNUNET_break (NULL == ar->session); ar->session = session; @@ -737,7 +737,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, */ int GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, - struct Session *session) + struct GNUNET_ATS_Session *session) { GNUNET_assert (session == ar->session); ar->session = NULL; diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index 1aa96b861..fe472103c 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -232,7 +232,7 @@ GAS_handle_address_destroyed (void *cls, const struct GNUNET_MessageHeader *message) { const struct AddressDestroyedMessage *m; - struct SessionReleaseMessage srm; + struct GNUNET_ATS_SessionReleaseMessage srm; m = (const struct AddressDestroyedMessage *) message; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -245,7 +245,7 @@ GAS_handle_address_destroyed (void *cls, GAS_addresses_destroy (&m->peer, ntohl (m->session_id)); srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE); - srm.header.size = ntohs (sizeof (struct SessionReleaseMessage)); + srm.header.size = ntohs (sizeof (struct GNUNET_ATS_SessionReleaseMessage)); srm.session_id = m->session_id; srm.peer = m->peer; GNUNET_SERVER_notification_context_unicast (nc, diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c index 314f19007..e191588bb 100644 --- a/src/ats/test_ats_lib.c +++ b/src/ats/test_ats_lib.c @@ -36,7 +36,7 @@ struct AddressSuggestData /** * Which session were we given? */ - struct Session *session; + struct GNUNET_ATS_Session *session; /** * What address was assigned? @@ -404,10 +404,10 @@ make_address (uint32_t pid, /** * Our dummy sessions. */ -struct Session +struct GNUNET_ATS_Session { /** - * Field to avoid `0 == sizeof(struct Session)`. + * Field to avoid `0 == sizeof(struct GNUNET_ATS_Session)`. */ unsigned int non_empty; }; @@ -419,10 +419,10 @@ struct Session * @param i which session number to return * @return NULL if @a i is 0, otherwise a pointer unique to @a i */ -static struct Session * +static struct GNUNET_ATS_Session * make_session (unsigned int i) { - struct Session *baseptr = NULL; + struct GNUNET_ATS_Session *baseptr = NULL; if (0 == i) return NULL; @@ -618,7 +618,7 @@ interpreter (void *cls, case CMD_ADD_ADDRESS: { struct GNUNET_HELLO_Address *addr; - struct Session *session; + struct GNUNET_ATS_Session *session; addr = make_address (cmd->details.add_address.pid, cmd->details.add_address.addr_num, @@ -781,7 +781,7 @@ interpreter (void *cls, case CMD_ADD_SESSION: { struct Command *add; - struct Session *session; + struct GNUNET_ATS_Session *session; add = find_command (CMD_ADD_ADDRESS, cmd->details.add_session.add_label); @@ -796,7 +796,7 @@ interpreter (void *cls, { struct Command *add_address; struct Command *add_session; - struct Session *session; + struct GNUNET_ATS_Session *session; add_session = find_command (CMD_ADD_SESSION, cmd->details.del_session.add_session_label); @@ -891,7 +891,7 @@ static void address_suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Address *address, - struct Session *session, + struct GNUNET_ATS_Session *session, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in) { -- cgit v1.2.3