diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-10-24 17:54:09 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2010-10-28 16:56:42 +0200 |
| commit | f52f7122c72515b21472e72f99b5fd7c0060dc87 (patch) | |
| tree | 6ac20705e9f1f7af0a08d9ae9ef9340bda638968 /src | |
| parent | 1bd9af48278de02c969aa2970262891ae6bb9f20 (diff) | |
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 <meta dir="independent">...</meta>)
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/conntrack/snprintf_xml.c | 10 |
1 files changed, 8 insertions, 2 deletions
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, "<meta direction=\"independent\">"); 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, "</meta>"); BUFFER_SIZE(ret, size, len, offset); } |