libnetfilter_conntrack.h   libnetfilter_conntrack.h 
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_MAX ATTR_MAX
}; };
/* conntrack attribute groups */
enum nf_conntrack_attr_grp {
ATTR_GRP_ORIG_IPV4 = 0, /* 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_REPL_IPV6, /* struct nfct_attr_grp_ipv6
*/
ATTR_GRP_ORIG_PORT = 4, /* struct nfct_attr_grp_port
*/
ATTR_GRP_REPL_PORT, /* struct nfct_attr_grp_port
*/
ATTR_GRP_ICMP, /* struct nfct_attr_grp_icmp
*/
ATTR_GRP_MASTER_IPV4, /* struct nfct_attr_grp_ipv4
*/
ATTR_GRP_MASTER_IPV6 = 8, /* struct nfct_attr_grp_ipv6
*/
ATTR_GRP_MASTER_PORT, /* struct nfct_attr_grp_port
*/
ATTR_GRP_ORIG_COUNTERS, /* struct nfct_attr_grp_ctrs
*/
ATTR_GRP_REPL_COUNTERS, /* struct nfct_attr_grp_ctrs
*/
ATTR_GRP_MAX
};
struct nfct_attr_grp_ipv4 {
u_int32_t src, dst;
};
struct nfct_attr_grp_ipv6 {
u_int32_t src[4], dst[4];
};
struct nfct_attr_grp_port {
u_int16_t sport, dport;
};
struct nfct_attr_grp_icmp {
u_int16_t id;
u_int8_t code, type;
};
struct nfct_attr_grp_ctrs {
u_int64_t packets;
u_int64_t bytes;
};
/* message type */ /* message type */
enum nf_conntrack_msg_type { enum nf_conntrack_msg_type {
NFCT_T_UNKNOWN = 0, NFCT_T_UNKNOWN = 0,
NFCT_T_NEW_BIT = 0, NFCT_T_NEW_BIT = 0,
NFCT_T_NEW = (1 << NFCT_T_NEW_BIT), NFCT_T_NEW = (1 << NFCT_T_NEW_BIT),
NFCT_T_UPDATE_BIT = 1, NFCT_T_UPDATE_BIT = 1,
NFCT_T_UPDATE = (1 << NFCT_T_UPDATE_BIT), NFCT_T_UPDATE = (1 << NFCT_T_UPDATE_BIT),
skipping to change at line 237 skipping to change at line 276
extern u_int16_t nfct_get_attr_u16(const struct nf_conntrack *ct, extern u_int16_t nfct_get_attr_u16(const struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
extern u_int32_t nfct_get_attr_u32(const struct nf_conntrack *ct, extern u_int32_t nfct_get_attr_u32(const struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
/* checker */ /* checker */
extern int nfct_attr_is_set(const struct nf_conntrack *ct, extern int nfct_attr_is_set(const struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
extern int nfct_attr_is_set_array(const struct nf_conntrack *ct,
const enum nf_conntrack_attr *type_array,
int size);
/* unsetter */ /* unsetter */
extern int nfct_attr_unset(struct nf_conntrack *ct, extern int nfct_attr_unset(struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
/* group setter */
extern void nfct_set_attr_grp(struct nf_conntrack *ct,
const enum nf_conntrack_attr_grp type,
const void *value);
/* group getter */
extern int nfct_get_attr_grp(const struct nf_conntrack *ct,
const enum nf_conntrack_attr_grp type,
void *data);
/* group checker */
extern int nfct_attr_grp_is_set(const struct nf_conntrack *ct,
const enum nf_conntrack_attr_grp type);
/* unsetter */
extern int nfct_attr_grp_unset(struct nf_conntrack *ct,
const enum nf_conntrack_attr_grp type);
/* print */ /* print */
/* output type */ /* output type */
enum { enum {
NFCT_O_PLAIN, NFCT_O_PLAIN,
NFCT_O_DEFAULT = NFCT_O_PLAIN, NFCT_O_DEFAULT = NFCT_O_PLAIN,
NFCT_O_XML, NFCT_O_XML,
NFCT_O_MAX NFCT_O_MAX
}; };
 End of changes. 3 change blocks. 
0 lines changed or deleted 72 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/