41c41
< * $FreeBSD: head/sys/net/bpf.h 58273 2000-03-19 05:42:34Z rwatson $
---
> * $FreeBSD: head/sys/net/bpf.h 80767 2001-07-31 23:27:06Z fenner $
155,156d154
< #define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
< #define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
158a157,238
> * These are values from BSD/OS's "bpf.h".
> * These are not the same as the values from the traditional libpcap
> * "bpf.h"; however, these values shouldn't be generated by any
> * OS other than BSD/OS, so the correct values to use here are the
> * BSD/OS values.
> *
> * Platforms that have already assigned these values to other
> * DLT_ codes, however, should give these codes the values
> * from that platform, so that programs that use these codes will
> * continue to compile - even though they won't correctly read
> * files of these types.
> */
> #define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */
> #define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */
>
> #define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */
>
> /*
> * This value is defined by NetBSD; other platforms should refrain from
> * using it for other purposes, so that NetBSD savefiles with a link
> * type of 50 can be read as this type on all platforms.
> */
> #define DLT_PPP_SERIAL 50 /* PPP over serial with HDLC encapsulation */
>
> /*
> * This value was defined by libpcap 0.5; platforms that have defined
> * it with a different value should define it here with that value -
> * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
> * whatever value that happens to be, so programs will correctly
> * handle files with that link type regardless of the value of
> * DLT_C_HDLC.
> *
> * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
> * compatibility with programs written for BSD/OS.
> *
> * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
> * for source compatibility with programs written for libpcap 0.5.
> */
> #define DLT_C_HDLC 104 /* Cisco HDLC */
> #define DLT_CHDLC DLT_C_HDLC
>
> /*
> * Reserved for future use.
> * Do not pick other numerical value for these unless you have also
> * picked up the tcpdump.org top-of-CVS-tree version of "savefile.c",
> * which will arrange that capture files for these DLT_ types have
> * the same "network" value on all platforms, regardless of what
> * value is chosen for their DLT_ type (thus allowing captures made
> * on one platform to be read on other platforms, even if the two
> * platforms don't use the same numerical values for all DLT_ types).
> */
> #define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
>
> /*
> * Values between 106 and 107 are used in capture file headers as
> * link-layer types corresponding to DLT_ types that might differ
> * between platforms; don't use those values for new DLT_ new types.
> */
>
> /*
> * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
> * that the AF_ type in the link-layer header is in network byte order.
> *
> * OpenBSD defines it as 12, but that collides with DLT_RAW, so we
> * define it as 108 here. If OpenBSD picks up this file, it should
> * define DLT_LOOP as 12 in its version, as per the comment above -
> * and should not use 108 for any purpose.
> */
> #define DLT_LOOP 108
>
> /*
> * Values between 109 and 112 are used in capture file headers as
> * link-layer types corresponding to DLT_ types that might differ
> * between platforms; don't use those values for new DLT_ new types.
> */
>
> /*
> * This is for Linux cooked sockets.
> */
> #define DLT_LINUX_SLL 113
>
> /*
< * $FreeBSD: head/sys/net/bpf.h 58273 2000-03-19 05:42:34Z rwatson $
---
> * $FreeBSD: head/sys/net/bpf.h 80767 2001-07-31 23:27:06Z fenner $
155,156d154
< #define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */
< #define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */
158a157,238
> * These are values from BSD/OS's "bpf.h".
> * These are not the same as the values from the traditional libpcap
> * "bpf.h"; however, these values shouldn't be generated by any
> * OS other than BSD/OS, so the correct values to use here are the
> * BSD/OS values.
> *
> * Platforms that have already assigned these values to other
> * DLT_ codes, however, should give these codes the values
> * from that platform, so that programs that use these codes will
> * continue to compile - even though they won't correctly read
> * files of these types.
> */
> #define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */
> #define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */
>
> #define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */
>
> /*
> * This value is defined by NetBSD; other platforms should refrain from
> * using it for other purposes, so that NetBSD savefiles with a link
> * type of 50 can be read as this type on all platforms.
> */
> #define DLT_PPP_SERIAL 50 /* PPP over serial with HDLC encapsulation */
>
> /*
> * This value was defined by libpcap 0.5; platforms that have defined
> * it with a different value should define it here with that value -
> * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
> * whatever value that happens to be, so programs will correctly
> * handle files with that link type regardless of the value of
> * DLT_C_HDLC.
> *
> * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
> * compatibility with programs written for BSD/OS.
> *
> * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
> * for source compatibility with programs written for libpcap 0.5.
> */
> #define DLT_C_HDLC 104 /* Cisco HDLC */
> #define DLT_CHDLC DLT_C_HDLC
>
> /*
> * Reserved for future use.
> * Do not pick other numerical value for these unless you have also
> * picked up the tcpdump.org top-of-CVS-tree version of "savefile.c",
> * which will arrange that capture files for these DLT_ types have
> * the same "network" value on all platforms, regardless of what
> * value is chosen for their DLT_ type (thus allowing captures made
> * on one platform to be read on other platforms, even if the two
> * platforms don't use the same numerical values for all DLT_ types).
> */
> #define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
>
> /*
> * Values between 106 and 107 are used in capture file headers as
> * link-layer types corresponding to DLT_ types that might differ
> * between platforms; don't use those values for new DLT_ new types.
> */
>
> /*
> * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
> * that the AF_ type in the link-layer header is in network byte order.
> *
> * OpenBSD defines it as 12, but that collides with DLT_RAW, so we
> * define it as 108 here. If OpenBSD picks up this file, it should
> * define DLT_LOOP as 12 in its version, as per the comment above -
> * and should not use 108 for any purpose.
> */
> #define DLT_LOOP 108
>
> /*
> * Values between 109 and 112 are used in capture file headers as
> * link-layer types corresponding to DLT_ types that might differ
> * between platforms; don't use those values for new DLT_ new types.
> */
>
> /*
> * This is for Linux cooked sockets.
> */
> #define DLT_LINUX_SLL 113
>
> /*