From 7321f327c917d35eea319858d883d7d6430c514c Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 24 Dec 2011 15:22:45 +0100 Subject: 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 --- src/expect/snprintf_default.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'src/expect/snprintf_default.c') 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); -- cgit v1.2.3