History

netfilter: nft_ct: add NFT_CT_{SRC,DST}_{IP,IP6}

All existing keys, except the NFT_CT_SRC and NFT_CT_DST are assumed to have strict datatypes. This is causing problems with sets and concatenations given the specific length of these keys is not known.

Pablo Neira Ayuso committed 8 years ago

Commit d719e3f1 parent 35d8deb2 files · +48 −2Browse files

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

Unified · Split

include/uapi/linux/netfilter/nf_tables.h+10−2
@@ -909,8 +909,8 @@ enum nft_rt_attributes { · 908 unmodified lines
909909 * @NFT_CT_EXPIRATION: relative conntrack expiration time in ms
910910 * @NFT_CT_HELPER: connection tracking helper assigned to conntrack
911911 * @NFT_CT_L3PROTOCOL: conntrack layer 3 protocol
912− * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address)
913− * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address)
912+ * @NFT_CT_SRC: conntrack layer 3 protocol source (IPv4/IPv6 address, deprecated)
913+ * @NFT_CT_DST: conntrack layer 3 protocol destination (IPv4/IPv6 address, deprecated)
914914 * @NFT_CT_PROTOCOL: conntrack layer 4 protocol
915915 * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source
916916 * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination
@@ -920,6 +920,10 @@ enum nft_rt_attributes { · 3 unmodified lines
920920 * @NFT_CT_AVGPKT: conntrack average bytes per packet
921921 * @NFT_CT_ZONE: conntrack zone
922922 * @NFT_CT_EVENTMASK: ctnetlink events to be generated for this conntrack
923+ * @NFT_CT_SRC_IP: conntrack layer 3 protocol source (IPv4 address)
924+ * @NFT_CT_DST_IP: conntrack layer 3 protocol destination (IPv4 address)
925+ * @NFT_CT_SRC_IP6: conntrack layer 3 protocol source (IPv6 address)
926+ * @NFT_CT_DST_IP6: conntrack layer 3 protocol destination (IPv6 address)
923927 */
924928 enum nft_ct_keys {
925929 NFT_CT_STATE,
@@ -941,6 +945,10 @@ enum nft_ct_keys { · 15 unmodified lines
941945 NFT_CT_AVGPKT,
942946 NFT_CT_ZONE,
943947 NFT_CT_EVENTMASK,
948+ NFT_CT_SRC_IP,
949+ NFT_CT_DST_IP,
950+ NFT_CT_SRC_IP6,
951+ NFT_CT_DST_IP6,
944952 };
945953
946954 /**