print ats properties

1 files changed, 33 insertions, 1 deletions

diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c
index 73e017fc1..0543549aa 100644
--- a/src/ats-tool/gnunet-ats.c
+++ b/src/ats-tool/gnunet-ats.c
@@ -75,17 +75,49 @@ void transport_addr_to_str_cb (void *cls, const char *address)
   struct PendingResolutions * pr = cls;
   char *ats_str;
   char *ats_tmp;
+  char *ats_prop_arr[GNUNET_ATS_PropertyCount] = GNUNET_ATS_PropertyStrings;
+  char *ats_net_arr[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
+  char *ats_prop_value;
   unsigned int c;
+  uint32_t ats_type;
+  uint32_t ats_value;
+
   if (NULL != address)
   {
       ats_str = GNUNET_strdup("");
       for (c = 0; c <  pr->ats_count; c++)
       {
           ats_tmp = ats_str;
-          GNUNET_asprintf (&ats_str, "%s%u %u ", ats_tmp, ntohl(pr->ats[c].type), 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;
+          }
+
+          switch (ats_type) {
+            case GNUNET_ATS_NETWORK_TYPE:
+              if (ats_value > GNUNET_ATS_NetworkTypeCount)
+              {
+                  GNUNET_break (0);
+                  continue;
+              }
+              GNUNET_asprintf (&ats_prop_value, "%s", ats_net_arr[ats_value]);
+              break;
+            default:
+              GNUNET_asprintf (&ats_prop_value, "%u", ats_value);
+              break;
+          }
+
+          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', bw out: %u Bytes/s, bw in %u Bytes/s, %s\n"),
         GNUNET_i2s (&pr->address->peer), pr->address->transport_name, address,
         ntohl (pr->bandwidth_out.value__), ntohl (pr->bandwidth_in.value__),ats_str);