From fanf@demon.net Thu Oct 14 11:26:54 1999
Return-Path: <fanf@demon.net>
Received: from internal.mail.demon.net (internal.mail.demon.net [193.195.224.3])
	by hub.freebsd.org (Postfix) with ESMTP id E571014F88
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 14 Oct 1999 11:26:47 -0700 (PDT)
	(envelope-from fanf@demon.net)
Received: from fanf.eng.demon.net (fanf.eng.demon.net [195.11.55.89])
	by internal.mail.demon.net with ESMTP id TAA20874;
	Thu, 14 Oct 1999 19:26:40 +0100 (BST)
Received: from fanf by fanf.eng.demon.net with local (Exim 3.03 #2)
	id 11bpZq-000EYx-00
	for FreeBSD-gnats-submit@freebsd.org; Thu, 14 Oct 1999 19:26:10 +0100
Message-Id: <E11bpZq-000EYx-00@fanf.eng.demon.net>
Date: Thu, 14 Oct 1999 19:26:10 +0100
From: Tony Finch <dot@dotat.at>
Sender: Tony Finch <fanf@demon.net>
Reply-To: Tony Finch <dot@dotat.at>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] fix clash between /usr/src/contrib/tcpdump/ppp.h and /usr/include/net/ppp_defs.h
X-Send-Pr-Version: 3.2

>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:    peter
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 14 11:30:00 PDT 1999
>Closed-Date:    Mon Dec 10 12:35:46 PST 2001
>Last-Modified:  Mon Dec 10 12:36:45 PST 2001
>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:
Responsible-Changed-From-To: freebsd-bugs->peter 
Responsible-Changed-By: sheldonh 
Responsible-Changed-When: Fri Oct 15 02:06:34 PDT 1999 
Responsible-Changed-Why:  
It's probably more appropriate for this to be resolved outside of 
the contrib directory. Over to Mr Wemm, pppd's most apparent  
maintainer. 
Responsible-Changed-From-To: peter->dec 
Responsible-Changed-By: peter 
Responsible-Changed-When: Mon Sep 25 11:28:27 PDT 2000 
Responsible-Changed-Why:  
dec is now maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=14330 
Responsible-Changed-From-To: dec->peter 
Responsible-Changed-By: peter 
Responsible-Changed-When: Mon Sep 25 11:28:54 PDT 2000 
Responsible-Changed-Why:  
oops, wrong pr. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=14330 
State-Changed-From-To: open->closed 
State-Changed-By: peter 
State-Changed-When: Mon Dec 10 12:35:46 PST 2001 
State-Changed-Why:  
This isn't a problem on RELENG_4 or -current which have a newer 
tcpdump/libpcap.  RELENG_3 is essentially closed these days. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=14330 
>Unformatted:
