On Sat, Feb 20, 2016 at 10:07:09AM +0100, Stephane Bryant wrote:
> From: stephane <stephane.ml.bryant@xxxxxxxxx>
>
> -this creates 2 netlink attribute NLQA_VLAN and NLQA_L2HDR
> -these are filled up for the PF_BRIDGE family on the way to userspace
>
> Signed-off-by: Stephane Bryant <stephane.ml.bryant@xxxxxxxxx>
> ---
> include/uapi/linux/netfilter/nfnetlink_queue.h | 7 ++++
> net/netfilter/nfnetlink_queue.c | 53 ++++++++++++++++++++++++++
> 2 files changed, 60 insertions(+)
>
> diff --git a/include/uapi/linux/netfilter/nfnetlink_queue.h b/include/uapi/linux/netfilter/nfnetlink_queue.h
> index b67a853..211fcdc 100644
> --- a/include/uapi/linux/netfilter/nfnetlink_queue.h
> +++ b/include/uapi/linux/netfilter/nfnetlink_queue.h
> @@ -30,6 +30,11 @@ struct nfqnl_msg_packet_timestamp {
> __aligned_be64 usec;
> };
>
> +struct nfqnl_msg_vlan {
> + __be16 proto;
> + __u16 tci;
> +} __attribute__ ((packed));
Stephane, I'm very looking forward to having this update pushed
mainstream.
However, this I think it would be good if you can translate this to
use nested attributes.
See nla_nest_start() and nla_nest_end(). Then, add a new vlan
attributes for this:
enum nfqnl_vlan_attr {
NFQA_VLAN_UNSPEC,
NFQA_VLAN_PROTO,
NFQA_VLAN_TCI,
__NFQA_VLAN_MAX,
};
#define NFQA_VLAN_MAX (__NFQA_VLAN_MAX + 1)
Using structure to encapsulate netlink data is highly discouraged. I
know we're doing this already in old attribute but that we cannot
change since it's part of the ABI. But I would like that we start
doing this the right way for new attributes.
Let me know,
Thanks!
> +
> enum nfqnl_attr_type {
> NFQA_UNSPEC,
> NFQA_PACKET_HDR,
> @@ -50,6 +55,8 @@ enum nfqnl_attr_type {
> NFQA_UID, /* __u32 sk uid */
> NFQA_GID, /* __u32 sk gid */
> NFQA_SECCTX, /* security context string */
> + NFQA_VLAN, /* packet vlan info */
> + NFQA_L2HDR, /* full L2 header */
>
> __NFQA_MAX
> };
--
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
