aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RATIONALE2
-rw-r--r--README8
-rw-r--r--src/util/network.c2
3 files changed, 7 insertions, 5 deletions
diff --git a/RATIONALE b/RATIONALE
index d68e244c6..c0e8e781e 100644
--- a/RATIONALE
+++ b/RATIONALE
@@ -289,6 +289,8 @@ SUMMARY:
289 - bandwidth and time APIs 289 - bandwidth and time APIs
290 - buffered IO API 290 - buffered IO API
291 - HKDF implementation (crypto) 291 - HKDF implementation (crypto)
292 - load calculation API
293 - bandwidth calculation API
292* Major changes in util: 294* Major changes in util:
293 - more expressive server (replaces selector) 295 - more expressive server (replaces selector)
294 - DNS lookup replaced by async service 296 - DNS lookup replaced by async service
diff --git a/README b/README
index f82d16828..d04078693 100644
--- a/README
+++ b/README
@@ -33,9 +33,9 @@ These are the direct dependencies for running GNUnet:
33- libgcrypt >= 1.2 33- libgcrypt >= 1.2
34- libcurl >= 7.21.0 34- libcurl >= 7.21.0
35- libltdl >= 2.2 (part of GNU libtool) 35- libltdl >= 2.2 (part of GNU libtool)
36- sqlite >= 3.0 (alternative to MySQL) 36- sqlite >= 3.0 (default database)
37- mysql >= 5.1 (alternative to sqLite) 37- mysql >= 5.1 (alternative to sqLite)
38- postgres >= ??? (not yet supported) 38- postgres >= 8.3 (alternative to sqLite)
39 39
40Recommended autotools for compiling the SVN version are: 40Recommended autotools for compiling the SVN version are:
41- autoconf >= 2.59 41- autoconf >= 2.59
@@ -59,8 +59,8 @@ traversal).
59GNUnet requires the GNU MP library (http://www.gnu.org/software/gmp/) 59GNUnet requires the GNU MP library (http://www.gnu.org/software/gmp/)
60and libgcrypt (http://www.gnupg.org/). You can specify the path to 60and libgcrypt (http://www.gnupg.org/). You can specify the path to
61libgcrypt by passing "--with-gcrypt=PATH" to configure. You will also 61libgcrypt by passing "--with-gcrypt=PATH" to configure. You will also
62need either sqlite (http://www.sqlite.org/) or MySQL 62need either sqlite (http://www.sqlite.org/), MySQL
63(http://www.mysql.org/). 63(http://www.mysql.org/) or PostGres (http://www.postgres.org/).
64 64
65If you install from source, you need to install GNU libextractor first 65If you install from source, you need to install GNU libextractor first
66(download from http://www.gnu.org/software/libextractor/). We also 66(download from http://www.gnu.org/software/libextractor/). We also
diff --git a/src/util/network.c b/src/util/network.c
index 292e49976..e0b908e45 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -1048,7 +1048,7 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
1048#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set)) 1048#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))
1049 1049
1050 /* calculate how long we need to wait in milliseconds */ 1050 /* calculate how long we need to wait in milliseconds */
1051 if (timeout.abs_value == GNUNET_TIME_UNIT_FOREVER_REL.abs_value) 1051 if (timeout.abs_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
1052 ms_total = INFINITE; 1052 ms_total = INFINITE;
1053 1053
1054 else 1054 else