If parser debugging is enabled, ensure pcap_debug is exported.

[libpcap] / gencode.c

diff --git a/gencode.c b/gencode.c
index 090a8ed3ddece9efa7319df919aa2c4666b6cc78..481c4d9c358a5ade099ba458a907502b837c8139 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#ifdef WIN32
+#ifdef _WIN32

 #include <pcap-stdinc.h>
 #include <pcap-stdinc.h>

-#else /* WIN32 */
+#else /* _WIN32 */

 #if HAVE_INTTYPES_H
 #include <inttypes.h>
 #elif HAVE_STDINT_H
 #if HAVE_INTTYPES_H
 #include <inttypes.h>
 #elif HAVE_STDINT_H


@@ -37,16 +37,9 @@
 #endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
 #include <sys/types.h>
 #include <sys/socket.h>

-#endif /* WIN32 */
+#endif /* _WIN32 */

 
 

-/*
- * XXX - why was this included even on UNIX?
- */
-#ifdef __MINGW32__
-#include "ip6_misc.h"
-#endif
-
-#ifndef WIN32
+#ifndef _WIN32

 
 #ifdef __NetBSD__
 #include <sys/param.h>
 
 #ifdef __NetBSD__
 #include <sys/param.h>


@@ -55,7 +48,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 

-#endif /* WIN32 */
+#endif /* _WIN32 */

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -80,27 +73,80 @@
 #include "pcap/sll.h"
 #include "pcap/ipnet.h"
 #include "arcnet.h"
 #include "pcap/sll.h"
 #include "pcap/ipnet.h"
 #include "arcnet.h"

+
+#include "grammar.h"
+#include "scanner.h"
+

 #if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 #include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/filter.h>
 #endif
 #if defined(linux) && defined(PF_PACKET) && defined(SO_ATTACH_FILTER)
 #include <linux/types.h>
 #include <linux/if_packet.h>
 #include <linux/filter.h>
 #endif

+

 #ifdef HAVE_NET_PFVAR_H
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 #endif
 #ifdef HAVE_NET_PFVAR_H
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
 #endif

+

 #ifndef offsetof
 #define offsetof(s, e) ((size_t)&((s *)0)->e)
 #endif
 #ifndef offsetof
 #define offsetof(s, e) ((size_t)&((s *)0)->e)
 #endif

+

 #ifdef INET6
 #ifdef INET6

-#ifndef WIN32
+#ifdef _WIN32
+#if defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF)
+/* IPv6 address */
+struct in6_addr
+  {
+    union
+      {
+       u_int8_t                u6_addr8[16];
+       u_int16_t       u6_addr16[8];
+       u_int32_t       u6_addr32[4];
+      } in6_u;
+#define s6_addr                        in6_u.u6_addr8
+#define s6_addr16              in6_u.u6_addr16
+#define s6_addr32              in6_u.u6_addr32
+#define s6_addr64              in6_u.u6_addr64
+  };
+
+typedef unsigned short sa_family_t;
+
+#define        __SOCKADDR_COMMON(sa_prefix) \
+  sa_family_t sa_prefix##family
+
+/* Ditto, for IPv6.  */
+struct sockaddr_in6
+  {
+    __SOCKADDR_COMMON (sin6_);
+    u_int16_t sin6_port;               /* Transport layer port # */
+    u_int32_t sin6_flowinfo;   /* IPv6 flow information */
+    struct in6_addr sin6_addr; /* IPv6 address */
+  };
+
+#ifndef EAI_ADDRFAMILY
+struct addrinfo {
+       int     ai_flags;       /* AI_PASSIVE, AI_CANONNAME */
+       int     ai_family;      /* PF_xxx */
+       int     ai_socktype;    /* SOCK_xxx */
+       int     ai_protocol;    /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
+       size_t  ai_addrlen;     /* length of ai_addr */
+       char    *ai_canonname;  /* canonical name for hostname */
+       struct sockaddr *ai_addr;       /* binary address */
+       struct addrinfo *ai_next;       /* next structure in linked list */
+};
+#endif /* EAI_ADDRFAMILY */
+#endif /* defined(__MINGW32__) && defined(DEFINE_ADDITIONAL_IPV6_STUFF) */
+#else /* _WIN32 */

 #include <netdb.h>     /* for "struct addrinfo" */
 #include <netdb.h>     /* for "struct addrinfo" */

-#endif /* WIN32 */
-#endif /*INET6*/
+#endif /* _WIN32 */
+#endif /* INET6 */

 #include <pcap/namedb.h>
 
 #include <pcap/namedb.h>
 

+#include "nametoaddr.h"
+

 #define ETHERMTU       1500
 
 #ifndef ETHERTYPE_TEB
 #define ETHERMTU       1500
 
 #ifndef ETHERTYPE_TEB


@@ -136,7 +182,7 @@ static jmp_buf top_ctx;
 static pcap_t *bpf_pcap;
 
 /* Hack for handling VLAN and MPLS stacks. */
 static pcap_t *bpf_pcap;
 
 /* Hack for handling VLAN and MPLS stacks. */

-#ifdef WIN32
+#ifdef _WIN32

 static u_int   label_stack_depth = (u_int)-1, vlan_stack_depth = (u_int)-1;
 #else
 static u_int   label_stack_depth = -1U, vlan_stack_depth = -1U;
 static u_int   label_stack_depth = (u_int)-1, vlan_stack_depth = (u_int)-1;
 #else
 static u_int   label_stack_depth = -1U, vlan_stack_depth = -1U;


@@ -153,7 +199,7 @@ bpf_error(const char *fmt, ...)
 
        va_start(ap, fmt);
        if (bpf_pcap != NULL)
 
        va_start(ap, fmt);
        if (bpf_pcap != NULL)

-               (void)vsnprintf(pcap_geterr(bpf_pcap), PCAP_ERRBUF_SIZE,
+               (void)pcap_vsnprintf(pcap_geterr(bpf_pcap), PCAP_ERRBUF_SIZE,

                    fmt, ap);
        va_end(ap);
        longjmp(top_ctx, 1);
                    fmt, ap);
        va_end(ap);
        longjmp(top_ctx, 1);


@@ -230,14 +276,14 @@ static struct addrinfo *ai;
 #define NCHUNKS 16
 #define CHUNK0SIZE 1024
 struct chunk {
 #define NCHUNKS 16
 #define CHUNK0SIZE 1024
 struct chunk {

-       u_int n_left;
+       size_t n_left;

        void *m;
 };
 
 static struct chunk chunks[NCHUNKS];
 static int cur_chunk;
 
        void *m;
 };
 
 static struct chunk chunks[NCHUNKS];
 static int cur_chunk;
 

-static void *newchunk(u_int);
+static void *newchunk(size_t);

 static void freechunks(void);
 static inline struct block *new_block(int);
 static inline struct slist *new_stmt(int);
 static void freechunks(void);
 static inline struct block *new_block(int);
 static inline struct slist *new_stmt(int);


@@ -321,8 +367,7 @@ static struct block *gen_ppi_dlt_check(void);
 static struct block *gen_msg_abbrev(int type);
 
 static void *
 static struct block *gen_msg_abbrev(int type);
 
 static void *

-newchunk(n)
-       u_int n;
+newchunk(size_t n)

 {
        struct chunk *cp;
        int k;
 {
        struct chunk *cp;
        int k;


@@ -374,7 +419,7 @@ char *
 sdup(s)
        register const char *s;
 {
 sdup(s)
        register const char *s;
 {

-       int n = strlen(s) + 1;
+       size_t n = strlen(s) + 1;

        char *cp = newchunk(n);
 
        strlcpy(cp, s, n);
        char *cp = newchunk(n);
 
        strlcpy(cp, s, n);


@@ -432,6 +477,8 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
 {
        extern int n_errors;
        const char * volatile xbuf = buf;
 {
        extern int n_errors;
        const char * volatile xbuf = buf;

+       yyscan_t scanner = NULL;
+       YY_BUFFER_STATE in_buffer = NULL;

        u_int len;
        int  rc;
 
        u_int len;
        int  rc;
 


@@ -440,12 +487,11 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
         * UN*X, if the platform supports pthreads?  If that requires
         * a separate -lpthread, we might not want to do that.
         */
         * UN*X, if the platform supports pthreads?  If that requires
         * a separate -lpthread, we might not want to do that.
         */

-#ifdef WIN32
-       extern int wsockinit (void);
+#ifdef _WIN32

        static int done = 0;
 
        if (!done)
        static int done = 0;
 
        if (!done)

-               wsockinit();
+               pcap_wsockinit();

        done = 1;
        EnterCriticalSection(&g_PcapCompileCriticalSection);
 #endif
        done = 1;
        EnterCriticalSection(&g_PcapCompileCriticalSection);
 #endif


@@ -455,7 +501,7 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
         * link-layer type, so we can't use it.
         */
        if (!p->activated) {
         * link-layer type, so we can't use it.
         */
        if (!p->activated) {

-               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,

                    "not-yet-activated pcap_t passed to pcap_compile");
                rc = -1;
                goto quit;
                    "not-yet-activated pcap_t passed to pcap_compile");
                rc = -1;
                goto quit;


@@ -473,8 +519,6 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
                        ai = NULL;
                }
 #endif
                        ai = NULL;
                }
 #endif

-               lex_cleanup();
-               freechunks();

                rc = -1;
                goto quit;
        }
                rc = -1;
                goto quit;
        }


@@ -483,15 +527,17 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
 
        snaplen = pcap_snapshot(p);
        if (snaplen == 0) {
 
        snaplen = pcap_snapshot(p);
        if (snaplen == 0) {

-               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+               pcap_snprintf(p->errbuf, PCAP_ERRBUF_SIZE,

                         "snaplen of 0 rejects all packets");
                rc = -1;
                goto quit;
        }
 
                         "snaplen of 0 rejects all packets");
                rc = -1;
                goto quit;
        }
 

-       lex_init(xbuf ? xbuf : "");
+       if (pcap_lex_init(&scanner) != 0)
+               bpf_error("can't initialize scanner: %s", pcap_strerror(errno));
+       in_buffer = pcap__scan_string(xbuf ? xbuf : "", scanner);

        init_linktype(p);
        init_linktype(p);

-       (void)pcap_parse();
+       (void)pcap_parse(scanner);

 
        if (n_errors)
                syntax();
 
        if (n_errors)
                syntax();


@@ -508,14 +554,23 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
        program->bf_insns = icode_to_fcode(root, &len);
        program->bf_len = len;
 
        program->bf_insns = icode_to_fcode(root, &len);
        program->bf_len = len;
 

-       lex_cleanup();
-       freechunks();
-

        rc = 0;  /* We're all okay */
 
 quit:
        rc = 0;  /* We're all okay */
 
 quit:

+       /*
+        * Clean up everything for the lexical analyzer.
+        */
+       if (in_buffer != NULL)
+               pcap__delete_buffer(in_buffer, scanner);
+       if (scanner != NULL)
+               pcap_lex_destroy(scanner);

 
 

-#ifdef WIN32
+       /*
+        * Clean up our own allocated memory.
+        */
+       freechunks();
+
+#ifdef _WIN32

        LeaveCriticalSection(&g_PcapCompileCriticalSection);
 #endif
 
        LeaveCriticalSection(&g_PcapCompileCriticalSection);
 #endif
 


@@ -628,6 +683,15 @@ finish_parse(p)
        /*
         * For DLT_PPI captures, generate a check of the per-packet
         * DLT value to make sure it's DLT_IEEE802_11.
        /*
         * For DLT_PPI captures, generate a check of the per-packet
         * DLT value to make sure it's DLT_IEEE802_11.

+        *
+        * XXX - TurboCap cards use DLT_PPI for Ethernet.
+        * Can we just define some DLT_ETHERNET_WITH_PHDR pseudo-header
+        * with appropriate Ethernet information and use that rather
+        * than using something such as DLT_PPI where you don't know
+        * the link-layer header type until runtime, which, in the
+        * general case, would force us to generate both Ethernet *and*
+        * 802.11 code (*and* anything else for which PPI is used)
+        * and choose between them early in the BPF program?

         */
        ppi_dlt_check = gen_ppi_dlt_check();
        if (ppi_dlt_check != NULL)
         */
        ppi_dlt_check = gen_ppi_dlt_check();
        if (ppi_dlt_check != NULL)


@@ -5561,7 +5625,7 @@ gen_protochain(v, proto, dir)
        int reg2 = alloc_reg();
 
        memset(s, 0, sizeof(s));
        int reg2 = alloc_reg();
 
        memset(s, 0, sizeof(s));

-       fix2 = fix3 = fix4 = fix5 = 0;
+       fix3 = fix4 = fix5 = 0;

 
        switch (proto) {
        case Q_IP:
 
        switch (proto) {
        case Q_IP:


@@ -7915,6 +7979,9 @@ gen_vlan_no_bpf_extensions(int vlan_num)
 
         /* check for VLAN, including QinQ */
         b0 = gen_linktype(ETHERTYPE_8021Q);
 
         /* check for VLAN, including QinQ */
         b0 = gen_linktype(ETHERTYPE_8021Q);

+        b1 = gen_linktype(ETHERTYPE_8021AD);
+        gen_or(b0,b1);
+        b0 = b1;

         b1 = gen_linktype(ETHERTYPE_8021QINQ);
         gen_or(b0,b1);
         b0 = b1;
         b1 = gen_linktype(ETHERTYPE_8021QINQ);
         gen_or(b0,b1);
         b0 = b1;


@@ -8260,7 +8327,7 @@ gen_geneve6(int vni)
                sappend(s, s1);
        } else {
                s = new_stmt(BPF_LD|BPF_IMM);
                sappend(s, s1);
        } else {
                s = new_stmt(BPF_LD|BPF_IMM);

-               s->s.k = 40;;
+               s->s.k = 40;

        }
 
        /* Forcibly append these statements to the true condition
        }
 
        /* Forcibly append these statements to the true condition