]> The Tcpdump Group git mirrors - libpcap/blobdiff - gencode.c
Tony Li's changes, from FreeBSD, to support filtering for OSI packets
[libpcap] / gencode.c
index b7c8c88de6488a1f002f3091434f99f7a478a0b4..ea844903b1a8b74c85109358f532d1565ef29abb 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -1,3 +1,4 @@
+/*#define CHASE_CHAIN*/
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
  *     The Regents of the University of California.  All rights reserved.
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.94 1999-10-07 23:46:40 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.129 2000-10-28 09:30:21 guy Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
+#ifdef __NetBSD__
+#include <sys/param.h>
+#endif
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
-
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
 
 #include <stdlib.h>
+#include <string.h>
 #include <memory.h>
 #include <setjmp.h>
-#if __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "pcap-int.h"
 
 #include "ethertype.h"
+#include "nlpid.h"
 #include "gencode.h"
 #include "ppp.h"
 #include <pcap-namedb.h>
+#ifdef INET6
+#include <netdb.h>
+#include <sys/socket.h>
+#endif /*INET6*/
+
+#define LLC_ISO_LSAP   0xfe
+
+#define ETHERMTU       1500
 
-#include "gnuc.h"
 #ifdef HAVE_OS_PROTO_H
 #include "os-proto.h"
 #endif
@@ -72,24 +81,16 @@ int pcap_fddipad;
 #endif
 
 /* VARARGS */
-__dead void
-#if __STDC__
+void
 bpf_error(const char *fmt, ...)
-#else
-bpf_error(fmt, va_alist)
-       const char *fmt;
-       va_dcl
-#endif
+
 {
        va_list ap;
 
-#if __STDC__
        va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
        if (bpf_pcap != NULL)
-               (void)vsprintf(pcap_geterr(bpf_pcap), fmt, ap);
+               (void)vsnprintf(pcap_geterr(bpf_pcap), PCAP_ERRBUF_SIZE,
+                   fmt, ap);
        va_end(ap);
        longjmp(top_ctx, 1);
        /* NOTREACHED */
@@ -128,23 +129,42 @@ static inline void syntax(void);
 static void backpatch(struct block *, struct block *);
 static void merge(struct block *, struct block *);
 static struct block *gen_cmp(u_int, u_int, bpf_int32);
+static struct block *gen_cmp_gt(u_int, u_int, bpf_int32);
 static struct block *gen_mcmp(u_int, u_int, bpf_int32, bpf_u_int32);
 static struct block *gen_bcmp(u_int, u_int, const u_char *);
 static struct block *gen_uncond(int);
 static inline struct block *gen_true(void);
 static inline struct block *gen_false(void);
 static struct block *gen_linktype(int);
+static struct block *gen_snap(bpf_u_int32, bpf_u_int32, u_int);
 static struct block *gen_hostop(bpf_u_int32, bpf_u_int32, int, int, u_int, u_int);
+#ifdef INET6
+static struct block *gen_hostop6(struct in6_addr *, struct in6_addr *, int, int, u_int, u_int);
+#endif
 static struct block *gen_ehostop(const u_char *, int);
 static struct block *gen_fhostop(const u_char *, int);
+static struct block *gen_thostop(const u_char *, int);
 static struct block *gen_dnhostop(bpf_u_int32, int, u_int);
 static struct block *gen_host(bpf_u_int32, bpf_u_int32, int, int);
+#ifdef INET6
+static struct block *gen_host6(struct in6_addr *, struct in6_addr *, int, int);
+#endif
+#ifndef INET6
 static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
+#endif
 static struct block *gen_ipfrag(void);
 static struct block *gen_portatom(int, bpf_int32);
+#ifdef INET6
+static struct block *gen_portatom6(int, bpf_int32);
+#endif
 struct block *gen_portop(int, int, int);
 static struct block *gen_port(int, int, int);
+#ifdef INET6
+struct block *gen_portop6(int, int, int);
+static struct block *gen_port6(int, int, int);
+#endif
 static int lookup_proto(const char *, int);
+static struct block *gen_protochain(int, int, int);
 static struct block *gen_proto(int, int, int);
 static struct slist *xfer_to_x(struct arth *);
 static struct slist *xfer_to_a(struct arth *);
@@ -157,8 +177,13 @@ newchunk(n)
        struct chunk *cp;
        int k, size;
 
+#ifndef __NetBSD__
        /* XXX Round up to nearest long. */
        n = (n + sizeof(long) - 1) & ~(sizeof(long) - 1);
+#else
+       /* XXX Round up to structure boundary. */
+       n = ALIGN(n);
+#endif
 
        cp = &chunks[cur_chunk];
        if (n > cp->n_left) {
@@ -199,7 +224,7 @@ sdup(s)
        int n = strlen(s) + 1;
        char *cp = newchunk(n);
 
-       strcpy(cp, s);
+       strlcpy(cp, s, n);
        return (cp);
 }
 
@@ -246,6 +271,7 @@ syntax()
 
 static bpf_u_int32 netmask;
 static int snaplen;
+int no_optimize;
 
 int
 pcap_compile(pcap_t *p, struct bpf_program *program,
@@ -254,16 +280,32 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
        extern int n_errors;
        int len;
 
+       no_optimize = 0;
        n_errors = 0;
        root = NULL;
        bpf_pcap = p;
        if (setjmp(top_ctx)) {
+               lex_cleanup();
                freechunks();
                return (-1);
        }
 
        netmask = mask;
+       
+       /* On Linux we do not use the BPF filter to truncate the packet
+        * since the kernel provides other ways for that. In fact if we
+        * are using the packet filter for that duty we will be unable 
+        * to acquire the original packet size.  -- Torsten */
+#ifndef linux
        snaplen = pcap_snapshot(p);
+#else
+       snaplen = 0xffff;
+#endif
+       if (snaplen == 0) {
+               snprintf(p->errbuf, PCAP_ERRBUF_SIZE,
+                        "snaplen of 0 rejects all packets");
+               return -1;
+       }
 
        lex_init(buf ? buf : "");
        init_linktype(pcap_datalink(p));
@@ -275,6 +317,55 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
        if (root == NULL)
                root = gen_retblk(snaplen);
 
+       if (optimize && !no_optimize) {
+               bpf_optimize(&root);
+               if (root == NULL ||
+                   (root->s.code == (BPF_RET|BPF_K) && root->s.k == 0))
+                       bpf_error("expression rejects all packets");
+       }
+       program->bf_insns = icode_to_fcode(root, &len);
+       program->bf_len = len;
+
+       lex_cleanup();
+       freechunks();
+       return (0);
+}
+
+/*
+ * entry point for using the compiler with no pcap open
+ * pass in all the stuff that is needed explicitly instead.
+ */
+int
+pcap_compile_nopcap(int snaplen_arg, int linktype_arg,
+                   struct bpf_program *program,
+            char *buf, int optimize, bpf_u_int32 mask)
+{
+       extern int n_errors;
+       int len;
+
+       n_errors = 0;
+       root = NULL;
+       bpf_pcap = NULL;
+       if (setjmp(top_ctx)) {
+               freechunks();
+               return (-1);
+       }
+
+       netmask = mask;
+
+       /* XXX needed? I don't grok the use of globals here. */
+       snaplen = snaplen_arg;
+
+       lex_init(buf ? buf : "");
+       init_linktype(linktype_arg);
+       (void)pcap_parse();
+
+       if (n_errors)
+               syntax();
+
+       if (root == NULL)
+               root = gen_retblk(snaplen_arg);
+
        if (optimize) {
                bpf_optimize(&root);
                if (root == NULL ||
@@ -288,6 +379,20 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
        return (0);
 }
 
+/*
+ * Clean up a "struct bpf_program" by freeing all the memory allocated
+ * in it.
+ */
+void
+pcap_freecode(struct bpf_program *program)
+{
+       program->bf_len = 0;
+       if (program->bf_insns != NULL) {
+               free((char *)program->bf_insns);
+               program->bf_insns = NULL;
+       }
+}
+
 /*
  * Backpatch the blocks in 'list' to 'target'.  The 'sense' field indicates
  * which of the jt and jf fields has been resolved and which is a pointer
@@ -388,6 +493,24 @@ gen_cmp(offset, size, v)
        return b;
 }
 
+static struct block *
+gen_cmp_gt(offset, size, v)
+       u_int offset, size;
+       bpf_int32 v;
+{
+       struct slist *s;
+       struct block *b;
+
+       s = new_stmt(BPF_LD|BPF_ABS|size);
+       s->s.k = offset;
+
+       b = new_block(JMP(BPF_JGT));
+       b->stmts = s;
+       b->s.k = v;
+
+       return b;
+}
+
 static struct block *
 gen_mcmp(offset, size, v, mask)
        u_int offset, size;
@@ -487,6 +610,8 @@ init_linktype(type)
                return;
 
        case DLT_PPP:
+       case DLT_C_HDLC:
+       case DLT_PPP_SERIAL:
                off_linktype = 2;
                off_nl = 4;
                return;
@@ -501,6 +626,8 @@ init_linktype(type)
                 * FDDI doesn't really have a link-level type field.
                 * We assume that SSAP = SNAP is being used and pick
                 * out the encapsulated Ethernet type.
+                *
+                * XXX - should we generate code to check for SNAP?
                 */
                off_linktype = 19;
 #ifdef PCAP_FDDIPAD
@@ -513,6 +640,28 @@ init_linktype(type)
                return;
 
        case DLT_IEEE802:
+               /*
+                * Token Ring doesn't really have a link-level type field.
+                * We assume that SSAP = SNAP is being used and pick
+                * out the encapsulated Ethernet type.
+                *
+                * XXX - should we generate code to check for SNAP?
+                *
+                * XXX - the header is actually variable-length.
+                * Some various Linux patched versions gave 38
+                * as "off_linktype" and 40 as "off_nl"; however,
+                * if a token ring packet has *no* routing
+                * information, i.e. is not source-routed, the correct
+                * values are 20 and 22, as they are in the vanilla code.
+                *
+                * A packet is source-routed iff the uppermost bit
+                * of the first byte of the source address, at an
+                * offset of 8, has the uppermost bit set.  If the
+                * packet is source-routed, the total number of bytes
+                * of routing information is 2 plus bits 0x1F00 of
+                * the 16-bit value at an offset of 14 (shifted right
+                * 8 - figure out which byte that is).
+                */
                off_linktype = 20;
                off_nl = 22;
                return;
@@ -530,6 +679,11 @@ init_linktype(type)
                off_linktype = -1;
                off_nl = 0;
                return;
+
+       case DLT_ATM_CLIP:      /* Linux ATM defines this */
+               off_linktype = 6;
+               off_nl = 8;
+               return;
        }
        bpf_error("unknown data link type 0x%x", linktype);
        /* NOTREACHED */
@@ -568,21 +722,114 @@ gen_linktype(proto)
 {
        struct block *b0, *b1;
 
-       /* If we're not using encapsulation and checking for IP, we're done */
-       if (off_linktype == -1 && proto == ETHERTYPE_IP)
+       /* If we're not using encapsulation, we're done */
+       if (off_linktype == -1)
                return gen_true();
 
        switch (linktype) {
 
+       case DLT_EN10MB:
+               /*
+                * XXX - handle other LLC-encapsulated protocols here
+                * (IPX, OSI)?
+                */
+               switch (proto) {
+
+               case LLC_ISO_LSAP:
+                       /*
+                        * OSI protocols always use 802.2 encapsulation.
+                        */
+                       b0 = gen_cmp_gt(off_linktype, BPF_H, ETHERMTU);
+                       gen_not(b0);
+                       b1 = gen_cmp(off_linktype + 2, BPF_H, (long)
+                                    ((LLC_ISO_LSAP << 8) | LLC_ISO_LSAP));
+                       gen_and(b0, b1);
+                       return b1;
+
+               case ETHERTYPE_ATALK:
+               case ETHERTYPE_AARP:
+                       /*
+                        * EtherTalk (AppleTalk protocols on Ethernet link
+                        * layer) may use 802.2 encapsulation.
+                        */
+
+                       /*
+                        * Check for 802.2 encapsulation (EtherTalk phase 2?);
+                        * we check for an Ethernet type field less than
+                        * 1500, which means it's an 802.3 length field.
+                        */
+                       b0 = gen_cmp_gt(off_linktype, BPF_H, ETHERMTU);
+                       gen_not(b0);
+
+                       /*
+                        * 802.2-encapsulated ETHERTYPE_ATALK packets are
+                        * SNAP packets with an organization code of
+                        * 0x080007 (Apple, for Appletalk) and a protocol
+                        * type of ETHERTYPE_ATALK (Appletalk).
+                        *
+                        * 802.2-encapsulated ETHERTYPE_AARP packets are
+                        * SNAP packets with an organization code of
+                        * 0x000000 (encapsulated Ethernet) and a protocol
+                        * type of ETHERTYPE_AARP (Appletalk ARP).
+                        */
+                       if (proto == ETHERTYPE_ATALK)
+                               b1 = gen_snap(0x080007, ETHERTYPE_ATALK, 14);
+                       else    /* proto == ETHERTYPE_AARP */
+                               b1 = gen_snap(0x000000, ETHERTYPE_AARP, 14);
+                       gen_and(b0, b1);
+
+                       /*
+                        * Check for Ethernet encapsulation (Ethertalk
+                        * phase 1?); we just check for the Ethernet
+                        * protocol type.
+                        */
+                       b0 = gen_cmp(off_linktype, BPF_H, (bpf_int32)proto);
+
+                       gen_or(b0, b1);
+                       return b1;
+               }
+               break;
+
        case DLT_SLIP:
                return gen_false();
 
        case DLT_PPP:
-               if (proto == ETHERTYPE_IP)
+       case DLT_PPP_SERIAL:
+               /*
+                * We use Ethernet protocol types inside libpcap;
+                * map them to the corresponding PPP protocol types.
+                */
+               switch (proto) {
+
+               case ETHERTYPE_IP:
                        proto = PPP_IP;                 /* XXX was 0x21 */
+                       break;
+
+#ifdef INET6
+               case ETHERTYPE_IPV6:
+                       proto = PPP_IPV6;
+                       break;
+#endif
+
+               case ETHERTYPE_DN:
+                       proto = PPP_DECNET;
+                       break;
+
+               case ETHERTYPE_ATALK:
+                       proto = PPP_APPLE;
+                       break;
+
+               case ETHERTYPE_NS:
+                       proto = PPP_NS;
+                       break;
+               }
                break;
 
        case DLT_PPP_BSDOS:
+               /*
+                * We use Ethernet protocol types inside libpcap;
+                * map them to the corresponding PPP protocol types.
+                */
                switch (proto) {
 
                case ETHERTYPE_IP:
@@ -593,6 +840,13 @@ gen_linktype(proto)
                        gen_or(b1, b0);
                        return b0;
 
+#ifdef INET6
+               case ETHERTYPE_IPV6:
+                       proto = PPP_IPV6;
+                       /* more to go? */
+                       break;
+#endif
+
                case ETHERTYPE_DN:
                        proto = PPP_DECNET;
                        break;
@@ -611,12 +865,42 @@ gen_linktype(proto)
                /* XXX */
                if (proto == ETHERTYPE_IP)
                        return (gen_cmp(0, BPF_W, (bpf_int32)htonl(AF_INET)));
+#ifdef INET6
+               else if (proto == ETHERTYPE_IPV6)
+                       return (gen_cmp(0, BPF_W, (bpf_int32)htonl(AF_INET6)));
+#endif
                else
                        return gen_false();
        }
        return gen_cmp(off_linktype, BPF_H, (bpf_int32)proto);
 }
 
+/*
+ * Check for an LLC SNAP packet with a given organization code and
+ * protocol type; we check the entire contents of the 802.2 LLC and
+ * snap headers, checking for a DSAP of 0xAA, an SSAP of 0xAA, and
+ * a control field of 0x03 in the LLC header, and for the specified
+ * organization code and protocol type in the SNAP header.
+ */
+static struct block *
+gen_snap(orgcode, ptype, offset)
+       bpf_u_int32 orgcode;
+       bpf_u_int32 ptype;
+       u_int offset;
+{
+       u_char snapblock[8];
+
+       snapblock[0] = 0xAA;    /* DSAP = SNAP */
+       snapblock[1] = 0xAA;    /* SSAP = SNAP */
+       snapblock[2] = 0x03;    /* control = UI */
+       snapblock[3] = (orgcode >> 16); /* upper 8 bits of organization code */
+       snapblock[4] = (orgcode >> 8);  /* middle 8 bits of organization code */
+       snapblock[5] = (orgcode >> 0);  /* lower 8 bits of organization code */
+       snapblock[6] = (ptype >> 8);    /* upper 8 bits of protocol type */
+       snapblock[7] = (ptype >> 0);    /* lower 8 bits of protocol type */
+       return gen_bcmp(offset, 8, snapblock);
+}
+
 static struct block *
 gen_hostop(addr, mask, dir, proto, src_off, dst_off)
        bpf_u_int32 addr;
@@ -659,6 +943,60 @@ gen_hostop(addr, mask, dir, proto, src_off, dst_off)
        return b1;
 }
 
+#ifdef INET6
+static struct block *
+gen_hostop6(addr, mask, dir, proto, src_off, dst_off)
+       struct in6_addr *addr;
+       struct in6_addr *mask;
+       int dir, proto;
+       u_int src_off, dst_off;
+{
+       struct block *b0, *b1;
+       u_int offset;
+       u_int32_t *a, *m;
+
+       switch (dir) {
+
+       case Q_SRC:
+               offset = src_off;
+               break;
+
+       case Q_DST:
+               offset = dst_off;
+               break;
+
+       case Q_AND:
+               b0 = gen_hostop6(addr, mask, Q_SRC, proto, src_off, dst_off);
+               b1 = gen_hostop6(addr, mask, Q_DST, proto, src_off, dst_off);
+               gen_and(b0, b1);
+               return b1;
+
+       case Q_OR:
+       case Q_DEFAULT:
+               b0 = gen_hostop6(addr, mask, Q_SRC, proto, src_off, dst_off);
+               b1 = gen_hostop6(addr, mask, Q_DST, proto, src_off, dst_off);
+               gen_or(b0, b1);
+               return b1;
+
+       default:
+               abort();
+       }
+       /* this order is important */
+       a = (u_int32_t *)addr;
+       m = (u_int32_t *)mask;
+       b1 = gen_mcmp(offset + 12, BPF_W, ntohl(a[3]), ntohl(m[3]));
+       b0 = gen_mcmp(offset + 8, BPF_W, ntohl(a[2]), ntohl(m[2]));
+       gen_and(b0, b1);
+       b0 = gen_mcmp(offset + 4, BPF_W, ntohl(a[1]), ntohl(m[1]));
+       gen_and(b0, b1);
+       b0 = gen_mcmp(offset + 0, BPF_W, ntohl(a[0]), ntohl(m[0]));
+       gen_and(b0, b1);
+       b0 = gen_linktype(proto);
+       gen_and(b0, b1);
+       return b1;
+}
+#endif /*INET6*/
+
 static struct block *
 gen_ehostop(eaddr, dir)
        register const u_char *eaddr;
@@ -732,6 +1070,40 @@ gen_fhostop(eaddr, dir)
        /* NOTREACHED */
 }
 
+/*
+ * Like gen_ehostop, but for DLT_IEEE802 (Token Ring)
+ */
+static struct block *
+gen_thostop(eaddr, dir)
+       register const u_char *eaddr;
+       register int dir;
+{
+       register struct block *b0, *b1;
+
+       switch (dir) {
+       case Q_SRC:
+               return gen_bcmp(8, 6, eaddr);
+
+       case Q_DST:
+               return gen_bcmp(2, 6, eaddr);
+
+       case Q_AND:
+               b0 = gen_thostop(eaddr, Q_SRC);
+               b1 = gen_thostop(eaddr, Q_DST);
+               gen_and(b0, b1);
+               return b1;
+
+       case Q_DEFAULT:
+       case Q_OR:
+               b0 = gen_thostop(eaddr, Q_SRC);
+               b1 = gen_thostop(eaddr, Q_DST);
+               gen_or(b0, b1);
+               return b1;
+       }
+       abort();
+       /* NOTREACHED */
+}
+
 /*
  * This is quite tricky because there may be pad bytes in front of the
  * DECNET header, and then there are two possible data packet formats that
@@ -787,6 +1159,9 @@ gen_dnhostop(addr, dir, base_off)
                gen_or(b0, b1);
                return b1;
 
+       case Q_ISO:
+               bpf_error("ISO host filtering not implemented");
+               
        default:
                abort();
        }
@@ -833,10 +1208,12 @@ gen_host(addr, mask, proto, dir)
 
        case Q_DEFAULT:
                b0 = gen_host(addr, mask, Q_IP, dir);
-               b1 = gen_host(addr, mask, Q_ARP, dir);
-               gen_or(b0, b1);
-               b0 = gen_host(addr, mask, Q_RARP, dir);
-               gen_or(b1, b0);
+               if (off_linktype != -1) {
+                   b1 = gen_host(addr, mask, Q_ARP, dir);
+                   gen_or(b0, b1);
+                   b0 = gen_host(addr, mask, Q_RARP, dir);
+                   gen_or(b1, b0);
+               }
                return b0;
 
        case Q_IP:
@@ -866,9 +1243,15 @@ gen_host(addr, mask, proto, dir)
        case Q_IGRP:
                bpf_error("'igrp' modifier applied to host");
 
+       case Q_PIM:
+               bpf_error("'pim' modifier applied to host");
+
        case Q_ATALK:
                bpf_error("ATALK host filtering not implemented");
 
+       case Q_AARP:
+               bpf_error("AARP host filtering not implemented");
+
        case Q_DECNET:
                return gen_dnhostop(addr, dir, off_nl);
 
@@ -884,12 +1267,108 @@ gen_host(addr, mask, proto, dir)
        case Q_MOPRC:
                bpf_error("MOPRC host filtering not implemented");
 
+#ifdef INET6
+       case Q_IPV6:
+               bpf_error("'ip6' modifier applied to ip host");
+
+       case Q_ICMPV6:
+               bpf_error("'icmp6' modifier applied to host");
+#endif /* INET6 */
+
+       case Q_AH:
+               bpf_error("'ah' modifier applied to host");
+
+       case Q_ESP:
+               bpf_error("'esp' modifier applied to host");
+
+       default:
+               abort();
+       }
+       /* NOTREACHED */
+}
+
+#ifdef INET6
+static struct block *
+gen_host6(addr, mask, proto, dir)
+       struct in6_addr *addr;
+       struct in6_addr *mask;
+       int proto;
+       int dir;
+{
+       switch (proto) {
+
+       case Q_DEFAULT:
+               return gen_host6(addr, mask, Q_IPV6, dir);
+
+       case Q_IP:
+               bpf_error("'ip' modifier applied to ip6 host");
+
+       case Q_RARP:
+               bpf_error("'rarp' modifier applied to ip6 host");
+
+       case Q_ARP:
+               bpf_error("'arp' modifier applied to ip6 host");
+
+       case Q_TCP:
+               bpf_error("'tcp' modifier applied to host");
+
+       case Q_UDP:
+               bpf_error("'udp' modifier applied to host");
+
+       case Q_ICMP:
+               bpf_error("'icmp' modifier applied to host");
+
+       case Q_IGMP:
+               bpf_error("'igmp' modifier applied to host");
+
+       case Q_IGRP:
+               bpf_error("'igrp' modifier applied to host");
+
+       case Q_PIM:
+               bpf_error("'pim' modifier applied to host");
+
+       case Q_ATALK:
+               bpf_error("ATALK host filtering not implemented");
+
+       case Q_AARP:
+               bpf_error("AARP host filtering not implemented");
+
+       case Q_DECNET:
+               bpf_error("'decnet' modifier applied to ip6 host");
+
+       case Q_SCA:
+               bpf_error("SCA host filtering not implemented");
+
+       case Q_LAT:
+               bpf_error("LAT host filtering not implemented");
+
+       case Q_MOPDL:
+               bpf_error("MOPDL host filtering not implemented");
+
+       case Q_MOPRC:
+               bpf_error("MOPRC host filtering not implemented");
+
+       case Q_IPV6:
+               return gen_hostop6(addr, mask, dir, ETHERTYPE_IPV6,
+                                 off_nl + 8, off_nl + 24);
+
+       case Q_ICMPV6:
+               bpf_error("'icmp6' modifier applied to host");
+
+       case Q_AH:
+               bpf_error("'ah' modifier applied to host");
+
+       case Q_ESP:
+               bpf_error("'esp' modifier applied to host");
+
        default:
                abort();
        }
        /* NOTREACHED */
 }
+#endif /*INET6*/
 
+#ifndef INET6
 static struct block *
 gen_gateway(eaddr, alist, proto, dir)
        const u_char *eaddr;
@@ -911,9 +1390,11 @@ gen_gateway(eaddr, alist, proto, dir)
                        b0 = gen_ehostop(eaddr, Q_OR);
                else if (linktype == DLT_FDDI)
                        b0 = gen_fhostop(eaddr, Q_OR);
+               else if (linktype == DLT_IEEE802)
+                       b0 = gen_thostop(eaddr, Q_OR);
                else
                        bpf_error(
-                           "'gateway' supported only on ethernet or FDDI");
+                           "'gateway' supported only on ethernet, FDDI or token ring");
 
                b1 = gen_host(**alist++, 0xffffffff, proto, Q_OR);
                while (*alist) {
@@ -928,46 +1409,64 @@ gen_gateway(eaddr, alist, proto, dir)
        bpf_error("illegal modifier of 'gateway'");
        /* NOTREACHED */
 }
+#endif
 
 struct block *
 gen_proto_abbrev(proto)
        int proto;
 {
-       struct block *b0, *b1;
+#ifdef INET6
+       struct block *b0;
+#endif
+       struct block *b1;
 
        switch (proto) {
 
        case Q_TCP:
-               b0 = gen_linktype(ETHERTYPE_IP);
-               b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_TCP);
-               gen_and(b0, b1);
+               b1 = gen_proto(IPPROTO_TCP, Q_IP, Q_DEFAULT);
+#ifdef INET6
+               b0 = gen_proto(IPPROTO_TCP, Q_IPV6, Q_DEFAULT);
+               gen_or(b0, b1);
+#endif
                break;
 
        case Q_UDP:
-               b0 =  gen_linktype(ETHERTYPE_IP);
-               b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_UDP);
-               gen_and(b0, b1);
+               b1 = gen_proto(IPPROTO_UDP, Q_IP, Q_DEFAULT);
+#ifdef INET6
+               b0 = gen_proto(IPPROTO_UDP, Q_IPV6, Q_DEFAULT);
+               gen_or(b0, b1);
+#endif
                break;
 
        case Q_ICMP:
-               b0 =  gen_linktype(ETHERTYPE_IP);
-               b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)IPPROTO_ICMP);
-               gen_and(b0, b1);
+               b1 = gen_proto(IPPROTO_ICMP, Q_IP, Q_DEFAULT);
                break;
 
+#ifndef        IPPROTO_IGMP
+#define        IPPROTO_IGMP    2
+#endif
+
        case Q_IGMP:
-               b0 =  gen_linktype(ETHERTYPE_IP);
-               b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)2);
-               gen_and(b0, b1);
+               b1 = gen_proto(IPPROTO_IGMP, Q_IP, Q_DEFAULT);
                break;
 
 #ifndef        IPPROTO_IGRP
 #define        IPPROTO_IGRP    9
 #endif
        case Q_IGRP:
-               b0 =  gen_linktype(ETHERTYPE_IP);
-               b1 = gen_cmp(off_nl + 9, BPF_B, (long)IPPROTO_IGRP);
-               gen_and(b0, b1);
+               b1 = gen_proto(IPPROTO_IGRP, Q_IP, Q_DEFAULT);
+               break;
+
+#ifndef IPPROTO_PIM
+#define IPPROTO_PIM    103
+#endif
+
+       case Q_PIM:
+               b1 = gen_proto(IPPROTO_PIM, Q_IP, Q_DEFAULT);
+#ifdef INET6
+               b0 = gen_proto(IPPROTO_PIM, Q_IPV6, Q_DEFAULT);
+               gen_or(b0, b1);
+#endif
                break;
 
        case Q_IP:
@@ -989,6 +1488,10 @@ gen_proto_abbrev(proto)
                b1 =  gen_linktype(ETHERTYPE_ATALK);
                break;
 
+       case Q_AARP:
+               b1 =  gen_linktype(ETHERTYPE_AARP);
+               break;
+
        case Q_DECNET:
                b1 =  gen_linktype(ETHERTYPE_DN);
                break;
@@ -1009,6 +1512,53 @@ gen_proto_abbrev(proto)
                b1 =  gen_linktype(ETHERTYPE_MOPRC);
                break;
 
+#ifdef INET6
+       case Q_IPV6:
+               b1 = gen_linktype(ETHERTYPE_IPV6);
+               break;
+
+#ifndef IPPROTO_ICMPV6
+#define IPPROTO_ICMPV6 58
+#endif
+       case Q_ICMPV6:
+               b1 = gen_proto(IPPROTO_ICMPV6, Q_IPV6, Q_DEFAULT);
+               break;
+#endif /* INET6 */
+
+#ifndef IPPROTO_AH
+#define IPPROTO_AH     51
+#endif
+       case Q_AH:
+               b1 = gen_proto(IPPROTO_AH, Q_IP, Q_DEFAULT);
+#ifdef INET6
+               b0 = gen_proto(IPPROTO_AH, Q_IPV6, Q_DEFAULT);
+               gen_or(b0, b1);
+#endif
+               break;
+
+#ifndef IPPROTO_ESP
+#define IPPROTO_ESP    50
+#endif
+       case Q_ESP:
+               b1 = gen_proto(IPPROTO_ESP, Q_IP, Q_DEFAULT);
+#ifdef INET6
+               b0 = gen_proto(IPPROTO_ESP, Q_IPV6, Q_DEFAULT);
+               gen_or(b0, b1);
+#endif
+               break;
+
+       case Q_ISO:
+               b1 = gen_linktype(LLC_ISO_LSAP);
+               break;
+
+       case Q_ESIS:
+               b1 = gen_proto(ISO9542_ESIS, Q_ISO, Q_DEFAULT);
+               break;
+
+       case Q_ISIS:
+               b1 = gen_proto(ISO10589_ISIS, Q_ISO, Q_DEFAULT);
+               break;
+
        default:
                abort();
        }
@@ -1053,6 +1603,16 @@ gen_portatom(off, v)
        return b;
 }
 
+#ifdef INET6
+static struct block *
+gen_portatom6(off, v)
+       int off;
+       bpf_int32 v;
+{
+       return gen_cmp(off_nl + 40 + off, BPF_H, v);
+}
+#endif/*INET6*/
+
 struct block *
 gen_portop(port, proto, dir)
        int port, proto, dir;
@@ -1124,6 +1684,77 @@ gen_port(port, ip_proto, dir)
        return b1;
 }
 
+#ifdef INET6
+struct block *
+gen_portop6(port, proto, dir)
+       int port, proto, dir;
+{
+       struct block *b0, *b1, *tmp;
+
+       /* ip proto 'proto' */
+       b0 = gen_cmp(off_nl + 6, BPF_B, (bpf_int32)proto);
+
+       switch (dir) {
+       case Q_SRC:
+               b1 = gen_portatom6(0, (bpf_int32)port);
+               break;
+
+       case Q_DST:
+               b1 = gen_portatom6(2, (bpf_int32)port);
+               break;
+
+       case Q_OR:
+       case Q_DEFAULT:
+               tmp = gen_portatom6(0, (bpf_int32)port);
+               b1 = gen_portatom6(2, (bpf_int32)port);
+               gen_or(tmp, b1);
+               break;
+
+       case Q_AND:
+               tmp = gen_portatom6(0, (bpf_int32)port);
+               b1 = gen_portatom6(2, (bpf_int32)port);
+               gen_and(tmp, b1);
+               break;
+
+       default:
+               abort();
+       }
+       gen_and(b0, b1);
+
+       return b1;
+}
+
+static struct block *
+gen_port6(port, ip_proto, dir)
+       int port;
+       int ip_proto;
+       int dir;
+{
+       struct block *b0, *b1, *tmp;
+
+       /* ether proto ip */
+       b0 =  gen_linktype(ETHERTYPE_IPV6);
+
+       switch (ip_proto) {
+       case IPPROTO_UDP:
+       case IPPROTO_TCP:
+               b1 = gen_portop6(port, ip_proto, dir);
+               break;
+
+       case PROTO_UNDEF:
+               tmp = gen_portop6(port, IPPROTO_TCP, dir);
+               b1 = gen_portop6(port, IPPROTO_UDP, dir);
+               gen_or(tmp, b1);
+               break;
+
+       default:
+               abort();
+       }
+       gen_and(b0, b1);
+       return b1;
+}
+#endif /* INET6 */
+
 static int
 lookup_proto(name, proto)
        register const char *name;
@@ -1154,6 +1785,320 @@ lookup_proto(name, proto)
        return v;
 }
 
+#if 0
+struct stmt *
+gen_joinsp(s, n)
+       struct stmt **s;
+       int n;
+{
+       return NULL;
+}
+#endif
+
+static struct block *
+gen_protochain(v, proto, dir)
+       int v;
+       int proto;
+       int dir;
+{
+#ifdef NO_PROTOCHAIN
+       return gen_proto(v, proto, dir);
+#else
+       struct block *b0, *b;
+       struct slist *s[100];
+       int fix2, fix3, fix4, fix5;
+       int ahcheck, again, end;
+       int i, max;
+       int reg1 = alloc_reg();
+       int reg2 = alloc_reg();
+
+       memset(s, 0, sizeof(s));
+       fix2 = fix3 = fix4 = fix5 = 0;
+
+       switch (proto) {
+       case Q_IP:
+       case Q_IPV6:
+               break;
+       case Q_DEFAULT:
+               b0 = gen_protochain(v, Q_IP, dir);
+               b = gen_protochain(v, Q_IPV6, dir);
+               gen_or(b0, b);
+               return b;
+       default:
+               bpf_error("bad protocol applied for 'protochain'");
+               /*NOTREACHED*/
+       }
+
+       no_optimize = 1; /*this code is not compatible with optimzer yet */
+
+       /*
+        * s[0] is a dummy entry to protect other BPF insn from damaged
+        * by s[fix] = foo with uninitialized variable "fix".  It is somewhat
+        * hard to find interdependency made by jump table fixup.
+        */
+       i = 0;
+       s[i] = new_stmt(0);     /*dummy*/
+       i++;
+
+       switch (proto) {
+       case Q_IP:
+               b0 = gen_linktype(ETHERTYPE_IP);
+
+               /* A = ip->ip_p */
+               s[i] = new_stmt(BPF_LD|BPF_ABS|BPF_B);
+               s[i]->s.k = off_nl + 9;
+               i++;
+               /* X = ip->ip_hl << 2 */
+               s[i] = new_stmt(BPF_LDX|BPF_MSH|BPF_B);
+               s[i]->s.k = off_nl;
+               i++;
+               break;
+#ifdef INET6
+       case Q_IPV6:
+               b0 = gen_linktype(ETHERTYPE_IPV6);
+
+               /* A = ip6->ip_nxt */
+               s[i] = new_stmt(BPF_LD|BPF_ABS|BPF_B);
+               s[i]->s.k = off_nl + 6;
+               i++;
+               /* X = sizeof(struct ip6_hdr) */
+               s[i] = new_stmt(BPF_LDX|BPF_IMM);
+               s[i]->s.k = 40;
+               i++;
+               break;
+#endif
+       default:
+               bpf_error("unsupported proto to gen_protochain");
+               /*NOTREACHED*/
+       }
+
+       /* again: if (A == v) goto end; else fall through; */
+       again = i;
+       s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+       s[i]->s.k = v;
+       s[i]->s.jt = NULL;              /*later*/
+       s[i]->s.jf = NULL;              /*update in next stmt*/
+       fix5 = i;
+       i++;
+
+#ifndef IPPROTO_NONE
+#define IPPROTO_NONE   59
+#endif
+       /* if (A == IPPROTO_NONE) goto end */
+       s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+       s[i]->s.jt = NULL;      /*later*/
+       s[i]->s.jf = NULL;      /*update in next stmt*/
+       s[i]->s.k = IPPROTO_NONE;
+       s[fix5]->s.jf = s[i];
+       fix2 = i;
+       i++;
+
+#ifdef INET6
+       if (proto == Q_IPV6) {
+               int v6start, v6end, v6advance, j;
+
+               v6start = i;
+               /* if (A == IPPROTO_HOPOPTS) goto v6advance */
+               s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+               s[i]->s.jt = NULL;      /*later*/
+               s[i]->s.jf = NULL;      /*update in next stmt*/
+               s[i]->s.k = IPPROTO_HOPOPTS;
+               s[fix2]->s.jf = s[i];
+               i++;
+               /* if (A == IPPROTO_DSTOPTS) goto v6advance */
+               s[i - 1]->s.jf = s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+               s[i]->s.jt = NULL;      /*later*/
+               s[i]->s.jf = NULL;      /*update in next stmt*/
+               s[i]->s.k = IPPROTO_DSTOPTS;
+               i++;
+               /* if (A == IPPROTO_ROUTING) goto v6advance */
+               s[i - 1]->s.jf = s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+               s[i]->s.jt = NULL;      /*later*/
+               s[i]->s.jf = NULL;      /*update in next stmt*/
+               s[i]->s.k = IPPROTO_ROUTING;
+               i++;
+               /* if (A == IPPROTO_FRAGMENT) goto v6advance; else goto ahcheck; */
+               s[i - 1]->s.jf = s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+               s[i]->s.jt = NULL;      /*later*/
+               s[i]->s.jf = NULL;      /*later*/
+               s[i]->s.k = IPPROTO_FRAGMENT;
+               fix3 = i;
+               v6end = i;
+               i++;
+
+               /* v6advance: */
+               v6advance = i;
+
+               /*
+                * in short,
+                * A = P[X + 1];
+                * X = X + (P[X] + 1) * 8;
+                */
+               /* A = X */
+               s[i] = new_stmt(BPF_MISC|BPF_TXA);
+               i++;
+               /* MEM[reg1] = A */
+               s[i] = new_stmt(BPF_ST);
+               s[i]->s.k = reg1;
+               i++;
+               /* A += 1 */
+               s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+               s[i]->s.k = 1;
+               i++;
+               /* X = A */
+               s[i] = new_stmt(BPF_MISC|BPF_TAX);
+               i++;
+               /* A = P[X + packet head]; */
+               s[i] = new_stmt(BPF_LD|BPF_IND|BPF_B);
+               s[i]->s.k = off_nl;
+               i++;
+               /* MEM[reg2] = A */
+               s[i] = new_stmt(BPF_ST);
+               s[i]->s.k = reg2;
+               i++;
+               /* X = MEM[reg1] */
+               s[i] = new_stmt(BPF_LDX|BPF_MEM);
+               s[i]->s.k = reg1;
+               i++;
+               /* A = P[X + packet head] */
+               s[i] = new_stmt(BPF_LD|BPF_IND|BPF_B);
+               s[i]->s.k = off_nl;
+               i++;
+               /* A += 1 */
+               s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+               s[i]->s.k = 1;
+               i++;
+               /* A *= 8 */
+               s[i] = new_stmt(BPF_ALU|BPF_MUL|BPF_K);
+               s[i]->s.k = 8;
+               i++;
+               /* X = A; */
+               s[i] = new_stmt(BPF_MISC|BPF_TAX);
+               i++;
+               /* A = MEM[reg2] */
+               s[i] = new_stmt(BPF_LD|BPF_MEM);
+               s[i]->s.k = reg2;
+               i++;
+
+               /* goto again; (must use BPF_JA for backward jump) */
+               s[i] = new_stmt(BPF_JMP|BPF_JA);
+               s[i]->s.k = again - i - 1;
+               s[i - 1]->s.jf = s[i];
+               i++;
+
+               /* fixup */
+               for (j = v6start; j <= v6end; j++)
+                       s[j]->s.jt = s[v6advance];
+       } else
+#endif
+       {
+               /* nop */
+               s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+               s[i]->s.k = 0;
+               s[fix2]->s.jf = s[i];
+               i++;
+       }
+
+       /* ahcheck: */
+       ahcheck = i;
+       /* if (A == IPPROTO_AH) then fall through; else goto end; */
+       s[i] = new_stmt(BPF_JMP|BPF_JEQ|BPF_K);
+       s[i]->s.jt = NULL;      /*later*/
+       s[i]->s.jf = NULL;      /*later*/
+       s[i]->s.k = IPPROTO_AH;
+       if (fix3)
+               s[fix3]->s.jf = s[ahcheck];
+       fix4 = i;
+       i++;
+
+       /*
+        * in short,
+        * A = P[X + 1];
+        * X = X + (P[X] + 2) * 4;
+        */
+       /* A = X */
+       s[i - 1]->s.jt = s[i] = new_stmt(BPF_MISC|BPF_TXA);
+       i++;
+       /* MEM[reg1] = A */
+       s[i] = new_stmt(BPF_ST);
+       s[i]->s.k = reg1;
+       i++;
+       /* A += 1 */
+       s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+       s[i]->s.k = 1;
+       i++;
+       /* X = A */
+       s[i] = new_stmt(BPF_MISC|BPF_TAX);
+       i++;
+       /* A = P[X + packet head]; */
+       s[i] = new_stmt(BPF_LD|BPF_IND|BPF_B);
+       s[i]->s.k = off_nl;
+       i++;
+       /* MEM[reg2] = A */
+       s[i] = new_stmt(BPF_ST);
+       s[i]->s.k = reg2;
+       i++;
+       /* X = MEM[reg1] */
+       s[i] = new_stmt(BPF_LDX|BPF_MEM);
+       s[i]->s.k = reg1;
+       i++;
+       /* A = P[X + packet head] */
+       s[i] = new_stmt(BPF_LD|BPF_IND|BPF_B);
+       s[i]->s.k = off_nl;
+       i++;
+       /* A += 2 */
+       s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+       s[i]->s.k = 2;
+       i++;
+       /* A *= 4 */
+       s[i] = new_stmt(BPF_ALU|BPF_MUL|BPF_K);
+       s[i]->s.k = 4;
+       i++;
+       /* X = A; */
+       s[i] = new_stmt(BPF_MISC|BPF_TAX);
+       i++;
+       /* A = MEM[reg2] */
+       s[i] = new_stmt(BPF_LD|BPF_MEM);
+       s[i]->s.k = reg2;
+       i++;
+
+       /* goto again; (must use BPF_JA for backward jump) */
+       s[i] = new_stmt(BPF_JMP|BPF_JA);
+       s[i]->s.k = again - i - 1;
+       i++;
+
+       /* end: nop */
+       end = i;
+       s[i] = new_stmt(BPF_ALU|BPF_ADD|BPF_K);
+       s[i]->s.k = 0;
+       s[fix2]->s.jt = s[end];
+       s[fix4]->s.jf = s[end];
+       s[fix5]->s.jt = s[end];
+       i++;
+
+       /*
+        * make slist chain
+        */
+       max = i;
+       for (i = 0; i < max - 1; i++)
+               s[i]->next = s[i + 1];
+       s[max - 1]->next = NULL;
+
+       /*
+        * emit final check
+        */
+       b = new_block(JMP(BPF_JEQ));
+       b->stmts = s[1];        /*remember, s[0] is dummy*/
+       b->s.k = v;
+
+       free_reg(reg1);
+       free_reg(reg2);
+
+       gen_and(b0, b);
+       return b;
+#endif
+}
+
 static struct block *
 gen_proto(v, proto, dir)
        int v;
@@ -1167,9 +2112,27 @@ gen_proto(v, proto, dir)
 
        switch (proto) {
        case Q_DEFAULT:
+#ifdef INET6
+               b0 = gen_proto(v, Q_IP, dir);
+               b1 = gen_proto(v, Q_IPV6, dir);
+               gen_or(b0, b1);
+               return b1;
+#else
+               /*FALLTHROUGH*/
+#endif
        case Q_IP:
                b0 = gen_linktype(ETHERTYPE_IP);
+#ifndef CHASE_CHAIN
                b1 = gen_cmp(off_nl + 9, BPF_B, (bpf_int32)v);
+#else
+               b1 = gen_protochain(v, Q_IP);
+#endif
+               gen_and(b0, b1);
+               return b1;
+
+       case Q_ISO:
+               b0 = gen_linktype(LLC_ISO_LSAP);
+               b1 = gen_cmp(off_nl + 3, BPF_B, (long)v);
                gen_and(b0, b1);
                return b1;
 
@@ -1228,6 +2191,31 @@ gen_proto(v, proto, dir)
                bpf_error("'igrp proto' is bogus");
                /* NOTREACHED */
 
+       case Q_PIM:
+               bpf_error("'pim proto' is bogus");
+               /* NOTREACHED */
+
+#ifdef INET6
+       case Q_IPV6:
+               b0 = gen_linktype(ETHERTYPE_IPV6);
+#ifndef CHASE_CHAIN
+               b1 = gen_cmp(off_nl + 6, BPF_B, (bpf_int32)v);
+#else
+               b1 = gen_protochain(v, Q_IPV6);
+#endif
+               gen_and(b0, b1);
+               return b1;
+
+       case Q_ICMPV6:
+               bpf_error("'icmp6 proto' is bogus");
+#endif /* INET6 */
+
+       case Q_AH:
+               bpf_error("'ah proto' is bogus");
+
+       case Q_ESP:
+               bpf_error("'ah proto' is bogus");
+
        default:
                abort();
                /* NOTREACHED */
@@ -1244,7 +2232,16 @@ gen_scode(name, q)
        int dir = q.dir;
        int tproto;
        u_char *eaddr;
-       bpf_u_int32 mask, addr, **alist;
+       bpf_u_int32 mask, addr;
+#ifndef INET6
+       bpf_u_int32 **alist;
+#else
+       int tproto6;
+       struct sockaddr_in *sin;
+       struct sockaddr_in6 *sin6;
+       struct addrinfo *res, *res0;
+       struct in6_addr mask128;
+#endif /*INET6*/
        struct block *b, *tmp;
        int port, real_proto;
 
@@ -1281,9 +2278,16 @@ gen_scode(name, q)
                                            "unknown FDDI host '%s'", name);
                                return gen_fhostop(eaddr, dir);
 
+                       case DLT_IEEE802:
+                               eaddr = pcap_ether_hostton(name);
+                               if (eaddr == NULL)
+                                       bpf_error(
+                                           "unknown token ring host '%s'", name);
+                               return gen_thostop(eaddr, dir);
+
                        default:
                                bpf_error(
-                       "only ethernet/FDDI supports link-level host name");
+                       "only ethernet/FDDI/token ring supports link-level host name");
                                break;
                        }
                } else if (proto == Q_DECNET) {
@@ -1294,6 +2298,7 @@ gen_scode(name, q)
                         */
                        return (gen_host(dn_addr, 0, proto, dir));
                } else {
+#ifndef INET6
                        alist = pcap_nametoaddr(name);
                        if (alist == NULL || *alist == NULL)
                                bpf_error("unknown host '%s'", name);
@@ -1308,6 +2313,51 @@ gen_scode(name, q)
                                b = tmp;
                        }
                        return b;
+#else
+                       memset(&mask128, 0xff, sizeof(mask128));
+                       res0 = res = pcap_nametoaddrinfo(name);
+                       if (res == NULL)
+                               bpf_error("unknown host '%s'", name);
+                       b = tmp = NULL;
+                       tproto = tproto6 = proto;
+                       if (off_linktype == -1 && tproto == Q_DEFAULT) {
+                               tproto = Q_IP;
+                               tproto6 = Q_IPV6;
+                       }
+                       for (res = res0; res; res = res->ai_next) {
+                               switch (res->ai_family) {
+                               case AF_INET:
+                                       if (tproto == Q_IPV6)
+                                               continue;
+
+                                       sin = (struct sockaddr_in *)
+                                               res->ai_addr;
+                                       tmp = gen_host(ntohl(sin->sin_addr.s_addr),
+                                               0xffffffff, tproto, dir);
+                                       break;
+                               case AF_INET6:
+                                       if (tproto6 == Q_IP)
+                                               continue;
+
+                                       sin6 = (struct sockaddr_in6 *)
+                                               res->ai_addr;
+                                       tmp = gen_host6(&sin6->sin6_addr,
+                                               &mask128, tproto6, dir);
+                                       break;
+                               }
+                               if (b)
+                                       gen_or(b, tmp);
+                               b = tmp;
+                       }
+                       freeaddrinfo(res0);
+                       if (b == NULL) {
+                               bpf_error("unknown host '%s'%s", name,
+                                   (proto == Q_DEFAULT)
+                                       ? ""
+                                       : " for specified address family");
+                       }
+                       return b;
+#endif /*INET6*/
                }
 
        case Q_PORT:
@@ -1329,9 +2379,19 @@ gen_scode(name, q)
                                /* override PROTO_UNDEF */
                                real_proto = IPPROTO_TCP;
                }
+#ifndef INET6
                return gen_port(port, real_proto, dir);
+#else
+           {
+               struct block *b;
+               b = gen_port(port, real_proto, dir);
+               gen_or(gen_port6(port, real_proto, dir), b);
+               return b;
+           }
+#endif /* INET6 */
 
        case Q_GATEWAY:
+#ifndef INET6
                eaddr = pcap_ether_hostton(name);
                if (eaddr == NULL)
                        bpf_error("unknown ether host: %s", name);
@@ -1340,6 +2400,9 @@ gen_scode(name, q)
                if (alist == NULL || *alist == NULL)
                        bpf_error("unknown host '%s'", name);
                return gen_gateway(eaddr, alist, proto, dir);
+#else
+               bpf_error("'gateway' not supported in this configuration");
+#endif /*INET6*/
 
        case Q_PROTO:
                real_proto = lookup_proto(name, proto);
@@ -1348,6 +2411,14 @@ gen_scode(name, q)
                else
                        bpf_error("unknown protocol: %s", name);
 
+       case Q_PROTOCHAIN:
+               real_proto = lookup_proto(name, proto);
+               if (real_proto >= 0)
+                       return gen_protochain(real_proto, proto, dir);
+               else
+                       bpf_error("unknown protocol: %s", name);
+
+
        case Q_UNDEF:
                syntax();
                /* NOTREACHED */
@@ -1450,7 +2521,16 @@ gen_ncode(s, v, q)
                else
                        bpf_error("illegal qualifier of 'port'");
 
+#ifndef INET6
                return gen_port((int)v, proto, dir);
+#else
+           {
+               struct block *b;
+               b = gen_port((int)v, proto, dir);
+               gen_or(gen_port6((int)v, proto, dir), b);
+               return b;
+           }
+#endif /* INET6 */
 
        case Q_GATEWAY:
                bpf_error("'gateway' requires a name");
@@ -1459,6 +2539,9 @@ gen_ncode(s, v, q)
        case Q_PROTO:
                return gen_proto((int)v, proto, dir);
 
+       case Q_PROTOCHAIN:
+               return gen_protochain((int)v, proto, dir);
+
        case Q_UNDEF:
                syntax();
                /* NOTREACHED */
@@ -1470,6 +2553,64 @@ gen_ncode(s, v, q)
        /* NOTREACHED */
 }
 
+#ifdef INET6
+struct block *
+gen_mcode6(s1, s2, masklen, q)
+       register const char *s1, *s2;
+       register int masklen;
+       struct qual q;
+{
+       struct addrinfo *res;
+       struct in6_addr *addr;
+       struct in6_addr mask;
+       struct block *b;
+       u_int32_t *a, *m;
+
+       if (s2)
+               bpf_error("no mask %s supported", s2);
+
+       res = pcap_nametoaddrinfo(s1);
+       if (!res)
+               bpf_error("invalid ip6 address %s", s1);
+       if (res->ai_next)
+               bpf_error("%s resolved to multiple address", s1);
+       addr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+
+       if (sizeof(mask) * 8 < masklen)
+               bpf_error("mask length must be <= %u", (unsigned int)(sizeof(mask) * 8));
+       memset(&mask, 0xff, masklen / 8);
+       if (masklen % 8) {
+               mask.s6_addr[masklen / 8] =
+                       (0xff << (8 - masklen % 8)) & 0xff;
+       }
+
+       a = (u_int32_t *)addr;
+       m = (u_int32_t *)&mask;
+       if ((a[0] & ~m[0]) || (a[1] & ~m[1])
+        || (a[2] & ~m[2]) || (a[3] & ~m[3])) {
+               bpf_error("non-network bits set in \"%s/%d\"", s1, masklen);
+       }
+
+       switch (q.addr) {
+
+       case Q_DEFAULT:
+       case Q_HOST:
+               if (masklen != 128)
+                       bpf_error("Mask syntax for networks only");
+               /* FALLTHROUGH */
+
+       case Q_NET:
+               b = gen_host6(addr, &mask, q.proto, q.dir);
+               freeaddrinfo(res);
+               return b;
+
+       default:
+               bpf_error("invalid qualifier against IPv6 address");
+               /* NOTREACHED */
+       }
+}
+#endif /*INET6*/
+
 struct block *
 gen_ecode(eaddr, q)
        register const u_char *eaddr;
@@ -1480,6 +2621,8 @@ gen_ecode(eaddr, q)
                        return gen_ehostop(eaddr, (int)q.dir);
                if (linktype == DLT_FDDI)
                        return gen_fhostop(eaddr, (int)q.dir);
+               if (linktype == DLT_IEEE802)
+                       return gen_thostop(eaddr, (int)q.dir);
        }
        bpf_error("ethernet address used in non-ether expression");
        /* NOTREACHED */
@@ -1568,7 +2711,10 @@ gen_load(proto, index, size)
        case Q_LAT:
        case Q_MOPRC:
        case Q_MOPDL:
-               /* XXX Note that we assume a fixed link link header here. */
+#ifdef INET6
+       case Q_IPV6:
+#endif
+               /* XXX Note that we assume a fixed link header here. */
                s = xfer_to_x(index);
                tmp = new_stmt(BPF_LD|BPF_IND|size);
                tmp->s.k = off_nl;
@@ -1586,6 +2732,7 @@ gen_load(proto, index, size)
        case Q_ICMP:
        case Q_IGMP:
        case Q_IGRP:
+       case Q_PIM:
                s = new_stmt(BPF_LDX|BPF_MSH|BPF_B);
                s->s.k = off_nl;
                sappend(s, xfer_to_a(index));
@@ -1598,8 +2745,16 @@ gen_load(proto, index, size)
                gen_and(gen_proto_abbrev(proto), b = gen_ipfrag());
                if (index->b)
                        gen_and(index->b, b);
+#ifdef INET6
+               gen_and(gen_proto_abbrev(Q_IP), b);
+#endif
                index->b = b;
                break;
+#ifdef INET6
+       case Q_ICMPV6:
+               bpf_error("IPv6 upper-layer protocol is not supported by proto[x]");
+               /*NOTREACHED*/
+#endif
        }
        index->regno = regno;
        s = new_stmt(BPF_ST);
@@ -1796,6 +2951,9 @@ gen_greater(n)
        return gen_len(BPF_JGE, n);
 }
 
+/*
+ * Actually, this is less than or equal.
+ */
 struct block *
 gen_less(n)
        int n;
@@ -1865,6 +3023,8 @@ gen_broadcast(proto)
                        return gen_ehostop(ebroadcast, Q_DST);
                if (linktype == DLT_FDDI)
                        return gen_fhostop(ebroadcast, Q_DST);
+               if (linktype == DLT_IEEE802)
+                       return gen_thostop(ebroadcast, Q_DST);
                bpf_error("not a broadcast link");
                break;
 
@@ -1912,6 +3072,10 @@ gen_multicast(proto)
                        b0->stmts = s;
                        return b0;
                }
+
+               /* TODO - check how token ring handles multicast */
+               /* if (linktype == DLT_IEEE802) ... */
+
                /* Link not known to support multicasts */
                break;
 
@@ -1921,6 +3085,14 @@ gen_multicast(proto)
                b1->s.code = JMP(BPF_JGE);
                gen_and(b0, b1);
                return b1;
+
+#ifdef INET6
+       case Q_IPV6:
+               b0 = gen_linktype(ETHERTYPE_IPV6);
+               b1 = gen_cmp(off_nl + 24, BPF_B, (bpf_int32)255);
+               gen_and(b0, b1);
+               return b1;
+#endif /* INET6 */
        }
        bpf_error("only IP multicast filters supported on ethernet/FDDI");
 }
@@ -1942,3 +3114,50 @@ gen_inbound(dir)
                          dir);
        return (b0);
 }
+
+/*
+ * support IEEE 802.1Q VLAN trunk over ethernet
+ */
+struct block *
+gen_vlan(vlan_num)
+       int vlan_num;
+{
+       static u_int    orig_linktype = -1, orig_nl = -1;
+       struct  block   *b0;
+
+       /*
+        * Change the offsets to point to the type and data fields within
+        * the VLAN packet.  This is somewhat of a kludge.
+        */
+       if (orig_nl == (u_int)-1) {
+               orig_linktype = off_linktype;   /* save original values */
+               orig_nl = off_nl;
+
+               switch (linktype) {
+
+               case DLT_EN10MB:
+                       off_linktype = 16;
+                       off_nl = 18;
+                       break;
+
+               default:
+                       bpf_error("no VLAN support for data link type %d",
+                                 linktype);
+                       /*NOTREACHED*/
+               }
+       }
+
+       /* check for VLAN */
+       b0 = gen_cmp(orig_linktype, BPF_H, (bpf_int32)ETHERTYPE_8021Q);
+
+       /* If a specific VLAN is requested, check VLAN id */
+       if (vlan_num >= 0) {
+               struct block *b1;
+
+               b1 = gen_cmp(orig_nl, BPF_H, (bpf_int32)vlan_num);
+               gen_and(b0, b1);
+               b0 = b1;
+       }
+
+       return (b0);
+}