fixing resource leaks

[oweals/gnunet.git] / src / ats / gnunet-service-ats_performance.c

diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 9447691e1eb5424410902b9f5b299d62ee450e7d..5a1d8cc66f081c5430b5569efa2f5d74128eef5a 100644 (file)
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -129,6 +129,7 @@ GAS_performance_remove_client (struct GNUNET_SERVER_Client *client)
   if (NULL == pc)
     return;
   GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
+  GAS_addresses_preference_client_disconnect (GSA_addresses, client);
   GNUNET_free (pc);
 }
 
@@ -152,7 +153,7 @@ GAS_performance_notify_client (struct PerformanceClient *pc,
                                const struct GNUNET_PeerIdentity *peer,
                                const char *plugin_name,
                                const void *plugin_addr, size_t plugin_addr_len,
-                               const int active,
+                               int active,
                                const struct GNUNET_ATS_Information *atsi,
                                uint32_t atsi_count,
                                struct GNUNET_BANDWIDTH_Value32NBO
@@ -215,9 +216,9 @@ GAS_performance_notify_client (struct PerformanceClient *pc,
  */
 void
 GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer,
-                                const char *plugin_name,
-                                const void *plugin_addr, size_t plugin_addr_len,
-                                const int active,
+                                    const char *plugin_name,
+                                    const void *plugin_addr, size_t plugin_addr_len,
+                                    int active,
                                 const struct GNUNET_ATS_Information *atsi,
                                 uint32_t atsi_count,
                                 struct GNUNET_BANDWIDTH_Value32NBO
@@ -225,6 +226,7 @@ GAS_performance_notify_all_clients (const struct GNUNET_PeerIdentity *peer,
                                 struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
   struct PerformanceClient *pc;
+
   for (pc = pc_head; pc != NULL; pc = pc->next)
     if (pc->flag == START_FLAG_PERFORMANCE_WITH_PIC)
     {
@@ -258,15 +260,12 @@ peerinfo_it (void *cls,
   if (NULL == id)
     return;
 
-  if (GNUNET_NO == active)
-    return;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n",
+              "Callback for peer `%s' plugin `%s' BW out %u, BW in %u \n",
               GNUNET_i2s (id),
               plugin_name,
-              ntohl (bandwidth_out.value__),
-              ntohl (bandwidth_in.value__));
+              (unsigned int) ntohl (bandwidth_out.value__),
+              (unsigned int) ntohl (bandwidth_in.value__));
   GAS_performance_notify_client(pc,
                                 id,
                                 plugin_name,
@@ -309,9 +308,13 @@ GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
   struct PerformanceClient *pc;
   GNUNET_break (NULL == find_client (client));
 
-  pc = GNUNET_malloc (sizeof (struct PerformanceClient));
+  pc = GNUNET_new (struct PerformanceClient);
   pc->client = client;
   pc->flag = flag;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding performance client %s PIC\n",
+      (flag == START_FLAG_PERFORMANCE_WITH_PIC) ? "with" : "without");
+
   GNUNET_SERVER_notification_context_add (nc, client);
   GNUNET_CONTAINER_DLL_insert (pc_head, pc_tail, pc);
 
@@ -402,7 +405,7 @@ req_addr_peerinfo_it (void *cls,
       return;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Callback for  %s peer `%s' plugin `%s' BW out %u, BW in %u \n",
+              "Callback for  %s peer `%s' plugin `%s' BW out %u, BW in %u\n",
               (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
               GNUNET_i2s (id),
               plugin_name,
@@ -413,20 +416,20 @@ req_addr_peerinfo_it (void *cls,
   if ((GNUNET_YES == ai->all) || (GNUNET_YES == active))
   {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending result for  %s peer `%s' plugin `%s' BW out %u, BW in %u \n",
+                  "Sending result for  %s peer `%s' plugin `%s' BW out %u, BW in %u\n",
                   (active == GNUNET_YES) ? "ACTIVE" : "INACTIVE",
                   GNUNET_i2s (id),
                   plugin_name,
                   (unsigned int) ntohl (bandwidth_out.value__),
                   (unsigned int) ntohl (bandwidth_in.value__));
     transmit_req_addr (cls,
-        id,
-        plugin_name,
-        plugin_addr, plugin_addr_len,
-        active,
-        atsi,
-        atsi_count,
-        bandwidth_out, bandwidth_in);
+                       id,
+                       plugin_name,
+                       plugin_addr, plugin_addr_len,
+                       active,
+                       atsi,
+                       atsi_count,
+                       bandwidth_out, bandwidth_in);
   }
 }
 
@@ -504,52 +507,42 @@ GAS_handle_request_address_list (void *cls, struct GNUNET_SERVER_Client *client,
 
 void
 GAS_handle_performance_update (struct GNUNET_PeerIdentity *peer,
-                                                                                                                        const char *plugin_name,
-                                                                                                                        const void *plugin_addr,
-                                                                                                                        size_t plugin_addr_len,
-                                                                                                                        const int active,
-                                                                                                                        struct GNUNET_ATS_Information *ats,
-                                                                                                                        uint32_t ats_count,
-                                                                                                                        struct GNUNET_BANDWIDTH_Value32NBO
-                                                                                                                        bandwidth_out,
-                                                                                                                        struct GNUNET_BANDWIDTH_Value32NBO
-                                                                                                                        bandwidth_in)
+    const char *plugin_name, const void *plugin_addr, size_t plugin_addr_len,
+    const int active, struct GNUNET_ATS_Information *ats, uint32_t ats_count,
+    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
 {
-/* Notify here */
-       GAS_performance_notify_all_clients (peer,
-                                                                                                                                                       plugin_name,
-                                                                                                                                                       plugin_addr, plugin_addr_len,
-                                                                                                                                                       active,
-                                                                                                                                                       ats, ats_count,
-                                                                                                                                                       bandwidth_out, bandwidth_in);
+  /* Notify here */
+  GAS_performance_notify_all_clients (peer, plugin_name, plugin_addr,
+      plugin_addr_len, active, ats, ats_count, bandwidth_out, bandwidth_in);
 
 #if 0
-       struct PerformanceClient *cur;
-       struct PerformanceMonitorClient *curm;
-       struct MonitorResponseMessage *mrm;
-       size_t msglen;
-
-       msglen = sizeof (struct MonitorResponseMessage) +
-                                        ats_count * sizeof (struct GNUNET_ATS_Information);
-       mrm = GNUNET_malloc (msglen);
-
-       mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
-       mrm->header.size = htons (msglen);
-       mrm->ats_count = htonl (ats_count);
-       mrm->peer = *peer;
-       memcpy (&mrm[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
-
-       for (cur = pc_head; NULL != cur; cur = cur->next)
-               for (curm = cur->pm_head; NULL != curm; curm = curm->next)
-               {
-                               /* Notify client about update */
-                               mrm->id = htonl (curm->id);
-                         GNUNET_SERVER_notification_context_unicast (nc,
-                                       cur->client,
-                                       (struct GNUNET_MessageHeader *) mrm,
-                                       GNUNET_YES);
-               }
-       GNUNET_free (mrm);
+  struct PerformanceClient *cur;
+  struct PerformanceMonitorClient *curm;
+  struct MonitorResponseMessage *mrm;
+  size_t msglen;
+
+  msglen = sizeof (struct MonitorResponseMessage) +
+  ats_count * sizeof (struct GNUNET_ATS_Information);
+  mrm = GNUNET_malloc (msglen);
+
+  mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
+  mrm->header.size = htons (msglen);
+  mrm->ats_count = htonl (ats_count);
+  mrm->peer = *peer;
+  memcpy (&mrm[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
+
+  for (cur = pc_head; NULL != cur; cur = cur->next)
+  for (curm = cur->pm_head; NULL != curm; curm = curm->next)
+  {
+    /* Notify client about update */
+    mrm->id = htonl (curm->id);
+    GNUNET_SERVER_notification_context_unicast (nc,
+        cur->client,
+        (struct GNUNET_MessageHeader *) mrm,
+        GNUNET_YES);
+  }
+  GNUNET_free (mrm);
 #endif
 }
 
@@ -638,7 +631,7 @@ GAS_handle_preference_change (void *cls,
                             1, GNUNET_NO);
   pi = (const struct PreferenceInformation *) &msg[1];
   for (i = 0; i < nump; i++)
-    GAS_addresses_change_preference (GSA_addresses,
+    GAS_addresses_preference_change (GSA_addresses,
                                      client,
                                      &msg->peer,
                                      (enum GNUNET_ATS_PreferenceKind)