diff options
6 files changed, 20 insertions, 163 deletions
diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h index cd8d7a9..35e5a05 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -8,23 +8,6 @@ #ifndef _LIBNETFILTER_CONNTRACK_ICMP_H_ #define _LIBNETFILTER_CONNTRACK_ICMP_H_ -#ifdef __cplusplus -extern "C" { -#endif - -enum icmp_flags { - ICMP_TYPE_BIT = 0, - ICMP_TYPE = (1 << ICMP_TYPE_BIT), - - ICMP_CODE_BIT = 1, - ICMP_CODE = (1 << ICMP_CODE_BIT), - - ICMP_ID_BIT = 2, - ICMP_ID = (1 << ICMP_ID_BIT) -}; - -#ifdef __cplusplus -} -#endif +#warning "Please, remove libnetfilter_conntrack_icmp.h from your includes!" #endif diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h index df2a547..f888012 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -8,30 +8,6 @@ #ifndef _LIBNETFILTER_CONNTRACK_IPV4_H_ #define _LIBNETFILTER_CONNTRACK_IPV4_H_ -#ifdef __cplusplus -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 +#warning "Please, remove libnetfilter_conntrack_ipv4.h from your includes!" #endif diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h index 73cf2f4..4ab02a1 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -8,30 +8,6 @@ #ifndef _LIBNETFILTER_CONNTRACK_IPV6_H_ #define _LIBNETFILTER_CONNTRACK_IPV6_H_ -#ifdef __cplusplus -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 +#warning "Please, remove libnetfilter_conntrack_ipv6.h from your includes!" #endif diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h index 7e62823..89c878d 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -12,33 +12,16 @@ extern "C" { #endif -enum sctp_flags { - SCTP_ORIG_SPORT_BIT = 0, - SCTP_ORIG_SPORT = (1 << SCTP_ORIG_SPORT_BIT), - - SCTP_ORIG_DPORT_BIT = 1, - SCTP_ORIG_DPORT = (1 << SCTP_ORIG_DPORT_BIT), - - SCTP_REPL_SPORT_BIT = 2, - SCTP_REPL_SPORT = (1 << SCTP_REPL_SPORT_BIT), - - 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) +enum sctp_state { + SCTP_CONNTRACK_NONE, + SCTP_CONNTRACK_CLOSED, + SCTP_CONNTRACK_COOKIE_WAIT, + SCTP_CONNTRACK_COOKIE_ECHOED, + SCTP_CONNTRACK_ESTABLISHED, + SCTP_CONNTRACK_SHUTDOWN_SENT, + SCTP_CONNTRACK_SHUTDOWN_RECD, + SCTP_CONNTRACK_SHUTDOWN_ACK_SENT, + SCTP_CONNTRACK_MAX }; #ifdef __cplusplus diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h index 38651b5..d4b6076 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -27,35 +27,6 @@ enum tcp_state { TCP_CONNTRACK_IGNORE }; -enum tcp_flags { - TCP_ORIG_SPORT_BIT = 0, - TCP_ORIG_SPORT = (1 << TCP_ORIG_SPORT_BIT), - - TCP_ORIG_DPORT_BIT = 1, - TCP_ORIG_DPORT = (1 << TCP_ORIG_DPORT_BIT), - - TCP_REPL_SPORT_BIT = 2, - TCP_REPL_SPORT = (1 << TCP_REPL_SPORT_BIT), - - TCP_REPL_DPORT_BIT = 3, - TCP_REPL_DPORT = (1 << TCP_REPL_DPORT_BIT), - - TCP_MASK_SPORT_BIT = 4, - TCP_MASK_SPORT = (1 << TCP_MASK_SPORT_BIT), - - TCP_MASK_DPORT_BIT = 5, - TCP_MASK_DPORT = (1 << TCP_MASK_DPORT_BIT), - - TCP_STATE_BIT = 6, - TCP_STATE = (1 << TCP_STATE_BIT), - - TCP_EXPTUPLE_SPORT_BIT = 7, - TCP_EXPTUPLE_SPORT = (1 << TCP_EXPTUPLE_SPORT_BIT), - - TCP_EXPTUPLE_DPORT_BIT = 8, - TCP_EXPTUPLE_DPORT = (1 << TCP_EXPTUPLE_DPORT_BIT) -}; - #ifdef __cplusplus } #endif diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h b/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h index 638e8eb..62ad87b 100644 --- a/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h +++ b/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h @@ -1,5 +1,5 @@ /* - * (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 * of the GNU General Public License, incorporated herein by reference. @@ -8,38 +8,6 @@ #ifndef _LIBNETFILTER_CONNTRACK_UDP_H_ #define _LIBNETFILTER_CONNTRACK_UDP_H_ -#ifdef __cplusplus -extern "C" { -#endif - -enum udp_flags { - UDP_ORIG_SPORT_BIT = 0, - UDP_ORIG_SPORT = (1 << UDP_ORIG_SPORT_BIT), - - UDP_ORIG_DPORT_BIT = 1, - UDP_ORIG_DPORT = (1 << UDP_ORIG_DPORT_BIT), - - UDP_REPL_SPORT_BIT = 2, - UDP_REPL_SPORT = (1 << UDP_REPL_SPORT_BIT), - - UDP_REPL_DPORT_BIT = 3, - UDP_REPL_DPORT = (1 << UDP_REPL_DPORT_BIT), - - UDP_MASK_SPORT_BIT = 4, - UDP_MASK_SPORT = (1 << UDP_MASK_SPORT_BIT), - - UDP_MASK_DPORT_BIT = 5, - UDP_MASK_DPORT = (1 << UDP_MASK_DPORT_BIT), - - UDP_EXPTUPLE_SPORT_BIT = 6, - UDP_EXPTUPLE_SPORT = (1 << UDP_EXPTUPLE_SPORT_BIT), - - UDP_EXPTUPLE_DPORT_BIT = 7, - UDP_EXPTUPLE_DPORT = (1 << UDP_EXPTUPLE_DPORT_BIT) -}; - -#ifdef __cplusplus -} -#endif +#warning "Please, remove libnetfilter_conntrack_udp.h from your includes!" #endif |