On Fri, 20 Sep 2013, Oliver wrote:
> From: Oliver Smith <oliver@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
> This adds a new set that provides the ability to configure pairs of
> subnets. A small amount of additional handling code has been added to
> the generic hash header file - this code is conditionally activated by a
> preprocessor definition.
Patch is applied with a small modification:
[...]
> +static int
> +hash_netnet6_uadt(struct ip_set *set, struct nlattr *tb[],
> + enum ipset_adt adt, u32 *lineno, u32 flags, bool retried)
> +{
> + ipset_adtfn adtfn = set->variant->adt[adt];
> + struct hash_netnet6_elem e = { .cidr[0] = HOST_MASK,
> + .cidr[1] = HOST_MASK };
> + struct ip_set_ext ext = IP_SET_INIT_UEXT(set);
> + int ret;
> +
> + if (unlikely(!tb[IPSET_ATTR_IP] || !tb[IPSET_ATTR_IP2] ||
> + !ip_set_optattr_netorder(tb, IPSET_ATTR_TIMEOUT) ||
> + !ip_set_optattr_netorder(tb, IPSET_ATTR_CADT_FLAGS) ||
> + !ip_set_optattr_netorder(tb, IPSET_ATTR_PACKETS) ||
> + !ip_set_optattr_netorder(tb, IPSET_ATTR_BYTES)))
> + return -IPSET_ERR_PROTOCOL;
> + if (unlikely(tb[IPSET_ATTR_IP_TO]))
> + return -IPSET_ERR_HASH_RANGE_UNSUPPORTED;
The testing of tb[IPSET_ATTR_IP2_TO] was still missing, so I added here.
Best regards,
Jozsef
-
E-mail : kadlec@xxxxxxxxxxxxxxxxx, kadlecsik.jozsef@xxxxxxxxxxxxx
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
