From f9e731f8dc6350db2567165537fe2fee8c28fbad Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 4 Feb 2014 15:52:05 +0000 Subject: [PATCH] fix indentation --- src/ats-tool/gnunet-ats.c | 478 ++++++++++++++++++-------------------- 1 file changed, 232 insertions(+), 246 deletions(-) diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index 553e9db7d..05e76a43f 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c @@ -1,22 +1,22 @@ /* - This file is part of GNUnet. - (C) 2009--2013 Christian Grothoff (and other contributing authors) - - GNUnet is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - GNUnet is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ + This file is part of GNUnet. + (C) 2009--2013 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. + */ /** * @file ats-tool/gnunet-ats.c @@ -79,7 +79,6 @@ static int op_print_quotas; */ static int op_monitor; - static struct GNUNET_ATS_PerformanceHandle *ph; static struct GNUNET_ATS_AddressListHandle *alh; @@ -88,7 +87,6 @@ static struct GNUNET_CONFIGURATION_Handle *cfg; static GNUNET_SCHEDULER_TaskIdentifier end_task; - struct PendingResolutions { struct PendingResolutions *next; @@ -104,15 +102,12 @@ struct PendingResolutions struct GNUNET_TRANSPORT_AddressToStringContext * tats_ctx; }; - static struct PendingResolutions *head; static struct PendingResolutions *tail; - static void -end (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +end(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct PendingResolutions * pr; struct PendingResolutions * next; @@ -120,8 +115,8 @@ end (void *cls, if (NULL != alh) { - GNUNET_ATS_performance_list_addresses_cancel (alh); - alh = NULL; + GNUNET_ATS_performance_list_addresses_cancel (alh); + alh = NULL; } if (NULL != ph) @@ -134,23 +129,22 @@ end (void *cls, next = head; while (NULL != (pr = next)) { - next = pr->next; - GNUNET_CONTAINER_DLL_remove (head, tail, pr); - GNUNET_TRANSPORT_address_to_string_cancel (pr->tats_ctx); - GNUNET_free (pr->address); - GNUNET_free (pr); - pending ++; + next = pr->next; + GNUNET_CONTAINER_DLL_remove(head, tail, pr); + GNUNET_TRANSPORT_address_to_string_cancel (pr->tats_ctx); + GNUNET_free(pr->address); + GNUNET_free(pr); + pending++; } if (0 < pending) fprintf (stderr, _("%u address resolutions had a timeout\n"), pending); if (op_list_used || op_list_all) - fprintf (stderr, _("ATS returned results for %u addresses\n"), results); + fprintf (stderr, _("ATS returned results for %u addresses\n"), results); ret = 0; } - static void -transport_addr_to_str_cb (void *cls, const char *address) +transport_addr_to_str_cb(void *cls, const char *address) { struct PendingResolutions * pr = cls; char *ats_str; @@ -168,97 +162,93 @@ transport_addr_to_str_cb (void *cls, const char *address) network = GNUNET_ATS_NET_UNSPECIFIED; for (c = 0; c < pr->ats_count; c++) { - ats_tmp = ats_str; + ats_tmp = ats_str; - ats_type = ntohl(pr->ats[c].type); - ats_value = ntohl(pr->ats[c].value); + ats_type = ntohl (pr->ats[c].type); + ats_value = ntohl (pr->ats[c].value); - if (ats_type > GNUNET_ATS_PropertyCount) - { - GNUNET_break (0); - continue; - } + if (ats_type > GNUNET_ATS_PropertyCount) + { + GNUNET_break(0); + continue; + } - switch (ats_type) { - case GNUNET_ATS_NETWORK_TYPE: - if (ats_value > GNUNET_ATS_NetworkTypeCount) - { - GNUNET_break (0); - continue; - } - network = ats_value; - GNUNET_asprintf (&ats_prop_value, "%s", GNUNET_ATS_print_network_type(ats_value)); - break; - default: - GNUNET_asprintf (&ats_prop_value, "%u", ats_value); - break; - } - if ((verbose) && (ats_type < GNUNET_ATS_PropertyCount)) + switch (ats_type) + { + case GNUNET_ATS_NETWORK_TYPE: + if (ats_value > GNUNET_ATS_NetworkTypeCount) { - GNUNET_asprintf (&ats_str, "%s%s=%s, ", ats_tmp, ats_prop_arr[ats_type] , ats_prop_value); - GNUNET_free (ats_tmp); + GNUNET_break(0); + continue; } - GNUNET_free (ats_prop_value); + network = ats_value; + GNUNET_asprintf (&ats_prop_value, "%s", + GNUNET_ATS_print_network_type (ats_value)); + break; + default: + GNUNET_asprintf (&ats_prop_value, "%u", ats_value); + break; + } + if ((verbose) && (ats_type < GNUNET_ATS_PropertyCount)) + { + GNUNET_asprintf (&ats_str, "%s%s=%s, ", ats_tmp, ats_prop_arr[ats_type], + ats_prop_value); + GNUNET_free(ats_tmp); + } + GNUNET_free(ats_prop_value); } fprintf (stderr, - _("Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/s, %s\n"), - GNUNET_i2s (&pr->address->peer), - pr->address->transport_name, - address, - GNUNET_ATS_print_network_type(network), - ntohl (pr->bandwidth_out.value__), - ntohl (pr->bandwidth_in.value__), - ats_str); - GNUNET_free (ats_str); + _("Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/s, %s\n"), + GNUNET_i2s (&pr->address->peer), pr->address->transport_name, address, + GNUNET_ATS_print_network_type (network), + ntohl (pr->bandwidth_out.value__), ntohl (pr->bandwidth_in.value__), + ats_str); + GNUNET_free(ats_str); } else { /* We're done */ - GNUNET_CONTAINER_DLL_remove (head, tail, pr); - GNUNET_free (pr->address); - GNUNET_free (pr); + GNUNET_CONTAINER_DLL_remove(head, tail, pr); + GNUNET_free(pr->address); + GNUNET_free(pr); pending--; if ((GNUNET_YES == receive_done) && (0 == pending)) { - /* All messages received and no resolutions pending*/ - if (end_task != GNUNET_SCHEDULER_NO_TASK) - GNUNET_SCHEDULER_cancel (end_task); - end_task = GNUNET_SCHEDULER_add_now (end, NULL); + /* All messages received and no resolutions pending*/ + if (end_task != GNUNET_SCHEDULER_NO_TASK ) + GNUNET_SCHEDULER_cancel (end_task); + end_task = GNUNET_SCHEDULER_add_now (end, NULL ); } } } - static void -ats_perf_cb (void *cls, - const struct GNUNET_HELLO_Address *address, - int active, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, - struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, - const struct GNUNET_ATS_Information *ats, - uint32_t ats_count) +ats_perf_cb(void *cls, const struct GNUNET_HELLO_Address *address, int active, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, + struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, + const struct GNUNET_ATS_Information *ats, uint32_t ats_count) { struct PendingResolutions * pr; if (NULL != address) { pr = GNUNET_malloc (sizeof (struct PendingResolutions) + - ats_count * sizeof (struct GNUNET_ATS_Information)); + ats_count * sizeof (struct GNUNET_ATS_Information)); pr->ats_count = ats_count; pr->ats = (struct GNUNET_ATS_Information *) &pr[1]; if (ats_count > 0) - memcpy (pr->ats, ats, ats_count * sizeof (struct GNUNET_ATS_Information)); + memcpy (pr->ats, ats, ats_count * sizeof(struct GNUNET_ATS_Information)); pr->address = GNUNET_HELLO_address_copy (address); pr->bandwidth_in = bandwidth_in; pr->bandwidth_out = bandwidth_out; - pr->tats_ctx = GNUNET_TRANSPORT_address_to_string(cfg, address, - resolve_addresses_numeric, - GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10), - transport_addr_to_str_cb, pr); - GNUNET_CONTAINER_DLL_insert (head, tail, pr); + pr->tats_ctx = GNUNET_TRANSPORT_address_to_string (cfg, address, + resolve_addresses_numeric, + GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10), + transport_addr_to_str_cb, pr); + GNUNET_CONTAINER_DLL_insert(head, tail, pr); results++; pending++; } @@ -270,15 +260,15 @@ ats_perf_cb (void *cls, if (0 == pending) { /* All messages received and no resolutions pending*/ - if (end_task != GNUNET_SCHEDULER_NO_TASK) + if (end_task != GNUNET_SCHEDULER_NO_TASK ) GNUNET_SCHEDULER_cancel (end_task); - end_task = GNUNET_SCHEDULER_add_now (end, NULL); + end_task = GNUNET_SCHEDULER_add_now (end, NULL ); } } } static unsigned int -print_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg) +print_quotas(const struct GNUNET_CONFIGURATION_Handle *cfg) { char *network_str[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString; char * entry_in = NULL; @@ -296,51 +286,56 @@ print_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg) GNUNET_asprintf (&entry_in, "%s_QUOTA_IN", network_str[c]); /* quota out */ - if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_out, "a_out_str)) + if (GNUNET_OK + == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", entry_out, + "a_out_str)) { - if (0 == strcmp(quota_out_str, BIG_M_STRING) || - (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str, "a_out))) + if (0 == strcmp (quota_out_str, BIG_M_STRING) + || (GNUNET_SYSERR + == GNUNET_STRINGS_fancy_size_to_bytes (quota_out_str, "a_out))) quota_out = UINT32_MAX; - GNUNET_free (quota_out_str); + GNUNET_free(quota_out_str); GNUNET_asprintf ("a_out_str, "%llu", quota_out); } else { - fprintf (stderr, "Outbound quota for network `%11s' not configured!\n", - network_str[c]); - GNUNET_asprintf ("a_out_str, "-"); + fprintf (stderr, "Outbound quota for network `%11s' not configured!\n", + network_str[c]); + GNUNET_asprintf ("a_out_str, "-"); } - GNUNET_free (entry_out); + GNUNET_free(entry_out); /* quota in */ - if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string(cfg, "ats", entry_in, "a_in_str)) + if (GNUNET_OK + == GNUNET_CONFIGURATION_get_value_string (cfg, "ats", entry_in, + "a_in_str)) { - if (0 == strcmp(quota_in_str, BIG_M_STRING) || - (GNUNET_SYSERR == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, "a_in))) - quota_in = UINT32_MAX; - GNUNET_free (quota_in_str); + if (0 == strcmp (quota_in_str, BIG_M_STRING) + || (GNUNET_SYSERR + == GNUNET_STRINGS_fancy_size_to_bytes (quota_in_str, "a_in))) + quota_in = UINT32_MAX; + GNUNET_free(quota_in_str); GNUNET_asprintf ("a_in_str, "%llu", quota_in); } else { - fprintf (stderr, "Inbound quota for network `%11s' not configured!\n", - network_str[c]); - GNUNET_asprintf ("a_in_str, "-"); + fprintf (stderr, "Inbound quota for network `%11s' not configured!\n", + network_str[c]); + GNUNET_asprintf ("a_in_str, "-"); } - GNUNET_free (entry_in); + GNUNET_free(entry_in); - fprintf (stderr, _("Quota for network `%11s' (in/out): %10s / %10s\n"), network_str[c], quota_in_str, quota_out_str ); - GNUNET_free (quota_out_str); - GNUNET_free (quota_in_str); + fprintf (stderr, _("Quota for network `%11s' (in/out): %10s / %10s\n"), + network_str[c], quota_in_str, quota_out_str); + GNUNET_free(quota_out_str); + GNUNET_free(quota_in_str); } return GNUNET_ATS_NetworkTypeCount; } - static void -testservice_ats (void *cls, - int result) +testservice_ats(void *cls, int result) { struct GNUNET_CONFIGURATION_Handle *cfg = cls; struct GNUNET_PeerIdentity pid; @@ -357,9 +352,9 @@ testservice_ats (void *cls, if (NULL != pid_str) { - if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (pid_str, - strlen (pid_str), - &pid.public_key)) + if (GNUNET_OK + != GNUNET_CRYPTO_eddsa_public_key_from_string (pid_str, + strlen (pid_str), &pid.public_key)) { FPRINTF (stderr, _("Failed to parse peer identity `%s'\n"), pid_str); return; @@ -369,102 +364,104 @@ testservice_ats (void *cls, c = op_list_all + op_list_used + op_monitor + op_set_pref; if ((1 < c)) { - FPRINTF (stderr, _("Please select one operation : %s or %s or %s or %s or %s\n"), - "--used", "--all", "--monitor", "--preference", "--quotas"); - return; + FPRINTF (stderr, + _("Please select one operation : %s or %s or %s or %s or %s\n"), + "--used", "--all", "--monitor", "--preference", "--quotas"); + return; } if ((0 == c)) op_list_used = GNUNET_YES; /* set default */ - if (op_print_quotas) + if (op_print_quotas) + { + ret = print_quotas (cfg); + return; + } + if (op_list_all) + { + ph = GNUNET_ATS_performance_init (cfg, NULL, NULL ); + if (NULL == ph) { - ret = print_quotas (cfg); - return; + fprintf (stderr, _("Cannot connect to ATS service, exiting...\n") ); + return; } - if (op_list_all) - { - ph = GNUNET_ATS_performance_init (cfg, NULL, NULL); - if (NULL == ph) - { - fprintf (stderr, _("Cannot connect to ATS service, exiting...\n")); - return; - } - alh = GNUNET_ATS_performance_list_addresses (ph, - (NULL == pid_str) ? NULL : &pid, - GNUNET_YES, ats_perf_cb, NULL); - if (NULL == alh) - { - fprintf (stderr, _("Cannot issue request to ATS service, exiting...\n")); - end_task = GNUNET_SCHEDULER_add_now (&end, NULL); - return; - } - end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, NULL); - } - else if (op_list_used) + alh = GNUNET_ATS_performance_list_addresses (ph, + (NULL == pid_str) ? NULL : &pid, GNUNET_YES, ats_perf_cb, NULL ); + if (NULL == alh) { - ph = GNUNET_ATS_performance_init (cfg, NULL, NULL); - if (NULL == ph) - fprintf (stderr, _("Cannot connect to ATS service, exiting...\n")); - - alh = GNUNET_ATS_performance_list_addresses (ph, - (NULL == pid_str) ? NULL : &pid, - GNUNET_NO, ats_perf_cb, NULL); - if (NULL == alh) - { - fprintf (stderr, _("Cannot issue request to ATS service, exiting...\n")); - end_task = GNUNET_SCHEDULER_add_now (&end, NULL); - return; - } - end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, NULL); + fprintf (stderr, _("Cannot issue request to ATS service, exiting...\n") ); + end_task = GNUNET_SCHEDULER_add_now (&end, NULL ); + return; } - else if (op_monitor) + end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, + NULL ); + } + else if (op_list_used) + { + ph = GNUNET_ATS_performance_init (cfg, NULL, NULL ); + if (NULL == ph) + fprintf (stderr, _("Cannot connect to ATS service, exiting...\n") ); + + alh = GNUNET_ATS_performance_list_addresses (ph, + (NULL == pid_str) ? NULL : &pid, GNUNET_NO, ats_perf_cb, NULL ); + if (NULL == alh) { - ph = GNUNET_ATS_performance_init (cfg, &ats_perf_cb, NULL); - if (NULL == ph) - fprintf (stderr, _("Cannot connect to ATS service, exiting...\n")); - end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, NULL); + fprintf (stderr, _("Cannot issue request to ATS service, exiting...\n") ); + end_task = GNUNET_SCHEDULER_add_now (&end, NULL ); + return; + } + end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, + NULL ); + } + else if (op_monitor) + { + ph = GNUNET_ATS_performance_init (cfg, &ats_perf_cb, NULL ); + if (NULL == ph) + fprintf (stderr, _("Cannot connect to ATS service, exiting...\n") ); + end_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &end, + NULL ); + } + else if (op_set_pref) + { + if (NULL == type_str) + { + fprintf (stderr, _("No preference type given!\n") ); + return; } - else if (op_set_pref) + if (NULL == pid_str) { - if (NULL == type_str) - { - fprintf (stderr, _("No preference type given!\n")); - return; - } - if (NULL == pid_str) - { - fprintf (stderr, _("No peer given!\n")); - return; - } - - + fprintf (stderr, _("No peer given!\n") ); + return; + } - for (c = 0; c