PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-25 08:59:01 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade libpcap to 1.8.1 (Nmap-specific patches not yet applied)

Browse Source
This commit is contained in:
dmiller
2018-07-18 13:41:35 +00:00
parent cbb54f79a8
commit 3fc4a6fc95
216 changed files with 27408 additions and 18957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
libpcap/tests/filtertest.c
View File

@@ -34,29 +34,78 @@ The Regents of the University of California. All rights reserved.\n";
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#ifdef _WIN32
#include "getopt.h"
#else
#include <unistd.h>
#endif
#include <fcntl.h>
#include <errno.h>
#include <arpa/inet.h>
#ifdef _WIN32
#include <winsock2.h>
typedef unsigned __int32 in_addr_t;
#else
#include <arpa/inet.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#ifndef HAVE___ATTRIBUTE__
#define __attribute__(x)
/*
* This was introduced by Clang:
*
* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
*
* in some version (which version?); it has been picked up by GCC 5.0.
*/
#ifndef __has_attribute
/*
* It's a macro, so you can check whether it's defined to check
* whether it's supported.
*
* If it's not, define it to always return 0, so that we move on to
* the fallback checks.
*/
#define __has_attribute(x) 0
#endif
#if __has_attribute(noreturn) \
|| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) \
|| (defined(__xlC__) && __xlC__ >= 0x0A01) \
|| (defined(__HP_aCC) && __HP_aCC >= 61000)
/*
* Compiler with support for it, or GCC 2.5 and later, or Solaris Studio 12
* (Sun C 5.9) and later, or IBM XL C 10.1 and later (do any earlier
* versions of XL C support this?), or HP aCC A.06.10 and later.
*/
#define PCAP_NORETURN __attribute((noreturn))
#elif defined( _MSC_VER )
#define PCAP_NORETURN __declspec(noreturn)
#else
#define PCAP_NORETURN
#endif
#if __has_attribute(__format__) \
|| (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)) \
|| (defined(__xlC__) && __xlC__ >= 0x0A01) \
|| (defined(__HP_aCC) && __HP_aCC >= 61000)
/*
* Compiler with support for it, or GCC 2.3 and later, or IBM XL C 10.1
* and later (do any earlier versions of XL C support this?),
* or HP aCC A.06.10 and later.
*/
#define PCAP_PRINTFLIKE(x,y) __attribute__((__format__(__printf__,x,y)))
#else
#define PCAP_PRINTFLIKE(x,y)
#endif
static char *program_name;
/* Forwards */
static void usage(void) __attribute__((noreturn));
static void error(const char *, ...)
__attribute__((noreturn, format (printf, 1, 2)));
static void warn(const char *, ...)
__attribute__((format (printf, 1, 2)));
static void PCAP_NORETURN usage(void);
static void PCAP_NORETURN error(const char *, ...) PCAP_PRINTFLIKE(1, 2);
static void warn(const char *, ...) PCAP_PRINTFLIKE(1, 2);
extern int optind;
extern int opterr;
extern char *optarg;
#ifdef BDEBUG
int dflag;
#endif
@@ -194,16 +243,16 @@ main(int argc, char **argv)
pcap_t *pd;
struct bpf_program fcode;
#ifdef WIN32
#ifdef _WIN32
if(wsockinit() != 0) return 1;
#endif /* WIN32 */
#endif /* _WIN32 */
#ifndef BDEBUG
dflag = 1;
#else
/* if optimizer debugging is enabled, output DOT graph
* `dflag=4' is equivalent to -dddd to follow -d/-dd/-ddd
* convention in tcpdump command line
* convention in tcpdump command line
*/
dflag = 4;
#endif
@@ -236,7 +285,7 @@ main(int argc, char **argv)
in_addr_t addr;
addr = inet_addr(optarg);
if (addr == INADDR_NONE)
if (addr == (in_addr_t)(-1))
error("invalid netmask %s", optarg);
netmask = addr;
break;