From: Guy Harris <guy@alum.mit.edu>
Date: Thu, 30 Jun 2016 03:18:37 +0000 (-0700)
Subject: Move the private-to-DAG-cards definitions to pcap-dag.c.
X-Git-Tag: libpcap-1.8.0-bp~20
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/8924ffeafc0cef74a399e9c8eb285b46c5a04e0f

Move the private-to-DAG-cards definitions to pcap-dag.c.

Have pcap-dag.h just declare the functions called from pcap.c, as is the
case with the header files for other pcap modules.
---

diff --git a/pcap-dag.c b/pcap-dag.c
index 77c03b36..50e0cfc5 100644
--- a/pcap-dag.c
+++ b/pcap-dag.c
@@ -53,6 +53,99 @@ struct rtentry;		/* declarations in <net/if.h> */
 #define DAG_MAX_BOARDS 32
 #endif
 
+
+#ifndef TYPE_AAL5
+#define TYPE_AAL5               4
+#endif
+
+#ifndef TYPE_MC_HDLC
+#define TYPE_MC_HDLC            5
+#endif
+
+#ifndef TYPE_MC_RAW
+#define TYPE_MC_RAW             6
+#endif
+
+#ifndef TYPE_MC_ATM
+#define TYPE_MC_ATM             7
+#endif
+
+#ifndef TYPE_MC_RAW_CHANNEL
+#define TYPE_MC_RAW_CHANNEL     8
+#endif
+
+#ifndef TYPE_MC_AAL5
+#define TYPE_MC_AAL5            9
+#endif
+
+#ifndef TYPE_COLOR_HDLC_POS
+#define TYPE_COLOR_HDLC_POS     10
+#endif
+
+#ifndef TYPE_COLOR_ETH
+#define TYPE_COLOR_ETH          11
+#endif
+
+#ifndef TYPE_MC_AAL2
+#define TYPE_MC_AAL2            12
+#endif
+
+#ifndef TYPE_IP_COUNTER
+#define TYPE_IP_COUNTER         13
+#endif
+
+#ifndef TYPE_TCP_FLOW_COUNTER
+#define TYPE_TCP_FLOW_COUNTER   14
+#endif
+
+#ifndef TYPE_DSM_COLOR_HDLC_POS
+#define TYPE_DSM_COLOR_HDLC_POS 15
+#endif
+
+#ifndef TYPE_DSM_COLOR_ETH
+#define TYPE_DSM_COLOR_ETH      16
+#endif
+
+#ifndef TYPE_COLOR_MC_HDLC_POS
+#define TYPE_COLOR_MC_HDLC_POS  17
+#endif
+
+#ifndef TYPE_AAL2
+#define TYPE_AAL2               18
+#endif
+
+#ifndef TYPE_COLOR_HASH_POS
+#define TYPE_COLOR_HASH_POS     19
+#endif
+
+#ifndef TYPE_COLOR_HASH_ETH
+#define TYPE_COLOR_HASH_ETH     20
+#endif
+
+#ifndef TYPE_INFINIBAND
+#define TYPE_INFINIBAND         21
+#endif
+
+#ifndef TYPE_IPV4
+#define TYPE_IPV4               22
+#endif
+
+#ifndef TYPE_IPV6
+#define TYPE_IPV6               23
+#endif
+
+#ifndef TYPE_RAW_LINK
+#define TYPE_RAW_LINK           24
+#endif
+
+#ifndef TYPE_INFINIBAND_LINK
+#define TYPE_INFINIBAND_LINK    25
+#endif
+
+#ifndef TYPE_PAD
+#define TYPE_PAD                48
+#endif
+
 #define ATM_CELL_SIZE		52
 #define ATM_HDR_SIZE		4
 
diff --git a/pcap-dag.h b/pcap-dag.h
index 68520dc8..dfeccd8b 100644
--- a/pcap-dag.h
+++ b/pcap-dag.h
@@ -10,97 +10,3 @@
 
 pcap_t *dag_create(const char *, char *, int *);
 int dag_findalldevs(pcap_if_t **devlistp, char *errbuf);
-
-#ifndef TYPE_AAL5
-#define TYPE_AAL5               4
-#endif
-
-#ifndef TYPE_MC_HDLC
-#define TYPE_MC_HDLC            5
-#endif
-
-#ifndef TYPE_MC_RAW
-#define TYPE_MC_RAW             6
-#endif
-
-#ifndef TYPE_MC_ATM
-#define TYPE_MC_ATM             7
-#endif
-
-#ifndef TYPE_MC_RAW_CHANNEL
-#define TYPE_MC_RAW_CHANNEL     8
-#endif
-
-#ifndef TYPE_MC_AAL5
-#define TYPE_MC_AAL5            9
-#endif
-
-#ifndef TYPE_COLOR_HDLC_POS
-#define TYPE_COLOR_HDLC_POS     10
-#endif
-
-#ifndef TYPE_COLOR_ETH
-#define TYPE_COLOR_ETH          11
-#endif
-
-#ifndef TYPE_MC_AAL2
-#define TYPE_MC_AAL2            12
-#endif
-
-#ifndef TYPE_IP_COUNTER
-#define TYPE_IP_COUNTER         13
-#endif
-
-#ifndef TYPE_TCP_FLOW_COUNTER
-#define TYPE_TCP_FLOW_COUNTER   14
-#endif
-
-#ifndef TYPE_DSM_COLOR_HDLC_POS
-#define TYPE_DSM_COLOR_HDLC_POS 15
-#endif
-
-#ifndef TYPE_DSM_COLOR_ETH
-#define TYPE_DSM_COLOR_ETH      16
-#endif
-
-#ifndef TYPE_COLOR_MC_HDLC_POS
-#define TYPE_COLOR_MC_HDLC_POS  17
-#endif
-
-#ifndef TYPE_AAL2
-#define TYPE_AAL2               18
-#endif
-
-#ifndef TYPE_COLOR_HASH_POS
-#define TYPE_COLOR_HASH_POS     19
-#endif
-
-#ifndef TYPE_COLOR_HASH_ETH
-#define TYPE_COLOR_HASH_ETH     20
-#endif
-
-#ifndef TYPE_INFINIBAND
-#define TYPE_INFINIBAND         21
-#endif
-
-#ifndef TYPE_IPV4
-#define TYPE_IPV4               22
-#endif
-
-#ifndef TYPE_IPV6
-#define TYPE_IPV6               23
-#endif
-
-#ifndef TYPE_RAW_LINK
-#define TYPE_RAW_LINK           24
-#endif
-
-#ifndef TYPE_INFINIBAND_LINK
-#define TYPE_INFINIBAND_LINK    25
-#endif
-
-
-
-#ifndef TYPE_PAD
-#define TYPE_PAD                48
-#endif