Index: net/lft/Makefile =================================================================== --- net/lft/Makefile +++ net/lft/Makefile @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror auto-accept -BROKEN_FreeBSD_12= fails to compile: lft_types.h: pcap-int.h: No such file or directory - GNU_CONFIGURE= yes PLIST_FILES= sbin/lft bin/whob man/man8/lft.8.gz man/man8/whob.8.gz Index: net/lft/files/patch-include_libpcap_pcap-int.h =================================================================== --- /dev/null +++ net/lft/files/patch-include_libpcap_pcap-int.h @@ -0,0 +1,472 @@ +--- include/libpcap/pcap-int.h.orig 2017-06-06 09:31:54 UTC ++++ include/libpcap/pcap-int.h +@@ -0,0 +1,469 @@ ++/* ++ * Copyright (c) 1994, 1995, 1996 ++ * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software ++ * must display the following acknowledgement: ++ * This product includes software developed by the Computer Systems ++ * Engineering Group at Lawrence Berkeley Laboratory. ++ * 4. Neither the name of the University nor of the Laboratory may be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. ++ */ ++ ++#ifndef pcap_int_h ++#define pcap_int_h ++ ++#include ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#if defined(_WIN32) ++ /* ++ * Make sure Packet32.h doesn't define BPF structures that we've ++ * probably already defined as a result of including . ++ */ ++ #define BPF_MAJOR_VERSION ++ #include ++#elif defined(MSDOS) ++ #include ++ #include ++#endif ++ ++#if (defined(_MSC_VER) && (_MSC_VER <= 1200)) /* we are compiling with Visual Studio 6, that doesn't support the LL suffix*/ ++ ++/* ++ * Swap byte ordering of unsigned long long timestamp on a big endian ++ * machine. ++ */ ++#define SWAPLL(ull) ((ull & 0xff00000000000000) >> 56) | \ ++ ((ull & 0x00ff000000000000) >> 40) | \ ++ ((ull & 0x0000ff0000000000) >> 24) | \ ++ ((ull & 0x000000ff00000000) >> 8) | \ ++ ((ull & 0x00000000ff000000) << 8) | \ ++ ((ull & 0x0000000000ff0000) << 24) | \ ++ ((ull & 0x000000000000ff00) << 40) | \ ++ ((ull & 0x00000000000000ff) << 56) ++ ++#else /* A recent Visual studio compiler or not VC */ ++ ++/* ++ * Swap byte ordering of unsigned long long timestamp on a big endian ++ * machine. ++ */ ++#define SWAPLL(ull) ((ull & 0xff00000000000000LL) >> 56) | \ ++ ((ull & 0x00ff000000000000LL) >> 40) | \ ++ ((ull & 0x0000ff0000000000LL) >> 24) | \ ++ ((ull & 0x000000ff00000000LL) >> 8) | \ ++ ((ull & 0x00000000ff000000LL) << 8) | \ ++ ((ull & 0x0000000000ff0000LL) << 24) | \ ++ ((ull & 0x000000000000ff00LL) << 40) | \ ++ ((ull & 0x00000000000000ffLL) << 56) ++ ++#endif /* _MSC_VER */ ++ ++/* ++ * Maximum snapshot length. ++ * ++ * Somewhat arbitrary, but chosen to be: ++ * ++ * 1) big enough for maximum-size Linux loopback packets (65549) ++ * and some USB packets captured with USBPcap: ++ * ++ * http://desowin.org/usbpcap/ ++ * ++ * (> 131072, < 262144) ++ * ++ * and ++ * ++ * 2) small enough not to cause attempts to allocate huge amounts of ++ * memory; some applications might use the snapshot length in a ++ * savefile header to control the size of the buffer they allocate, ++ * so a size of, say, 2^31-1 might not work well. ++ * ++ * We don't enforce this in pcap_set_snaplen(), but we use it internally. ++ */ ++#define MAXIMUM_SNAPLEN 262144 ++ ++struct pcap_opt { ++ char *device; ++ int timeout; /* timeout for buffering */ ++ u_int buffer_size; ++ int promisc; ++ int rfmon; /* monitor mode */ ++ int immediate; /* immediate mode - deliver packets as soon as they arrive */ ++ int tstamp_type; ++ int tstamp_precision; ++}; ++ ++typedef int (*activate_op_t)(pcap_t *); ++typedef int (*can_set_rfmon_op_t)(pcap_t *); ++typedef int (*read_op_t)(pcap_t *, int cnt, pcap_handler, u_char *); ++typedef int (*inject_op_t)(pcap_t *, const void *, size_t); ++typedef int (*setfilter_op_t)(pcap_t *, struct bpf_program *); ++typedef int (*setdirection_op_t)(pcap_t *, pcap_direction_t); ++typedef int (*set_datalink_op_t)(pcap_t *, int); ++typedef int (*getnonblock_op_t)(pcap_t *, char *); ++typedef int (*setnonblock_op_t)(pcap_t *, int, char *); ++typedef int (*stats_op_t)(pcap_t *, struct pcap_stat *); ++#ifdef _WIN32 ++typedef struct pcap_stat *(*stats_ex_op_t)(pcap_t *, int *); ++typedef int (*setbuff_op_t)(pcap_t *, int); ++typedef int (*setmode_op_t)(pcap_t *, int); ++typedef int (*setmintocopy_op_t)(pcap_t *, int); ++typedef HANDLE (*getevent_op_t)(pcap_t *); ++typedef int (*oid_get_request_op_t)(pcap_t *, bpf_u_int32, void *, size_t *); ++typedef int (*oid_set_request_op_t)(pcap_t *, bpf_u_int32, const void *, size_t *); ++typedef u_int (*sendqueue_transmit_op_t)(pcap_t *, pcap_send_queue *, int); ++typedef int (*setuserbuffer_op_t)(pcap_t *, int); ++typedef int (*live_dump_op_t)(pcap_t *, char *, int, int); ++typedef int (*live_dump_ended_op_t)(pcap_t *, int); ++typedef PAirpcapHandle (*get_airpcap_handle_op_t)(pcap_t *); ++#endif ++typedef void (*cleanup_op_t)(pcap_t *); ++ ++/* ++ * We put all the stuff used in the read code path at the beginning, ++ * to try to keep it together in the same cache line or lines. ++ */ ++struct pcap { ++ /* ++ * Method to call to read packets on a live capture. ++ */ ++ read_op_t read_op; ++ ++ /* ++ * Method to call to read packets from a savefile. ++ */ ++ int (*next_packet_op)(pcap_t *, struct pcap_pkthdr *, u_char **); ++ ++#ifdef _WIN32 ++ ADAPTER *adapter; ++#else ++ int fd; ++ int selectable_fd; ++#endif /* _WIN32 */ ++ ++ /* ++ * Read buffer. ++ */ ++ u_int bufsize; ++ void *buffer; ++ u_char *bp; ++ int cc; ++ ++ int break_loop; /* flag set to force break from packet-reading loop */ ++ ++ void *priv; /* private data for methods */ ++ ++ int swapped; ++ FILE *rfile; /* null if live capture, non-null if savefile */ ++ u_int fddipad; ++ struct pcap *next; /* list of open pcaps that need stuff cleared on close */ ++ ++ /* ++ * File version number; meaningful only for a savefile, but we ++ * keep it here so that apps that (mistakenly) ask for the ++ * version numbers will get the same zero values that they ++ * always did. ++ */ ++ int version_major; ++ int version_minor; ++ ++ int snapshot; ++ int linktype; /* Network linktype */ ++ int linktype_ext; /* Extended information stored in the linktype field of a file */ ++ int tzoff; /* timezone offset */ ++ int offset; /* offset for proper alignment */ ++ int activated; /* true if the capture is really started */ ++ int oldstyle; /* if we're opening with pcap_open_live() */ ++ ++ struct pcap_opt opt; ++ ++ /* ++ * Place holder for pcap_next(). ++ */ ++ u_char *pkt; ++ ++#ifdef _WIN32 ++ struct pcap_stat stat; /* used for pcap_stats_ex() */ ++#endif ++ ++ /* We're accepting only packets in this direction/these directions. */ ++ pcap_direction_t direction; ++ ++ /* ++ * Flags to affect BPF code generation. ++ */ ++ int bpf_codegen_flags; ++ ++ /* ++ * Placeholder for filter code if bpf not in kernel. ++ */ ++ struct bpf_program fcode; ++ ++ char errbuf[PCAP_ERRBUF_SIZE + 1]; ++ int dlt_count; ++ u_int *dlt_list; ++ int tstamp_type_count; ++ u_int *tstamp_type_list; ++ int tstamp_precision_count; ++ u_int *tstamp_precision_list; ++ ++ struct pcap_pkthdr pcap_header; /* This is needed for the pcap_next_ex() to work */ ++ ++ /* ++ * More methods. ++ */ ++ activate_op_t activate_op; ++ can_set_rfmon_op_t can_set_rfmon_op; ++ inject_op_t inject_op; ++ setfilter_op_t setfilter_op; ++ setdirection_op_t setdirection_op; ++ set_datalink_op_t set_datalink_op; ++ getnonblock_op_t getnonblock_op; ++ setnonblock_op_t setnonblock_op; ++ stats_op_t stats_op; ++ ++ /* ++ * Routine to use as callback for pcap_next()/pcap_next_ex(). ++ */ ++ pcap_handler oneshot_callback; ++ ++#ifdef _WIN32 ++ /* ++ * These are, at least currently, specific to the Win32 NPF ++ * driver. ++ */ ++ stats_ex_op_t stats_ex_op; ++ setbuff_op_t setbuff_op; ++ setmode_op_t setmode_op; ++ setmintocopy_op_t setmintocopy_op; ++ getevent_op_t getevent_op; ++ oid_get_request_op_t oid_get_request_op; ++ oid_set_request_op_t oid_set_request_op; ++ sendqueue_transmit_op_t sendqueue_transmit_op; ++ setuserbuffer_op_t setuserbuffer_op; ++ live_dump_op_t live_dump_op; ++ live_dump_ended_op_t live_dump_ended_op; ++ get_airpcap_handle_op_t get_airpcap_handle_op; ++#endif ++ cleanup_op_t cleanup_op; ++}; ++ ++/* ++ * BPF code generation flags. ++ */ ++#define BPF_SPECIAL_VLAN_HANDLING 0x00000001 /* special VLAN handling for Linux */ ++ ++/* ++ * This is a timeval as stored in a savefile. ++ * It has to use the same types everywhere, independent of the actual ++ * `struct timeval'; `struct timeval' has 32-bit tv_sec values on some ++ * platforms and 64-bit tv_sec values on other platforms, and writing ++ * out native `struct timeval' values would mean files could only be ++ * read on systems with the same tv_sec size as the system on which ++ * the file was written. ++ */ ++ ++struct pcap_timeval { ++ bpf_int32 tv_sec; /* seconds */ ++ bpf_int32 tv_usec; /* microseconds */ ++}; ++ ++/* ++ * This is a `pcap_pkthdr' as actually stored in a savefile. ++ * ++ * Do not change the format of this structure, in any way (this includes ++ * changes that only affect the length of fields in this structure), ++ * and do not make the time stamp anything other than seconds and ++ * microseconds (e.g., seconds and nanoseconds). Instead: ++ * ++ * introduce a new structure for the new format; ++ * ++ * send mail to "tcpdump-workers@lists.tcpdump.org", requesting ++ * a new magic number for your new capture file format, and, when ++ * you get the new magic number, put it in "savefile.c"; ++ * ++ * use that magic number for save files with the changed record ++ * header; ++ * ++ * make the code in "savefile.c" capable of reading files with ++ * the old record header as well as files with the new record header ++ * (using the magic number to determine the header format). ++ * ++ * Then supply the changes by forking the branch at ++ * ++ * https://github.com/the-tcpdump-group/libpcap/issues ++ * ++ * and issuing a pull request, so that future versions of libpcap and ++ * programs that use it (such as tcpdump) will be able to read your new ++ * capture file format. ++ */ ++ ++struct pcap_sf_pkthdr { ++ struct pcap_timeval ts; /* time stamp */ ++ bpf_u_int32 caplen; /* length of portion present */ ++ bpf_u_int32 len; /* length this packet (off wire) */ ++}; ++ ++/* ++ * How a `pcap_pkthdr' is actually stored in savefiles written ++ * by some patched versions of libpcap (e.g. the ones in Red ++ * Hat Linux 6.1 and 6.2). ++ * ++ * Do not change the format of this structure, in any way (this includes ++ * changes that only affect the length of fields in this structure). ++ * Instead, introduce a new structure, as per the above. ++ */ ++ ++struct pcap_sf_patched_pkthdr { ++ struct pcap_timeval ts; /* time stamp */ ++ bpf_u_int32 caplen; /* length of portion present */ ++ bpf_u_int32 len; /* length this packet (off wire) */ ++ int index; ++ unsigned short protocol; ++ unsigned char pkt_type; ++}; ++ ++/* ++ * User data structure for the one-shot callback used for pcap_next() ++ * and pcap_next_ex(). ++ */ ++struct oneshot_userdata { ++ struct pcap_pkthdr *hdr; ++ const u_char **pkt; ++ pcap_t *pd; ++}; ++ ++#ifndef min ++#define min(a, b) ((a) > (b) ? (b) : (a)) ++#endif ++ ++int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *); ++ ++#include ++ ++#include "portability.h" ++ ++/* ++ * Does the packet count argument to a module's read routine say ++ * "supply packets until you run out of packets"? ++ */ ++#define PACKET_COUNT_IS_UNLIMITED(count) ((count) <= 0) ++ ++/* ++ * Routines that most pcap implementations can use for non-blocking mode. ++ */ ++#if !defined(_WIN32) && !defined(MSDOS) ++int pcap_getnonblock_fd(pcap_t *, char *); ++int pcap_setnonblock_fd(pcap_t *p, int, char *); ++#endif ++ ++/* ++ * Internal interfaces for "pcap_create()". ++ * ++ * "pcap_create_interface()" is the routine to do a pcap_create on ++ * a regular network interface. There are multiple implementations ++ * of this, one for each platform type (Linux, BPF, DLPI, etc.), ++ * with the one used chosen by the configure script. ++ * ++ * "pcap_create_common()" allocates and fills in a pcap_t, for use ++ * by pcap_create routines. ++ */ ++pcap_t *pcap_create_interface(const char *, char *); ++pcap_t *pcap_create_common(char *, size_t); ++int pcap_do_addexit(pcap_t *); ++void pcap_add_to_pcaps_to_close(pcap_t *); ++void pcap_remove_from_pcaps_to_close(pcap_t *); ++void pcap_cleanup_live_common(pcap_t *); ++int pcap_check_activated(pcap_t *); ++ ++/* ++ * Internal interfaces for "pcap_findalldevs()". ++ * ++ * "pcap_platform_finddevs()" is a platform-dependent routine to ++ * find local network interfaces. ++ * ++ * "pcap_findalldevs_interfaces()" is a helper to find those interfaces ++ * using the "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.). ++ * ++ * "pcap_add_if()" adds an interface to the list of interfaces, for ++ * use by various "find interfaces" routines. ++ */ ++int pcap_platform_finddevs(pcap_if_t **, char *); ++#if !defined(_WIN32) && !defined(MSDOS) ++int pcap_findalldevs_interfaces(pcap_if_t **, char *, ++ int (*)(const char *)); ++#endif ++int add_addr_to_iflist(pcap_if_t **, const char *, bpf_u_int32, ++ struct sockaddr *, size_t, struct sockaddr *, size_t, ++ struct sockaddr *, size_t, struct sockaddr *, size_t, char *); ++int add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t, ++ struct sockaddr *, size_t, struct sockaddr *, size_t, ++ struct sockaddr *dstaddr, size_t, char *errbuf); ++int pcap_add_if(pcap_if_t **, const char *, bpf_u_int32, const char *, ++ char *); ++int add_or_find_if(pcap_if_t **, pcap_if_t **, const char *, bpf_u_int32, ++ const char *, char *); ++#ifndef _WIN32 ++bpf_u_int32 if_flags_to_pcap_flags(const char *, u_int); ++#endif ++ ++/* ++ * Internal interfaces for "pcap_open_offline()". ++ * ++ * "pcap_open_offline_common()" allocates and fills in a pcap_t, for use ++ * by pcap_open_offline routines. ++ * ++ * "sf_cleanup()" closes the file handle associated with a pcap_t, if ++ * appropriate, and frees all data common to all modules for handling ++ * savefile types. ++ */ ++pcap_t *pcap_open_offline_common(char *ebuf, size_t size); ++void sf_cleanup(pcap_t *p); ++ ++/* ++ * Internal interfaces for both "pcap_create()" and routines that ++ * open savefiles. ++ * ++ * "pcap_oneshot()" is the standard one-shot callback for "pcap_next()" ++ * and "pcap_next_ex()". ++ */ ++void pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *); ++ ++#ifdef _WIN32 ++void pcap_win32_err_to_str(DWORD, char *); ++#endif ++ ++int install_bpf_program(pcap_t *, struct bpf_program *); ++ ++int pcap_strcasecmp(const char *, const char *); ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif Index: net/lft/files/patch-include_libpcap_portability.h =================================================================== --- /dev/null +++ net/lft/files/patch-include_libpcap_portability.h @@ -0,0 +1,219 @@ +--- include/libpcap/portability.h.orig 2017-06-06 09:32:02 UTC ++++ include/libpcap/portability.h +@@ -0,0 +1,216 @@ ++/* ++ * Copyright (c) 1994, 1995, 1996 ++ * The Regents of the University of California. 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. All advertising materials mentioning features or use of this software ++ * must display the following acknowledgement: ++ * This product includes software developed by the Computer Systems ++ * Engineering Group at Lawrence Berkeley Laboratory. ++ * 4. Neither the name of the University nor of the Laboratory may be used ++ * to endorse or promote products derived from this software without ++ * specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. ++ */ ++ ++#ifndef portability_h ++#define portability_h ++ ++/* ++ * Helpers for portability between Windows and UN*X and between different ++ * flavors of UN*X. ++ */ ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#ifndef HAVE_STRLCPY ++ /* ++ * Macro that does the same thing as strlcpy(). ++ */ ++ #ifdef _MSC_VER ++ /* ++ * strncpy_s() is supported at least back to Visual ++ * Studio 2005. ++ */ ++ #define strlcpy(x, y, z) \ ++ strncpy_s((x), (z), (y), _TRUNCATE) ++ ++ #else ++ #define strlcpy(x, y, z) \ ++ (strncpy((x), (y), (z)), \ ++ ((z) <= 0 ? 0 : ((x)[(z) - 1] = '\0')), \ ++ (void) strlen((y))) ++ #endif ++#endif ++ ++/* ++ * For flagging arguments as format strings in MSVC. ++ */ ++#if _MSC_VER >= 1400 ++ #include ++ #if _MSC_VER > 1400 ++ #define FORMAT_STRING(p) _Printf_format_string_ p ++ #else ++ #define FORMAT_STRING(p) __format_string p ++ #endif ++#else ++ #define FORMAT_STRING(p) p ++#endif ++ ++#ifdef _MSC_VER ++ #define strdup _strdup ++ #define sscanf sscanf_s ++ #define setbuf(x, y) \ ++ setvbuf((x), (y), _IONBF, 0) ++ #define fopen(x, y) \ ++ fopen_safe((x), (y)) ++ FILE *fopen_safe(const char *filename, const char* mode); ++#endif ++ ++#if defined(_MSC_VER) || defined(__MINGW32__) ++ #define strlcat(x, y, z) \ ++ strncat_s((x), (z), (y), _TRUNCATE) ++#endif ++ ++#ifdef _MSC_VER ++ /* ++ * MSVC. ++ */ ++ #if _MSC_VER >= 1900 ++ /* ++ * VS 2015 or newer; we have snprintf() function. ++ */ ++ #define HAVE_SNPRINTF ++ #endif ++#endif ++ ++/* ++ * On Windows, snprintf(), with that name and with C99 behavior - i.e., ++ * guaranteeing that the formatted string is null-terminated - didn't ++ * appear until Visual Studio 2015. Prior to that, the C runtime had ++ * only _snprintf(), which *doesn't* guarantee that the string is ++ * null-terminated if it is truncated due to the buffer being too ++ * small. We therefore can't just define snprintf to be _snprintf ++ * and define vsnprintf to be _vsnprintf, as we're relying on null- ++ * termination of strings in all cases. ++ * ++ * We also want to allow this to be built with versions of Visual Studio ++ * prior to VS 2015, so we can't rely on snprintf() being present. ++ * ++ * And we want to make sure that, if we support plugins in the future, ++ * a routine with C99 snprintf() behavior will be available to them. ++ * We also don't want it to collide with the C library snprintf() if ++ * there is one. ++ * ++ * So we make pcap_snprintf() and pcap_vsnprintf() available, either by ++ * #defining them to be snprintf or vsnprintf, respectively, or by ++ * defining our own versions and exporting them. ++ */ ++#ifdef HAVE_SNPRINTF ++#define pcap_snprintf snprintf ++#else ++extern int pcap_snprintf(char *, size_t, FORMAT_STRING(const char *), ...) ++#ifdef __ATTRIBUTE___FORMAT_OK ++ __attribute__((format (printf, 3, 4))) ++#endif /* __ATTRIBUTE___FORMAT_OK */ ++ ; ++#endif ++ ++#ifdef HAVE_VSNPRINTF ++#define pcap_vsnprintf vsnprintf ++#else ++extern int pcap_vsnprintf(char *, size_t, const char *, va_list ap); ++#endif ++ ++#ifdef HAVE_STRTOK_R ++ #define pcap_strtok_r strtok_r ++#else ++ #ifdef _MSC_VER ++ /* ++ * Microsoft gives it a different name. ++ */ ++ #define pcap_strtok_r strtok_s ++ #else ++ /* ++ * Define it ourselves. ++ */ ++ #define NEED_STRTOK_R ++ extern int pcap_strtok_r(char *, const char *, char **); ++ #endif ++#endif /* HAVE_STRTOK_R */ ++ ++#ifdef _WIN32 ++ /* ++ * These may be defined by . ++ * ++ * XXX - for MSVC, we always want the _MSC_EXTENSIONS versions. ++ * What about other compilers? If, as the MinGW Web site says MinGW ++ * does, the other compilers just use Microsoft's run-time library, ++ * then they should probably use the _MSC_EXTENSIONS even if the ++ * compiler doesn't define _MSC_EXTENSIONS. ++ * ++ * XXX - we currently aren't using any of these, but this allows ++ * their use in the future. ++ */ ++ #ifndef PRId64 ++ #ifdef _MSC_EXTENSIONS ++ #define PRId64 "I64d" ++ #else ++ #define PRId64 "lld" ++ #endif ++ #endif /* PRId64 */ ++ ++ #ifndef PRIo64 ++ #ifdef _MSC_EXTENSIONS ++ #define PRIo64 "I64o" ++ #else ++ #define PRIo64 "llo" ++ #endif ++ #endif /* PRIo64 */ ++ ++ #ifndef PRIx64 ++ #ifdef _MSC_EXTENSIONS ++ #define PRIx64 "I64x" ++ #else ++ #define PRIx64 "llx" ++ #endif ++ #endif ++ ++ #ifndef PRIu64 ++ #ifdef _MSC_EXTENSIONS ++ #define PRIu64 "I64u" ++ #else ++ #define PRIu64 "llu" ++ #endif ++ #endif ++ ++ #if !defined(__cplusplus) ++ #define inline __inline ++ #endif ++#endif /* _WIN32 */ ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif Index: net/lft/files/patch-lft__types.h =================================================================== --- /dev/null +++ net/lft/files/patch-lft__types.h @@ -0,0 +1,11 @@ +--- lft_types.h.orig 2017-06-06 09:31:27 UTC ++++ lft_types.h +@@ -102,7 +102,7 @@ typedef signed long n_time; + #define HAVE_SNPRINTF + #define HAVE_VSNPRINTF + #if !defined(OPENBSD) +-#include ++#include "include/libpcap/pcap-int.h" + #endif + #endif + #endif