From: Lukas Tribus <lukas@ltri.eu>
Date: Sun, 11 Aug 2019 16:03:45 +0000 (+0200)
Subject: BUG/MINOR: lua: fix setting netfilter mark
X-Git-Tag: v2.1-dev2~211
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=579e3e3dd51de734ead47960ce125f6feabc33fa;p=thirdparty%2Fhaproxy.git

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.
---

diff --git a/src/hlua.c b/src/hlua.c
index 8844ebe672..9ecf03210d 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -5376,7 +5376,7 @@ __LJMP static int hlua_txn_set_mark(lua_State *L)
 	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;
 }