diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2010-08-17 21:36:00 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2010-08-17 21:36:00 +0000 |
| commit | 5e1e53bd7729ac89aab0a76c5037da98162a80cc (patch) | |
| tree | 9b4ccf1d3dd1c01257e6cb5a0ba9cae99cfbde45 /sys-cluster | |
| parent | Fix sandbox.d config install #333131 by Hans Nieser. (diff) | |
| download | gentoo-2-5e1e53bd7729ac89aab0a76c5037da98162a80cc.tar.gz gentoo-2-5e1e53bd7729ac89aab0a76c5037da98162a80cc.tar.bz2 gentoo-2-5e1e53bd7729ac89aab0a76c5037da98162a80cc.zip | |
Include a patch that fixes wrong connection information via the netlink interface.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
| -rw-r--r-- | sys-cluster/ipvsadm/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff | 29 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/ipvsadm-1.25.ebuild | 5 |
3 files changed, 39 insertions, 4 deletions
diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog index fe211344aa5f..1fdbc1757cfd 100644 --- a/sys-cluster/ipvsadm/ChangeLog +++ b/sys-cluster/ipvsadm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-cluster/ipvsadm -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.40 2009/11/21 21:59:51 swegener Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.41 2010/08/17 21:36:00 swegener Exp $ + + 17 Aug 2010; Sven Wegener <swegener@gentoo.org> ipvsadm-1.25.ebuild, + +files/ipvsadm-1.25-netlink-conns.diff: + Include a patch that fixes wrong connection information via the netlink + interface. 21 Nov 2009; Sven Wegener <swegener@gentoo.org> ipvsadm-1.21-r1.ebuild, ipvsadm-1.24.ebuild, ipvsadm-1.25.ebuild: diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff new file mode 100644 index 000000000000..4a25e6dbdfbb --- /dev/null +++ b/sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff @@ -0,0 +1,29 @@ +------------------------------------------------------------------------ +r64 | wensong | 2010-07-22 01:50:58 +0200 (Thu, 22 Jul 2010) | 11 lines + +This fixes what appears to be a typo in the netlink client code +whereby the activeconns is read as activeconns and then +overwritten by persistentconns. The result is that the active +connection count reported by ipvsadm -L is wrong if the +code is compiled to use the netlink interface. + +Tested-by: Nigel Kukard <nkukard@lbsd.net> +Signed-off-by: Simon Horman <horms@verge.net.au> +Signed-off-by: Wensong Zhang <wensong@linux-vs.org> + + +------------------------------------------------------------------------ + +Index: ipvsadm/libipvs/libipvs.c +=================================================================== +--- ipvsadm/libipvs/libipvs.c (revision 63) ++++ ipvsadm/libipvs/libipvs.c (revision 64) +@@ -748,7 +748,7 @@ + d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]); + d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]); + d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]); +- d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]); ++ d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]); + d->entrytable[i].af = d->af; + + if (ipvs_parse_stats(&(d->entrytable[i].stats), diff --git a/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild index d06234a95c04..213b9afc65f9 100644 --- a/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild +++ b/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild,v 1.3 2009/11/21 21:59:51 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild,v 1.4 2010/08/17 21:36:00 swegener Exp $ EAPI=2 inherit linux-info toolchain-funcs eutils @@ -27,6 +27,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/ipvsadm-1.25-build-fixup.diff + epatch "${FILESDIR}"/ipvsadm-1.25-netlink-conns.diff } src_compile() { |