From f52f7122c72515b21472e72f99b5fd7c0060dc87 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 24 Oct 2010 17:54:09 +0200 Subject: conntrack: fix independent metadata checkings in XML output This patch adds some missing attribute checkings in the XML output that may result in inconsistent output (thus, displaying some attributes out of ...) Signed-off-by: Pablo Neira Ayuso --- src/conntrack/snprintf_xml.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/conntrack/snprintf_xml.c') diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c index a518617..cc588ee 100644 --- a/src/conntrack/snprintf_xml.c +++ b/src/conntrack/snprintf_xml.c @@ -294,8 +294,11 @@ int __snprintf_conntrack_xml(char *buf, test_bit(ATTR_DCCP_STATE, ct->set) || test_bit(ATTR_TIMEOUT, ct->set) || test_bit(ATTR_MARK, ct->set) || + test_bit(ATTR_SECMARK, ct->set) || + test_bit(ATTR_ZONE, ct->set) || test_bit(ATTR_USE, ct->set) || - test_bit(ATTR_STATUS, ct->set)) { + test_bit(ATTR_STATUS, ct->set) || + test_bit(ATTR_ID, ct->set)) { ret = snprintf(buf+offset, len, ""); BUFFER_SIZE(ret, size, len, offset); @@ -374,8 +377,11 @@ int __snprintf_conntrack_xml(char *buf, test_bit(ATTR_DCCP_STATE, ct->set) || test_bit(ATTR_TIMEOUT, ct->set) || test_bit(ATTR_MARK, ct->set) || + test_bit(ATTR_SECMARK, ct->set) || + test_bit(ATTR_ZONE, ct->set) || test_bit(ATTR_USE, ct->set) || - test_bit(ATTR_STATUS, ct->set)) { + test_bit(ATTR_STATUS, ct->set) || + test_bit(ATTR_ID, ct->set)) { ret = snprintf(buf+offset, len, ""); BUFFER_SIZE(ret, size, len, offset); } -- cgit v1.2.3