libnetfilter_conntrack: headers diff between 1.0.0 and 1.0.1 versions

	libnetfilter_conntrack.h	libnetfilter_conntrack.h

	skipping to change at line 152	skipping to change at line 152
	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 */
	ATTR_GRP_REPL_PORT, /* struct nfct_attr_grp_port */	ATTR_GRP_REPL_PORT, /* struct nfct_attr_grp_port */
	ATTR_GRP_ICMP, /* struct nfct_attr_grp_icmp */	ATTR_GRP_ICMP, /* struct nfct_attr_grp_icmp */
	ATTR_GRP_MASTER_IPV4, /* struct nfct_attr_grp_ipv4 */	ATTR_GRP_MASTER_IPV4, /* struct nfct_attr_grp_ipv4 */
	ATTR_GRP_MASTER_IPV6 = 8, /* struct nfct_attr_grp_ipv6 */	ATTR_GRP_MASTER_IPV6 = 8, /* struct nfct_attr_grp_ipv6 */
	ATTR_GRP_MASTER_PORT, /* struct nfct_attr_grp_port */	ATTR_GRP_MASTER_PORT, /* struct nfct_attr_grp_port */
	ATTR_GRP_ORIG_COUNTERS, /* struct nfct_attr_grp_ctrs */	ATTR_GRP_ORIG_COUNTERS, /* struct nfct_attr_grp_ctrs */
	ATTR_GRP_REPL_COUNTERS, /* struct nfct_attr_grp_ctrs */	ATTR_GRP_REPL_COUNTERS, /* struct nfct_attr_grp_ctrs */

		ATTR_GRP_ORIG_ADDR_SRC = 12, /* union nfct_attr_grp_addr
		*/
		ATTR_GRP_ORIG_ADDR_DST, /* union nfct_attr_grp_addr
		*/
		ATTR_GRP_REPL_ADDR_SRC, /* union nfct_attr_grp_addr
		*/
		ATTR_GRP_REPL_ADDR_DST, /* union nfct_attr_grp_addr
		*/
	ATTR_GRP_MAX	ATTR_GRP_MAX
	};	};

	struct nfct_attr_grp_ipv4 {	struct nfct_attr_grp_ipv4 {
	u_int32_t src, dst;	u_int32_t src, dst;
	};	};

	struct nfct_attr_grp_ipv6 {	struct nfct_attr_grp_ipv6 {
	u_int32_t src[4], dst[4];	u_int32_t src[4], dst[4];
	};	};

	skipping to change at line 177	skipping to change at line 181
	struct nfct_attr_grp_icmp {	struct nfct_attr_grp_icmp {
	u_int16_t id;	u_int16_t id;
	u_int8_t code, type;	u_int8_t code, type;
	};	};

	struct nfct_attr_grp_ctrs {	struct nfct_attr_grp_ctrs {
	u_int64_t packets;	u_int64_t packets;
	u_int64_t bytes;	u_int64_t bytes;
	};	};


		union nfct_attr_grp_addr {
		u_int32_t ip;
		u_int32_t ip6[4];
		u_int32_t addr[4];
		};

	/* 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 394	skipping to change at line 404
	/* query */	/* query */
	enum nf_conntrack_query {	enum nf_conntrack_query {
	NFCT_Q_CREATE,	NFCT_Q_CREATE,
	NFCT_Q_UPDATE,	NFCT_Q_UPDATE,
	NFCT_Q_DESTROY,	NFCT_Q_DESTROY,
	NFCT_Q_GET,	NFCT_Q_GET,
	NFCT_Q_FLUSH,	NFCT_Q_FLUSH,
	NFCT_Q_DUMP,	NFCT_Q_DUMP,
	NFCT_Q_DUMP_RESET,	NFCT_Q_DUMP_RESET,
	NFCT_Q_CREATE_UPDATE,	NFCT_Q_CREATE_UPDATE,

		NFCT_Q_DUMP_FILTER,
		NFCT_Q_DUMP_FILTER_RESET,
	};	};

	extern int nfct_query(struct nfct_handle *h,	extern int nfct_query(struct nfct_handle *h,
	const enum nf_conntrack_query query,	const enum nf_conntrack_query query,
	const void *data);	const void *data);

	extern int nfct_send(struct nfct_handle *h,	extern int nfct_send(struct nfct_handle *h,
	const enum nf_conntrack_query query,	const enum nf_conntrack_query query,
	const void *data);	const void *data);


	skipping to change at line 423	skipping to change at line 435
	};	};

	extern void nfct_copy(struct nf_conntrack *dest,	extern void nfct_copy(struct nf_conntrack *dest,
	const struct nf_conntrack *source,	const struct nf_conntrack *source,
	unsigned int flags);	unsigned int flags);

	extern void nfct_copy_attr(struct nf_conntrack *ct1,	extern void nfct_copy_attr(struct nf_conntrack *ct1,
	const struct nf_conntrack *ct2,	const struct nf_conntrack *ct2,
	const enum nf_conntrack_attr type);	const enum nf_conntrack_attr type);


	/* filter */	/* event filtering */

	struct nfct_filter;	struct nfct_filter;

	extern struct nfct_filter *nfct_filter_create(void);	extern struct nfct_filter *nfct_filter_create(void);
	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;
	};	};

	skipping to change at line 474	skipping to change at line 486
	NFCT_FILTER_LOGIC_MAX	NFCT_FILTER_LOGIC_MAX
	};	};

	extern int nfct_filter_set_logic(struct nfct_filter *filter,	extern int nfct_filter_set_logic(struct nfct_filter *filter,
	const enum nfct_filter_attr attr,	const enum nfct_filter_attr attr,
	const enum nfct_filter_logic logic);	const enum nfct_filter_logic logic);

	extern int nfct_filter_attach(int fd, struct nfct_filter *filter);	extern int nfct_filter_attach(int fd, struct nfct_filter *filter);
	extern int nfct_filter_detach(int fd);	extern int nfct_filter_detach(int fd);


		/* dump filtering */

		struct nfct_filter_dump;

		struct nfct_filter_dump_mark {
		u_int32_t val;
		u_int32_t mask;
		};

		enum nfct_filter_dump_attr {
		NFCT_FILTER_DUMP_MARK = 0, /* struct nfct_filter_dump_mark */
		NFCT_FILTER_DUMP_L3NUM, /* u_int8_t */
		NFCT_FILTER_DUMP_MAX
		};

		struct nfct_filter_dump *nfct_filter_dump_create(void);

		void nfct_filter_dump_destroy(struct nfct_filter_dump *filter);

		void nfct_filter_dump_set_attr(struct nfct_filter_dump *filter_dump,
		const enum nfct_filter_dump_attr type,
		const void *data);

		void nfct_filter_dump_set_attr_u8(struct nfct_filter_dump *filter_dump,
		const enum nfct_filter_dump_attr type,
		u_int8_t data);

	/* low level API: netlink functions */	/* low level API: netlink functions */

	extern __attribute__((deprecated)) int	extern __attribute__((deprecated)) int
	nfct_build_conntrack(struct nfnl_subsys_handle *ssh,	nfct_build_conntrack(struct nfnl_subsys_handle *ssh,
	void *req,	void *req,
	size_t size,	size_t size,
	u_int16_t type,	u_int16_t type,
	u_int16_t flags,	u_int16_t flags,
	const struct nf_conntrack *ct);	const struct nf_conntrack *ct);


	skipping to change at line 512	skipping to change at line 551

	/* 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 */
	ATTR_EXP_EXPECTED, /* pointer to conntrack object */	ATTR_EXP_EXPECTED, /* pointer to conntrack object */
	ATTR_EXP_MASK, /* pointer to conntrack object */	ATTR_EXP_MASK, /* pointer to conntrack object */
	ATTR_EXP_TIMEOUT, /* u32 bits */	ATTR_EXP_TIMEOUT, /* u32 bits */
	ATTR_EXP_ZONE, /* u16 bits */	ATTR_EXP_ZONE, /* u16 bits */
	ATTR_EXP_FLAGS, /* u32 bits */	ATTR_EXP_FLAGS, /* u32 bits */
	ATTR_EXP_HELPER_NAME, /* string (16 bytes max) */	ATTR_EXP_HELPER_NAME, /* string (16 bytes max) */

		ATTR_EXP_CLASS, /* u32 bits */
		ATTR_EXP_NAT_TUPLE, /* pointer to conntrack object */
		ATTR_EXP_NAT_DIR, /* u8 bits */
		ATTR_EXP_FN, /* string */
	ATTR_EXP_MAX	ATTR_EXP_MAX
	};	};

	/* constructor / destructor */	/* constructor / destructor */
	extern struct nf_expect *nfexp_new(void);	extern struct nf_expect *nfexp_new(void);
	extern void nfexp_destroy(struct nf_expect *exp);	extern void nfexp_destroy(struct nf_expect *exp);

	/* clone */	/* clone */
	extern struct nf_expect nfexp_clone(const struct nf_expect exp);	extern struct nf_expect nfexp_clone(const struct nf_expect exp);


End of changes. 6 change blocks.
	1 lines changed or deleted	48 lines changed or added

	linux_nfnetlink_conntrack.h	linux_nfnetlink_conntrack.h

	skipping to change at line 49	skipping to change at line 49
	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, /* obsolete */	CTA_SECMARK, /* obsolete */
	CTA_ZONE,	CTA_ZONE,
	CTA_SECCTX,	CTA_SECCTX,
	CTA_TIMESTAMP,	CTA_TIMESTAMP,

		CTA_MARK_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
	};	};

	skipping to change at line 178	skipping to change at line 179
	enum ctattr_expect {	enum ctattr_expect {
	CTA_EXPECT_UNSPEC,	CTA_EXPECT_UNSPEC,
	CTA_EXPECT_MASTER,	CTA_EXPECT_MASTER,
	CTA_EXPECT_TUPLE,	CTA_EXPECT_TUPLE,
	CTA_EXPECT_MASK,	CTA_EXPECT_MASK,
	CTA_EXPECT_TIMEOUT,	CTA_EXPECT_TIMEOUT,
	CTA_EXPECT_ID,	CTA_EXPECT_ID,
	CTA_EXPECT_HELP_NAME,	CTA_EXPECT_HELP_NAME,
	CTA_EXPECT_ZONE,	CTA_EXPECT_ZONE,
	CTA_EXPECT_FLAGS,	CTA_EXPECT_FLAGS,

		CTA_EXPECT_CLASS,
		CTA_EXPECT_NAT,
		CTA_EXPECT_FN,
	__CTA_EXPECT_MAX	__CTA_EXPECT_MAX
	};	};
	#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1)	#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1)


		enum ctattr_expect_nat {
		CTA_EXPECT_NAT_UNSPEC,
		CTA_EXPECT_NAT_DIR,
		CTA_EXPECT_NAT_TUPLE,
		__CTA_EXPECT_NAT_MAX
		};
		#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_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,

End of changes. 3 change blocks.
	0 lines changed or deleted	12 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/