History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

Pablo Neira Ayuso says: ==================== Netfilter updates for net-next The following patchset contains Netfilter updates for net-next to extend ctnetlink and the flowtable infrastructure: 1) Extend ctnetlink kernel side netlink dump filtering capabilities, from Romain Bellan. 2) Generalise the flowtable hook parser to take a hook list. 3) Pass a hook list to the flowtable hook registration/unregistration. 4) Add a helper function to release the flowtable hook list. 5) Update the flowtable event notifier to pass a flowtable hook list. 6) Allow users to add new devices to an existing flowtables. 7) Allow users to remove devices to an existing flowtables. 8) Allow for registering a flowtable with no initial devices. ====================

David S. Miller committed 6 years ago

Commit af0a2482 parents a74d19b 5b6743f9 files · +670 −137Browse files

Showing the changes to include/uapi/linux (1 of 9 files). Show all

Unified · Split

include/uapi/linux/netfilter/nfnetlink_conntrack.h+9−0
@@ -55,6 +55,7 @@ enum ctattr_type { · 54 unmodified lines
5555 CTA_LABELS,
5656 CTA_LABELS_MASK,
5757 CTA_SYNPROXY,
58+ CTA_FILTER,
5859 __CTA_MAX
5960 };
6061 #define CTA_MAX (__CTA_MAX - 1)
@@ -276,4 +277,12 @@ enum ctattr_expect_stats { · 215 unmodified lines
276277 };
277278 #define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
278279
280+enum ctattr_filter {
281+ CTA_FILTER_UNSPEC,
282+ CTA_FILTER_ORIG_FLAGS,
283+ CTA_FILTER_REPLY_FLAGS,
284+ __CTA_FILTER_MAX
285+};
286+#define CTA_FILTER_MAX (__CTA_FILTER_MAX - 1)
287+
279288 #endif /* _IPCONNTRACK_NETLINK_H */