diff options
| author | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-05-29 19:09:28 +0000 |
| commit | 7dacff5dd0aeebda55a754dc5d25feab441b5d03 (patch) | |
| tree | 71f0f8d5860cc5ba4d96abee0d8048a044b51cd3 /contrib/tcpdump/ppp.h | |
| parent | d9db21b8bcec89e09ac680f84c6d7d0ca014d6df (diff) | |
| download | FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.zip FreeBSD-src-7dacff5dd0aeebda55a754dc5d25feab441b5d03.tar.gz | |
resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h
Reviewed by: bms
Diffstat (limited to 'contrib/tcpdump/ppp.h')
| -rw-r--r-- | contrib/tcpdump/ppp.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/tcpdump/ppp.h b/contrib/tcpdump/ppp.h index 6c69ce8..484ea46 100644 --- a/contrib/tcpdump/ppp.h +++ b/contrib/tcpdump/ppp.h @@ -1,4 +1,4 @@ -/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.14 2003/05/22 15:29:22 hannes Exp $ (LBL) */ +/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.16 2004/10/20 16:14:16 hannes Exp $ (LBL) */ /* * Point to Point Protocol (PPP) RFC1331 * @@ -24,6 +24,9 @@ #undef PPP_CONTROL #define PPP_CONTROL 0x03 /* The control byte value */ +#define PPP_WITHDIRECTION_IN 0x00 /* non-standard for DLT_PPP_WITHDIRECTION */ +#define PPP_WITHDIRECTION_OUT 0x01 /* non-standard for DLT_PPP_WITHDIRECTION */ + /* Protocol numbers */ #ifndef PPP_IP #define PPP_IP 0x0021 /* Raw IP */ @@ -40,6 +43,7 @@ #define PPP_BRPDU 0x0031 /* Bridging PDU */ #define PPP_STII 0x0033 /* Stream Protocol (ST-II) */ #define PPP_VINES 0x0035 /* Banyan Vines */ +#define PPP_ML 0x003d /* Multi-Link PPP */ #define PPP_IPV6 0x0057 /* IPv6 */ #define PPP_COMP 0x00fd /* Compressed Datagram */ @@ -68,7 +72,7 @@ #define PPP_CHAP 0xc223 /* Challenge Handshake Authentication Protocol */ #define PPP_BACP 0xc02b /* Bandwidth Allocation Control Protocol */ #define PPP_BAP 0xc02d /* BAP */ -#define PPP_MP 0xc03d /* Multi-Link */ +#define PPP_MPCP 0xc03d /* Multi-Link */ #define PPP_SPAP_OLD 0xc123 #define PPP_EAP 0xc227 |
