initial cb

3 files changed, 27 insertions, 7 deletions

diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index cbf18a0cc..34f3a232e 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -582,14 +582,23 @@ process_mr_message (struct GNUNET_ATS_PerformanceHandle *ph,
         uint32_t ats_count;
         uint32_t id;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+      _("Received %s message\n"), "ATS_MONITOR_RESPONSE");
+
         msg_size = ntohs (msg->size);
         if (msg_size < sizeof (struct MonitorResponseMessage))
+        {
+                GNUNET_break (0);
                 return GNUNET_SYSERR;
+        }
 
         ats_count = ntohl (mrm->ats_count);
         if (msg_size != (sizeof (struct MonitorResponseMessage) +
                         ats_count * sizeof (struct GNUNET_ATS_Information)))
-                return GNUNET_SYSERR;
+                {
+                        GNUNET_break (0);
+                        return GNUNET_SYSERR;
+                }
 
         id = ntohl (mrm->id);
         /* Do work here */
@@ -600,7 +609,10 @@ process_mr_message (struct GNUNET_ATS_PerformanceHandle *ph,
         }
 
         if (NULL == cur)
-                return GNUNET_SYSERR;
+                {
+                        GNUNET_break (0);
+                        return GNUNET_SYSERR;
+                }
 
         ats = (struct GNUNET_ATS_Information *) &mrm[1];
         cur->moncb (cur->moncb_cls, &mrm->peer, ats, ats_count);
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index 74b9650c9..cbbed1967 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -542,6 +542,7 @@ GAS_handle_performance_update (struct GNUNET_PeerIdentity *peer,
         mrm->header.size = htons (msglen);
         mrm->ats_count = htonl (ats_count);
         mrm->peer = *peer;
+        memcpy (&mrm[1], ats, sizeof (struct GNUNET_ATS_Information));
 
         for (cur = pc_head; NULL != cur; cur = cur->next)
                 for (curm = cur->pm_head; NULL != curm; curm = curm->next)
@@ -582,17 +583,17 @@ mon_peerinfo_it (void *cls,
 
         mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
         mrm->header.size = htons (msglen);
+        mrm->id = htonl(pmc->id);
         mrm->ats_count = htonl (atsi_count);
         mrm->peer = *id;
-        mrm->id = pmc->id;
+        memcpy (&mrm[1], atsi, sizeof (struct GNUNET_ATS_Information));
 
         /* Send initial information about peers to client */
-/*
+
   GNUNET_SERVER_notification_context_unicast (nc,
                 pmc->client,
                 (struct GNUNET_MessageHeader *) mrm,
                 GNUNET_YES);
-*/
   GNUNET_free (mrm);
 }
 
@@ -661,9 +662,8 @@ GAS_handle_monitor (void *cls,
                         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                                         "Added performance monitoring client %p id %u\n",
                                         client, id);
-
                         /* Return all values here */
-                  GAS_addresses_iterate_peers (GSA_addresses, &mon_peer_it, pc);
+                  GAS_addresses_iterate_peers (GSA_addresses, &mon_peer_it, pmc);
 
         }
         else if (GNUNET_NO == op)
diff --git a/src/ats/test_ats_api_performance_monitor.c b/src/ats/test_ats_api_performance_monitor.c
index 6187a87e1..32ec27db8 100644
--- a/src/ats/test_ats_api_performance_monitor.c
+++ b/src/ats/test_ats_api_performance_monitor.c
@@ -149,6 +149,14 @@ perf_mon_cb (void *cls,
                                                 struct GNUNET_ATS_Information *ats,
                                                 uint32_t ats_count)
 {
+        static int stage_counter = 0;
+        if (0 == stage_counter)
+        {
+                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Received initial callback\n");
+                stage_counter ++;
+        }
+
+
 
 }