summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2011-12-24 15:22:45 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2011-12-24 15:22:45 +0100
commit7321f327c917d35eea319858d883d7d6430c514c (patch)
tree6166ce3a85beb356d9fd4c0d0ed72dd1706ce0e4
parent6a05d293fed594f89ad05625e43dec6a81da487d (diff)
expect: modify output by moving zone and flags to the end of the line
Now, the output of nfexp_snprintf looks like this: 299 proto=6 src=192.168.1.130 dst=130.89.148.12 sport=0 dport=45420 mask-src=255.255.255.255 mask-dst=255.255.255.255 sport=0 dport=65535 master-src=192.168.1.130 master-dst=130.89.148.12 sport=46368 dport=21 helper=ftp Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--src/expect/snprintf_default.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/expect/snprintf_default.c b/src/expect/snprintf_default.c
index bda39cc..6958552 100644
--- a/src/expect/snprintf_default.c
+++ b/src/expect/snprintf_default.c
@@ -64,6 +64,24 @@ int __snprintf_expect_default(char *buf,
ret = __snprintf_proto(buf+offset, len, &exp->expected.tuple[__DIR_ORIG]);
BUFFER_SIZE(ret, size, len, offset);
+ ret = __snprintf_address(buf+offset, len,
+ &exp->mask.tuple[__DIR_ORIG],
+ "mask-src", "mask-dst");
+ BUFFER_SIZE(ret, size, len, offset);
+
+ ret = __snprintf_proto(buf+offset, len,
+ &exp->mask.tuple[__DIR_ORIG]);
+ BUFFER_SIZE(ret, size, len, offset);
+
+ ret = __snprintf_address(buf+offset, len,
+ &exp->master.tuple[__DIR_ORIG],
+ "master-src", "master-dst");
+ BUFFER_SIZE(ret, size, len, offset);
+
+ ret = __snprintf_proto(buf+offset, len,
+ &exp->master.tuple[__DIR_ORIG]);
+ BUFFER_SIZE(ret, size, len, offset);
+
if (test_bit(ATTR_EXP_ZONE, exp->set)) {
ret = snprintf(buf+offset, len, "zone=%u ", exp->zone);
BUFFER_SIZE(ret, size, len, offset);
@@ -84,24 +102,6 @@ int __snprintf_expect_default(char *buf,
BUFFER_SIZE(ret, size, len, offset);
}
- ret = __snprintf_address(buf+offset, len,
- &exp->mask.tuple[__DIR_ORIG],
- "mask-src", "mask-dst");
- BUFFER_SIZE(ret, size, len, offset);
-
- ret = __snprintf_proto(buf+offset, len,
- &exp->mask.tuple[__DIR_ORIG]);
- BUFFER_SIZE(ret, size, len, offset);
-
- ret = __snprintf_address(buf+offset, len,
- &exp->master.tuple[__DIR_ORIG],
- "master-src", "master-dst");
- BUFFER_SIZE(ret, size, len, offset);
-
- ret = __snprintf_proto(buf+offset, len,
- &exp->master.tuple[__DIR_ORIG]);
- BUFFER_SIZE(ret, size, len, offset);
-
if (test_bit(ATTR_EXP_HELPER_NAME, exp->set)) {
ret = snprintf(buf+offset, len, "helper=%s", exp->helper_name);
BUFFER_SIZE(ret, size, len, offset);