From: Guy Harris <guy@alum.mit.edu>
Date: Fri, 9 Dec 2011 03:47:42 +0000 (-0800)
Subject: Put declarations of pcap-netfilter-linux.c in pcap-netfilter-linux.h.
X-Git-Tag: libpcap-1.3-bp~22
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/bbcc0ffba7e0d38df2060d156f4322ac3a22c1d3

Put declarations of pcap-netfilter-linux.c in pcap-netfilter-linux.h.

That way, the same declarations are used in the file that defines the
functions and the files that use them, so we actually do type checking.
---

diff --git a/Makefile.in b/Makefile.in
index 8931f778..37c9d3ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -301,6 +301,7 @@ EXTRA_DIST = \
 	pcap-linux.c \
 	pcap-namedb.h \
 	pcap-netfilter-linux.c \
+	pcap-netfilter-linux.h \
 	pcap-nit.c \
 	pcap-null.c \
 	pcap-pf.c \
diff --git a/pcap-linux.c b/pcap-linux.c
index 50752311..5079eb26 100644
--- a/pcap-linux.c
+++ b/pcap-linux.c
@@ -167,8 +167,7 @@ static const char rcsid[] _U_ =
 #endif
 
 #ifdef PCAP_SUPPORT_NETFILTER
-int netfilter_platform_finddevs(pcap_if_t **alldevsp, char *err_str);
-pcap_t *nflog_create(const char *device, char *ebuf);
+#include "pcap-netfilter-linux.h"
 #endif
 
 /*
diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
index 1c34a095..225e49f9 100644
--- a/pcap-netfilter-linux.c
+++ b/pcap-netfilter-linux.c
@@ -54,6 +54,8 @@
 #include <linux/netfilter/nfnetlink.h>
 #include <linux/netfilter/nfnetlink_log.h>
 
+#include "pcap-netfilter-linux.h"
+
 #define HDR_LENGTH (NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg))))
 
 #define NFLOG_IFACE "nflog"
diff --git a/pcap-netfilter-linux.h b/pcap-netfilter-linux.h
new file mode 100644
index 00000000..63e23f40
--- /dev/null
+++ b/pcap-netfilter-linux.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2011 Jakub Zawadzki
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote 
+ * products derived from this software without specific prior written 
+ * permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Prototypes for netlink-related functions
+ */
+int nflog_platform_finddevs(pcap_if_t **alldevsp, char *err_str);
+pcap_t *nflog_create(const char *device, char *ebuf);