Date: Thu, 14 Oct 1999 19:26:10 +0100 From: Tony Finch <dot@dotat.at> To: FreeBSD-gnats-submit@freebsd.org Subject: bin/14330: [PATCH] fix clash between /usr/src/contrib/tcpdump/ppp.h and /usr/include/net/ppp_defs.h Message-ID: <E11bpZq-000EYx-00@fanf.eng.demon.net>
index | next in thread | raw e-mail
>Number: 14330
>Category: bin
>Synopsis: [PATCH] fix clash between /usr/src/contrib/tcpdump/ppp.h and /usr/include/net/ppp_defs.h
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 14 11:30:00 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Tony Finch
>Release: FreeBSD 3.3-STABLE-19990927 i386
>Organization:
Demon Internet Ltd
>Environment:
FreeBSD fanf.eng.demon.net 3.3-STABLE-19990927 FreeBSD 3.3-STABLE-19990927 #14: Mon Sep 27 02:50:55 BST 1999 root@fanf.eng.demon.net:/usr/src/sys/compile/DELL-PREC410 i386
>Description:
cc -O -pipe -DHAVE_FCNTL_H=1 -DHAVE_NET_SLIP_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_ETHER_NTOHOST=1 -DHAVE_SETLINEBUF=1 -DSTDC_HEADERS=1 -DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_TM_GMTOFF=1 -DLBL_ALIGN=1 -DPPP -DHAVE_FDDI -g -I/usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/lbl -c /usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-ppp.c
In file included from /usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/print-ppp.c:54:
/usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/ppp.h:18: warning: `PPP_ADDRESS' redefined
/usr/include/net/ppp_defs.h:40: warning: this is the location of the previous definition
/usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/ppp.h:19: warning: `PPP_CONTROL' redefined
/usr/include/net/ppp_defs.h:41: warning: this is the location of the previous definition
/usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/ppp.h:22: warning: `PPP_IP' redefined
/usr/include/net/ppp_defs.h:56: warning: this is the location of the previous definition
/usr/src/usr.sbin/tcpdump/tcpdump/../../../contrib/tcpdump/ppp.h:27: warning: `PPP_IPX' redefined
/usr/include/net/ppp_defs.h:59: warning: this is the location of the previous definition
>How-To-Repeat:
make buildworld
>Fix:
--- /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;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E11bpZq-000EYx-00>