[netfilter-cvslog] r6786 -
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack
pablo at netfilter.org
pablo at netfilter.org
Fri Mar 30 01:19:21 CEST 2007
Author: pablo at netfilter.org
Date: 2007-03-30 01:19:21 +0200 (Fri, 30 Mar 2007)
New Revision: 6786
Modified:
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
Log:
add extern C's to public headers (Phil Dibowitz)
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -13,6 +13,10 @@
#include <libnfnetlink/libnfnetlink.h>
#include <libnetfilter_conntrack/linux_nfnetlink_conntrack.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum {
CONNTRACK = NFNL_SUBSYS_CTNETLINK,
EXPECT = NFNL_SUBSYS_CTNETLINK_EXP
@@ -549,4 +553,8 @@
void *req,
unsigned int size);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _LIBNETFILTER_CONNTRACK_H_ */
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_icmp.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#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),
@@ -19,4 +23,8 @@
ICMP_ID = (1 << ICMP_ID_BIT)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv4.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#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),
@@ -26,4 +30,8 @@
IPV4_REPL = (IPV4_REPL_SRC | IPV4_REPL_DST)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_ipv6.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#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),
@@ -26,4 +30,8 @@
IPV6_REPL = (IPV6_REPL_SRC | IPV6_REPL_DST)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_sctp.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#ifndef _LIBNETFILTER_CONNTRACK_SCTP_H_
#define _LIBNETFILTER_CONNTRACK_SCTP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum sctp_flags {
SCTP_ORIG_SPORT_BIT = 0,
SCTP_ORIG_SPORT = (1 << SCTP_ORIG_SPORT_BIT),
@@ -37,4 +41,8 @@
SCTP_EXPTUPLE_DPORT = (1 << SCTP_EXPTUPLE_DPORT_BIT)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_tcp.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#ifndef _LIBNETFILTER_CONNTRACK_TCP_H_
#define _LIBNETFILTER_CONNTRACK_TCP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum tcp_state {
TCP_CONNTRACK_NONE,
TCP_CONNTRACK_SYN_SENT,
@@ -52,4 +56,8 @@
TCP_EXPTUPLE_DPORT = (1 << TCP_EXPTUPLE_DPORT_BIT)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/libnetfilter_conntrack_udp.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -8,6 +8,10 @@
#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),
@@ -34,4 +38,8 @@
UDP_EXPTUPLE_DPORT = (1 << UDP_EXPTUPLE_DPORT_BIT)
};
+#ifdef __cplusplus
+}
#endif
+
+#endif
Modified: trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h
===================================================================
--- trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h 2007-03-28 16:59:16 UTC (rev 6785)
+++ trunk/libnetfilter_conntrack/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h 2007-03-29 23:19:21 UTC (rev 6786)
@@ -2,6 +2,10 @@
#define _IPCONNTRACK_NETLINK_H
#include <libnfnetlink/linux_nfnetlink.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum cntl_msg_types {
IPCTNL_MSG_CT_NEW,
IPCTNL_MSG_CT_GET,
@@ -134,4 +138,8 @@
};
#define CTA_HELP_MAX (__CTA_HELP_MAX - 1)
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _IPCONNTRACK_NETLINK_H */
More information about the netfilter-cvslog
mailing list