Another change from Debian.

[libpcap] / gencode.c

diff --git a/gencode.c b/gencode.c
index 41057ba8cb12a98c5dae50f795be0634a809473d..5548e6fd1f0c4dadfdff9b0778a0f6dde3e0daa6 100644 (file)
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
  */
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.290.2.16 2008-09-22 20:16:01 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.290.2.19 2008-12-23 20:14:12 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -1497,6 +1497,26 @@ init_linktype(p)
                off_nl = -1;
                off_nl_nosnap = -1;
                return;
                off_nl = -1;
                off_nl_nosnap = -1;
                return;

+
+       case DLT_MPLS:
+               /*
+                * Currently, only raw "link[N:M]" filtering is supported.
+                */
+               off_linktype = -1;
+               off_macpl = -1;
+               off_nl = -1;
+               off_nl_nosnap = -1;
+               return;
+
+       case DLT_USB_LINUX_MMAPPED:
+               /*
+                * Currently, only raw "link[N:M]" filtering is supported.
+                */
+               off_linktype = -1;
+               off_macpl = -1;
+               off_nl = -1;
+               off_nl_nosnap = -1;
+               return;

        }
        bpf_error("unknown data link type %d", linktype);
        /* NOTREACHED */
        }
        bpf_error("unknown data link type %d", linktype);
        /* NOTREACHED */


@@ -3350,6 +3370,7 @@ gen_linktype(proto)
 
        case DLT_USB:
        case DLT_USB_LINUX:
 
        case DLT_USB:
        case DLT_USB_LINUX:

+       case DLT_USB_LINUX_MMAPPED:

                bpf_error("USB link-layer type filtering not implemented");
 
        case DLT_BLUETOOTH_HCI_H4:
                bpf_error("USB link-layer type filtering not implemented");
 
        case DLT_BLUETOOTH_HCI_H4: