diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-07-06 15:58:41 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-07-06 15:58:41 +0000 |
| commit | 4f80d8c5beb2c2106ce1b0686e9f29449d744832 (patch) | |
| tree | 7ac921a889e7525b439f130374d60a47cf854ac3 /src/transport/gnunet-service-transport.c | |
| parent | 3d7bae58c4b9b128e6000a2fe1fe65595235bb14 (diff) | |
misc minor fixes
Diffstat (limited to 'src/transport/gnunet-service-transport.c')
| -rw-r--r-- | src/transport/gnunet-service-transport.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 14eefdfb3..5a764f91f 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -859,7 +859,6 @@ run (void *cls, } max_fd_rlimit = 0; - max_fd_cfg = 0; #if HAVE_GETRLIMIT struct rlimit r_file; if (0 == getrlimit (RLIMIT_NOFILE, &r_file)) @@ -872,10 +871,12 @@ run (void *cls, } max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport */ #endif - GNUNET_CONFIGURATION_get_value_number (GST_cfg, - "transport", - "MAX_FD", - &max_fd_cfg); + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (GST_cfg, + "transport", + "MAX_FD", + &max_fd_cfg)) + max_fd_cfg = max_fd_rlimit; if (max_fd_cfg > max_fd_rlimit) max_fd = max_fd_cfg; @@ -886,7 +887,9 @@ run (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Limiting number of sockets to %u: validation %u, neighbors: %u\n", - max_fd, (max_fd / 3), (max_fd / 3) * 2); + max_fd, + (max_fd / 3), + (max_fd / 3) * 2); friend_only = GNUNET_CONFIGURATION_get_value_yesno (GST_cfg, "topology", |