diff options
Diffstat (limited to 'src/ats-tool')
-rw-r--r-- | src/ats-tool/Makefile.am | 1 | ||||
-rw-r--r-- | src/ats-tool/gnunet-ats.c | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/ats-tool/Makefile.am b/src/ats-tool/Makefile.am index 02a21591b..55bfe1322 100644 --- a/src/ats-tool/Makefile.am +++ b/src/ats-tool/Makefile.am | |||
@@ -17,6 +17,7 @@ gnunet_ats_SOURCES = \ | |||
17 | gnunet_ats_LDADD = \ | 17 | gnunet_ats_LDADD = \ |
18 | $(top_builddir)/src/util/libgnunetutil.la \ | 18 | $(top_builddir)/src/util/libgnunetutil.la \ |
19 | $(top_builddir)/src/ats/libgnunetats.la \ | 19 | $(top_builddir)/src/ats/libgnunetats.la \ |
20 | $(top_builddir)/src/nt/libgnunetnt.la \ | ||
20 | $(top_builddir)/src/transport/libgnunettransport.la \ | 21 | $(top_builddir)/src/transport/libgnunettransport.la \ |
21 | $(top_builddir)/src/hello/libgnunethello.la \ | 22 | $(top_builddir)/src/hello/libgnunethello.la \ |
22 | $(GN_LIBINTL) | 23 | $(GN_LIBINTL) |
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c index 2db0a47d9..0d26ba5d9 100644 --- a/src/ats-tool/gnunet-ats.c +++ b/src/ats-tool/gnunet-ats.c | |||
@@ -394,7 +394,7 @@ transport_addr_to_str_cb (void *cls, | |||
394 | GNUNET_i2s (&pr->address->peer), | 394 | GNUNET_i2s (&pr->address->peer), |
395 | pr->address->transport_name, | 395 | pr->address->transport_name, |
396 | address, | 396 | address, |
397 | GNUNET_ATS_print_network_type (pr->properties.scope), | 397 | GNUNET_NT_to_string (pr->properties.scope), |
398 | ntohl (pr->bandwidth_out.value__), | 398 | ntohl (pr->bandwidth_out.value__), |
399 | ntohl (pr->bandwidth_in.value__), | 399 | ntohl (pr->bandwidth_in.value__), |
400 | pr->active ? _("active ") : _("inactive ")); | 400 | pr->active ? _("active ") : _("inactive ")); |
@@ -641,15 +641,15 @@ print_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
641 | unsigned long long int quota_in; | 641 | unsigned long long int quota_in; |
642 | int c; | 642 | int c; |
643 | 643 | ||
644 | for (c = 0; (c < GNUNET_ATS_NetworkTypeCount); c++) | 644 | for (c = 0; (c < GNUNET_NT_COUNT); c++) |
645 | { | 645 | { |
646 | 646 | ||
647 | GNUNET_asprintf (&entry_out, | 647 | GNUNET_asprintf (&entry_out, |
648 | "%s_QUOTA_OUT", | 648 | "%s_QUOTA_OUT", |
649 | GNUNET_ATS_print_network_type (c)); | 649 | GNUNET_NT_to_string (c)); |
650 | GNUNET_asprintf (&entry_in, | 650 | GNUNET_asprintf (&entry_in, |
651 | "%s_QUOTA_IN", | 651 | "%s_QUOTA_IN", |
652 | GNUNET_ATS_print_network_type (c)); | 652 | GNUNET_NT_to_string (c)); |
653 | 653 | ||
654 | /* quota out */ | 654 | /* quota out */ |
655 | if (GNUNET_OK == | 655 | if (GNUNET_OK == |
@@ -671,7 +671,7 @@ print_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
671 | { | 671 | { |
672 | FPRINTF (stderr, | 672 | FPRINTF (stderr, |
673 | "Outbound quota for network `%11s' not configured!\n", | 673 | "Outbound quota for network `%11s' not configured!\n", |
674 | GNUNET_ATS_print_network_type (c)); | 674 | GNUNET_NT_to_string (c)); |
675 | GNUNET_asprintf ("a_out_str, "-"); | 675 | GNUNET_asprintf ("a_out_str, "-"); |
676 | } | 676 | } |
677 | GNUNET_free (entry_out); | 677 | GNUNET_free (entry_out); |
@@ -694,20 +694,20 @@ print_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
694 | { | 694 | { |
695 | FPRINTF (stderr, | 695 | FPRINTF (stderr, |
696 | "Inbound quota for network `%11s' not configured!\n", | 696 | "Inbound quota for network `%11s' not configured!\n", |
697 | GNUNET_ATS_print_network_type (c)); | 697 | GNUNET_NT_to_string (c)); |
698 | GNUNET_asprintf ("a_in_str, "-"); | 698 | GNUNET_asprintf ("a_in_str, "-"); |
699 | } | 699 | } |
700 | GNUNET_free(entry_in); | 700 | GNUNET_free(entry_in); |
701 | 701 | ||
702 | FPRINTF (stdout, | 702 | FPRINTF (stdout, |
703 | _("Quota for network `%11s' (in/out): %10s / %10s\n"), | 703 | _("Quota for network `%11s' (in/out): %10s / %10s\n"), |
704 | GNUNET_ATS_print_network_type (c), | 704 | GNUNET_NT_to_string (c), |
705 | quota_in_str, | 705 | quota_in_str, |
706 | quota_out_str); | 706 | quota_out_str); |
707 | GNUNET_free(quota_out_str); | 707 | GNUNET_free(quota_out_str); |
708 | GNUNET_free(quota_in_str); | 708 | GNUNET_free(quota_in_str); |
709 | } | 709 | } |
710 | return GNUNET_ATS_NetworkTypeCount; | 710 | return GNUNET_NT_COUNT; |
711 | } | 711 | } |
712 | 712 | ||
713 | 713 | ||