summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2010-08-17 21:36:00 +0000
committerSven Wegener <swegener@gentoo.org>2010-08-17 21:36:00 +0000
commit5e1e53bd7729ac89aab0a76c5037da98162a80cc (patch)
tree9b4ccf1d3dd1c01257e6cb5a0ba9cae99cfbde45 /sys-cluster/ipvsadm/files
parentFix sandbox.d config install #333131 by Hans Nieser. (diff)
downloadgentoo-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/ipvsadm/files')
-rw-r--r--sys-cluster/ipvsadm/files/ipvsadm-1.25-netlink-conns.diff29
1 files changed, 29 insertions, 0 deletions
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),