From: Cyril Bonté <cyril.bonte@free.fr>
Date: Sun, 16 Feb 2014 00:07:07 +0000 (+0100)
Subject: BUG/MEDIUM: peers: fix key consistency for integer stick tables
X-Git-Tag: v1.5-dev23~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a60ff9cb60cb11fbf6db932dcfbc3fe810212d8;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: peers: fix key consistency for integer stick tables

Peers with integer stick tables are breaking the keys received. This is due to
the fact that the sender converts the key with htonl() but the receiver doesn't
convert the value back to its original format.

Peers appeared in haproxy-1.5, no backport is needed.
---

diff --git a/src/peers.c b/src/peers.c
index 0d06505d61..b1022ab43e 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -676,10 +676,14 @@ switchstate:
 						}
 					}
 					else if (ps->table->table->type == STKTABLE_TYPE_INTEGER) {
-						newts = stksess_new(ps->table->table, NULL);
-						reql = bo_getblk(si->ob, newts ? (char *)newts->key.key : trash.str, sizeof(netinteger), totl);
+						reql = bo_getblk(si->ob, (char *)&netinteger, sizeof(netinteger), totl);
 						if (reql <= 0) /* closed or EOL not found */
 							goto incomplete;
+						newts = stksess_new(ps->table->table, NULL);
+						if (newts) {
+							netinteger = ntohl(netinteger);
+							memcpy(newts->key.key, &netinteger, sizeof(netinteger));
+						}
 						totl += reql;
 					}
 					else {