[GNUnet-SVN] r25405 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-12-12 10:20:00 +0100 (Wed, 12 Dec 2012)
New Revision: 25405

Modified:
   gnunet/src/ats/ats_api_scheduling.c
Log:
msgs

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2012-12-12 08:57:45 UTC (rev 25404)
+++ gnunet/src/ats/ats_api_scheduling.c 2012-12-12 09:20:00 UTC (rev 25405)
@@ -822,6 +822,7 @@
 {
   GNUNET_assert (sh != NULL);
   struct ATS_Network * cur = sh->net_head;
+  char *networks[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkTypeString;
   int type = GNUNET_ATS_NET_UNSPECIFIED;
   struct GNUNET_ATS_Information ats;
 
@@ -862,15 +863,7 @@
       struct sockaddr_in * mask4 = (struct sockaddr_in *) cur->netmask;
 
       if (((a4->sin_addr.s_addr & mask4->sin_addr.s_addr)) == 
net4->sin_addr.s_addr)
-      {
-        char * net = GNUNET_strdup (GNUNET_a2s ((const struct sockaddr *) 
net4, addrlen));
-        GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
-            "`%s' is in network `%s'\n",
-            GNUNET_a2s ((const struct sockaddr *)a4, addrlen),
-            net);
-        GNUNET_free (net);
         type = GNUNET_ATS_NET_LAN;
-      }
     }
     if (addr->sa_family == AF_INET6)
     {
@@ -888,14 +881,7 @@
           res = GNUNET_NO;
 
       if (res == GNUNET_YES)
-      {
-        char * net = GNUNET_strdup (GNUNET_a2s ((const struct sockaddr *) 
net6, addrlen));
-        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "`%s' is in network `%s'\n",
-              GNUNET_a2s ((const struct sockaddr *) a6, addrlen),
-              net);
-        GNUNET_free (net);
         type = GNUNET_ATS_NET_LAN;
-      }
     }
     cur = cur->next;
   }
@@ -904,7 +890,13 @@
   if (type == GNUNET_ATS_NET_UNSPECIFIED)
     type = GNUNET_ATS_NET_WAN;
   ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  ats.value = htonl (type);  
+  ats.value = htonl (type);
+
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "ats-scheduling-api",
+                   "`%s' is in network `%s'\n",
+                   GNUNET_a2s ((const struct sockaddr *) addr, addrlen),
+                   networks[type]);
+
   return ats;
 }