Merge pull request #3844 from nathaniel-bennett/nf-tables-fix

Add missing `NFT_CT_*` constants to Linux/Android

Author: tgross35

libc-test/semver/android.txt

@@ -1500,11 +1500,16 @@ NFT_CMP_LT
 NFT_CMP_LTE
 NFT_CMP_NEQ
 NFT_CONTINUE
+NFT_CT_AVGPKT
 NFT_CT_BYTES
 NFT_CT_DIRECTION
 NFT_CT_DST
+NFT_CT_DST_IP
+NFT_CT_DST_IP6
+NFT_CT_EVENTMASK
 NFT_CT_EXPIRATION
 NFT_CT_HELPER
+NFT_CT_ID
 NFT_CT_L3PROTOCOL
 NFT_CT_LABELS
 NFT_CT_MARK
@@ -1514,8 +1519,11 @@ NFT_CT_PROTO_DST
 NFT_CT_PROTO_SRC
 NFT_CT_SECMARK
 NFT_CT_SRC
+NFT_CT_SRC_IP
+NFT_CT_SRC_IP6
 NFT_CT_STATE
 NFT_CT_STATUS
+NFT_CT_ZONE
 NFT_DATA_RESERVED_MASK
 NFT_DATA_VALUE
 NFT_DATA_VALUE_MAXLEN

libc-test/semver/linux-gnu.txt

@@ -191,9 +191,13 @@ NFT_CMP_LT
 NFT_CMP_LTE
 NFT_CMP_NEQ
 NFT_CONTINUE
+NFT_CT_AVGPKT
 NFT_CT_BYTES
 NFT_CT_DIRECTION
 NFT_CT_DST
+NFT_CT_DST_IP
+NFT_CT_DST_IP6
+NFT_CT_EVENTMASK
 NFT_CT_EXPIRATION
 NFT_CT_HELPER
 NFT_CT_L3PROTOCOL
@@ -205,8 +209,11 @@ NFT_CT_PROTO_DST
 NFT_CT_PROTO_SRC
 NFT_CT_SECMARK
 NFT_CT_SRC
+NFT_CT_SRC_IP
+NFT_CT_SRC_IP6
 NFT_CT_STATE
 NFT_CT_STATUS
+NFT_CT_ZONE
 NFT_DATA_RESERVED_MASK
 NFT_DATA_VALUE
 NFT_DATA_VALUE_MAXLEN

src/unix/linux_like/android/mod.rs

@@ -2558,6 +2558,14 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
 pub const NFT_CT_LABELS: ::c_int = 13;
 pub const NFT_CT_PKTS: ::c_int = 14;
 pub const NFT_CT_BYTES: ::c_int = 15;
+pub const NFT_CT_AVGPKT: ::c_int = 16;
+pub const NFT_CT_ZONE: ::c_int = 17;
+pub const NFT_CT_EVENTMASK: ::c_int = 18;
+pub const NFT_CT_SRC_IP: ::c_int = 19;
+pub const NFT_CT_DST_IP: ::c_int = 20;
+pub const NFT_CT_SRC_IP6: ::c_int = 21;
+pub const NFT_CT_DST_IP6: ::c_int = 22;
+pub const NFT_CT_ID: ::c_int = 23;
 
 pub const NFT_LIMIT_PKTS: ::c_int = 0;
 pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;

src/unix/linux_like/linux/mod.rs

@@ -4429,6 +4429,13 @@ pub const NFT_CT_PROTO_DST: ::c_int = 12;
 pub const NFT_CT_LABELS: ::c_int = 13;
 pub const NFT_CT_PKTS: ::c_int = 14;
 pub const NFT_CT_BYTES: ::c_int = 15;
+pub const NFT_CT_AVGPKT: ::c_int = 16;
+pub const NFT_CT_ZONE: ::c_int = 17;
+pub const NFT_CT_EVENTMASK: ::c_int = 18;
+pub const NFT_CT_SRC_IP: ::c_int = 19;
+pub const NFT_CT_DST_IP: ::c_int = 20;
+pub const NFT_CT_SRC_IP6: ::c_int = 21;
+pub const NFT_CT_DST_IP6: ::c_int = 22;
 
 pub const NFT_LIMIT_PKTS: ::c_int = 0;
 pub const NFT_LIMIT_PKT_BYTES: ::c_int = 1;