bugfix: fix timeout issue on Solaris (Sandor Geller)

diff --git a/ChangeLog b/ChangeLog
index 4c8bd95a7ca941779de912dcdf2c25d012516c29..37e8de315e6a52ee0c5e7eaf89c19e0bb3e7aad0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 UNRELEASED
 David Schweikert <david@schweikert.ch>
-- Revision v3.1 ALPHA
+- Revision v3.1 RC1
   * -g option (generate): exclude network and broadcast address for cidr
     ranges (idea by Eric Brander)
   * do not explicitely check if running as root, to make it possible to
@@ -9,6 +9,7 @@ David Schweikert <david@schweikert.ch>
   * ANSI C (C89) compiler now a requirement
   * portability fixes
   * reorganized source directory
+  * bugfix: fix timeout issue on Solaris (Sandor Geller)
 
 Thu Dec 28 2011
 David Schweikert <david@schweikert.ch>

diff --git a/configure.in b/configure.in
index b4ab6e8361b16757b91d621477ff68322cf33663..9f72706c759ae1433aa34e4b95937c7235ca36d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-AC_INIT([fping],[3.0])
+AC_INIT([fping],[3.1-rc1])
 
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([foreign])

diff --git a/src/fping.c b/src/fping.c
index 6fd8f3475de1b780d6d0ff2d602fedef2eaa982c..562859e5c782d17c6031ce0dfaf43a487c187e07 100644 (file)
--- a/src/fping.c
+++ b/src/fping.c
@@ -2619,6 +2619,10 @@ int recvfrom_wto( int s, char *buf, int len, FPING_SOCKADDR *saddr, long timo )
 
     to.tv_sec = 0;
     to.tv_usec = timo * 10;
+    while (to.tv_usec > 1000000) {
+        to.tv_sec++;
+        to.tv_usec -= 1000000;
+    }
 
     FD_ZERO( &readset );
     FD_ZERO( &writeset );