Add a "netbeui" keyword, which selects NetBEUI packets (LLC packets with

[libpcap] / gencode.c

diff --git a/gencode.c b/gencode.c
index 65d18ec9a2928d022ad01c63df240e807c34ec02..711acfc1fd505f50301aa69be6b9697fe29b6462 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.146 2001-01-15 00:03:40 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.147 2001-01-28 09:44:48 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -721,6 +721,20 @@ gen_linktype(proto)
                        gen_and(b0, b1);
                        return b1;
 
                        gen_and(b0, b1);
                        return b1;
 

+               case LLCSAP_NETBEUI:
+                       /*
+                        * NetBEUI always uses 802.2 encapsulation.
+                        * XXX - should we check both the DSAP and the
+                        * SSAP, like this, or should we check just the
+                        * DSAP?
+                        */
+                       b0 = gen_cmp_gt(off_linktype, BPF_H, ETHERMTU);
+                       gen_not(b0);
+                       b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
+                                    ((LLCSAP_NETBEUI << 8) | LLCSAP_NETBEUI));
+                       gen_and(b0, b1);
+                       return b1;
+

                case LLCSAP_IPX:
                        /*
                         * Check for;
                case LLCSAP_IPX:
                        /*
                         * Check for;


@@ -879,6 +893,18 @@ gen_linktype(proto)
                        return gen_cmp(off_linktype, BPF_H, (long)
                                     ((LLCSAP_ISONS << 8) | LLCSAP_ISONS));
 
                        return gen_cmp(off_linktype, BPF_H, (long)
                                     ((LLCSAP_ISONS << 8) | LLCSAP_ISONS));
 

+               case LLCSAP_NETBEUI:
+                       return gen_cmp(off_linktype, BPF_H, (long)
+                                    ((LLCSAP_NETBEUI << 8) | LLCSAP_NETBEUI));
+
+               case LLCSAP_IPX:
+                       /*
+                        * XXX - are there ever SNAP frames for IPX on
+                        * non-Ethernet 802.x networks?
+                        */
+                       return gen_cmp(off_linktype, BPF_B,
+                           (bpf_int32)LLCSAP_IPX);
+

                case ETHERTYPE_ATALK:
                        /*
                         * 802.2-encapsulated ETHERTYPE_ATALK packets are
                case ETHERTYPE_ATALK:
                        /*
                         * 802.2-encapsulated ETHERTYPE_ATALK packets are


@@ -950,6 +976,19 @@ gen_linktype(proto)
                        gen_and(b0, b1);
                        return b1;
 
                        gen_and(b0, b1);
                        return b1;
 

+               case LLCSAP_NETBEUI:
+                       /*
+                        * NetBEUI always uses 802.2 encapsulation.
+                        * XXX - should we check both the DSAP and the
+                        * LSAP, like this, or should we check just the
+                        * DSAP?
+                        */
+                       b0 = gen_cmp(off_linktype, BPF_H, LINUX_SLL_P_802_2);
+                       b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
+                                    ((LLCSAP_NETBEUI << 8) | LLCSAP_NETBEUI));
+                       gen_and(b0, b1);
+                       return b1;
+

                case LLCSAP_IPX:
                        /*
                         *      Ethernet_II frames, which are Ethernet
                case LLCSAP_IPX:
                        /*
                         *      Ethernet_II frames, which are Ethernet


@@ -1712,6 +1751,9 @@ gen_host(addr, mask, proto, dir)
        case Q_IPX:
                bpf_error("IPX host filtering not implemented");
 
        case Q_IPX:
                bpf_error("IPX host filtering not implemented");
 

+       case Q_NETBEUI:
+               bpf_error("'netbeui' modifier applied to host");
+

        default:
                abort();
        }
        default:
                abort();
        }


@@ -1810,6 +1852,9 @@ gen_host6(addr, mask, proto, dir)
        case Q_IPX:
                bpf_error("IPX host filtering not implemented");
 
        case Q_IPX:
                bpf_error("IPX host filtering not implemented");
 

+       case Q_NETBEUI:
+               bpf_error("'netbeui' modifier applied to host");
+

        default:
                abort();
        }
        default:
                abort();
        }


@@ -2020,6 +2065,10 @@ gen_proto_abbrev(proto)
                b1 = gen_linktype(LLCSAP_IPX);
                break;
 
                b1 = gen_linktype(LLCSAP_IPX);
                break;
 

+       case Q_NETBEUI:
+               b1 = gen_linktype(LLCSAP_NETBEUI);
+               break;
+

        default:
                abort();
        }
        default:
                abort();
        }


@@ -2682,6 +2731,9 @@ gen_proto(v, proto, dir)
        case Q_IPX:
                bpf_error("'ipx proto' is bogus");
 
        case Q_IPX:
                bpf_error("'ipx proto' is bogus");
 

+       case Q_NETBEUI:
+               bpf_error("'netbeui proto' is bogus");
+

        default:
                abort();
                /* NOTREACHED */
        default:
                abort();
                /* NOTREACHED */