From: Florian Forster Date: Sun, 25 Jun 2006 08:51:57 +0000 (+0200) Subject: Merge branch 'v391-fix' into v392-fix X-Git-Tag: collectd-3.9.2^0 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=20b5c36871fae3f86024da3b134e52351ddb77c5;hp=a073c1d52cc236c497f1a38c06433a70a7155616;p=collectd.git Merge branch 'v391-fix' into v392-fix --- diff --git a/ChangeLog b/ChangeLog index e4907673..6a5f3eab 100644 --- 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 4c56de7c..789fadad 100644 --- 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 3.9.2-1 +- New upstream version + * Fri Apr 21 2006 Florian octo Forster 3.9.1-1 - New upstream version diff --git a/configure.in b/configure.in index f9d3dc1a..315e28d0 100644 --- 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 86fcc6c9..38cab468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +collectd (3.9.2-1) unstable; urgency=low + + * New upstream version + + -- Florian Forster 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 a85de2e3..afd44868 100644 --- 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",