libnetfilter_conntrack.h   libnetfilter_conntrack.h 
skipping to change at line 136 skipping to change at line 136
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_HELPER_INFO, /* variable length */
ATTR_CONNLABELS, /* variable length */
ATTR_CONNLABELS_MASK, /* 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 276 skipping to change at line 278
extern void nfct_callback_unregister2(struct nfct_handle *h); extern void nfct_callback_unregister2(struct nfct_handle *h);
/* callback verdict */ /* callback verdict */
enum { enum {
NFCT_CB_FAILURE = -1, /* failure */ NFCT_CB_FAILURE = -1, /* failure */
NFCT_CB_STOP = 0, /* stop the query */ NFCT_CB_STOP = 0, /* stop the query */
NFCT_CB_CONTINUE = 1, /* keep iterating through data */ NFCT_CB_CONTINUE = 1, /* keep iterating through data */
NFCT_CB_STOLEN = 2, /* like continue, but ct is not freed */ NFCT_CB_STOLEN = 2, /* like continue, but ct is not freed */
}; };
/* bitmask setter/getter */
struct nfct_bitmask;
struct nfct_bitmask *nfct_bitmask_new(unsigned int maxbit);
struct nfct_bitmask *nfct_bitmask_clone(const struct nfct_bitmask *);
unsigned int nfct_bitmask_maxbit(const struct nfct_bitmask *);
void nfct_bitmask_set_bit(struct nfct_bitmask *, unsigned int bit);
int nfct_bitmask_test_bit(const struct nfct_bitmask *, unsigned int bit);
void nfct_bitmask_unset_bit(struct nfct_bitmask *, unsigned int bit);
void nfct_bitmask_destroy(struct nfct_bitmask *);
/* connlabel name <-> bit translation mapping */
struct nfct_labelmap;
struct nfct_labelmap *nfct_labelmap_new(const char *mapfile);
void nfct_labelmap_destroy(struct nfct_labelmap *map);
const char *nfct_labelmap_get_name(struct nfct_labelmap *m, unsigned int bi
t);
int nfct_labelmap_get_bit(struct nfct_labelmap *m, const char *name);
/* setter */ /* setter */
extern void nfct_set_attr(struct nf_conntrack *ct, extern void nfct_set_attr(struct nf_conntrack *ct,
const enum nf_conntrack_attr type, const enum nf_conntrack_attr type,
const void *value); const void *value);
extern void nfct_set_attr_u8(struct nf_conntrack *ct, extern void nfct_set_attr_u8(struct nf_conntrack *ct,
const enum nf_conntrack_attr type, const enum nf_conntrack_attr type,
u_int8_t value); u_int8_t value);
extern void nfct_set_attr_u16(struct nf_conntrack *ct, extern void nfct_set_attr_u16(struct nf_conntrack *ct,
skipping to change at line 379 skipping to change at line 401
NFCT_OF_TIMESTAMP = (1 << NFCT_OF_TIMESTAMP_BIT), NFCT_OF_TIMESTAMP = (1 << NFCT_OF_TIMESTAMP_BIT),
}; };
extern int nfct_snprintf(char *buf, extern int nfct_snprintf(char *buf,
unsigned int size, unsigned int size,
const struct nf_conntrack *ct, const struct nf_conntrack *ct,
const unsigned int msg_type, const unsigned int msg_type,
const unsigned int out_type, const unsigned int out_type,
const unsigned int out_flags); const unsigned int out_flags);
extern int nfct_snprintf_labels(char *buf,
unsigned int size,
const struct nf_conntrack *ct,
const unsigned int msg_type,
const unsigned int out_type,
const unsigned int out_flags,
struct nfct_labelmap *map);
/* comparison */ /* comparison */
extern int nfct_compare(const struct nf_conntrack *ct1, extern int nfct_compare(const struct nf_conntrack *ct1,
const struct nf_conntrack *ct2); const struct nf_conntrack *ct2);
enum { enum {
NFCT_CMP_ALL = 0, NFCT_CMP_ALL = 0,
NFCT_CMP_ORIG = (1 << 0), NFCT_CMP_ORIG = (1 << 0),
NFCT_CMP_REPL = (1 << 1), NFCT_CMP_REPL = (1 << 1),
NFCT_CMP_TIMEOUT_EQ = (1 << 2), NFCT_CMP_TIMEOUT_EQ = (1 << 2),
NFCT_CMP_TIMEOUT_GT = (1 << 3), NFCT_CMP_TIMEOUT_GT = (1 << 3),
 End of changes. 3 change blocks. 
0 lines changed or deleted 31 lines changed or added


 linux_nfnetlink_conntrack.h   linux_nfnetlink_conntrack.h 
skipping to change at line 55 skipping to change at line 55
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, /* obsolete */ CTA_SECMARK, /* obsolete */
CTA_ZONE, CTA_ZONE,
CTA_SECCTX, CTA_SECCTX,
CTA_TIMESTAMP, CTA_TIMESTAMP,
CTA_MARK_MASK, CTA_MARK_MASK,
CTA_LABELS,
CTA_LABELS_MASK,
__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 2 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/