i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert min / max change and set timeout_t nice way

Browse Source 
Mixing up seconds and micro-seconds made me do it.
This commit is contained in:
Fredrik Holmqvist
2017-03-25 15:00:55 +01:00
parent 3bbff30d9e
commit f1361497b0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/net/DHCPClient.cpp
+2 -2
View File
@@ -157,7 +157,7 @@ struct dhcp_message {
struct socket_timeout { struct socket_timeout {
socket_timeout(int socket) socket_timeout(int socket)
: :
timeout((time_t)AS_USECS(DEFAULT_TIMEOUT)), timeout(time_t(AS_USECS(DEFAULT_TIMEOUT))),
tries(0) tries(0)
{ {
UpdateSocket(socket); UpdateSocket(socket);
@@ -457,7 +457,7 @@ socket_timeout::Shift(int socket, bigtime_t stateMaxTime, const char* device)
if (stateMaxTime == -1) if (stateMaxTime == -1)
return false; return false;
bigtime_t remaining = (stateMaxTime - system_time()) / 2 + 1; bigtime_t remaining = (stateMaxTime - system_time()) / 2 + 1;
timeout = std::min(remaining, (bigtime_t)AS_USECS(MAX_TIMEOUT)); timeout = std::max(remaining, bigtime_t(60));
} }
syslog(LOG_DEBUG, "%s: Timeout shift: %lu secs (try %lu)\n", syslog(LOG_DEBUG, "%s: Timeout shift: %lu secs (try %lu)\n",