Merge branch 'v391-fix' into v392-fix

diff --git a/ChangeLog b/ChangeLog
index e4907673ce54b23b4d14c6f5d93393ed8cfed486..6a5f3eab19b8fefeb39dfd00a9bf36d37c32ce1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09, Version 3.9.2
+       * Applied a patch to the `liboping' library. Due to a bug in the
+         sequence checking the `ping' plugin stopped working after
+         approximately 7.6 days.
+
 2006-04-21, Version 3.9.1
        * Build issues with Solaris and possible other architectures have been
          resolved.

diff --git a/collectd.spec b/collectd.spec
index 4c56de7ce67d9a120487c6b2adf9970f795b4ac0..789fadad439f070806e0516a18f5e0e246e7de4a 100644 (file)
--- a/collectd.spec
+++ b/collectd.spec
@@ -101,6 +101,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0444,root,root) %{_libdir}/%{name}/sensors.so*
 
 %changelog
+* Tue May 09 2006 Florian octo Forster <octo@verplant.org> 3.9.2-1
+- New upstream version
+
 * Fri Apr 21 2006 Florian octo Forster <octo@verplant.org> 3.9.1-1
 - New upstream version
 

diff --git a/configure.in b/configure.in
index f9d3dc1a7f81bf8cf39b68795d50296c355ac905..315e28d06a66b4adbf5bb4c45d90e1ff8f6f41da 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.9.1)
+AC_INIT(collectd, 3.9.2)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)

diff --git a/debian/changelog b/debian/changelog
index 86fcc6c9fdce9b5a73a790600fe14df4a60105b7..38cab46801808b7ef152489071a05c568cc6f613 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+collectd (3.9.2-1) unstable; urgency=low
+
+  * New upstream version
+
+ -- Florian Forster <octo@verplant.org>  Tue,  9 May 2006 11:12:00 +0200
+
 collectd (3.9.1-1) unstable; urgency=low
 
   * New upstream version

diff --git a/src/liboping/liboping.c b/src/liboping/liboping.c
index a85de2e3b618c323805966aeb349a0e6533ba384..afd44868133230842b69bf07fe0676d5ce81180d 100644 (file)
--- a/src/liboping/liboping.c
+++ b/src/liboping/liboping.c
@@ -213,7 +213,7 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
        for (ptr = ph; ptr != NULL; ptr = ptr->next)
        {
                dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n",
-                               ptr->hostname, ptr->ident, ptr->sequence - 1);
+                               ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF));
 
                if (ptr->addrfamily != AF_INET)
                        continue;
@@ -224,7 +224,7 @@ static pinghost_t *ping_receive_ipv4 (pinghost_t *ph, char *buffer, size_t buffe
                if (ptr->ident != ident)
                        continue;
 
-               if ((ptr->sequence - 1) != seq)
+               if (((ptr->sequence - 1) & 0xFFFF) != seq)
                        continue;
 
                dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n",
@@ -276,7 +276,7 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe
        for (ptr = ph; ptr != NULL; ptr = ptr->next)
        {
                dprintf ("hostname = %s, ident = 0x%04x, seq = %i\n",
-                               ptr->hostname, ptr->ident, ptr->sequence - 1);
+                               ptr->hostname, ptr->ident, ((ptr->sequence - 1) & 0xFFFF));
 
                if (ptr->addrfamily != AF_INET6)
                        continue;
@@ -287,7 +287,7 @@ static pinghost_t *ping_receive_ipv6 (pinghost_t *ph, char *buffer, size_t buffe
                if (ptr->ident != ident)
                        continue;
 
-               if ((ptr->sequence - 1) != seq)
+               if (((ptr->sequence - 1) & 0xFFFF) != seq)
                        continue;
 
                dprintf ("Match found: hostname = %s, ident = 0x%04x, seq = %i\n",