libnetfilter_conntrack.h   libnetfilter_conntrack.h 
skipping to change at line 135 skipping to change at line 135
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_ORIG, /* u8 bits */
ATTR_TCP_WSCALE_REPL = 60, /* u8 bits */ ATTR_TCP_WSCALE_REPL = 60, /* u8 bits */
ATTR_ZONE, /* u16 bits */ ATTR_ZONE, /* u16 bits */
ATTR_SECCTX, /* string */ ATTR_SECCTX, /* string */
ATTR_TIMESTAMP_START, /* u64 bits, linux >= 2.6.38 */ ATTR_TIMESTAMP_START, /* u64 bits, linux >= 2.6.38 */
ATTR_TIMESTAMP_STOP = 64, /* u64 bits, linux >= 2.6.38 */ ATTR_TIMESTAMP_STOP = 64, /* u64 bits, linux >= 2.6.38 */
ATTR_HELPER_INFO, /* variable length */
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 */
skipping to change at line 296 skipping to change at line 297
u_int16_t value); u_int16_t value);
extern void nfct_set_attr_u32(struct nf_conntrack *ct, extern void nfct_set_attr_u32(struct nf_conntrack *ct,
const enum nf_conntrack_attr type, const enum nf_conntrack_attr type,
u_int32_t value); u_int32_t value);
extern void nfct_set_attr_u64(struct nf_conntrack *ct, extern void nfct_set_attr_u64(struct nf_conntrack *ct,
const enum nf_conntrack_attr type, const enum nf_conntrack_attr type,
u_int64_t value); u_int64_t value);
extern void nfct_set_attr_l(struct nf_conntrack *ct,
const enum nf_conntrack_attr type,
const void *value,
size_t len);
/* getter */ /* getter */
extern const void *nfct_get_attr(const struct nf_conntrack *ct, extern const void *nfct_get_attr(const struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
extern u_int8_t nfct_get_attr_u8(const struct nf_conntrack *ct, extern u_int8_t nfct_get_attr_u8(const struct nf_conntrack *ct,
const enum nf_conntrack_attr type); const enum nf_conntrack_attr type);
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);
skipping to change at line 535 skipping to change at line 541
const struct nlmsghdr *nlh, const struct nlmsghdr *nlh,
struct nf_conntrack *ct); struct nf_conntrack *ct);
extern __attribute__((deprecated)) extern __attribute__((deprecated))
int nfct_build_query(struct nfnl_subsys_handle *ssh, int nfct_build_query(struct nfnl_subsys_handle *ssh,
const enum nf_conntrack_query query, const enum nf_conntrack_query query,
const void *data, const void *data,
void *req, void *req,
unsigned int size); unsigned int size);
/* New low level API: netlink functions */
extern int nfct_nlmsg_build(struct nlmsghdr *nlh, const struct nf_conntrack
*ct);
extern int nfct_nlmsg_parse(const struct nlmsghdr *nlh, struct nf_conntrack
*ct);
extern int nfct_payload_parse(const void *payload, size_t payload_len, uint
16_t l3num, struct nf_conntrack *ct);
/* /*
* NEW expectation API * NEW expectation API
*/ */
/* expectation object */ /* expectation object */
struct nf_expect; struct nf_expect;
/* expect attributes */ /* expect attributes */
enum nf_expect_attr { enum nf_expect_attr {
ATTR_EXP_MASTER = 0, /* pointer to conntrack object */ ATTR_EXP_MASTER = 0, /* pointer to conntrack object */
skipping to change at line 676 skipping to change at line 688
const struct nlmsghdr *nlh, const struct nlmsghdr *nlh,
struct nf_expect *exp); struct nf_expect *exp);
extern __attribute__((deprecated)) extern __attribute__((deprecated))
int nfexp_build_query(struct nfnl_subsys_handle *ssh, int nfexp_build_query(struct nfnl_subsys_handle *ssh,
const enum nf_conntrack_query qt, const enum nf_conntrack_query qt,
const void *data, const void *data,
void *buffer, void *buffer,
unsigned int size); unsigned int size);
/* New low level API: netlink functions */
extern int nfexp_nlmsg_build(struct nlmsghdr *nlh, const struct nf_expect *
exp);
extern int nfexp_nlmsg_parse(const struct nlmsghdr *nlh, struct nf_expect *
exp);
/* Bitset representing status of connection. Taken from ip_conntrack.h /* Bitset representing status of connection. Taken from ip_conntrack.h
* *
* Note: For backward compatibility this shouldn't ever change * Note: For backward compatibility this shouldn't ever change
* in kernel space. * in kernel space.
*/ */
enum ip_conntrack_status { enum ip_conntrack_status {
/* It's an expected connection: bit 0 set. This bit never changed * / /* It's an expected connection: bit 0 set. This bit never changed * /
IPS_EXPECTED_BIT = 0, IPS_EXPECTED_BIT = 0,
IPS_EXPECTED = (1 << IPS_EXPECTED_BIT), IPS_EXPECTED = (1 << IPS_EXPECTED_BIT),
 End of changes. 4 change blocks. 
0 lines changed or deleted 22 lines changed or added


 linux_nfnetlink_conntrack.h   linux_nfnetlink_conntrack.h 
skipping to change at line 14 skipping to change at line 14
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
enum cntl_msg_types { enum cntl_msg_types {
IPCTNL_MSG_CT_NEW, IPCTNL_MSG_CT_NEW,
IPCTNL_MSG_CT_GET, IPCTNL_MSG_CT_GET,
IPCTNL_MSG_CT_DELETE, IPCTNL_MSG_CT_DELETE,
IPCTNL_MSG_CT_GET_CTRZERO, IPCTNL_MSG_CT_GET_CTRZERO,
IPCTNL_MSG_CT_GET_STATS_CPU,
IPCTNL_MSG_CT_GET_STATS,
IPCTNL_MSG_MAX IPCTNL_MSG_MAX
}; };
enum ctnl_exp_msg_types { enum ctnl_exp_msg_types {
IPCTNL_MSG_EXP_NEW, IPCTNL_MSG_EXP_NEW,
IPCTNL_MSG_EXP_GET, IPCTNL_MSG_EXP_GET,
IPCTNL_MSG_EXP_DELETE, IPCTNL_MSG_EXP_DELETE,
IPCTNL_MSG_EXP_GET_STATS_CPU,
IPCTNL_MSG_EXP_MAX IPCTNL_MSG_EXP_MAX
}; };
enum ctattr_type { enum ctattr_type {
CTA_UNSPEC, CTA_UNSPEC,
CTA_TUPLE_ORIG, CTA_TUPLE_ORIG,
CTA_TUPLE_REPLY, CTA_TUPLE_REPLY,
CTA_STATUS, CTA_STATUS,
CTA_PROTOINFO, CTA_PROTOINFO,
skipping to change at line 197 skipping to change at line 200
CTA_EXPECT_NAT_UNSPEC, CTA_EXPECT_NAT_UNSPEC,
CTA_EXPECT_NAT_DIR, CTA_EXPECT_NAT_DIR,
CTA_EXPECT_NAT_TUPLE, CTA_EXPECT_NAT_TUPLE,
__CTA_EXPECT_NAT_MAX __CTA_EXPECT_NAT_MAX
}; };
#define CTA_EXPECT_NAT_MAX (__CTA_EXPECT_NAT_MAX - 1) #define CTA_EXPECT_NAT_MAX (__CTA_EXPECT_NAT_MAX - 1)
enum ctattr_help { enum ctattr_help {
CTA_HELP_UNSPEC, CTA_HELP_UNSPEC,
CTA_HELP_NAME, CTA_HELP_NAME,
CTA_HELP_INFO,
__CTA_HELP_MAX __CTA_HELP_MAX
}; };
#define CTA_HELP_MAX (__CTA_HELP_MAX - 1) #define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
enum ctattr_secctx { enum ctattr_secctx {
CTA_SECCTX_UNSPEC, CTA_SECCTX_UNSPEC,
CTA_SECCTX_NAME, CTA_SECCTX_NAME,
__CTA_SECCTX_MAX __CTA_SECCTX_MAX
}; };
#define CTA_SECCTX_MAX (__CTA_SECCTX_MAX - 1) #define CTA_SECCTX_MAX (__CTA_SECCTX_MAX - 1)
enum ctattr_stats_cpu {
CTA_STATS_UNSPEC,
CTA_STATS_SEARCHED,
CTA_STATS_FOUND,
CTA_STATS_NEW,
CTA_STATS_INVALID,
CTA_STATS_IGNORE,
CTA_STATS_DELETE,
CTA_STATS_DELETE_LIST,
CTA_STATS_INSERT,
CTA_STATS_INSERT_FAILED,
CTA_STATS_DROP,
CTA_STATS_EARLY_DROP,
CTA_STATS_ERROR,
CTA_STATS_SEARCH_RESTART,
__CTA_STATS_MAX,
};
#define CTA_STATS_MAX (__CTA_STATS_MAX - 1)
enum ctattr_stats_global {
CTA_STATS_GLOBAL_UNSPEC,
CTA_STATS_GLOBAL_ENTRIES,
__CTA_STATS_GLOBAL_MAX,
};
#define CTA_STATS_GLOBAL_MAX (__CTA_STATS_GLOBAL_MAX - 1)
enum ctattr_expect_stats {
CTA_STATS_EXP_UNSPEC,
CTA_STATS_EXP_NEW,
CTA_STATS_EXP_CREATE,
CTA_STATS_EXP_DELETE,
__CTA_STATS_EXP_MAX,
};
#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _IPCONNTRACK_NETLINK_H */ #endif /* _IPCONNTRACK_NETLINK_H */
 End of changes. 4 change blocks. 
0 lines changed or deleted 39 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/