From 52161a61d1d0db2a9ca8ce652d7272dd4954c59f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sun, 13 Jun 2010 22:21:25 +0200 Subject: ct: print zone before use make output of nfct_snprintf() similar to /proc/net/nf_conntrack. tcp 6 23 TIME_WAIT src=XX.208.XX.243 dst=XX.14.XX.100 sport=35917 dport=80 packets=10 bytes=2555 src=XX.14.XX.100 dst=XX.208.XX.243 sport=80 dport=35917 packets=9 bytes=1163 [ASSURED] mark=0 secmark=0 use=2 zone=1 ^^^^^^ Signed-off-by: Pablo Neira Ayuso --- src/conntrack/snprintf_default.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/conntrack/snprintf_default.c') diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c index ce5a477..4a61f8a 100644 --- a/src/conntrack/snprintf_default.c +++ b/src/conntrack/snprintf_default.c @@ -321,6 +321,11 @@ int __snprintf_conntrack_default(char *buf, BUFFER_SIZE(ret, size, len, offset); } + if (test_bit(ATTR_ZONE, ct->set)) { + ret = __snprintf_zone(buf+offset, len, ct); + BUFFER_SIZE(ret, size, len, offset); + } + if (test_bit(ATTR_USE, ct->set)) { ret = __snprintf_use(buf+offset, len, ct); BUFFER_SIZE(ret, size, len, offset); @@ -331,11 +336,6 @@ int __snprintf_conntrack_default(char *buf, BUFFER_SIZE(ret, size, len, offset); } - if (test_bit(ATTR_ZONE, ct->set)) { - ret = __snprintf_zone(buf+offset, len, ct); - BUFFER_SIZE(ret, size, len, offset); - } - /* Delete the last blank space */ size--; -- cgit v1.2.3