backport the changes over the weekend from HEAD to 0_9

diff --git a/configure.in b/configure.in
index 47e5500adf568a91e1f33c086ce973f158c86fe1..bd9ab6e61f93d392272be1634db338e7d2d9b6bc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.121 2005-04-08 02:15:49 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/libpcap/configure.in,v 1.120.2.1 2005-04-10 18:04:49 hannes Exp $ (LBL)

 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.


@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
 dnl Process this file with autoconf to produce a configure script.
 dnl
 

-AC_REVISION($Revision: 1.121 $)
+AC_REVISION($Revision: 1.120.2.1 $)

 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 
 AC_PREREQ(2.50)
 AC_INIT(pcap.c)
 

diff --git a/fad-getad.c b/fad-getad.c
index be271136434eb8ec5175ff7d0057f7ee8af5403a..6d4d0ac75e0b1eaf68c308a16e72f2ee33b603a6 100644 (file)
--- a/fad-getad.c
+++ b/fad-getad.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.11 2005-04-08 02:01:19 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/fad-getad.c,v 1.10.2.1 2005-04-10 18:04:49 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H

diff --git a/fad-gifc.c b/fad-gifc.c
index 19aaa6b08517d7cb9e9816e0fd5cb05de00a1ca4..c9c7f6937545c8fc6dc536c745109676424402da 100644 (file)
--- a/fad-gifc.c
+++ b/fad-gifc.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/fad-gifc.c,v 1.10 2005-04-08 02:15:49 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/fad-gifc.c,v 1.8.2.1 2005-04-10 18:04:50 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H

diff --git a/gencode.c b/gencode.c
index 3328719569797daafc587cbc7a8755addf9a777a..90149f72805702571b3c4cd8df44d8e0b553cc55 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.221.2.1 2005-04-09 18:16:50 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.2 2005-04-10 18:04:50 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -171,7 +171,7 @@ static struct block *gen_ether_linktype(int);
 static struct block *gen_linux_sll_linktype(int);
 static struct block *gen_linktype(int);
 static struct block *gen_snap(bpf_u_int32, bpf_u_int32, u_int);
 static struct block *gen_linux_sll_linktype(int);
 static struct block *gen_linktype(int);
 static struct block *gen_snap(bpf_u_int32, bpf_u_int32, u_int);

-static struct block *gen_llc(int);
+static struct block *gen_llc_linktype(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);
 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);


@@ -989,7 +989,7 @@ init_linktype(p)
        case DLT_APPLE_IP_OVER_IEEE1394:
                off_linktype = 16;
                off_nl = 18;
        case DLT_APPLE_IP_OVER_IEEE1394:
                off_linktype = 16;
                off_nl = 18;

-               off_nl_nosnap = 0;      /* no 802.2 LLC */
+               off_nl_nosnap = 18;     /* no 802.2 LLC */

                return;
 
        case DLT_LINUX_IRDA:
                return;
 
        case DLT_LINUX_IRDA:


@@ -1018,16 +1018,16 @@ init_linktype(p)
 
        case DLT_PFLOG:
                off_linktype = 0;
 
        case DLT_PFLOG:
                off_linktype = 0;

-               /* XXX read from header? */
+               /* XXX read this from pf.h? */

                off_nl = PFLOG_HDRLEN;
                off_nl = PFLOG_HDRLEN;

-               off_nl_nosnap = PFLOG_HDRLEN;
+               off_nl_nosnap = PFLOG_HDRLEN;   /* no 802.2 LLC */

                return;
 
         case DLT_JUNIPER_MLFR:
         case DLT_JUNIPER_MLPPP:
                 off_linktype = 4;
                off_nl = 4;
                return;
 
         case DLT_JUNIPER_MLFR:
         case DLT_JUNIPER_MLPPP:
                 off_linktype = 4;
                off_nl = 4;

-               off_nl_nosnap = -1;
+               off_nl_nosnap = -1;     /* no 802.2 LLC */

                 return;
 
        case DLT_JUNIPER_ATM1:
                 return;
 
        case DLT_JUNIPER_ATM1:


@@ -1050,7 +1050,7 @@ init_linktype(p)
                return;
 #endif
 
                return;
 #endif
 

-       case DLT_LAPD:
+       case DLT_LINUX_LAPD:

                /*
                 * Currently, only raw "link[N:M]" filtering is supported.
                 */
                /*
                 * Currently, only raw "link[N:M]" filtering is supported.
                 */


@@ -1098,6 +1098,15 @@ gen_false()
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 

+/*
+ * Generate code to match a particular packet type.
+ *
+ * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
+ * value, if <= ETHERMTU.  We use that to determine whether to
+ * match the type/length field or to check the type/length field for
+ * a value <= ETHERMTU to see whether it's a type field and then do
+ * the appropriate test.
+ */

 static struct block *
 gen_ether_linktype(proto)
        register int proto;
 static struct block *
 gen_ether_linktype(proto)
        register int proto;


@@ -1107,38 +1116,24 @@ gen_ether_linktype(proto)
        switch (proto) {
 
        case LLCSAP_ISONS:
        switch (proto) {
 
        case LLCSAP_ISONS:

-               /*
-                * OSI protocols always use 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_ISONS << 8) | LLCSAP_ISONS));
-               gen_and(b0, b1);
-               return b1;
-

        case LLCSAP_IP:
        case LLCSAP_IP:

-               b0 = gen_cmp_gt(off_linktype, BPF_H, ETHERMTU);
-               gen_not(b0);
-               b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
-                            ((LLCSAP_IP << 8) | LLCSAP_IP));
-               gen_and(b0, b1);
-               return b1;
-

        case LLCSAP_NETBEUI:
                /*
        case LLCSAP_NETBEUI:
                /*

-                * NetBEUI always uses 802.2 encapsulation.
+                * OSI protocols and NetBEUI always use 802.2 encapsulation,
+                * so we check the DSAP and SSAP.
+                *
+                * LLCSAP_IP checks for IP-over-802.2, rather
+                * than IP-over-Ethernet or IP-over-SNAP.
+                *

                 * XXX - should we check both the DSAP and the
                 * SSAP, like this, or should we check just the
                 * XXX - should we check both the DSAP and the
                 * SSAP, like this, or should we check just the

-                * DSAP?
+                * DSAP, as we do for other types <= ETHERMTU
+                * (i.e., other SAP values)?

                 */
                b0 = gen_cmp_gt(off_linktype, BPF_H, ETHERMTU);
                gen_not(b0);
                b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
                 */
                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));
+                            ((proto << 8) | proto));

                gen_and(b0, b1);
                return b1;
 
                gen_and(b0, b1);
                return b1;
 


@@ -1282,6 +1277,14 @@ gen_ether_linktype(proto)
        }
 }
 
        }
 }
 

+/*
+ * Generate code to match a particular packet type.
+ *
+ * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
+ * value, if <= ETHERMTU.  We use that to determine whether to
+ * match the type field or to check the type field for the special
+ * LINUX_SLL_P_802_2 value and then do the appropriate test.
+ */

 static struct block *
 gen_linux_sll_linktype(proto)
        register int proto;
 static struct block *
 gen_linux_sll_linktype(proto)
        register int proto;


@@ -1290,36 +1293,24 @@ gen_linux_sll_linktype(proto)
 
        switch (proto) {
 
 
        switch (proto) {
 

-       case LLCSAP_IP:
-               b0 = gen_cmp(off_linktype, BPF_H, LINUX_SLL_P_802_2);
-               b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
-                            ((LLCSAP_IP << 8) | LLCSAP_IP));
-               gen_and(b0, b1);
-               return b1;
-

        case LLCSAP_ISONS:
        case LLCSAP_ISONS:

-               /*
-                * OSI protocols always use 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(off_linktype, BPF_H, LINUX_SLL_P_802_2);
-               b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
-                            ((LLCSAP_ISONS << 8) | LLCSAP_ISONS));
-               gen_and(b0, b1);
-               return b1;
-
+       case LLCSAP_IP:

        case LLCSAP_NETBEUI:
                /*
        case LLCSAP_NETBEUI:
                /*

-                * NetBEUI always uses 802.2 encapsulation.
+                * OSI protocols and NetBEUI always use 802.2 encapsulation,
+                * so we check the DSAP and SSAP.
+                *
+                * LLCSAP_IP checks for IP-over-802.2, rather
+                * than IP-over-Ethernet or IP-over-SNAP.
+                *

                 * XXX - should we check both the DSAP and the
                 * XXX - should we check both the DSAP and the

-                * LSAP, like this, or should we check just the
-                * DSAP?
+                * SSAP, like this, or should we check just the
+                * DSAP, as we do for other types <= ETHERMTU
+                * (i.e., other SAP values)?

                 */
                b0 = gen_cmp(off_linktype, BPF_H, LINUX_SLL_P_802_2);
                b1 = gen_cmp(off_linktype + 2, BPF_H, (bpf_int32)
                 */
                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));
+                            ((proto << 8) | proto));

                gen_and(b0, b1);
                return b1;
 
                gen_and(b0, b1);
                return b1;
 


@@ -1448,6 +1439,13 @@ gen_linux_sll_linktype(proto)
        }
 }
 
        }
 }
 

+/*
+ * Generate code to match a particular packet type by matching the
+ * link-layer type field or fields in the 802.2 LLC header.
+ *
+ * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
+ * value, if <= ETHERMTU.
+ */

 static struct block *
 gen_linktype(proto)
        register int proto;
 static struct block *
 gen_linktype(proto)
        register int proto;


@@ -1457,12 +1455,7 @@ gen_linktype(proto)
        switch (linktype) {
 
        case DLT_EN10MB:
        switch (linktype) {
 
        case DLT_EN10MB:

-
-                if (proto <= ETHERMTU) {
-                        off_linktype+=2;
-                        return gen_llc(proto);
-                }
-                else return gen_ether_linktype(proto);
+                return gen_ether_linktype(proto);

                 /*NOTREACHED*/
                 break;
 
                 /*NOTREACHED*/
                 break;
 


@@ -1488,7 +1481,7 @@ gen_linktype(proto)
        case DLT_ATM_RFC1483:
        case DLT_ATM_CLIP:
        case DLT_IP_OVER_FC:
        case DLT_ATM_RFC1483:
        case DLT_ATM_CLIP:
        case DLT_IP_OVER_FC:

-               return gen_llc(proto);
+               return gen_llc_linktype(proto);

                /*NOTREACHED*/
                break;
 
                /*NOTREACHED*/
                break;
 


@@ -1521,10 +1514,12 @@ gen_linktype(proto)
                         * protocol.
                         */
                        b0 = gen_atmfield_code(A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);
                         * protocol.
                         */
                        b0 = gen_atmfield_code(A_PROTOTYPE, PT_LLC, BPF_JEQ, 0);

-                       b1 = gen_llc(proto);
+                       b1 = gen_llc_linktype(proto);

                        gen_and(b0, b1);
                        return b1;
                }
                        gen_and(b0, b1);
                        return b1;
                }

+               /*NOTREACHED*/
+               break;

 
        case DLT_LINUX_SLL:
                return gen_linux_sll_linktype(proto);
 
        case DLT_LINUX_SLL:
                return gen_linux_sll_linktype(proto);


@@ -1862,7 +1857,7 @@ gen_linktype(proto)
        case DLT_DOCSIS:
                bpf_error("DOCSIS link-layer type filtering not implemented");
 
        case DLT_DOCSIS:
                bpf_error("DOCSIS link-layer type filtering not implemented");
 

-       case DLT_LAPD:
+       case DLT_LINUX_LAPD:

                bpf_error("LAPD link-layer type filtering not implemented");
        }
 
                bpf_error("LAPD link-layer type filtering not implemented");
        }
 


@@ -1918,10 +1913,19 @@ gen_snap(orgcode, ptype, offset)
 }
 
 /*
 }
 
 /*

- * Check for a given protocol value assuming an 802.2 LLC header.
+ * Generate code to match a particular packet type, for link-layer types
+ * using 802.2 LLC headers.
+ *
+ * This is *NOT* used for Ethernet; "gen_ether_linktype()" is used
+ * for that - it handles the D/I/X Ethernet vs. 802.3+802.2 issues.
+ *
+ * "proto" is an Ethernet type value, if > ETHERMTU, or an LLC SAP
+ * value, if <= ETHERMTU.  We use that to determine whether to
+ * match the DSAP or both DSAP and LSAP or to check the OUI and
+ * protocol ID in a SNAP header.

  */
 static struct block *
  */
 static struct block *

-gen_llc(proto)
+gen_llc_linktype(proto)

        int proto;
 {
        /*
        int proto;
 {
        /*


@@ -1930,16 +1934,16 @@ gen_llc(proto)
        switch (proto) {
 
        case LLCSAP_IP:
        switch (proto) {
 
        case LLCSAP_IP:

-               return gen_cmp(off_linktype, BPF_H, (long)
-                            ((LLCSAP_IP << 8) | LLCSAP_IP));
-

        case LLCSAP_ISONS:
        case LLCSAP_ISONS:

-               return gen_cmp(off_linktype, BPF_H, (long)
-                            ((LLCSAP_ISONS << 8) | LLCSAP_ISONS));
-

        case LLCSAP_NETBEUI:
        case LLCSAP_NETBEUI:

+               /*
+                * XXX - should we check both the DSAP and the
+                * SSAP, like this, or should we check just the
+                * DSAP, as we do for other types <= ETHERMTU
+                * (i.e., other SAP values)?
+                */

                return gen_cmp(off_linktype, BPF_H, (long)
                return gen_cmp(off_linktype, BPF_H, (long)

-                            ((LLCSAP_NETBEUI << 8) | LLCSAP_NETBEUI));
+                            ((proto << 8) | proto));

 
        case LLCSAP_IPX:
                /*
 
        case LLCSAP_IPX:
                /*


@@ -3080,7 +3084,9 @@ gen_proto_abbrev(proto)
                break;
 
        case Q_ISIS:
                break;
 
        case Q_ISIS:

+                b0 = gen_linktype(LLCSAP_ISONS);

                b1 = gen_proto(ISO10589_ISIS, Q_ISO, Q_DEFAULT);
                b1 = gen_proto(ISO10589_ISIS, Q_ISO, Q_DEFAULT);

+                gen_and(b0, b1);

                break;
 
        case Q_ISIS_L1: /* all IS-IS Level1 PDU-Types */
                break;
 
        case Q_ISIS_L1: /* all IS-IS Level1 PDU-Types */


@@ -3807,13 +3813,6 @@ gen_proto(v, proto, dir)
                        gen_and(b0, b1);
                        return b1;
 
                        gen_and(b0, b1);
                        return b1;
 

-                case DLT_EN10MB:
-                        b0 = gen_cmp(off_nl_nosnap-3, BPF_H, LLCSAP_ISONS<< 8 | LLCSAP_ISONS);
-                        b1 = gen_cmp(off_nl_nosnap, BPF_B, (long)v);
-                        gen_and(b0, b1);
-                        return b1;
-                        break;
-

                default:
                        b0 = gen_linktype(LLCSAP_ISONS);
                        b1 = gen_cmp(off_nl_nosnap, BPF_B, (long)v);
                default:
                        b0 = gen_linktype(LLCSAP_ISONS);
                        b1 = gen_cmp(off_nl_nosnap, BPF_B, (long)v);


@@ -5344,7 +5343,33 @@ gen_vlan(vlan_num)
 
        /*
         * Change the offsets to point to the type and data fields within
 
        /*
         * Change the offsets to point to the type and data fields within

-        * the VLAN packet. just increment the offsets to support hierarchy.
+        * the VLAN packet.  Just increment the offsets, so that we
+        * can support a hierarchy, e.g. "vlan 300 && vlan 200" to
+        * capture VLAN 200 encapsulated within VLAN 100.
+        *
+        * XXX - this is a bit of a kludge.  If we were to split the
+        * compiler into a parser that parses an expression and
+        * generates an expression tree, and a code generator that
+        * takes an expression tree (which could come from our
+        * parser or from some other parser) and generates BPF code,
+        * we could perhaps make the offsets parameters of routines
+        * and, in the handler for an "AND" node, pass to subnodes
+        * other than the VLAN node the adjusted offsets.
+        *
+        * This would mean that "vlan" would, instead of changing the
+        * behavior of *all* tests after it, change only the behavior
+        * of tests ANDed with it.  That would change the documented
+        * semantics of "vlan", which might break some expressions.
+        * However, it would mean that "(vlan and ip) or ip" would check
+        * both for VLAN-encapsulated IP and IP-over-Ethernet, rather than
+        * checking only for VLAN-encapsulated IP, so that could still
+        * be considered worth doing; it wouldn't break expressions
+        * that are of the form "vlan and ..." or "vlan N and ...",
+        * which I suspect are the most common expressions involving
+        * "vlan".  "vlan or ..." doesn't necessarily do what the user
+        * would really want, now, as all the "or ..." tests would
+        * be done assuming a VLAN, even though the "or" could be viewed
+        * as meaning "or, if this isn't a VLAN packet...".

         */
         orig_linktype = off_linktype;  /* save original values */
         orig_nl = off_nl;
         */
         orig_linktype = off_linktype;  /* save original values */
         orig_nl = off_nl;


@@ -5355,7 +5380,7 @@ gen_vlan(vlan_num)
         case DLT_EN10MB:
                 off_linktype += 4;
                 off_nl_nosnap += 4;
         case DLT_EN10MB:
                 off_linktype += 4;
                 off_nl_nosnap += 4;

-                off_nl = +4;
+                off_nl += 4;

                 break;
 
         default:
                 break;
 
         default:


@@ -5390,7 +5415,12 @@ gen_mpls(label_num)
 
        /*
         * Change the offsets to point to the type and data fields within
 
        /*
         * Change the offsets to point to the type and data fields within

-        * the MPLS packet. just increment the offsets to support hierarchy.
+        * the MPLS packet.  Just increment the offsets, so that we
+        * can support a hierarchy, e.g. "mpls 100000 && mpls 1024" to
+        * capture packets with an outer label of 100000 and an inner
+        * label of 1024.
+        *
+        * XXX - this is a bit of a kludge.  See comments in gen_vlan().

         */
         orig_linktype = off_linktype;  /* save original values */
         orig_nl = off_nl;
         */
         orig_linktype = off_linktype;  /* save original values */
         orig_nl = off_nl;

diff --git a/pcap-bpf.h b/pcap-bpf.h
index 53ccbaee701b4090b4127421c19898b5eb39a30d..12ae9ee337b4b6b9028b6a3e252ceb4a05d1d475 100644 (file)
--- a/pcap-bpf.h
+++ b/pcap-bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.1 2005-04-09 18:26:17 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.2 2005-04-10 18:04:51 hannes Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -582,12 +582,14 @@ struct bpf_version {
 
 /*
  * Requested by Daniele Orlandi <[email protected]> for raw LAPD
 
 /*
  * Requested by Daniele Orlandi <[email protected]> for raw LAPD

- * for vISDN (http://www.orlandi.com/visdn/).
+ * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
+ * includes additional information before the LAPD header, so it's
+ * not necessarily a generic LAPD header.

  */
  */

-#define DLT_LAPD               177
+#define DLT_LINUX_LAPD         177

 
 /*
 
 /*

- * The instruction encodings.
+\18 * The instruction encodings.

  */
 /* instruction classes */
 #define BPF_CLASS(code) ((code) & 0x07)
  */
 /* instruction classes */
 #define BPF_CLASS(code) ((code) & 0x07)

diff --git a/pcap-dlpi.c b/pcap-dlpi.c
index 80ad7c7c94f50c9c8baf49c20c145c52c5aac2d8..48071cbebb938d9bc388ed6ce05489185d28ceb7 100644 (file)
--- a/pcap-dlpi.c
+++ b/pcap-dlpi.c
@@ -66,7 +66,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.110 2005-04-08 03:08:00 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/pcap-dlpi.c,v 1.108.2.1 2005-04-10 18:04:51 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H

diff --git a/pcap-int.h b/pcap-int.h
index 0c50473fae70b5d0b77f05e7662c4ed067249bfd..2789f8da3028c43489910beddb7b6d048e3b3775 100644 (file)
--- a/pcap-int.h
+++ b/pcap-int.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.70 2005-04-07 02:47:34 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.68.2.1 2005-04-10 18:04:52 hannes Exp $ (LBL)

  */
 
 #ifndef pcap_int_h
  */
 
 #ifndef pcap_int_h

diff --git a/savefile.c b/savefile.c
index 0100739f0a144f0a994e229c6f83a9ff8f0f5a4c..815303bdeb7d90485100b2c4b5dc7e30d481a5df 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.127 2005-04-07 20:42:46 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.126.2.1 2005-04-10 18:04:52 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -406,9 +406,11 @@ static const char rcsid[] _U_ =
 
 /*
  * Requested by Daniele Orlandi <[email protected]> for raw LAPD
 
 /*
  * Requested by Daniele Orlandi <[email protected]> for raw LAPD

- * for vISDN (http://www.orlandi.com/visdn/).
+ * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
+ * includes additional information before the LAPD header, so it's
+ * not necessarily a generic LAPD header.

  */
  */

-#define LINKTYPE_LAPD          177
+#define LINKTYPE_LINUX_LAPD    177

 
 static struct linktype_map {
        int     dlt;
 
 static struct linktype_map {
        int     dlt;


@@ -600,8 +602,8 @@ static struct linktype_map {
        { DLT_ERF_ETH,          LINKTYPE_ERF_ETH },
        { DLT_ERF_POS,          LINKTYPE_ERF_POS },
 
        { DLT_ERF_ETH,          LINKTYPE_ERF_ETH },
        { DLT_ERF_POS,          LINKTYPE_ERF_POS },
 

-       /* Raw LAPD */
-       { DLT_LAPD,             LINKTYPE_LAPD },
+       /* viSDN LAPD */
+       { DLT_LINUX_LAPD,       LINKTYPE_LINUX_LAPD },

 
        { -1,                   -1 }
 };
 
        { -1,                   -1 }
 };