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

[gnunet]

Author: wachs
Date: 2013-03-20 10:33:04 +0100 (Wed, 20 Mar 2013)
New Revision: 26507

Modified:
   gnunet/src/ats/ats_api_performance.c
   gnunet/src/ats/gnunet-service-ats_performance.c
   gnunet/src/ats/test_ats_api_performance_monitor.c
Log:
initial cb


Modified: gnunet/src/ats/ats_api_performance.c
===================================================================
--- gnunet/src/ats/ats_api_performance.c        2013-03-20 09:13:10 UTC (rev 
26506)
+++ gnunet/src/ats/ats_api_performance.c        2013-03-20 09:33:04 UTC (rev 
26507)
@@ -582,14 +582,23 @@
        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 @@
        }
 
        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);

Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c     2013-03-20 09:13:10 UTC 
(rev 26506)
+++ gnunet/src/ats/gnunet-service-ats_performance.c     2013-03-20 09:33:04 UTC 
(rev 26507)
@@ -542,6 +542,7 @@
        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 @@
 
        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 @@
                        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)

Modified: gnunet/src/ats/test_ats_api_performance_monitor.c
===================================================================
--- gnunet/src/ats/test_ats_api_performance_monitor.c   2013-03-20 09:13:10 UTC 
(rev 26506)
+++ gnunet/src/ats/test_ats_api_performance_monitor.c   2013-03-20 09:33:04 UTC 
(rev 26507)
@@ -149,7 +149,15 @@
                                                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 ++;
+       }
 
+
+
 }