diff options
Diffstat (limited to 'src/expect')
-rw-r--r-- | src/expect/parse.c | 5 | ||||
-rw-r--r-- | src/expect/snprintf_default.c | 22 |
2 files changed, 25 insertions, 2 deletions
diff --git a/src/expect/parse.c b/src/expect/parse.c index be9be78..0581aca 100644 --- a/src/expect/parse.c +++ b/src/expect/parse.c @@ -34,9 +34,12 @@ void __parse_expect(const struct nlmsghdr *nlh, exp->expected.tuple[__DIR_ORIG].l3protonum = nfhdr->nfgen_family; set_bit(ATTR_ORIG_L3PROTO, exp->expected.set); - exp->mask.tuple[__DIR_REPL].l3protonum = nfhdr->nfgen_family; + exp->mask.tuple[__DIR_ORIG].l3protonum = nfhdr->nfgen_family; set_bit(ATTR_ORIG_L3PROTO, exp->mask.set); + exp->master.tuple[__DIR_ORIG].l3protonum = nfhdr->nfgen_family; + set_bit(ATTR_ORIG_L3PROTO, exp->master.set); + if (cda[CTA_EXPECT_MASTER-1]) { __parse_tuple(cda[CTA_EXPECT_MASTER-1], &exp->master.tuple[__DIR_ORIG], diff --git a/src/expect/snprintf_default.c b/src/expect/snprintf_default.c index 51ffb30..c4a19fa 100644 --- a/src/expect/snprintf_default.c +++ b/src/expect/snprintf_default.c @@ -56,7 +56,9 @@ int __snprintf_expect_default(char *buf, ret = __snprintf_expect_proto(buf+offset, len, exp); BUFFER_SIZE(ret, size, len, offset); - ret = __snprintf_address(buf+offset, len, &exp->expected.tuple[__DIR_ORIG]); + ret = __snprintf_address(buf+offset, len, + &exp->expected.tuple[__DIR_ORIG], + "src", "dst"); BUFFER_SIZE(ret, size, len, offset); ret = __snprintf_proto(buf+offset, len, &exp->expected.tuple[__DIR_ORIG]); @@ -82,6 +84,24 @@ 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); + /* Delete the last blank space if needed */ if (len > 0 && buf[size-1] == ' ') size--; |