From d3f3b6c5b219f57f3b9a3a8358049d7a3f0a6e13 Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Mon, 23 Apr 2012 11:28:20 -0700 Subject: Use a common header to trim cut and paste include blocks. --- libnet/src/common.h | 56 ++++++++++++++++++++++++++++++++++++ libnet/src/libnet_advanced.c | 9 +----- libnet/src/libnet_asn1.c | 9 +----- libnet/src/libnet_build_802.1q.c | 9 +----- libnet/src/libnet_build_802.1x.c | 9 +----- libnet/src/libnet_build_802.2.c | 9 +----- libnet/src/libnet_build_802.3.c | 9 +----- libnet/src/libnet_build_arp.c | 9 +----- libnet/src/libnet_build_bgp.c | 9 +----- libnet/src/libnet_build_cdp.c | 9 +----- libnet/src/libnet_build_data.c | 9 +----- libnet/src/libnet_build_dhcp.c | 9 +----- libnet/src/libnet_build_dns.c | 9 +----- libnet/src/libnet_build_ethernet.c | 9 +----- libnet/src/libnet_build_fddi.c | 9 +----- libnet/src/libnet_build_gre.c | 9 +----- libnet/src/libnet_build_hsrp.c | 9 +----- libnet/src/libnet_build_icmp.c | 9 +----- libnet/src/libnet_build_igmp.c | 9 +----- libnet/src/libnet_build_ip.c | 10 +------ libnet/src/libnet_build_ipsec.c | 10 +------ libnet/src/libnet_build_isl.c | 9 +----- libnet/src/libnet_build_link.c | 10 +------ libnet/src/libnet_build_mpls.c | 9 +----- libnet/src/libnet_build_ntp.c | 9 +----- libnet/src/libnet_build_ospf.c | 9 +----- libnet/src/libnet_build_rip.c | 9 +----- libnet/src/libnet_build_rpc.c | 9 +----- libnet/src/libnet_build_sebek.c | 9 +----- libnet/src/libnet_build_snmp.c | 9 +----- libnet/src/libnet_build_stp.c | 9 +----- libnet/src/libnet_build_tcp.c | 9 +----- libnet/src/libnet_build_token_ring.c | 9 +----- libnet/src/libnet_build_udp.c | 9 +----- libnet/src/libnet_build_vrrp.c | 9 +----- libnet/src/libnet_checksum.c | 11 +------ libnet/src/libnet_cq.c | 9 +----- libnet/src/libnet_crc.c | 10 +------ libnet/src/libnet_error.c | 10 +------ libnet/src/libnet_if_addr.c | 12 ++------ libnet/src/libnet_init.c | 9 +----- libnet/src/libnet_internal.c | 9 +----- libnet/src/libnet_link_bpf.c | 6 ++-- libnet/src/libnet_link_dlpi.c | 5 ++-- libnet/src/libnet_link_linux.c | 6 ++-- libnet/src/libnet_link_nit.c | 9 +----- libnet/src/libnet_link_none.c | 9 +----- libnet/src/libnet_link_pf.c | 5 +--- libnet/src/libnet_link_snit.c | 11 ++----- libnet/src/libnet_link_snoop.c | 2 +- libnet/src/libnet_link_win32.c | 6 ++-- libnet/src/libnet_pblock.c | 12 +------- libnet/src/libnet_port_list.c | 9 +----- libnet/src/libnet_prand.c | 10 ++----- libnet/src/libnet_raw.c | 11 +------ libnet/src/libnet_resolve.c | 9 +----- libnet/src/libnet_write.c | 13 ++------- 57 files changed, 121 insertions(+), 437 deletions(-) create mode 100644 libnet/src/common.h diff --git a/libnet/src/common.h b/libnet/src/common.h new file mode 100644 index 0000000..1d7b4d3 --- /dev/null +++ b/libnet/src/common.h @@ -0,0 +1,56 @@ +/* + * common.h - common headers + * + * Copyright (c) 1998 - 2004 Mike D. Schiffman + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + * + */ + +#include "../include/config.h" + +#if (_WIN32) || (__CYGWIN__) + +#include "../include/win32/libnet.h" +#include "../include/win32/config.h" + +#else + +#include "../include/libnet.h" + +#include + +#include + +/* IPPROTO_ and sockaddr_ definitions are here. They are often + * implicitly pulled in, but some systems need them explicitly + * included. + */ +#include + +/* TODO - should ../include/gnuc.h be included here? */ + +/* TODO - HAVE_OS_PROTO_H is never defined, but used in some files, delete it */ + +#endif + diff --git a/libnet/src/libnet_advanced.c b/libnet/src/libnet_advanced.c index 95bb9c4..cf25258 100644 --- a/libnet/src/libnet_advanced.c +++ b/libnet/src/libnet_advanced.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" int libnet_adv_cull_packet(libnet_t *l, uint8_t **packet, uint32_t *packet_s) diff --git a/libnet/src/libnet_asn1.c b/libnet/src/libnet_asn1.c index bc4a42b..9a01855 100644 --- a/libnet/src/libnet_asn1.c +++ b/libnet/src/libnet_asn1.c @@ -53,14 +53,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" uint8_t * libnet_build_asn1_int(uint8_t *data, int *datalen, uint8_t type, int32_t *int_p, diff --git a/libnet/src/libnet_build_802.1q.c b/libnet/src/libnet_build_802.1q.c index 6a36023..229c73a 100644 --- a/libnet/src/libnet_build_802.1q.c +++ b/libnet/src/libnet_build_802.1q.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_802_1q(const uint8_t *dst, const uint8_t *src, uint16_t tpi, diff --git a/libnet/src/libnet_build_802.1x.c b/libnet/src/libnet_build_802.1x.c index 2790ecd..a7e1a4c 100644 --- a/libnet/src/libnet_build_802.1x.c +++ b/libnet/src/libnet_build_802.1x.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_802_1x(uint8_t eap_ver, uint8_t eap_type, uint16_t length, diff --git a/libnet/src/libnet_build_802.2.c b/libnet/src/libnet_build_802.2.c index 8802b86..66db80d 100644 --- a/libnet/src/libnet_build_802.2.c +++ b/libnet/src/libnet_build_802.2.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_802_2(uint8_t dsap, uint8_t ssap, uint8_t control, diff --git a/libnet/src/libnet_build_802.3.c b/libnet/src/libnet_build_802.3.c index 3c9de38..cd9b574 100644 --- a/libnet/src/libnet_build_802.3.c +++ b/libnet/src/libnet_build_802.3.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_802_3(const uint8_t *dst, const uint8_t *src, uint16_t len, diff --git a/libnet/src/libnet_build_arp.c b/libnet/src/libnet_build_arp.c index a7f80c3..e1ad91d 100644 --- a/libnet/src/libnet_build_arp.c +++ b/libnet/src/libnet_build_arp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t diff --git a/libnet/src/libnet_build_bgp.c b/libnet/src/libnet_build_bgp.c index 7b1d15b..ff3f7e7 100644 --- a/libnet/src/libnet_build_bgp.c +++ b/libnet/src/libnet_build_bgp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_bgp4_header(uint8_t marker[LIBNET_BGP4_MARKER_SIZE], diff --git a/libnet/src/libnet_build_cdp.c b/libnet/src/libnet_build_cdp.c index 249b246..4f4ec8b 100644 --- a/libnet/src/libnet_build_cdp.c +++ b/libnet/src/libnet_build_cdp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_cdp(uint8_t version, uint8_t ttl, uint16_t sum, uint16_t type, diff --git a/libnet/src/libnet_build_data.c b/libnet/src/libnet_build_data.c index 25ffb7e..01ca3e1 100644 --- a/libnet/src/libnet_build_data.c +++ b/libnet/src/libnet_build_data.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" /* FIXME this won't work with TCP or IPv4 data, which is probably a bug */ libnet_ptag_t diff --git a/libnet/src/libnet_build_dhcp.c b/libnet/src/libnet_build_dhcp.c index 7d3f172..fa16c45 100644 --- a/libnet/src/libnet_build_dhcp.c +++ b/libnet/src/libnet_build_dhcp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_dhcpv4(uint8_t opcode, uint8_t htype, uint8_t hlen, diff --git a/libnet/src/libnet_build_dns.c b/libnet/src/libnet_build_dns.c index b9fb7ca..bb282cc 100644 --- a/libnet/src/libnet_build_dns.c +++ b/libnet/src/libnet_build_dns.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t diff --git a/libnet/src/libnet_build_ethernet.c b/libnet/src/libnet_build_ethernet.c index 5ed780d..6783134 100644 --- a/libnet/src/libnet_build_ethernet.c +++ b/libnet/src/libnet_build_ethernet.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_ethernet(const uint8_t *dst, const uint8_t *src, uint16_t type, diff --git a/libnet/src/libnet_build_fddi.c b/libnet/src/libnet_build_fddi.c index 39b8c40..1a16b4c 100644 --- a/libnet/src/libnet_build_fddi.c +++ b/libnet/src/libnet_build_fddi.c @@ -29,14 +29,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_fddi(uint8_t fc, const uint8_t *dst, const uint8_t *src, uint8_t dsap, diff --git a/libnet/src/libnet_build_gre.c b/libnet/src/libnet_build_gre.c index eca7836..0790295 100644 --- a/libnet/src/libnet_build_gre.c +++ b/libnet/src/libnet_build_gre.c @@ -28,14 +28,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" /* * Overall packet diff --git a/libnet/src/libnet_build_hsrp.c b/libnet/src/libnet_build_hsrp.c index 8f56945..f11af33 100644 --- a/libnet/src/libnet_build_hsrp.c +++ b/libnet/src/libnet_build_hsrp.c @@ -29,14 +29,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_hsrp(uint8_t version, uint8_t opcode, uint8_t state, diff --git a/libnet/src/libnet_build_icmp.c b/libnet/src/libnet_build_icmp.c index deb030d..25a753f 100644 --- a/libnet/src/libnet_build_icmp.c +++ b/libnet/src/libnet_build_icmp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" #include diff --git a/libnet/src/libnet_build_igmp.c b/libnet/src/libnet_build_igmp.c index 70ac10d..1a9f208 100644 --- a/libnet/src/libnet_build_igmp.c +++ b/libnet/src/libnet_build_igmp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_igmp(uint8_t type, uint8_t reserved, uint16_t sum, uint32_t ip, diff --git a/libnet/src/libnet_build_ip.c b/libnet/src/libnet_build_ip.c index c05c235..c75340f 100644 --- a/libnet/src/libnet_build_ip.c +++ b/libnet/src/libnet_build_ip.c @@ -30,15 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - +#include "common.h" /* TODO len - should be calculated if -1 */ libnet_ptag_t diff --git a/libnet/src/libnet_build_ipsec.c b/libnet/src/libnet_build_ipsec.c index 0b9351a..2358158 100644 --- a/libnet/src/libnet_build_ipsec.c +++ b/libnet/src/libnet_build_ipsec.c @@ -31,15 +31,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - +#include "common.h" libnet_ptag_t libnet_build_ipsec_esp_hdr(uint32_t spi, uint32_t seq, uint32_t iv, diff --git a/libnet/src/libnet_build_isl.c b/libnet/src/libnet_build_isl.c index 67d310c..b714cf2 100644 --- a/libnet/src/libnet_build_isl.c +++ b/libnet/src/libnet_build_isl.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_isl(uint8_t *dhost, uint8_t type, uint8_t user, diff --git a/libnet/src/libnet_build_link.c b/libnet/src/libnet_build_link.c index 4c2d0f3..d2b851c 100644 --- a/libnet/src/libnet_build_link.c +++ b/libnet/src/libnet_build_link.c @@ -31,15 +31,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif - -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_link(const uint8_t *dst, const uint8_t *src, const uint8_t *oui, uint16_t type, diff --git a/libnet/src/libnet_build_mpls.c b/libnet/src/libnet_build_mpls.c index fe2619a..fc330b6 100644 --- a/libnet/src/libnet_build_mpls.c +++ b/libnet/src/libnet_build_mpls.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_mpls(uint32_t label, uint8_t experimental, uint8_t bos, diff --git a/libnet/src/libnet_build_ntp.c b/libnet/src/libnet_build_ntp.c index 15be80b..465e7d7 100644 --- a/libnet/src/libnet_build_ntp.c +++ b/libnet/src/libnet_build_ntp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_ntp(uint8_t leap_indicator, uint8_t version, uint8_t mode, diff --git a/libnet/src/libnet_build_ospf.c b/libnet/src/libnet_build_ospf.c index 5d79d4c..9806714 100644 --- a/libnet/src/libnet_build_ospf.c +++ b/libnet/src/libnet_build_ospf.c @@ -33,14 +33,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_ospfv2(uint16_t len, uint8_t type, uint32_t rtr_id, diff --git a/libnet/src/libnet_build_rip.c b/libnet/src/libnet_build_rip.c index 52a2db7..16b7659 100644 --- a/libnet/src/libnet_build_rip.c +++ b/libnet/src/libnet_build_rip.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_rip(uint8_t cmd, uint8_t version, uint16_t rd, uint16_t af, diff --git a/libnet/src/libnet_build_rpc.c b/libnet/src/libnet_build_rpc.c index 9b9fde7..9f4003a 100644 --- a/libnet/src/libnet_build_rpc.c +++ b/libnet/src/libnet_build_rpc.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_rpc_call(uint32_t rm, uint32_t xid, uint32_t prog_num, diff --git a/libnet/src/libnet_build_sebek.c b/libnet/src/libnet_build_sebek.c index e4534d0..9971db5 100644 --- a/libnet/src/libnet_build_sebek.c +++ b/libnet/src/libnet_build_sebek.c @@ -29,14 +29,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_sebek(uint32_t magic, uint16_t version, uint16_t type, diff --git a/libnet/src/libnet_build_snmp.c b/libnet/src/libnet_build_snmp.c index 37a04c6..662e713 100644 --- a/libnet/src/libnet_build_snmp.c +++ b/libnet/src/libnet_build_snmp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_snmp() diff --git a/libnet/src/libnet_build_stp.c b/libnet/src/libnet_build_stp.c index 2d2a6f8..c77d382 100644 --- a/libnet/src/libnet_build_stp.c +++ b/libnet/src/libnet_build_stp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_stp_conf(uint16_t id, uint8_t version, uint8_t bpdu_type, diff --git a/libnet/src/libnet_build_tcp.c b/libnet/src/libnet_build_tcp.c index 8150170..e0c0fcb 100644 --- a/libnet/src/libnet_build_tcp.c +++ b/libnet/src/libnet_build_tcp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_tcp( diff --git a/libnet/src/libnet_build_token_ring.c b/libnet/src/libnet_build_token_ring.c index ef41c82..d0c2e0b 100644 --- a/libnet/src/libnet_build_token_ring.c +++ b/libnet/src/libnet_build_token_ring.c @@ -29,14 +29,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_token_ring(uint8_t ac, uint8_t fc, const uint8_t *dst, const uint8_t *src, diff --git a/libnet/src/libnet_build_udp.c b/libnet/src/libnet_build_udp.c index c135d7a..8f0a1b4 100644 --- a/libnet/src/libnet_build_udp.c +++ b/libnet/src/libnet_build_udp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_udp(uint16_t sp, uint16_t dp, uint16_t len, uint16_t sum, diff --git a/libnet/src/libnet_build_vrrp.c b/libnet/src/libnet_build_vrrp.c index f6c7994..6a33f9f 100644 --- a/libnet/src/libnet_build_vrrp.c +++ b/libnet/src/libnet_build_vrrp.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_ptag_t libnet_build_vrrp(uint8_t version, uint8_t type, uint8_t vrouter_id, diff --git a/libnet/src/libnet_checksum.c b/libnet/src/libnet_checksum.c index 37423ed..1a7b796 100644 --- a/libnet/src/libnet_checksum.c +++ b/libnet/src/libnet_checksum.c @@ -30,16 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - -#include +#include "common.h" /* FIXME - unit test these - 0 is debian's version, else is -RC1's */ /* Note about aliasing warning: diff --git a/libnet/src/libnet_cq.c b/libnet/src/libnet_cq.c index ad0b6ae..a4580b8 100644 --- a/libnet/src/libnet_cq.c +++ b/libnet/src/libnet_cq.c @@ -31,14 +31,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" /* private function prototypes */ static libnet_cq_t *libnet_cq_find_internal(libnet_t *); diff --git a/libnet/src/libnet_crc.c b/libnet/src/libnet_crc.c index f26bee8..886f5dc 100644 --- a/libnet/src/libnet_crc.c +++ b/libnet/src/libnet_crc.c @@ -30,15 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - +#include "common.h" /* CRC routines based off of sample code in appendix of RFC 2083 */ static uint crc_table[256] = diff --git a/libnet/src/libnet_error.c b/libnet/src/libnet_error.c index 306c73d..eeda83d 100644 --- a/libnet/src/libnet_error.c +++ b/libnet/src/libnet_error.c @@ -30,15 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - +#include "common.h" char * libnet_geterror(libnet_t *l) diff --git a/libnet/src/libnet_if_addr.c b/libnet/src/libnet_if_addr.c index f7c9e50..ea9cf94 100644 --- a/libnet/src/libnet_if_addr.c +++ b/libnet/src/libnet_if_addr.c @@ -30,20 +30,12 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" + #ifdef HAVE_SYS_SOCKIO_H #include #endif -#include - #include "../include/ifaddrlist.h" #define MAX_IPADDR 512 diff --git a/libnet/src/libnet_init.c b/libnet/src/libnet_init.c index 7974f6c..c33369c 100644 --- a/libnet/src/libnet_init.c +++ b/libnet/src/libnet_init.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" libnet_t * libnet_init(int injection_type, const char *device, char *err_buf) diff --git a/libnet/src/libnet_internal.c b/libnet/src/libnet_internal.c index 1998149..de13647 100644 --- a/libnet/src/libnet_internal.c +++ b/libnet/src/libnet_internal.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" void libnet_diag_dump_hex(const uint8_t *packet, uint32_t len, int swap, FILE *stream) diff --git a/libnet/src/libnet_link_bpf.c b/libnet/src/libnet_link_bpf.c index 1e6eded..794fbf9 100644 --- a/libnet/src/libnet_link_bpf.c +++ b/libnet/src/libnet_link_bpf.c @@ -27,6 +27,8 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +#include "common.h" + #include /* optionally get BSD define */ #include #include @@ -36,10 +38,6 @@ #include #include -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#include "../include/libnet.h" #include #include #include diff --git a/libnet/src/libnet_link_dlpi.c b/libnet/src/libnet_link_dlpi.c index bb65901..65c3a46 100644 --- a/libnet/src/libnet_link_dlpi.c +++ b/libnet/src/libnet_link_dlpi.c @@ -31,9 +31,8 @@ */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif +#include "common.h" + #include #include #ifdef HAVE_SYS_BUFMOD_H diff --git a/libnet/src/libnet_link_linux.c b/libnet/src/libnet_link_linux.c index 7b6ddc6..924c106 100644 --- a/libnet/src/libnet_link_linux.c +++ b/libnet/src/libnet_link_linux.c @@ -24,9 +24,9 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif +#include "common.h" + + #include #include diff --git a/libnet/src/libnet_link_nit.c b/libnet/src/libnet_link_nit.c index 8f0cd35..4305bb9 100644 --- a/libnet/src/libnet_link_nit.c +++ b/libnet/src/libnet_link_nit.c @@ -27,14 +27,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" #include "../include/gnuc.h" #ifdef HAVE_OS_PROTO_H diff --git a/libnet/src/libnet_link_none.c b/libnet/src/libnet_link_none.c index 57343f2..d387bc6 100644 --- a/libnet/src/libnet_link_none.c +++ b/libnet/src/libnet_link_none.c @@ -27,14 +27,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" static void nosupport(libnet_t* l) { diff --git a/libnet/src/libnet_link_pf.c b/libnet/src/libnet_link_pf.c index 0f0c1b8..0af154c 100644 --- a/libnet/src/libnet_link_pf.c +++ b/libnet/src/libnet_link_pf.c @@ -30,10 +30,7 @@ * Extraction/creation by Jeffrey Mogul, DECWRL */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#include "../include/low_libnet.h" +#include "common.h" #include "../include/gnuc.h" #ifdef HAVE_OS_PROTO_H diff --git a/libnet/src/libnet_link_snit.c b/libnet/src/libnet_link_snit.c index e2d12fc..629ece2 100644 --- a/libnet/src/libnet_link_snit.c +++ b/libnet/src/libnet_link_snit.c @@ -31,20 +31,13 @@ * This module now handles the STREAMS based NIT. */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" + #include "../include/gnuc.h" #ifdef HAVE_OS_PROTO_H #include "../include/os-proto.h" #endif - struct libnet_link_int * libnet_open_link_interface(int8_t *device, int8_t *ebuf) { diff --git a/libnet/src/libnet_link_snoop.c b/libnet/src/libnet_link_snoop.c index 61c6995..6bef638 100644 --- a/libnet/src/libnet_link_snoop.c +++ b/libnet/src/libnet_link_snoop.c @@ -33,7 +33,7 @@ #include #include -#if (HAVE_CONFIG_H) +#include "common.h" #include "../include/config.h" #endif #include "../include/libnet.h" diff --git a/libnet/src/libnet_link_win32.c b/libnet/src/libnet_link_win32.c index 782e5c6..f707f4a 100644 --- a/libnet/src/libnet_link_win32.c +++ b/libnet/src/libnet_link_win32.c @@ -32,12 +32,10 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif +#include "common.h" + #include #include /* From the Microsoft Platform SDK */ -#include "../include/win32/libnet.h" #include #include #include diff --git a/libnet/src/libnet_pblock.c b/libnet/src/libnet_pblock.c index b51f1fb..09e880d 100644 --- a/libnet/src/libnet_pblock.c +++ b/libnet/src/libnet_pblock.c @@ -30,17 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - -#include -#include +#include "common.h" libnet_pblock_t * libnet_pblock_probe(libnet_t *l, libnet_ptag_t ptag, uint32_t b_len, uint8_t type) diff --git a/libnet/src/libnet_port_list.c b/libnet/src/libnet_port_list.c index 781966d..046cb81 100644 --- a/libnet/src/libnet_port_list.c +++ b/libnet/src/libnet_port_list.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" uint16_t *all_lists; diff --git a/libnet/src/libnet_prand.c b/libnet/src/libnet_prand.c index daab5a1..4fb7329 100644 --- a/libnet/src/libnet_prand.c +++ b/libnet/src/libnet_prand.c @@ -30,14 +30,8 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" + int libnet_seed_prand(libnet_t *l) { diff --git a/libnet/src/libnet_raw.c b/libnet/src/libnet_raw.c index 8a96a05..4f79603 100644 --- a/libnet/src/libnet_raw.c +++ b/libnet/src/libnet_raw.c @@ -30,16 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif - -#include +#include "common.h" /* TODO this doesn't make any sense, the code in the #else branch is littered with conditionals on __WIN32__ that are never reachable, what happened? diff --git a/libnet/src/libnet_resolve.c b/libnet/src/libnet_resolve.c index 3c3dfab..9a78f1f 100644 --- a/libnet/src/libnet_resolve.c +++ b/libnet/src/libnet_resolve.c @@ -30,14 +30,7 @@ * */ -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#endif +#include "common.h" #ifndef HAVE_GETHOSTBYNAME2 struct hostent * diff --git a/libnet/src/libnet_write.c b/libnet/src/libnet_write.c index 231612f..6e6d1f3 100644 --- a/libnet/src/libnet_write.c +++ b/libnet/src/libnet_write.c @@ -32,18 +32,9 @@ * */ -#include -#include -#include +#include "common.h" -#if (HAVE_CONFIG_H) -#include "../include/config.h" -#endif -#if (!(_WIN32) || (__CYGWIN__)) -#include "../include/libnet.h" -#else -#include "../include/win32/libnet.h" -#include "../include/win32/config.h" +#if (_WIN32) || (__CYGWIN__) #include "packet32.h" #include "Ntddndis.h" #endif -- cgit v1.2.1