libnetfilter_conntrack.h   libnetfilter_conntrack.h 
/* /*
* (C) 2005-2008 by Pablo Neira Ayuso <pablo@netfilter.org> * (C) 2005-2011 by Pablo Neira Ayuso <pablo@netfilter.org>
* *
* This software may be used and distributed according to the terms * This program is free software; you can redistribute it and/or modify it
* of the GNU General Public License, incorporated herein by reference. * under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/ */
#ifndef _LIBNETFILTER_CONNTRACK_H_ #ifndef _LIBNETFILTER_CONNTRACK_H_
#define _LIBNETFILTER_CONNTRACK_H_ #define _LIBNETFILTER_CONNTRACK_H_
#include <netinet/in.h> #include <netinet/in.h>
#include <libnfnetlink/linux_nfnetlink.h> #include <libnfnetlink/linux_nfnetlink.h>
#include <libnfnetlink/libnfnetlink.h> #include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h> #include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
skipping to change at line 509 skipping to change at line 511
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 */
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_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);
skipping to change at line 598 skipping to change at line 601
const void *data); const void *data);
/* print */ /* print */
extern int nfexp_snprintf(char *buf, extern int nfexp_snprintf(char *buf,
unsigned int size, unsigned int size,
const struct nf_expect *exp, const struct nf_expect *exp,
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);
/* compare */
extern int nfexp_cmp(const struct nf_expect *exp1,
const struct nf_expect *exp2,
unsigned int flags);
extern int nfexp_send(struct nfct_handle *h,
const enum nf_conntrack_query qt,
const void *data);
extern int nfexp_catch(struct nfct_handle *h); extern int nfexp_catch(struct nfct_handle *h);
/* low level API */ /* low level API */
extern __attribute__((deprecated)) extern __attribute__((deprecated))
int nfexp_build_expect(struct nfnl_subsys_handle *ssh, int nfexp_build_expect(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_expect *exp); const struct nf_expect *exp);
skipping to change at line 712 skipping to change at line 724
/* 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 re /* WARNING: do not use these constants in new applications, we keep them he re
* to avoid breaking backward compatibility. */ * to avoid breaking backward compatibility. */
#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
/* xt_helper uses a length size of 30 bytes, however, no helper name in
* the tree has exceeded 16 bytes length. Since 2.6.29, the maximum
* length accepted is 16 bytes, this limit is enforced during module load.
*/
#define NFCT_HELPER_NAME_MAX 16
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _LIBNETFILTER_CONNTRACK_H_ */ #endif /* _LIBNETFILTER_CONNTRACK_H_ */
 End of changes. 5 change blocks. 
3 lines changed or deleted 21 lines changed or added


 libnetfilter_conntrack_dccp.h   libnetfilter_conntrack_dccp.h 
/*
* (C) 2009 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*/
#ifndef _LIBNETFILTER_CONNTRACK_DCCP_H_ #ifndef _LIBNETFILTER_CONNTRACK_DCCP_H_
#define _LIBNETFILTER_CONNTRACK_DCCP_H_ #define _LIBNETFILTER_CONNTRACK_DCCP_H_
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
enum dccp_state { enum dccp_state {
DCCP_CONNTRACK_NONE, DCCP_CONNTRACK_NONE,
DCCP_CONNTRACK_REQUEST, DCCP_CONNTRACK_REQUEST,
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_icmp.h   libnetfilter_conntrack_icmp.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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 /* WARNING: do not use these flags in your new applications, they are obsol ete
* and we keep them here to avoid breaking backward compatibility. */ * and we keep them here to avoid breaking backward compatibility. */
enum icmp_flags { enum icmp_flags {
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_ipv4.h   libnetfilter_conntrack_ipv4.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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_
#warning "Please, remove libnetfilter_conntrack_ipv4.h from your includes!" #warning "Please, remove libnetfilter_conntrack_ipv4.h from your includes!"
#endif #endif
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_ipv6.h   libnetfilter_conntrack_ipv6.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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_
#warning "Please, remove libnetfilter_conntrack_ipv6.h from your includes!" #warning "Please, remove libnetfilter_conntrack_ipv6.h from your includes!"
#endif #endif
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_sctp.h   libnetfilter_conntrack_sctp.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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_state { enum sctp_state {
SCTP_CONNTRACK_NONE, SCTP_CONNTRACK_NONE,
SCTP_CONNTRACK_CLOSED, SCTP_CONNTRACK_CLOSED,
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_tcp.h   libnetfilter_conntrack_tcp.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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" {
#endif #endif
enum tcp_state { enum tcp_state {
TCP_CONNTRACK_NONE, TCP_CONNTRACK_NONE,
TCP_CONNTRACK_SYN_SENT, TCP_CONNTRACK_SYN_SENT,
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 lines changed or added


 libnetfilter_conntrack_udp.h   libnetfilter_conntrack_udp.h 
/*
* (C) 2005 by Pablo Neira Ayuso <pablo@netfilter.org>
*
* This software may be used and distributed according to the terms
* 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 /* WARNING: do not use these flags in your new applications, they are obsol ete
* and we keep them here to avoid breaking backward compatibility. */ * and we keep them here to avoid breaking backward compatibility. */
enum udp_flags { enum udp_flags {
 End of changes. 1 change blocks. 
7 lines changed or deleted 0 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/