summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/conntrack/objopt.c14
-rw-r--r--src/conntrack/setter.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/src/conntrack/objopt.c b/src/conntrack/objopt.c
index b495f55..ff73a71 100644
--- a/src/conntrack/objopt.c
+++ b/src/conntrack/objopt.c
@@ -46,22 +46,26 @@ int __getobjopt(const struct nf_conntrack *ct, unsigned int option)
switch(option) {
case NFCT_GOPT_IS_SNAT:
- ret = (ct->status & IPS_SRC_NAT_DONE &&
- ct->tuple[__DIR_REPL].dst.v4 !=
+ ret = (test_bit(ATTR_STATUS, ct->set) ?
+ ct->status & IPS_SRC_NAT_DONE : 1 &&
+ ct->tuple[__DIR_REPL].dst.v4 !=
ct->tuple[__DIR_ORIG].src.v4);
break;
case NFCT_GOPT_IS_DNAT:
- ret = (ct->status & IPS_DST_NAT_DONE &&
+ ret = (test_bit(ATTR_STATUS, ct->set) ?
+ ct->status & IPS_DST_NAT_DONE : 1 &&
ct->tuple[__DIR_REPL].src.v4 !=
ct->tuple[__DIR_ORIG].dst.v4);
break;
case NFCT_GOPT_IS_SPAT:
- ret = (ct->status & IPS_SRC_NAT_DONE &&
+ ret = (test_bit(ATTR_STATUS, ct->set) ?
+ ct->status & IPS_SRC_NAT_DONE : 1 &&
ct->tuple[__DIR_REPL].l4dst.tcp.port !=
ct->tuple[__DIR_ORIG].l4src.tcp.port);
break;
case NFCT_GOPT_IS_DPAT:
- ret = (ct->status & IPS_DST_NAT_DONE &&
+ ret = (test_bit(ATTR_STATUS, ct->set) ?
+ ct->status & IPS_DST_NAT_DONE : 1 &&
ct->tuple[__DIR_REPL].l4src.tcp.port !=
ct->tuple[__DIR_ORIG].l4dst.tcp.port);
break;
diff --git a/src/conntrack/setter.c b/src/conntrack/setter.c
index 7bc77b5..84b1d25 100644
--- a/src/conntrack/setter.c
+++ b/src/conntrack/setter.c
@@ -139,7 +139,7 @@ static void set_attr_mark(struct nf_conntrack *ct, const void *value)
static void set_attr_status(struct nf_conntrack *ct, const void *value)
{
- ct->status |= *((u_int32_t *) value);
+ ct->status = *((u_int32_t *) value);
}
set_attr set_attr_array[] = {