libnetfilter_conntrack.h   libnetfilter_conntrack.h 
skipping to change at line 124 skipping to change at line 124
ATTR_ORIG_NAT_SEQ_CORRECTION_POS, /* u32 bits */ ATTR_ORIG_NAT_SEQ_CORRECTION_POS, /* u32 bits */
ATTR_ORIG_NAT_SEQ_OFFSET_BEFORE, /* u32 bits */ ATTR_ORIG_NAT_SEQ_OFFSET_BEFORE, /* u32 bits */
ATTR_ORIG_NAT_SEQ_OFFSET_AFTER = 48, /* u32 bits */ ATTR_ORIG_NAT_SEQ_OFFSET_AFTER = 48, /* u32 bits */
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_ROLE, /* u8 bits */
ATTR_DCCP_HANDSHAKE_SEQ, /* u64 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 */
skipping to change at line 234 skipping to change at line 237
extern int nfct_callback_register(struct nfct_handle *h, extern int nfct_callback_register(struct nfct_handle *h,
enum nf_conntrack_msg_type type, enum nf_conntrack_msg_type type,
int (*cb)(enum nf_conntrack_msg_type type, int (*cb)(enum nf_conntrack_msg_type type,
struct nf_conntrack *ct, struct nf_conntrack *ct,
void *data), void *data),
void *data); void *data);
extern void nfct_callback_unregister(struct nfct_handle *h); extern void nfct_callback_unregister(struct nfct_handle *h);
/* register / unregister callback: extended version including netlink heade
r */
extern int nfct_callback_register2(struct nfct_handle *h,
enum nf_conntrack_msg_type type,
int (*cb)(const struct nlmsghdr *nlh,
enum nf_conntrack_msg_type type
,
struct nf_conntrack *ct,
void *data),
void *data);
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 */
}; };
/* setter */ /* setter */
extern void nfct_set_attr(struct nf_conntrack *ct, extern void nfct_set_attr(struct nf_conntrack *ct,
skipping to change at line 259 skipping to change at line 274
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,
const enum nf_conntrack_attr type, const enum nf_conntrack_attr type,
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,
const enum nf_conntrack_attr type,
u_int64_t value);
/* 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);
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);
extern u_int64_t nfct_get_attr_u64(const struct nf_conntrack *ct,
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, extern int nfct_attr_is_set_array(const struct nf_conntrack *ct,
const enum nf_conntrack_attr *type_array, const enum nf_conntrack_attr *type_array,
int size); int size);
/* unsetter */ /* unsetter */
extern int nfct_attr_unset(struct nf_conntrack *ct, extern int nfct_attr_unset(struct nf_conntrack *ct,
skipping to change at line 404 skipping to change at line 426
extern void nfct_filter_destroy(struct nfct_filter *filter); extern void nfct_filter_destroy(struct nfct_filter *filter);
struct nfct_filter_proto { struct nfct_filter_proto {
u_int16_t proto; u_int16_t proto;
u_int16_t state; u_int16_t state;
}; };
struct nfct_filter_ipv4 { struct nfct_filter_ipv4 {
u_int32_t addr; u_int32_t addr;
u_int32_t mask; u_int32_t mask;
}; };
struct nfct_filter_ipv6 {
u_int32_t addr[4];
u_int32_t mask[4];
};
enum nfct_filter_attr { enum nfct_filter_attr {
NFCT_FILTER_L4PROTO = 0, /* u_int32_t */ NFCT_FILTER_L4PROTO = 0, /* u_int32_t */
NFCT_FILTER_L4PROTO_STATE, /* struct nfct_filter_proto */ NFCT_FILTER_L4PROTO_STATE, /* struct nfct_filter_proto */
NFCT_FILTER_SRC_IPV4, /* struct nfct_filter_ipv4 */ NFCT_FILTER_SRC_IPV4, /* struct nfct_filter_ipv4 */
NFCT_FILTER_DST_IPV4, /* struct nfct_filter_ipv4 */ NFCT_FILTER_DST_IPV4, /* struct nfct_filter_ipv4 */
NFCT_FILTER_SRC_IPV6, /* struct nfct_filter_ipv6 */
NFCT_FILTER_DST_IPV6, /* struct nfct_filter_ipv6 */
NFCT_FILTER_MAX NFCT_FILTER_MAX
}; };
extern void nfct_filter_add_attr(struct nfct_filter *filter, extern void nfct_filter_add_attr(struct nfct_filter *filter,
const enum nfct_filter_attr attr, const enum nfct_filter_attr attr,
const void *value); const void *value);
extern void nfct_filter_add_attr_u32(struct nfct_filter *filter, extern void nfct_filter_add_attr_u32(struct nfct_filter *filter,
const enum nfct_filter_attr attr, const enum nfct_filter_attr attr,
const u_int32_t value); const u_int32_t value);
skipping to change at line 493 skipping to change at line 521
extern int nfexp_callback_register(struct nfct_handle *h, extern int nfexp_callback_register(struct nfct_handle *h,
enum nf_conntrack_msg_type type, enum nf_conntrack_msg_type type,
int (*cb)(enum nf_conntrack_msg_type type , int (*cb)(enum nf_conntrack_msg_type type ,
struct nf_expect *exp, struct nf_expect *exp,
void *data), void *data),
void *data); void *data);
extern void nfexp_callback_unregister(struct nfct_handle *h); extern void nfexp_callback_unregister(struct nfct_handle *h);
/* register / unregister callback: extended version including netlink heade
r */
extern int nfexp_callback_register2(struct nfct_handle *h,
enum nf_conntrack_msg_type type,
int (*cb)(const struct nlmsghdr *nlh,
enum nf_conntrack_msg_type typ
e,
struct nf_expect *exp,
void *data),
void *data);
extern void nfexp_callback_unregister2(struct nfct_handle *h);
/* setter */ /* setter */
extern void nfexp_set_attr(struct nf_expect *exp, extern void nfexp_set_attr(struct nf_expect *exp,
const enum nf_expect_attr type, const enum nf_expect_attr type,
const void *value); const void *value);
extern void nfexp_set_attr_u8(struct nf_expect *exp, extern void nfexp_set_attr_u8(struct nf_expect *exp,
const enum nf_expect_attr type, const enum nf_expect_attr type,
u_int8_t value); u_int8_t value);
extern void nfexp_set_attr_u16(struct nf_expect *exp, extern void nfexp_set_attr_u16(struct nf_expect *exp,
skipping to change at line 618 skipping to change at line 657
/* SACK is permitted by the sender */ /* SACK is permitted by the sender */
#define IP_CT_TCP_FLAG_SACK_PERM 0x02 #define IP_CT_TCP_FLAG_SACK_PERM 0x02
/* This sender sent FIN first */ /* This sender sent FIN first */
#define IP_CT_TCP_FLAG_CLOSE_INIT 0x04 #define IP_CT_TCP_FLAG_CLOSE_INIT 0x04
/* Be liberal in window checking */ /* Be liberal in window checking */
#define IP_CT_TCP_FLAG_BE_LIBERAL 0x08 #define IP_CT_TCP_FLAG_BE_LIBERAL 0x08
/* /* WARNING: do not use these constants in new applications, we keep them he
* Old deprecated API, its use for new applications is *strongly discourage re
d* * to avoid breaking backward compatibility. */
*/
/*
* In case that the user doesn't want to do some kind
* of action against a conntrack based on its ID
*/
#define NFCT_ANY_ID 0
union nfct_l4 {
/* Add other protocols here. */
u_int16_t all;
struct {
u_int16_t port;
} tcp;
struct {
u_int16_t port;
} udp;
struct {
u_int8_t type, code;
u_int16_t id;
} icmp;
struct {
u_int16_t port;
} sctp;
};
union nfct_address {
u_int32_t v4;
u_int32_t v6[4];
};
struct nfct_tuple {
union nfct_address src;
union nfct_address dst;
u_int8_t l3protonum;
u_int8_t protonum;
union nfct_l4 l4src;
union nfct_l4 l4dst;
};
union nfct_protoinfo {
struct {
u_int8_t state;
} tcp;
};
struct nfct_counters {
u_int64_t packets;
u_int64_t bytes;
};
struct nfct_nat {
u_int32_t min_ip, max_ip;
union nfct_l4 l4min, l4max;
};
#define NFCT_DIR_ORIGINAL 0 #define NFCT_DIR_ORIGINAL 0
#define NFCT_DIR_REPLY 1 #define NFCT_DIR_REPLY 1
#define NFCT_DIR_MAX NFCT_DIR_REPLY+1 #define NFCT_DIR_MAX NFCT_DIR_REPLY+1
struct nfct_conntrack {
struct nfct_tuple tuple[NFCT_DIR_MAX];
u_int32_t timeout;
u_int32_t mark;
u_int32_t status;
u_int32_t use;
u_int32_t id;
union nfct_protoinfo protoinfo;
struct nfct_counters counters[NFCT_DIR_MAX];
struct nfct_nat nat;
};
struct nfct_expect {
struct nfct_tuple master;
struct nfct_tuple tuple;
struct nfct_tuple mask;
u_int32_t timeout;
u_int32_t id;
u_int16_t expectfn_queue_id;
};
struct nfct_conntrack_compare {
struct nfct_conntrack *ct;
unsigned int flags;
unsigned int l3flags;
unsigned int l4flags;
};
enum {
NFCT_STATUS_BIT = 0,
NFCT_STATUS = (1 << NFCT_STATUS_BIT),
NFCT_PROTOINFO_BIT = 1,
NFCT_PROTOINFO = (1 << NFCT_PROTOINFO_BIT),
NFCT_TIMEOUT_BIT = 2,
NFCT_TIMEOUT = (1 << NFCT_TIMEOUT_BIT),
NFCT_MARK_BIT = 3,
NFCT_MARK = (1 << NFCT_MARK_BIT),
NFCT_COUNTERS_ORIG_BIT = 4,
NFCT_COUNTERS_ORIG = (1 << NFCT_COUNTERS_ORIG_BIT),
NFCT_COUNTERS_RPLY_BIT = 5,
NFCT_COUNTERS_RPLY = (1 << NFCT_COUNTERS_RPLY_BIT),
NFCT_USE_BIT = 6,
NFCT_USE = (1 << NFCT_USE_BIT),
NFCT_ID_BIT = 7,
NFCT_ID = (1 << NFCT_ID_BIT)
};
enum {
NFCT_MSG_UNKNOWN,
NFCT_MSG_NEW,
NFCT_MSG_UPDATE,
NFCT_MSG_DESTROY
};
typedef int (*nfct_callback)(void *arg, unsigned int flags, int, void *data
);
/*
* [Allocate|free] a conntrack
*/
extern __attribute__((deprecated))
struct nfct_conntrack *
nfct_conntrack_alloc(struct nfct_tuple *orig, struct nfct_tuple *reply,
u_int32_t timeout, union nfct_protoinfo *proto,
u_int32_t status, u_int32_t mark,
u_int32_t id, struct nfct_nat *range);
extern __attribute__((deprecated))
void nfct_conntrack_free(struct nfct_conntrack *ct);
/*
* [Allocate|free] an expectation
*/
extern __attribute__((deprecated))
struct nfct_expect *
nfct_expect_alloc(struct nfct_tuple *master, struct nfct_tuple *tuple,
struct nfct_tuple *mask, u_int32_t timeout,
u_int32_t id);
extern __attribute__((deprecated))
void nfct_expect_free(struct nfct_expect *exp);
/*
* [Register|unregister] callbacks
*/
extern __attribute__((deprecated))
void nfct_register_callback(struct nfct_handle *cth,
nfct_callback callback, void *data);
extern __attribute__((deprecated))
void nfct_unregister_callback(struct nfct_handle *cth);
/*
* callback displayers
*/
extern __attribute__((deprecated))
int nfct_default_conntrack_display(void *, unsigned int, int, void *);
extern __attribute__((deprecated))
int nfct_default_conntrack_display_id(void *, unsigned int, int, void *);
extern __attribute__((deprecated))
int nfct_default_expect_display(void *, unsigned int, int, void *);
extern __attribute__((deprecated))
int nfct_default_expect_display_id(void *, unsigned int, int, void *);
extern __attribute__((deprecated))
int nfct_default_conntrack_event_display(void *, unsigned int, int, void *)
;
/*
* [Create|update|get|destroy] conntracks
*/
extern __attribute__((deprecated))
int nfct_create_conntrack(struct nfct_handle *cth,
struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_update_conntrack(struct nfct_handle *cth,
struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_delete_conntrack(struct nfct_handle *cth,
struct nfct_tuple *tuple, int dir,
u_int32_t id);
extern __attribute__((deprecated))
int nfct_get_conntrack(struct nfct_handle *cth,
struct nfct_tuple *tuple, int dir,
u_int32_t id);
/*
* Conntrack table dumping & zeroing
*/
extern __attribute__((deprecated))
int nfct_dump_conntrack_table(struct nfct_handle *cth, int family);
extern __attribute__((deprecated))
int nfct_dump_conntrack_table_reset_counters(struct nfct_handle *cth,
int family);
/*
* Conntrack event notification
*/
extern __attribute__((deprecated))
int nfct_event_conntrack(struct nfct_handle *cth);
/*
* Conntrack printing functions
*/
extern __attribute__((deprecated))
int nfct_sprintf_conntrack(char *buf, struct nfct_conntrack *ct,
unsigned int flags);
extern __attribute__((deprecated))
int nfct_sprintf_conntrack_id(char *buf, struct nfct_conntrack *ct,
unsigned int flags);
extern __attribute__((deprecated))
int nfct_sprintf_address(char *buf, struct nfct_tuple *t);
extern __attribute__((deprecated))
int nfct_sprintf_proto(char *buf, struct nfct_tuple *t);
extern __attribute__((deprecated))
int nfct_sprintf_protoinfo(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_timeout(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_protocol(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_status_assured(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_status_seen_reply(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_counters(char *buf, struct nfct_conntrack *ct, int dir);
extern __attribute__((deprecated))
int nfct_sprintf_mark(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_use(char *buf, struct nfct_conntrack *ct);
extern __attribute__((deprecated))
int nfct_sprintf_id(char *buf, u_int32_t id);
/*
* Conntrack comparison
*/
extern __attribute__((deprecated))
int nfct_conntrack_compare(struct nfct_conntrack *ct1,
struct nfct_conntrack *ct2,
struct nfct_conntrack_compare *cmp);
/*
* Expectations
*/
extern __attribute__((deprecated))
int nfct_dump_expect_list(struct nfct_handle *cth, int family);
extern __attribute__((deprecated))
int nfct_flush_conntrack_table(struct nfct_handle *cth, int family);
extern __attribute__((deprecated))
int nfct_get_expectation(struct nfct_handle *cth,
struct nfct_tuple *tuple,
u_int32_t id);
extern __attribute__((deprecated))
int nfct_create_expectation(struct nfct_handle *cth, struct nfct_expect *);
extern __attribute__((deprecated))
int nfct_delete_expectation(struct nfct_handle *cth,
struct nfct_tuple *tuple, u_int32_t id);
extern __attribute__((deprecated))
int nfct_event_expectation(struct nfct_handle *cth);
extern __attribute__((deprecated))
int nfct_flush_expectation_table(struct nfct_handle *cth, int family);
/*
* expectation printing functions
*/
extern __attribute__((deprecated))
int nfct_sprintf_expect(char *buf, struct nfct_expect *exp);
extern __attribute__((deprecated))
int nfct_sprintf_expect_id(char *buf, struct nfct_expect *exp);
/*
* low-level functions for libnetfilter_cthelper
*/
extern __attribute__((deprecated))
void nfct_build_tuple(struct nfnlhdr *req, int size,
struct nfct_tuple *t, int type);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _LIBNETFILTER_CONNTRACK_H_ */ #endif /* _LIBNETFILTER_CONNTRACK_H_ */
 End of changes. 9 change blocks. 
283 lines changed or deleted 46 lines changed or added


 libnetfilter_conntrack_icmp.h   libnetfilter_conntrack_icmp.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_ICMP_H_ #ifndef _LIBNETFILTER_CONNTRACK_ICMP_H_
#define _LIBNETFILTER_CONNTRACK_ICMP_H_ #define _LIBNETFILTER_CONNTRACK_ICMP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* WARNING: do not use these flags in your new applications, they are obsol
ete
* and we keep them here to avoid breaking backward compatibility. */
enum icmp_flags { enum icmp_flags {
ICMP_TYPE_BIT = 0, ICMP_TYPE_BIT = 0,
ICMP_TYPE = (1 << ICMP_TYPE_BIT), ICMP_TYPE = (1 << ICMP_TYPE_BIT),
ICMP_CODE_BIT = 1, ICMP_CODE_BIT = 1,
ICMP_CODE = (1 << ICMP_CODE_BIT), ICMP_CODE = (1 << ICMP_CODE_BIT),
ICMP_ID_BIT = 2, ICMP_ID_BIT = 2,
ICMP_ID = (1 << ICMP_ID_BIT) ICMP_ID = (1 << ICMP_ID_BIT)
}; };
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 libnetfilter_conntrack_ipv4.h   libnetfilter_conntrack_ipv4.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_IPV4_H_ #ifndef _LIBNETFILTER_CONNTRACK_IPV4_H_
#define _LIBNETFILTER_CONNTRACK_IPV4_H_ #define _LIBNETFILTER_CONNTRACK_IPV4_H_
#ifdef __cplusplus #warning "Please, remove libnetfilter_conntrack_ipv4.h from your includes!"
extern "C" {
#endif
enum ipv4_flags {
IPV4_ORIG_SRC_BIT = 0,
IPV4_ORIG_SRC = (1 << IPV4_ORIG_SRC_BIT),
IPV4_ORIG_DST_BIT = 1,
IPV4_ORIG_DST = (1 << IPV4_ORIG_DST_BIT),
IPV4_ORIG = (IPV4_ORIG_SRC | IPV4_ORIG_DST),
IPV4_REPL_SRC_BIT = 2,
IPV4_REPL_SRC = (1 << IPV4_REPL_SRC_BIT),
IPV4_REPL_DST_BIT = 3,
IPV4_REPL_DST = (1 << IPV4_REPL_DST_BIT),
IPV4_REPL = (IPV4_REPL_SRC | IPV4_REPL_DST)
};
#ifdef __cplusplus
}
#endif
#endif #endif
 End of changes. 2 change blocks. 
26 lines changed or deleted 2 lines changed or added


 libnetfilter_conntrack_ipv6.h   libnetfilter_conntrack_ipv6.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_IPV6_H_ #ifndef _LIBNETFILTER_CONNTRACK_IPV6_H_
#define _LIBNETFILTER_CONNTRACK_IPV6_H_ #define _LIBNETFILTER_CONNTRACK_IPV6_H_
#ifdef __cplusplus #warning "Please, remove libnetfilter_conntrack_ipv6.h from your includes!"
extern "C" {
#endif
enum ipv6_flags {
IPV6_ORIG_SRC_BIT = 0,
IPV6_ORIG_SRC = (1 << IPV6_ORIG_SRC_BIT),
IPV6_ORIG_DST_BIT = 1,
IPV6_ORIG_DST = (1 << IPV6_ORIG_DST_BIT),
IPV6_ORIG = (IPV6_ORIG_SRC | IPV6_ORIG_DST),
IPV6_REPL_SRC_BIT = 2,
IPV6_REPL_SRC = (1 << IPV6_REPL_SRC_BIT),
IPV6_REPL_DST_BIT = 3,
IPV6_REPL_DST = (1 << IPV6_REPL_DST_BIT),
IPV6_REPL = (IPV6_REPL_SRC | IPV6_REPL_DST)
};
#ifdef __cplusplus
}
#endif
#endif #endif
 End of changes. 2 change blocks. 
26 lines changed or deleted 2 lines changed or added


 libnetfilter_conntrack_sctp.h   libnetfilter_conntrack_sctp.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_SCTP_H_ #ifndef _LIBNETFILTER_CONNTRACK_SCTP_H_
#define _LIBNETFILTER_CONNTRACK_SCTP_H_ #define _LIBNETFILTER_CONNTRACK_SCTP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
enum sctp_flags { enum sctp_state {
SCTP_ORIG_SPORT_BIT = 0, SCTP_CONNTRACK_NONE,
SCTP_ORIG_SPORT = (1 << SCTP_ORIG_SPORT_BIT), SCTP_CONNTRACK_CLOSED,
SCTP_CONNTRACK_COOKIE_WAIT,
SCTP_ORIG_DPORT_BIT = 1, SCTP_CONNTRACK_COOKIE_ECHOED,
SCTP_ORIG_DPORT = (1 << SCTP_ORIG_DPORT_BIT), SCTP_CONNTRACK_ESTABLISHED,
SCTP_CONNTRACK_SHUTDOWN_SENT,
SCTP_REPL_SPORT_BIT = 2, SCTP_CONNTRACK_SHUTDOWN_RECD,
SCTP_REPL_SPORT = (1 << SCTP_REPL_SPORT_BIT), SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
SCTP_CONNTRACK_MAX
SCTP_REPL_DPORT_BIT = 3,
SCTP_REPL_DPORT = (1 << SCTP_REPL_DPORT_BIT),
SCTP_MASK_SPORT_BIT = 4,
SCTP_MASK_SPORT = (1 << SCTP_MASK_SPORT_BIT),
SCTP_MASK_DPORT_BIT = 5,
SCTP_MASK_DPORT = (1 << SCTP_MASK_DPORT_BIT),
SCTP_STATE_BIT = 6,
SCTP_STATE = (1 << SCTP_STATE_BIT),
SCTP_EXPTUPLE_SPORT_BIT = 7,
SCTP_EXPTUPLE_SPORT = (1 << SCTP_EXPTUPLE_SPORT_BIT),
SCTP_EXPTUPLE_DPORT_BIT = 8,
SCTP_EXPTUPLE_DPORT = (1 << SCTP_EXPTUPLE_DPORT_BIT)
}; };
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
28 lines changed or deleted 11 lines changed or added


 libnetfilter_conntrack_tcp.h   libnetfilter_conntrack_tcp.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_TCP_H_ #ifndef _LIBNETFILTER_CONNTRACK_TCP_H_
#define _LIBNETFILTER_CONNTRACK_TCP_H_ #define _LIBNETFILTER_CONNTRACK_TCP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
skipping to change at line 25 skipping to change at line 25
enum tcp_state { enum tcp_state {
TCP_CONNTRACK_NONE, TCP_CONNTRACK_NONE,
TCP_CONNTRACK_SYN_SENT, TCP_CONNTRACK_SYN_SENT,
TCP_CONNTRACK_SYN_RECV, TCP_CONNTRACK_SYN_RECV,
TCP_CONNTRACK_ESTABLISHED, TCP_CONNTRACK_ESTABLISHED,
TCP_CONNTRACK_FIN_WAIT, TCP_CONNTRACK_FIN_WAIT,
TCP_CONNTRACK_CLOSE_WAIT, TCP_CONNTRACK_CLOSE_WAIT,
TCP_CONNTRACK_LAST_ACK, TCP_CONNTRACK_LAST_ACK,
TCP_CONNTRACK_TIME_WAIT, TCP_CONNTRACK_TIME_WAIT,
TCP_CONNTRACK_CLOSE, TCP_CONNTRACK_CLOSE,
TCP_CONNTRACK_LISTEN, TCP_CONNTRACK_LISTEN, /* obsolete */
#define TCP_CONNTRACK_SYN_SENT2 TCP_CONNTRACK_LISTEN
TCP_CONNTRACK_MAX, TCP_CONNTRACK_MAX,
TCP_CONNTRACK_IGNORE TCP_CONNTRACK_IGNORE
}; };
/* WARNING: do not use these flags in your new applications, they are obsol
ete
* and we keep them here to avoid breaking backward compatibility. */
enum tcp_flags { enum tcp_flags {
TCP_ORIG_SPORT_BIT = 0, TCP_ORIG_SPORT_BIT = 0,
TCP_ORIG_SPORT = (1 << TCP_ORIG_SPORT_BIT), TCP_ORIG_SPORT = (1 << TCP_ORIG_SPORT_BIT),
TCP_ORIG_DPORT_BIT = 1, TCP_ORIG_DPORT_BIT = 1,
TCP_ORIG_DPORT = (1 << TCP_ORIG_DPORT_BIT), TCP_ORIG_DPORT = (1 << TCP_ORIG_DPORT_BIT),
TCP_REPL_SPORT_BIT = 2, TCP_REPL_SPORT_BIT = 2,
TCP_REPL_SPORT = (1 << TCP_REPL_SPORT_BIT), TCP_REPL_SPORT = (1 << TCP_REPL_SPORT_BIT),
 End of changes. 3 change blocks. 
2 lines changed or deleted 6 lines changed or added


 libnetfilter_conntrack_udp.h   libnetfilter_conntrack_udp.h 
/* /*
* (C) 2005 by Pablo Neira Ayuso <pablo@eurodev.net> * (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference. * of the GNU General Public License, incorporated herein by reference.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_UDP_H_ #ifndef _LIBNETFILTER_CONNTRACK_UDP_H_
#define _LIBNETFILTER_CONNTRACK_UDP_H_ #define _LIBNETFILTER_CONNTRACK_UDP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* WARNING: do not use these flags in your new applications, they are obsol
ete
* and we keep them here to avoid breaking backward compatibility. */
enum udp_flags { enum udp_flags {
UDP_ORIG_SPORT_BIT = 0, UDP_ORIG_SPORT_BIT = 0,
UDP_ORIG_SPORT = (1 << UDP_ORIG_SPORT_BIT), UDP_ORIG_SPORT = (1 << UDP_ORIG_SPORT_BIT),
UDP_ORIG_DPORT_BIT = 1, UDP_ORIG_DPORT_BIT = 1,
UDP_ORIG_DPORT = (1 << UDP_ORIG_DPORT_BIT), UDP_ORIG_DPORT = (1 << UDP_ORIG_DPORT_BIT),
UDP_REPL_SPORT_BIT = 2, UDP_REPL_SPORT_BIT = 2,
UDP_REPL_SPORT = (1 << UDP_REPL_SPORT_BIT), UDP_REPL_SPORT = (1 << UDP_REPL_SPORT_BIT),
 End of changes. 2 change blocks. 
1 lines changed or deleted 4 lines changed or added


 linux_nfnetlink_conntrack.h   linux_nfnetlink_conntrack.h 
skipping to change at line 106 skipping to change at line 106
CTA_PROTOINFO_TCP_WSCALE_REPLY, CTA_PROTOINFO_TCP_WSCALE_REPLY,
CTA_PROTOINFO_TCP_FLAGS_ORIGINAL, CTA_PROTOINFO_TCP_FLAGS_ORIGINAL,
CTA_PROTOINFO_TCP_FLAGS_REPLY, CTA_PROTOINFO_TCP_FLAGS_REPLY,
__CTA_PROTOINFO_TCP_MAX __CTA_PROTOINFO_TCP_MAX
}; };
#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1) #define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1)
enum ctattr_protoinfo_dccp { enum ctattr_protoinfo_dccp {
CTA_PROTOINFO_DCCP_UNSPEC, CTA_PROTOINFO_DCCP_UNSPEC,
CTA_PROTOINFO_DCCP_STATE, CTA_PROTOINFO_DCCP_STATE,
__CTA_PROTOINFO_DCCP_MAX CTA_PROTOINFO_DCCP_ROLE,
CTA_PROTOINFO_DCCP_SEQ,
__CTA_PROTOINFO_DCCP_MAX,
}; };
#define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1) #define CTA_PROTOINFO_DCCP_MAX (__CTA_PROTOINFO_DCCP_MAX - 1)
enum ctattr_protoinfo_sctp { enum ctattr_protoinfo_sctp {
CTA_PROTOINFO_SCTP_UNSPEC, CTA_PROTOINFO_SCTP_UNSPEC,
CTA_PROTOINFO_SCTP_STATE, CTA_PROTOINFO_SCTP_STATE,
CTA_PROTOINFO_SCTP_VTAG_ORIGINAL, CTA_PROTOINFO_SCTP_VTAG_ORIGINAL,
CTA_PROTOINFO_SCTP_VTAG_REPLY, CTA_PROTOINFO_SCTP_VTAG_REPLY,
__CTA_PROTOINFO_SCTP_MAX __CTA_PROTOINFO_SCTP_MAX
}; };
#define CTA_PROTOINFO_SCTP_MAX (__CTA_PROTOINFO_SCTP_MAX - 1) #define CTA_PROTOINFO_SCTP_MAX (__CTA_PROTOINFO_SCTP_MAX - 1)
enum ctattr_counters { enum ctattr_counters {
CTA_COUNTERS_UNSPEC, CTA_COUNTERS_UNSPEC,
CTA_COUNTERS_PACKETS, /* old 64bit counters */ CTA_COUNTERS_PACKETS, /* 64bit counters */
CTA_COUNTERS_BYTES, /* old 64bit counters */ CTA_COUNTERS_BYTES, /* 64bit counters */
CTA_COUNTERS32_PACKETS, CTA_COUNTERS32_PACKETS, /* old 32bit counters, unused */
CTA_COUNTERS32_BYTES, CTA_COUNTERS32_BYTES, /* old 32bit counters, unused */
__CTA_COUNTERS_MAX __CTA_COUNTERS_MAX
}; };
#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1) #define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1)
enum ctattr_nat { enum ctattr_nat {
CTA_NAT_UNSPEC, CTA_NAT_UNSPEC,
CTA_NAT_MINIP, CTA_NAT_MINIP,
CTA_NAT_MAXIP, CTA_NAT_MAXIP,
CTA_NAT_PROTO, CTA_NAT_PROTO,
__CTA_NAT_MAX __CTA_NAT_MAX
 End of changes. 2 change blocks. 
5 lines changed or deleted 7 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/