FreeBSD Bugzilla – Attachment 6243 Details for
Bug 14330
[PATCH] fix clash between /usr/src/contrib/tcpdump/ppp.h and /usr/include/net/ppp_defs.h
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 1.99 KB, created by
Tony Finch
on 1999-10-14 19:30:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Tony Finch
Created:
1999-10-14 19:30:00 UTC
Size:
1.99 KB
patch
obsolete
>--- /usr/src/contrib/tcpdump/ppp.h.orig Thu Oct 14 19:06:04 1999 >+++ /usr/src/contrib/tcpdump/ppp.h Thu Oct 14 19:10:10 1999 >@@ -15,21 +15,21 @@ > * suitability of this software for any purpose. It is provided "as is" > * without express or implied warranty. > */ >-#define PPP_ADDRESS 0xff /* The address byte value */ >-#define PPP_CONTROL 0x03 /* The control byte value */ >+#define PPP_ADDRESS_VAL 0xff /* The address byte value */ >+#define PPP_CONTROL_VAL 0x03 /* The control byte value */ > > /* Protocol numbers */ >-#define PPP_IP 0x0021 /* Raw IP */ >-#define PPP_OSI 0x0023 /* OSI Network Layer */ >-#define PPP_NS 0x0025 /* Xerox NS IDP */ >-#define PPP_DECNET 0x0027 /* DECnet Phase IV */ >-#define PPP_APPLE 0x0029 /* Appletalk */ >-#define PPP_IPX 0x002b /* Novell IPX */ >-#define PPP_VJC 0x002d /* Van Jacobson Compressed TCP/IP */ >-#define PPP_VJNC 0x002f /* Van Jacobson Uncompressed TCP/IP */ >-#define PPP_BRPDU 0x0031 /* Bridging PDU */ >-#define PPP_STII 0x0033 /* Stream Protocol (ST-II) */ >-#define PPP_VINES 0x0035 /* Banyan Vines */ >+#define PPP_IP 0x21 /* Raw IP */ >+#define PPP_OSI 0x23 /* OSI Network Layer */ >+#define PPP_NS 0x25 /* Xerox NS IDP */ >+#define PPP_DECNET 0x27 /* DECnet Phase IV */ >+#define PPP_APPLE 0x29 /* Appletalk */ >+#define PPP_IPX 0x2b /* Novell IPX */ >+#define PPP_VJC 0x2d /* Van Jacobson Compressed TCP/IP */ >+#define PPP_VJNC 0x2f /* Van Jacobson Uncompressed TCP/IP */ >+#define PPP_BRPDU 0x31 /* Bridging PDU */ >+#define PPP_STII 0x33 /* Stream Protocol (ST-II) */ >+#define PPP_VINES 0x35 /* Banyan Vines */ > > #define PPP_HELLO 0x0201 /* 802.1d Hello Packets */ > #define PPP_LUXCOM 0x0231 /* Luxcom */ >--- /usr/src/contrib/tcpdump/print-ppp.c.orig Tue Sep 15 20:46:59 1998 >+++ /usr/src/contrib/tcpdump/print-ppp.c Thu Oct 14 19:07:44 1999 >@@ -571,7 +571,7 @@ > snapend = p + caplen; > hdrlength = 0; > >- if (p[0] == PPP_ADDRESS && p[1] == PPP_CONTROL) { >+ if (p[0] == PPP_ADDRESS_VAL && p[1] == PPP_CONTROL_VAL) { > if (eflag) > printf("%02x %02x ", p[0], p[1]); > p += 2;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 14330
: 6243