fix

diff --git a/RATIONALE b/RATIONALE
index d68e244c62d11bfe3da8bac06992268c3d45c0b4..c0e8e781ef615c3ec2753704601e9b7e0a4ef954 100644 (file)
--- a/RATIONALE
+++ b/RATIONALE
@@ -289,6 +289,8 @@ SUMMARY:
   - bandwidth and time APIs
   - buffered IO API
   - HKDF implementation (crypto)
+  - load calculation API
+  - bandwidth calculation API
 * Major changes in util:
   - more expressive server (replaces selector)
   - DNS lookup replaced by async service

diff --git a/README b/README
index f82d168288577a1b38c269cac81121b8d12fec53..d04078693703e5bc71766f4e3f4282badbaa43b8 100644 (file)
--- a/README
+++ b/README
@@ -33,9 +33,9 @@ These are the direct dependencies for running GNUnet:
 - libgcrypt     >= 1.2
 - libcurl       >= 7.21.0
 - libltdl       >= 2.2 (part of GNU libtool)
-- sqlite        >= 3.0 (alternative to MySQL)
+- sqlite        >= 3.0 (default database)
 - mysql         >= 5.1 (alternative to sqLite)
-- postgres      >= ??? (not yet supported)
+- postgres      >= 8.3 (alternative to sqLite)
 
 Recommended autotools for compiling the SVN version are:
 - autoconf >= 2.59
@@ -59,8 +59,8 @@ traversal).
 GNUnet requires the GNU MP library (http://www.gnu.org/software/gmp/)
 and libgcrypt (http://www.gnupg.org/).  You can specify the path to
 libgcrypt by passing "--with-gcrypt=PATH" to configure.  You will also
-need either sqlite (http://www.sqlite.org/) or MySQL
-(http://www.mysql.org/).
+need either sqlite (http://www.sqlite.org/), MySQL
+(http://www.mysql.org/) or PostGres (http://www.postgres.org/).
 
 If you install from source, you need to install GNU libextractor first
 (download from http://www.gnu.org/software/libextractor/).  We also

diff --git a/src/util/network.c b/src/util/network.c
index 292e499764b2da9507ea0ca8d3fcaa54831b65ab..e0b908e45f19255e36e59cfacba6890facc98df9 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -1048,7 +1048,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
 #define SAFE_FD_ISSET(fd, set)  (set != NULL && FD_ISSET(fd, set))
 
   /* calculate how long we need to wait in milliseconds */
-  if (timeout.abs_value == GNUNET_TIME_UNIT_FOREVER_REL.abs_value)
+  if (timeout.abs_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
     ms_total = INFINITE;
 
   else