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

[gnunet]

Author: wachs
Date: 2010-04-28 16:23:56 +0200 (Wed, 28 Apr 2010)
New Revision: 11100

Modified:
   gnunet/src/hostlist/gnunet-daemon-hostlist.h
   gnunet/src/hostlist/hostlist-client.h
   gnunet/src/hostlist/hostlist-server.c
Log:
hostlist client and server now use the same limit for transfers:
MAX_BYTES_PER_HOSTLISTS = 500000

Modified: gnunet/src/hostlist/gnunet-daemon-hostlist.h
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist.h        2010-04-28 14:05:14 UTC 
(rev 11099)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist.h        2010-04-28 14:23:56 UTC 
(rev 11100)
@@ -42,5 +42,6 @@
 #define DEBUG_HOSTLIST GNUNET_NO
 
 #define MAX_URL_LEN 1000
+#define MAX_BYTES_PER_HOSTLISTS 500000
 
 /* end of gnunet-daemon-hostlist.h */

Modified: gnunet/src/hostlist/hostlist-client.h
===================================================================
--- gnunet/src/hostlist/hostlist-client.h       2010-04-28 14:05:14 UTC (rev 
11099)
+++ gnunet/src/hostlist/hostlist-client.h       2010-04-28 14:23:56 UTC (rev 
11100)
@@ -33,7 +33,6 @@
 #include "gnunet_time_lib.h"
 
 #define MAX_NUMBER_HOSTLISTS 30
-#define MAX_BYTES_PER_HOSTLISTS 100000
 #define SAVING_INTERVALL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MINUTES, 30)
 #define TESTING_INTERVALL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 3)
 #define WAITING_INTERVALL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 1)

Modified: gnunet/src/hostlist/hostlist-server.c
===================================================================
--- gnunet/src/hostlist/hostlist-server.c       2010-04-28 14:05:14 UTC (rev 
11099)
+++ gnunet/src/hostlist/hostlist-server.c       2010-04-28 14:23:56 UTC (rev 
11100)
@@ -228,7 +228,7 @@
              "HELLO",
              GNUNET_i2s (peer));
 #endif
-  if (old + s >= GNUNET_MAX_MALLOC_CHECKED)
+  if (old + s >= MAX_BYTES_PER_HOSTLISTS)
     {
       GNUNET_STATISTICS_update (stats,
                                gettext_noop("bytes not included in hostlist 
(size limit)"),