summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2010-06-13 22:21:25 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2010-06-13 22:21:25 +0200
commit52161a61d1d0db2a9ca8ce652d7272dd4954c59f (patch)
tree76134cbb4bf0f2a403df45c901a9dfc0c6a61044
parentcf7130ab75b3e11142cf1bb749ef97f69a190148 (diff)
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 <pablo@netfilter.org>
-rw-r--r--src/conntrack/snprintf_default.c10
1 files changed, 5 insertions, 5 deletions
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--;