commit b59291a2e3593008ae9eacdbfd9790e09282d7aa
author Lukas Tribus <lukas@ltri.eu> Sun Aug 11 18:03:45 2019 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Mon Aug 12 08:56:14 2019 +0200
tree 9200eef8ad581cd7af3e03bd71c47be83d5c1579
parent 09e0b17d61bdd3e9bea9efa7370f3991bf482302

BUG/MINOR: lua: fix setting netfilter mark

In the REORG of commit 1a18b5414 ("REORG: connection: centralize the
conn_set_{tos,mark,quickack} functions") a bug was introduced by
calling conn_set_tos instead of conn_set_mark.

This was reported in issue #212

This should be backported to 1.9 and 2.0.

(cherry picked from commit 579e3e3dd51de734ead47960ce125f6feabc33fa)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/hlua.c

diff --git a/src/hlua.c b/src/hlua.c
index 4d92fa4..465c2c2 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -5998,7 +5998,7 @@
 	htxn = MAY_LJMP(hlua_checktxn(L, 1));
 	mark = MAY_LJMP(luaL_checkinteger(L, 2));
 
-	conn_set_tos(objt_conn(htxn->s->sess->origin), mark);
+	conn_set_mark(objt_conn(htxn->s->sess->origin), mark);
 	return 0;
 }