$NetBSD: patch-ax,v 1.2 2008/07/29 21:02:23 tnn Exp $

--- pppd/pppd.h.orig	2004-11-13 13:02:22.000000000 +0100
+++ pppd/pppd.h
@@ -85,7 +85,8 @@
  * Option descriptor structure.
  */
 
-typedef unsigned char	bool;
+/* typedef unsigned char	bool; */
+#include <stdbool.h>
 
 enum opt_type {
 	o_special_noarg = 0,
@@ -213,7 +214,7 @@ struct notifier {
 extern int	hungup;		/* Physical layer has disconnected */
 extern int	ifunit;		/* Interface unit number */
 extern char	ifname[];	/* Interface name */
-extern char	hostname[];	/* Our hostname */
+extern char	hostname[MAXNAMELEN];	/* Our hostname */
 extern u_char	outpacket_buf[]; /* Buffer for outgoing packets */
 extern int	devfd;		/* fd of underlying device */
 extern int	fd_ppp;		/* fd for talking PPP */
@@ -336,8 +337,13 @@ extern int       maxoctets_timeout;  /* 
 #endif
 
 #ifdef PPP_FILTER
-extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-extern struct	bpf_program active_filter; /* Filter for link-active pkts */
+/* Filter for packets to pass */
+extern struct	bpf_program pass_filter_in;
+extern struct	bpf_program pass_filter_out;
+
+/* Filter for link-active packets */
+extern struct	bpf_program active_filter_in;
+extern struct	bpf_program active_filter_out;
 #endif
 
 #ifdef MSLANMAN
@@ -506,8 +512,10 @@ void print_string __P((char *, int,  voi
 		void *));	/* Format a string for output */
 int slprintf __P((char *, int, char *, ...));		/* sprintf++ */
 int vslprintf __P((char *, int, char *, va_list));	/* vsprintf++ */
+#ifndef HAS_STRLFUNCS
 size_t strlcpy __P((char *, const char *, size_t));	/* safe strcpy */
 size_t strlcat __P((char *, const char *, size_t));	/* safe strncpy */
+#endif
 void dbglog __P((char *, ...));	/* log a debug message */
 void info __P((char *, ...));	/* log an informational message */
 void notice __P((char *, ...));	/* log a notice-level message */
@@ -657,7 +665,8 @@ void logwtmp __P((const char *, const ch
 int  get_host_seed __P((void));	/* Get host-dependent random number seed */
 int  have_route_to __P((u_int32_t)); /* Check if route to addr exists */
 #ifdef PPP_FILTER
-int  set_filters __P((struct bpf_program *pass, struct bpf_program *active));
+int  set_filters __P((struct bpf_program *pass_in, struct bpf_program *pass_out,
+	struct bpf_program *active_in, struct bpf_program *active_out));
 				/* Set filter programs in kernel */
 #endif
 #ifdef IPX_CHANGE
@@ -709,6 +718,10 @@ extern int (*allowed_address_hook) __P((
 extern void (*ip_up_hook) __P((void));
 extern void (*ip_down_hook) __P((void));
 extern void (*ip_choose_hook) __P((u_int32_t *));
+void (*lcp_up_hook) __P((void));
+void (*lcp_down_hook) __P((void));
+void (*lcp_echo_hook) __P((int));
+void (*lcp_echoreply_hook) __P((int));
 
 extern int (*chap_check_hook) __P((void));
 extern int (*chap_passwd_hook) __P((char *user, char *passwd));