Attachment #403676 for bug #549966

Lines 50-55 Link Here

(-)ppp-2.4.7.orig/include/linux/ppp_defs.h (+4 lines)
50	#ifndef _PPP_DEFS_H_	50	#ifndef _PPP_DEFS_H_
51	#define _PPP_DEFS_H_	51	#define _PPP_DEFS_H_
52		52
		53	#ifndef __P
		54	# define __P(x) x
		55	#endif
		56
53	/*	57	/*
54	* The basic PPP frame.	58	* The basic PPP frame.
55	*/	59	*/

Lines 38-43 Link Here

(-)ppp-2.4.7.orig/include/net/ppp_defs.h (+2 lines)
38	#ifndef _PPP_DEFS_H_	38	#ifndef _PPP_DEFS_H_
39	#define _PPP_DEFS_H_	39	#define _PPP_DEFS_H_
40		40
		41	#include <sys/time.h>
		42
41	/*	43	/*
42	* The basic PPP frame.	44	* The basic PPP frame.
43	*/	45	*/

Lines 126-132 Link Here

(-)ppp-2.4.7.orig/pppd/Makefile.linux (-1 / +1 lines)
126	endif	126	endif
127		127
128	ifdef USE_LIBUTIL	128	ifdef USE_LIBUTIL
129	CFLAGS += -DHAVE_LOGWTMP=1	129	#CFLAGS += -DHAVE_LOGWTMP=1
130	LIBS += -lutil	130	LIBS += -lutil
131	endif	131	endif
132		132

Lines 42-47 Link Here

(-)ppp-2.4.7.orig/pppd/magic.h (+4 lines)
42	* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $	42	* $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
43	*/	43	*/
44		44
		45	#ifndef __P
		46	# define __P(x) x
		47	#endif
		48
45	void magic_init __P((void)); /* Initialize the magic number generator */	49	void magic_init __P((void)); /* Initialize the magic number generator */
46	u_int32_t magic __P((void)); /* Returns the next magic number */	50	u_int32_t magic __P((void)); /* Returns the next magic number */
47		51

Lines 101-109 Link Here

(-)ppp-2.4.7.orig/pppd/plugins/rp-pppoe/config.h (-3 lines)
101	/* Define if you have the <netpacket/packet.h> header file. */	101	/* Define if you have the <netpacket/packet.h> header file. */
102	#define HAVE_NETPACKET_PACKET_H 1	102	#define HAVE_NETPACKET_PACKET_H 1
103		103
104	/* Define if you have the <sys/cdefs.h> header file. */
105	#define HAVE_SYS_CDEFS_H 1
106
107	/* Define if you have the <sys/dlpi.h> header file. */	104	/* Define if you have the <sys/dlpi.h> header file. */
108	/* #undef HAVE_SYS_DLPI_H */	105	/* #undef HAVE_SYS_DLPI_H */
109		106

Lines 30-39 Link Here

(-)ppp-2.4.7.orig/pppd/plugins/rp-pppoe/if.c (-4 lines)
30	#include <linux/if_packet.h>	30	#include <linux/if_packet.h>
31	#endif	31	#endif
32		32
33	#ifdef HAVE_NET_ETHERNET_H
34	#include <net/ethernet.h>
35	#endif
36
37	#ifdef HAVE_ASM_TYPES_H	33	#ifdef HAVE_ASM_TYPES_H
38	#include <asm/types.h>	34	#include <asm/types.h>
39	#endif	35	#endif

Lines 46-52 Link Here

(-)ppp-2.4.7.orig/pppd/plugins/rp-pppoe/plugin.c (-1 lines)
46	#include <unistd.h>	46	#include <unistd.h>
47	#include <fcntl.h>	47	#include <fcntl.h>
48	#include <signal.h>	48	#include <signal.h>
49	#include <net/ethernet.h>
50	#include <net/if_arp.h>	49	#include <net/if_arp.h>
51	#include <linux/ppp_defs.h>	50	#include <linux/ppp_defs.h>
52	#include <linux/if_pppox.h>	51	#include <linux/if_pppox.h>

Lines 27-36 Link Here

(-)ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe-discovery.c (-4 / +2 lines)
27	#include <linux/if_packet.h>	27	#include <linux/if_packet.h>
28	#endif	28	#endif
29		29
30	#ifdef HAVE_NET_ETHERNET_H
31	#include <net/ethernet.h>
32	#endif
33
34	#ifdef HAVE_ASM_TYPES_H	30	#ifdef HAVE_ASM_TYPES_H
35	#include <asm/types.h>	31	#include <asm/types.h>
36	#endif	32	#endif
Lines 55-60 Link Here
55	exit(status);	51	exit(status);
56	}	52	}
57		53
		54	#define error(x...) fprintf(stderr, x)
		55
58	/* Initialize frame types to RFC 2516 values. Some broken peers apparently	56	/* Initialize frame types to RFC 2516 values. Some broken peers apparently
59	use different frame types... sigh... */	57	use different frame types... sigh... */
60		58




#error Unknown method for accessing raw Ethernet frames
#endif

#ifdef HAVE_SYS_CDEFS_H
#include <sys/cdefs.h>
#endif

#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif


#include <netinet/in.h>

#ifdef HAVE_NETINET_IF_ETHER_H
#include <sys/types.h>

#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#ifndef HAVE_SYS_DLPI_H
#include <netinet/if_ether.h>
#endif
#endif



/* Ethernet frame types according to RFC 2516 */
#define ETH_PPPOE_DISCOVERY 0x8863
#define ETH_PPPOE_SESSION   0x8864




#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <errno.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <sys/utsname.h>

#define MAX_ADDR_LEN 7
#endif

#if __GLIBC__ >= 2
#include <asm/types.h>		/* glibc 2 conflicts with linux/types.h */
#include <net/if.h>
#include <net/if_arp.h>
#include <net/route.h>
#include <netinet/if_ether.h>
#else
#include <linux/types.h>
#include <linux/if.h>
#include <linux/if_arp.h>
#include <linux/route.h>
#include <linux/if_ether.h>
#endif
#include <netinet/in.h>
#include <arpa/inet.h>


Return to bug 549966

Lines 39-48 Link Here

(-)ppp-2.4.7.orig/pppd/plugins/rp-pppoe/pppoe.h (-17 lines)
39	#error Unknown method for accessing raw Ethernet frames	39	#error Unknown method for accessing raw Ethernet frames
40	#endif	40	#endif
41		41
42	#ifdef HAVE_SYS_CDEFS_H
43	#include <sys/cdefs.h>
44	#endif
45
46	#ifdef HAVE_SYS_SOCKET_H	42	#ifdef HAVE_SYS_SOCKET_H
47	#include <sys/socket.h>	43	#include <sys/socket.h>
48	#endif	44	#endif
Lines 86-104 Link Here
86		82
87	#include <netinet/in.h>	83	#include <netinet/in.h>
88		84
89	#ifdef HAVE_NETINET_IF_ETHER_H
90	#include <sys/types.h>
91
92	#ifdef HAVE_SYS_SOCKET_H
93	#include <sys/socket.h>
94	#endif
95	#ifndef HAVE_SYS_DLPI_H
96	#include <netinet/if_ether.h>
97	#endif
98	#endif
99
100
101
102	/* Ethernet frame types according to RFC 2516 */	85	/* Ethernet frame types according to RFC 2516 */
103	#define ETH_PPPOE_DISCOVERY 0x8863	86	#define ETH_PPPOE_DISCOVERY 0x8863
104	#define ETH_PPPOE_SESSION 0x8864	87	#define ETH_PPPOE_SESSION 0x8864

Lines 73-79 Link Here

(-)ppp-2.4.7.orig/pppd/sys-linux.c (-9 / +1 lines)
73	#include <sys/types.h>	73	#include <sys/types.h>
74	#include <sys/socket.h>	74	#include <sys/socket.h>
75	#include <sys/time.h>	75	#include <sys/time.h>
76	#include <sys/errno.h>	76	#include <errno.h>
77	#include <sys/file.h>	77	#include <sys/file.h>
78	#include <sys/stat.h>	78	#include <sys/stat.h>
79	#include <sys/utsname.h>	79	#include <sys/utsname.h>
Lines 102-120 Link Here
102	#define MAX_ADDR_LEN 7	102	#define MAX_ADDR_LEN 7
103	#endif	103	#endif
104		104
105	#if __GLIBC__ >= 2
106	#include <asm/types.h> /* glibc 2 conflicts with linux/types.h */	105	#include <asm/types.h> /* glibc 2 conflicts with linux/types.h */
107	#include <net/if.h>	106	#include <net/if.h>
108	#include <net/if_arp.h>	107	#include <net/if_arp.h>
109	#include <net/route.h>	108	#include <net/route.h>
110	#include <netinet/if_ether.h>	109	#include <netinet/if_ether.h>
111	#else
112	#include <linux/types.h>
113	#include <linux/if.h>
114	#include <linux/if_arp.h>
115	#include <linux/route.h>
116	#include <linux/if_ether.h>
117	#endif
118	#include <netinet/in.h>	110	#include <netinet/in.h>
119	#include <arpa/inet.h>	111	#include <arpa/inet.h>
120		112