History

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== This batch contains one single patch with the l2tp match for xtables, from James Chapman. ====================

David S. Miller committed 12 years ago

Commit ef8570d2 parents 11b57f9 74f77a65 files · +393 −0Browse files

Showing the changes to include/uapi/linux (2 of 5 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/netfilter/Kbuild +1 −0
  2. include/uapi/linux/netfilter/xt_l2tp.h +27 −0
include/uapi/linux/netfilter/Kbuild+1−0
@@ -58,6 +58,7 @@ header-y += xt_helper.h · 57 unmodified lines
5858 header-y += xt_ipcomp.h
5959 header-y += xt_iprange.h
6060 header-y += xt_ipvs.h
61+header-y += xt_l2tp.h
6162 header-y += xt_length.h
6263 header-y += xt_limit.h
6364 header-y += xt_mac.h
include/uapi/linux/netfilter/xt_l2tp.h+27−0
@@ -0,0 +1,27 @@
1+#ifndef _LINUX_NETFILTER_XT_L2TP_H
2+#define _LINUX_NETFILTER_XT_L2TP_H
3+
4+#include <linux/types.h>
5+
6+enum xt_l2tp_type {
7+ XT_L2TP_TYPE_CONTROL,
8+ XT_L2TP_TYPE_DATA,
9+};
10+
11+/* L2TP matching stuff */
12+struct xt_l2tp_info {
13+ __u32 tid; /* tunnel id */
14+ __u32 sid; /* session id */
15+ __u8 version; /* L2TP protocol version */
16+ __u8 type; /* L2TP packet type */
17+ __u8 flags; /* which fields to match */
18+};
19+
20+enum {
21+ XT_L2TP_TID = (1 << 0), /* match L2TP tunnel id */
22+ XT_L2TP_SID = (1 << 1), /* match L2TP session id */
23+ XT_L2TP_VERSION = (1 << 2), /* match L2TP protocol version */
24+ XT_L2TP_TYPE = (1 << 3), /* match L2TP packet type */
25+};
26+
27+#endif /* _LINUX_NETFILTER_XT_L2TP_H */