diff options
| author | Daniel Borkmann <daniel@iogearbox.net> | 2015-08-25 14:22:41 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-09-29 20:39:26 +0200 |
| commit | d3d2bee2d9ebd565e006f213c76cfa316b5e5ab1 (patch) | |
| tree | ba853d38ef24d856cc24a1fd8365cc41749126c4 /src/conntrack/snprintf_xml.c | |
| parent | ca8fa0b9f03968d5077af162010d670631089b6a (diff) | |
conntrack: add zone attribute to tuple
This patch adds the front-end to the recent ctnetlink interface
changes that add the zone attribute into the tuple.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/conntrack/snprintf_xml.c')
| -rw-r--r-- | src/conntrack/snprintf_xml.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c index bf52362..c3a836a 100644 --- a/src/conntrack/snprintf_xml.c +++ b/src/conntrack/snprintf_xml.c @@ -284,7 +284,7 @@ __snprintf_localtime_xml(char *buf, unsigned int len, const struct tm *tm) static int __snprintf_tuple_xml(char *buf, unsigned int len, const struct nf_conntrack *ct, - unsigned int dir) + unsigned int dir, bool zone_incl) { int ret; unsigned int size = 0, offset = 0; @@ -330,6 +330,11 @@ static int __snprintf_tuple_xml(char *buf, ret = snprintf(buf+offset, len, "</layer4>"); BUFFER_SIZE(ret, size, len, offset); + if (zone_incl) { + ret = snprintf(buf+offset, len, "<zone>%u</zone>", tuple->zone); + BUFFER_SIZE(ret, size, len, offset); + } + if (test_bit(ATTR_ORIG_COUNTER_PACKETS, ct->head.set) && test_bit(ATTR_ORIG_COUNTER_BYTES, ct->head.set)) { ret = snprintf(buf+offset, len, "<counters>"); @@ -398,10 +403,12 @@ int __snprintf_conntrack_xml(char *buf, BUFFER_SIZE(ret, size, len, offset); - ret = __snprintf_tuple_xml(buf+offset, len, ct, __DIR_ORIG); + ret = __snprintf_tuple_xml(buf+offset, len, ct, __DIR_ORIG, + test_bit(ATTR_ORIG_ZONE, ct->head.set)); BUFFER_SIZE(ret, size, len, offset); - ret = __snprintf_tuple_xml(buf+offset, len, ct, __DIR_REPL); + ret = __snprintf_tuple_xml(buf+offset, len, ct, __DIR_REPL, + test_bit(ATTR_REPL_ZONE, ct->head.set)); BUFFER_SIZE(ret, size, len, offset); if (test_bit(ATTR_TCP_STATE, ct->head.set) || |