|
@@ -346,8 +346,6 @@ nla_put_failure:
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
-#define tuple(ct, dir) (&(ct)->tuplehash[dir].tuple)
|
|
|
-
|
|
|
static int
|
|
|
ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
|
|
|
int event, const struct nf_conn *ct)
|
|
@@ -369,14 +367,14 @@ ctnetlink_fill_info(struct sk_buff *skb, u32 pid, u32 seq,
|
|
|
nest_parms = nla_nest_start(skb, CTA_TUPLE_ORIG | NLA_F_NESTED);
|
|
|
if (!nest_parms)
|
|
|
goto nla_put_failure;
|
|
|
- if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)
|
|
|
+ if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)
|
|
|
goto nla_put_failure;
|
|
|
nla_nest_end(skb, nest_parms);
|
|
|
|
|
|
nest_parms = nla_nest_start(skb, CTA_TUPLE_REPLY | NLA_F_NESTED);
|
|
|
if (!nest_parms)
|
|
|
goto nla_put_failure;
|
|
|
- if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_REPLY)) < 0)
|
|
|
+ if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_REPLY)) < 0)
|
|
|
goto nla_put_failure;
|
|
|
nla_nest_end(skb, nest_parms);
|
|
|
|
|
@@ -509,7 +507,8 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
|
|
|
if (!item->report && !nfnetlink_has_listeners(group))
|
|
|
return NOTIFY_DONE;
|
|
|
|
|
|
- skb = ctnetlink_alloc_skb(tuple(ct, IP_CT_DIR_ORIGINAL), GFP_ATOMIC);
|
|
|
+ skb = ctnetlink_alloc_skb(nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL),
|
|
|
+ GFP_ATOMIC);
|
|
|
if (!skb)
|
|
|
goto errout;
|
|
|
|
|
@@ -528,14 +527,14 @@ static int ctnetlink_conntrack_event(struct notifier_block *this,
|
|
|
nest_parms = nla_nest_start(skb, CTA_TUPLE_ORIG | NLA_F_NESTED);
|
|
|
if (!nest_parms)
|
|
|
goto nla_put_failure;
|
|
|
- if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)
|
|
|
+ if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_ORIGINAL)) < 0)
|
|
|
goto nla_put_failure;
|
|
|
nla_nest_end(skb, nest_parms);
|
|
|
|
|
|
nest_parms = nla_nest_start(skb, CTA_TUPLE_REPLY | NLA_F_NESTED);
|
|
|
if (!nest_parms)
|
|
|
goto nla_put_failure;
|
|
|
- if (ctnetlink_dump_tuples(skb, tuple(ct, IP_CT_DIR_REPLY)) < 0)
|
|
|
+ if (ctnetlink_dump_tuples(skb, nf_ct_tuple(ct, IP_CT_DIR_REPLY)) < 0)
|
|
|
goto nla_put_failure;
|
|
|
nla_nest_end(skb, nest_parms);
|
|
|
|