[GNUnet-SVN] r10608 - gnunet/src/hostlist

[gnunet]

Author: grothoff
Date: 2010-03-16 10:00:33 +0100 (Tue, 16 Mar 2010)
New Revision: 10608

Modified:
   gnunet/src/hostlist/hostlist-client.c
   gnunet/src/hostlist/hostlist-server.c
Log:
logging

Modified: gnunet/src/hostlist/hostlist-client.c
===================================================================
--- gnunet/src/hostlist/hostlist-client.c       2010-03-16 08:49:12 UTC (rev 
10607)
+++ gnunet/src/hostlist/hostlist-client.c       2010-03-16 09:00:33 UTC (rev 
10608)
@@ -159,7 +159,10 @@
       download_pos += cpy;
       left -= cpy;
       if (download_pos < sizeof(struct GNUNET_MessageHeader))
-       break;
+       {
+         GNUNET_assert (left == 0);
+         break;
+       }
       msg = (const struct GNUNET_MessageHeader *) download_buffer;
       msize = ntohs(msg->size);
       if (msize < sizeof(struct GNUNET_MessageHeader))
@@ -176,7 +179,10 @@
          return total;
        }
       if (download_pos < msize)
-       break;
+       {
+         GNUNET_assert (left == 0);
+         break;
+       }
       if (GNUNET_HELLO_size ((const struct GNUNET_HELLO_Message*)msg) == msize)
        {
 #if DEBUG_HOSTLIST_CLIENT
@@ -200,7 +206,7 @@
                      _("Invalid `%s' message received from hostlist at 
`%s'\n"),
                      "HELLO",
                      current_url);
-         bogus_url = 1;
+         bogus_url = GNUNET_YES;
          return total;
        }
       memmove (download_buffer,

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-03-16 08:49:12 UTC (rev 
10607)
+++ gnunet/src/hostlist/hostlist-server.c       2010-03-16 09:00:33 UTC (rev 
10608)
@@ -179,7 +179,17 @@
              GNUNET_i2s (peer));
 #endif
   if (old + s >= GNUNET_MAX_MALLOC_CHECKED)
-    return; /* too large, skip! */
+    {
+      GNUNET_STATISTICS_update (stats,
+                               gettext_noop("bytes not included in hostlist 
(size limit)"),
+                               s,
+                               GNUNET_NO);
+      return; /* too large, skip! */
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+             "Adding peer `%s' to hostlist (%u bytes)\n",
+             GNUNET_i2s (peer),
+             (unsigned int) s);
   GNUNET_array_grow (results->data,
                      results->size,
                      old + s);