libnetfilter_conntrack.h   libnetfilter_conntrack.h 
skipping to change at line 94 skipping to change at line 94
ATTR_ORIG_L4PROTO, /* u8 bits */ ATTR_ORIG_L4PROTO, /* u8 bits */
ATTR_L4PROTO = ATTR_ORIG_L4PROTO, /* alias */ ATTR_L4PROTO = ATTR_ORIG_L4PROTO, /* alias */
ATTR_REPL_L4PROTO, /* u8 bits */ ATTR_REPL_L4PROTO, /* u8 bits */
ATTR_TCP_STATE, /* u8 bits */ ATTR_TCP_STATE, /* u8 bits */
ATTR_SNAT_IPV4 = 20, /* u32 bits */ ATTR_SNAT_IPV4 = 20, /* u32 bits */
ATTR_DNAT_IPV4, /* u32 bits */ ATTR_DNAT_IPV4, /* u32 bits */
ATTR_SNAT_PORT, /* u16 bits */ ATTR_SNAT_PORT, /* u16 bits */
ATTR_DNAT_PORT, /* u16 bits */ ATTR_DNAT_PORT, /* u16 bits */
ATTR_TIMEOUT = 24, /* u32 bits */ ATTR_TIMEOUT = 24, /* u32 bits */
ATTR_MARK, /* u32 bits */ ATTR_MARK, /* u32 bits */
ATTR_ORIG_COUNTER_PACKETS, /* u32 bits */ ATTR_ORIG_COUNTER_PACKETS, /* u64 bits */
ATTR_REPL_COUNTER_PACKETS, /* u32 bits */ ATTR_REPL_COUNTER_PACKETS, /* u64 bits */
ATTR_ORIG_COUNTER_BYTES = 28, /* u32 bits */ ATTR_ORIG_COUNTER_BYTES = 28, /* u64 bits */
ATTR_REPL_COUNTER_BYTES, /* u32 bits */ ATTR_REPL_COUNTER_BYTES, /* u64 bits */
ATTR_USE, /* u32 bits */ ATTR_USE, /* u32 bits */
ATTR_ID, /* u32 bits */ ATTR_ID, /* u32 bits */
ATTR_STATUS = 32, /* u32 bits */ ATTR_STATUS = 32, /* u32 bits */
ATTR_TCP_FLAGS_ORIG, /* u8 bits */ ATTR_TCP_FLAGS_ORIG, /* u8 bits */
ATTR_TCP_FLAGS_REPL, /* u8 bits */ ATTR_TCP_FLAGS_REPL, /* u8 bits */
ATTR_TCP_MASK_ORIG, /* u8 bits */ ATTR_TCP_MASK_ORIG, /* u8 bits */
ATTR_TCP_MASK_REPL = 36, /* u8 bits */ ATTR_TCP_MASK_REPL = 36, /* u8 bits */
ATTR_MASTER_IPV4_SRC, /* u32 bits */ ATTR_MASTER_IPV4_SRC, /* u32 bits */
ATTR_MASTER_IPV4_DST, /* u32 bits */ ATTR_MASTER_IPV4_DST, /* u32 bits */
ATTR_MASTER_IPV6_SRC, /* u128 bits */ ATTR_MASTER_IPV6_SRC, /* u128 bits */
skipping to change at line 127 skipping to change at line 127
ATTR_REPL_NAT_SEQ_CORRECTION_POS, /* u32 bits */ ATTR_REPL_NAT_SEQ_CORRECTION_POS, /* u32 bits */
ATTR_REPL_NAT_SEQ_OFFSET_BEFORE, /* u32 bits */ ATTR_REPL_NAT_SEQ_OFFSET_BEFORE, /* u32 bits */
ATTR_REPL_NAT_SEQ_OFFSET_AFTER, /* u32 bits */ ATTR_REPL_NAT_SEQ_OFFSET_AFTER, /* u32 bits */
ATTR_SCTP_STATE = 52, /* u8 bits */ ATTR_SCTP_STATE = 52, /* u8 bits */
ATTR_SCTP_VTAG_ORIG, /* u32 bits */ ATTR_SCTP_VTAG_ORIG, /* u32 bits */
ATTR_SCTP_VTAG_REPL, /* u32 bits */ ATTR_SCTP_VTAG_REPL, /* u32 bits */
ATTR_HELPER_NAME, /* string (30 bytes max) */ ATTR_HELPER_NAME, /* string (30 bytes max) */
ATTR_DCCP_STATE = 56, /* u8 bits */ ATTR_DCCP_STATE = 56, /* u8 bits */
ATTR_DCCP_ROLE, /* u8 bits */ ATTR_DCCP_ROLE, /* u8 bits */
ATTR_DCCP_HANDSHAKE_SEQ, /* u64 bits */ ATTR_DCCP_HANDSHAKE_SEQ, /* u64 bits */
ATTR_TCP_WSCALE_ORIG, /* u8 bits */
ATTR_TCP_WSCALE_REPL = 60, /* u8 bits */
ATTR_ZONE, /* u16 bits */
ATTR_MAX ATTR_MAX
}; };
/* conntrack attribute groups */ /* conntrack attribute groups */
enum nf_conntrack_attr_grp { enum nf_conntrack_attr_grp {
ATTR_GRP_ORIG_IPV4 = 0, /* struct nfct_attr_grp_ipv4 */ ATTR_GRP_ORIG_IPV4 = 0, /* struct nfct_attr_grp_ipv4 */
ATTR_GRP_REPL_IPV4, /* struct nfct_attr_grp_ipv4 */ ATTR_GRP_REPL_IPV4, /* struct nfct_attr_grp_ipv4 */
ATTR_GRP_ORIG_IPV6, /* struct nfct_attr_grp_ipv6 */ ATTR_GRP_ORIG_IPV6, /* struct nfct_attr_grp_ipv6 */
ATTR_GRP_REPL_IPV6, /* struct nfct_attr_grp_ipv6 */ ATTR_GRP_REPL_IPV6, /* struct nfct_attr_grp_ipv6 */
ATTR_GRP_ORIG_PORT = 4, /* struct nfct_attr_grp_port */ ATTR_GRP_ORIG_PORT = 4, /* struct nfct_attr_grp_port */
 End of changes. 2 change blocks. 
4 lines changed or deleted 7 lines changed or added


 linux_nfnetlink_conntrack.h   linux_nfnetlink_conntrack.h 
skipping to change at line 46 skipping to change at line 46
CTA_MARK, CTA_MARK,
CTA_COUNTERS_ORIG, CTA_COUNTERS_ORIG,
CTA_COUNTERS_REPLY, CTA_COUNTERS_REPLY,
CTA_USE, CTA_USE,
CTA_ID, CTA_ID,
CTA_NAT_DST, CTA_NAT_DST,
CTA_TUPLE_MASTER, CTA_TUPLE_MASTER,
CTA_NAT_SEQ_ADJ_ORIG, CTA_NAT_SEQ_ADJ_ORIG,
CTA_NAT_SEQ_ADJ_REPLY, CTA_NAT_SEQ_ADJ_REPLY,
CTA_SECMARK, CTA_SECMARK,
CTA_ZONE,
__CTA_MAX __CTA_MAX
}; };
#define CTA_MAX (__CTA_MAX - 1) #define CTA_MAX (__CTA_MAX - 1)
enum ctattr_tuple { enum ctattr_tuple {
CTA_TUPLE_UNSPEC, CTA_TUPLE_UNSPEC,
CTA_TUPLE_IP, CTA_TUPLE_IP,
CTA_TUPLE_PROTO, CTA_TUPLE_PROTO,
__CTA_TUPLE_MAX __CTA_TUPLE_MAX
}; };
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/