Header file reorganization and cleaning up the public API for pppd version 2.5.0 (#379)

This commit does several things, being a squash-and-merge of a series
of changes; squashed in order not to break bisection.

* Clean up pppd.h, moving declarations that should only be accessed by
  pppd code (not by users of pppd) to a new pppd-private.h.  Also,
  other parts of pppd.h were moved to multilink.h, chap.h, eap.h,
  eui64.h, and a new options.h.

* Provide an API for access to data that is needed by plugins (in no
  particular order):
  - ifname
  - ifunit
  - remote_name
  - remote_number
  - peer_authname
  - status (now called "code" internally)
  - phase
  - doing_multilink
  - multilink_master
  - idle_time_limit
  - link_connect_time
  - max_connect_time
  - link_stats
  - ipparam
  - hostname
  - got_sigterm
  - got_sigusr2
  - got_sighup
  - session_number
  - maxoctets
  - maxoctets_dir
  - debug
  - persist
  - devnam
  - modem
  - peer_authname
  - sync_serial

* Update the version number to 2.5.0.

* Detect availability of stddef.h and stdarg.h.

* Rename some headers:
  - pppcrypt.c/h to crypto_ms.c/h
  - ppp-crypto.c/h to crypto.c/h
  - ppp-crypto-priv.h to crypto-priv.h
  - chap-new.c/h to chap.c/h

* Remove chap-md5.h, crypto-priv.h, eap-tls.h, etc. from the list of
  header files to be installed.

* Provide typedefs for the hook functions.

* Provide a typedef for the "phase" variable.

* Provide a typedef for the link statistics array.

* Remove the option_t typedef.

* Rename the following functions by adding a "ppp_" prefix (with the
  intention that these are a "public" API for use by plugins):
  - option_error
  - add_options
  - int_option,
  - options_from_file
  - script_setenv
  - bad_ip_adrs,
  - netif_get/set_mtu (renamed to ppp_get/set_mtu)
  - get_time
  - timeout
  - untimeout
  - safe_fork
  - sys_close
  - set_session_number
  - update_link_stats (renamed to ppp_get_link_stats)
  - add_notifier (renamed to ppp_add_notify)
  - remove_notifier (renamed to ppp_del_notify)
  - generic_[dis]establish_ppp (to ppp_generic_[dis]establish)

* Rename ppp_devnam to ppp_devname.

* Rename ppp_available() to ppp_check_kernel_support().

* Use unsigned char instead of u_char, unsigned short instead of
  u_short, uint32_t instead of u_int32_t.

* Add const to some declarations

* Update comments

* Change the interface for notifiers to use an enum to identify which
  notifier is to be modified.

* Provide an API for getting the path to a file, with an enum to
  identify different types of file.

* Link plugins with the -DPLUGIN flag

[paulus@ozlabs.org - wrote commit message]

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

1 files changed, 414 insertions, 829 deletions

diff --git a/pppd/pppd.h b/pppd/pppd.h
index d4bc043..135fd35 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -38,159 +38,118 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp $
  */
 
 #ifndef PPP_PPPD_H
 #define PPP_PPPD_H
 
-#include "pppdconf.h"
-
-#include <stdio.h>		/* for FILE */
-#include <stdlib.h>		/* for encrypt */
-#include <unistd.h>		/* for setkey */
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#include <stdint.h>
-#include <sys/types.h>		/* for u_int32_t, if defined */
-#if defined(SOL2)
-#include <net/ppp_defs.h>
-#else
-#include <linux/ppp_defs.h>
 #endif
 
-#ifdef PPP_WITH_IPV6CP
-#if defined(SOL2)
-#include <netinet/in.h>
-
-typedef union {
-    uint8_t	e8[8];		/* lower 64-bit IPv6 address */
-    uint32_t	e32[2];		/* lower 64-bit IPv6 address */
-} eui64_t;
-
-/*
- * Declare the two below, since in.h only defines them when _KERNEL
- * is declared - which shouldn't be true when dealing with user-land programs
- */
-#define	s6_addr8	_S6_un._S6_u8
-#define	s6_addr32	_S6_un._S6_u32
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
 
-#else /* else if not defined(SOL2) */
+#ifdef HAVE_STDDEF_H
+#include <stddef.h>
+#endif
 
-/*
- * TODO:
- *
- * Maybe this should be done by processing struct in6_addr directly...
- */
-typedef union
-{
-    u_int8_t e8[8];
-    u_int16_t e16[4];
-    u_int32_t e32[2];
-} eui64_t;
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
 
-#endif /* defined(SOL2) */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
 #endif
 
+#include "pppdconf.h"
+
 /*
- * Limits.
+ * Limits
  */
-
 #define NUM_PPP		1	/* One PPP interface supported (per process) */
 #define MAXWORDLEN	1024	/* max length of word in file (incl null) */
 #define MAXARGS		1	/* max # args to a command */
 #define MAXNAMELEN	256	/* max length of hostname or name for auth */
 #define MAXSECRETLEN	256	/* max length of password or secret */
 
+
 /*
- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
- * Where should PPP_DRV_NAME come from? Do we include it here?
+ * Values for phase.
  */
-#if !defined(PPP_DRV_NAME)
-#define PPP_DRV_NAME	"ppp"
-#endif /* !defined(PPP_DRV_NAME) */
+typedef enum ppp_phase
+{
+    PHASE_DEAD,
+    PHASE_INITIALIZE,
+    PHASE_SERIALCONN,
+    PHASE_DORMANT,
+    PHASE_ESTABLISH,
+    PHASE_AUTHENTICATE,
+    PHASE_CALLBACK,
+    PHASE_NETWORK,
+    PHASE_RUNNING,
+    PHASE_TERMINATE,
+    PHASE_DISCONNECT,
+    PHASE_HOLDOFF,
+    PHASE_MASTER,
+} ppp_phase_t;
 
 /*
- * Option descriptor structure.
+ * Values for exit codes
  */
+typedef enum ppp_exit_code
+{
+    EXIT_OK                 = 0,
+    EXIT_FATAL_ERROR        = 1,
+    EXIT_OPTION_ERROR       = 2,
+    EXIT_NOT_ROOT           = 3,
+    EXIT_NO_KERNEL_SUPPORT  = 4,
+    EXIT_USER_REQUEST       = 5,
+    EXIT_LOCK_FAILED        = 6,
+    EXIT_OPEN_FAILED        = 7,
+    EXIT_CONNECT_FAILED     = 8,
+    EXIT_PTYCMD_FAILED      = 9,
+    EXIT_NEGOTIATION_FAILED = 10,
+    EXIT_PEER_AUTH_FAILED   = 11,
+    EXIT_IDLE_TIMEOUT       = 12,
+    EXIT_CONNECT_TIME       = 13,
+    EXIT_CALLBACK           = 14,
+    EXIT_PEER_DEAD          = 15,
+    EXIT_HANGUP             = 16,
+    EXIT_LOOPBACK           = 17,
+    EXIT_INIT_FAILED        = 18,
+    EXIT_AUTH_TOPEER_FAILED = 19,
+    EXIT_TRAFFIC_LIMIT      = 20,
+    EXIT_CNID_AUTH_FAILED   = 21
+} ppp_exit_code_t;
 
-typedef unsigned char	bool;
-
-enum opt_type {
-	o_special_noarg = 0,
-	o_special = 1,
-	o_bool,
-	o_int,
-	o_uint32,
-	o_string,
-	o_wild
-};
-
-typedef struct {
-	char	*name;		/* name of the option */
-	enum opt_type type;
-	void	*addr;
-	char	*description;
-	unsigned int flags;
-	void	*addr2;
-	int	upper_limit;
-	int	lower_limit;
-	const char *source;
-	short int priority;
-	short int winner;
-} option_t;
-
-/* Values for flags */
-#define OPT_VALUE	0xff	/* mask for presupplied value */
-#define OPT_HEX		0x100	/* int option is in hex */
-#define OPT_NOARG	0x200	/* option doesn't take argument */
-#define OPT_OR		0x400	/* for u32, OR in argument to value */
-#define OPT_INC		0x400	/* for o_int, increment value */
-#define OPT_A2OR	0x800	/* for o_bool, OR arg to *(u_char *)addr2 */
-#define OPT_PRIV	0x1000	/* privileged option */
-#define OPT_STATIC	0x2000	/* string option goes into static array */
-#define OPT_NOINCR	0x2000	/* for o_int, value mustn't be increased */
-#define OPT_LLIMIT	0x4000	/* check value against lower limit */
-#define OPT_ULIMIT	0x8000	/* check value against upper limit */
-#define OPT_LIMITS	(OPT_LLIMIT|OPT_ULIMIT)
-#define OPT_ZEROOK	0x10000	/* 0 value is OK even if not within limits */
-#define OPT_HIDE	0x10000	/* for o_string, print value as ?????? */
-#define OPT_A2LIST	0x20000 /* for o_special, keep list of values */
-#define OPT_A2CLRB	0x20000 /* o_bool, clr val bits in *(u_char *)addr2 */
-#define OPT_ZEROINF	0x40000	/* with OPT_NOINCR, 0 == infinity */
-#define OPT_PRIO	0x80000	/* process option priorities for this option */
-#define OPT_PRIOSUB	0x100000 /* subsidiary member of priority group */
-#define OPT_ALIAS	0x200000 /* option is alias for previous option */
-#define OPT_A2COPY	0x400000 /* addr2 -> second location to rcv value */
-#define OPT_ENABLE	0x800000 /* use *addr2 as enable for option */
-#define OPT_A2CLR	0x1000000 /* clear *(bool *)addr2 */
-#define OPT_PRIVFIX	0x2000000 /* user can't override if set by root */
-#define OPT_INITONLY	0x4000000 /* option can only be set in init phase */
-#define OPT_DEVEQUIV	0x8000000 /* equiv to device name */
-#define OPT_DEVNAM	(OPT_INITONLY | OPT_DEVEQUIV)
-#define OPT_A2PRINTER	0x10000000 /* *addr2 printer_func to print option */
-#define OPT_A2STRVAL	0x20000000 /* *addr2 points to current string value */
-#define OPT_NOPRINT	0x40000000 /* don't print this option at all */
-
-#define OPT_VAL(x)	((x) & OPT_VALUE)
-
-/* Values for priority */
-#define OPRIO_DEFAULT	0	/* a default value */
-#define OPRIO_CFGFILE	1	/* value from a configuration file */
-#define OPRIO_CMDLINE	2	/* value from the command line */
-#define OPRIO_SECFILE	3	/* value from options in a secrets file */
-#define OPRIO_ROOT	100	/* added to priority if OPT_PRIVFIX && root */
-
-#ifndef GIDSET_TYPE
-#define GIDSET_TYPE	gid_t
-#endif
-
-/* Structure representing a list of permitted IP addresses. */
-struct permitted_ip {
-    int		permit;		/* 1 = permit, 0 = forbid */
-    u_int32_t	base;		/* match if (addr & mask) == base */
-    u_int32_t	mask;		/* base and mask are in network byte order */
-};
+/*
+ * Type of notifier callbacks
+ */
+typedef enum
+{
+    NF_PID_CHANGE,
+    NF_PHASE_CHANGE,
+    NF_EXIT,
+    NF_SIGNALED,
+    NF_IP_UP,
+    NF_IP_DOWN,
+    NF_IPV6_UP,
+    NF_IPV6_DOWN,
+    NF_AUTH_UP,
+    NF_LINK_DOWN,
+    NF_FORK,
+    NF_MAX_NOTIFY
+} ppp_notify_t;
+
+typedef enum
+{
+    PPP_DIR_LOG,
+    PPP_DIR_RUNTIME,
+    PPP_DIR_CONF,
+    PPP_DIR_PLUGIN,
+} ppp_path_t;
 
 /*
  * Unfortunately, the linux kernel driver uses a different structure
@@ -198,268 +157,36 @@ struct permitted_ip {
  * This structure serves as a common representation for the bits
  * pppd needs.
  */
-struct pppd_stats {
+struct pppd_stats
+{
     uint64_t		bytes_in;
     uint64_t		bytes_out;
     unsigned int	pkts_in;
     unsigned int	pkts_out;
 };
+typedef struct pppd_stats ppp_link_stats_st;
 
-/* Used for storing a sequence of words.  Usually malloced. */
+/*
+ * Used for storing a sequence of words.  Usually malloced.
+ */
 struct wordlist {
     struct wordlist	*next;
     char		*word;
 };
 
-/* An endpoint discriminator, used with multilink. */
-#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-struct epdisc {
-    unsigned char	class;
-    unsigned char	length;
-    unsigned char	value[MAX_ENDP_LEN];
-};
-
-/* values for epdisc.class */
-#define EPD_NULL	0	/* null discriminator, no data */
-#define EPD_LOCAL	1
-#define EPD_IP		2
-#define EPD_MAC		3
-#define EPD_MAGIC	4
-#define EPD_PHONENUM	5
-
-typedef void (*notify_func)(void *, int);
+struct option;
 typedef void (*printer_func)(void *, char *, ...);
 
-struct notifier {
-    struct notifier *next;
-    notify_func	    func;
-    void	    *arg;
-};
-
-/*
- * Global variables.
- */
-
-extern int	got_sigterm;	/* SIGINT or SIGTERM was received */
-extern int	hungup;		/* Physical layer has disconnected */
-extern int	ifunit;		/* Interface unit number */
-extern char	ifname[];	/* Interface name (IFNAMSIZ) */
-extern char	hostname[];	/* 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 */
-extern int	phase;		/* Current state of link - see values below */
-extern int	baud_rate;	/* Current link speed in bits/sec */
-extern char	*progname;	/* Name of this program */
-extern int	redirect_stderr;/* Connector's stderr should go to file */
-extern char	peer_authname[];/* Authenticated name of peer */
-extern int	auth_done[NUM_PPP]; /* Methods actually used for auth */
-extern int	privileged;	/* We were run by real-uid root */
-extern int	need_holdoff;	/* Need holdoff period after link terminates */
-extern char	**script_env;	/* Environment variables for scripts */
-extern int	detached;	/* Have detached from controlling tty */
-extern GIDSET_TYPE groups[];	/* groups the user is in */
-extern int	ngroups;	/* How many groups valid in groups */
-extern struct pppd_stats link_stats; /* byte/packet counts etc. for link */
-extern int	link_stats_valid; /* set if link_stats is valid */
-extern unsigned	link_connect_time; /* time the link was up for */
-extern int	using_pty;	/* using pty as device (notty or pty opt.) */
-extern int	log_to_fd;	/* logging to this fd as well as syslog */
-extern bool	log_default;	/* log_to_fd is default (stdout) */
-extern char	*no_ppp_msg;	/* message to print if ppp not in kernel */
-extern volatile int status;	/* exit status for pppd */
-extern bool	devnam_fixed;	/* can no longer change devnam */
-extern int	unsuccess;	/* # unsuccessful connection attempts */
-extern int	do_callback;	/* set if we want to do callback next */
-extern int	doing_callback;	/* set if this is a callback */
-extern int	error_count;	/* # of times error() has been called */
-extern char	ppp_devnam[];	/* name of PPP tty (maybe ttypx) */
-extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
-extern int      ppp_session_number; /* Session number (eg PPPoE session) */
-extern int	fd_devnull;	/* fd open to /dev/null */
-
-extern int	listen_time;	/* time to listen first (ms) */
-extern bool	doing_multilink;
-extern bool	multilink_master;
-extern bool	bundle_eof;
-extern bool	bundle_terminating;
-
-extern struct notifier *pidchange;   /* for notifications of pid changing */
-extern struct notifier *phasechange; /* for notifications of phase changes */
-extern struct notifier *exitnotify;  /* for notification that we're exiting */
-extern struct notifier *sigreceived; /* notification of received signal */
-extern struct notifier *ip_up_notifier;     /* IPCP has come up */
-extern struct notifier *ip_down_notifier;   /* IPCP has gone down */
-extern struct notifier *ipv6_up_notifier;   /* IPV6CP has come up */
-extern struct notifier *ipv6_down_notifier; /* IPV6CP has gone down */
-extern struct notifier *auth_up_notifier; /* peer has authenticated */
-extern struct notifier *link_down_notifier; /* link has gone down */
-extern struct notifier *fork_notifier;	/* we are a new child process */
-
-/* Values for do_callback and doing_callback */
-#define CALLBACK_DIALIN		1	/* we are expecting the call back */
-#define CALLBACK_DIALOUT	2	/* we are dialling out to call back */
-
-/*
- * Variables set by command-line options.
- */
-
-extern int	debug;		/* Debug flag */
-extern int	kdebugflag;	/* Tell kernel to print debug messages */
-extern int	default_device;	/* Using /dev/tty or equivalent */
-extern char	devnam[];	/* Device name */
-extern int	crtscts;	/* Use hardware flow control */
-extern int	stop_bits;	/* Number of serial port stop bits */
-extern bool	modem;		/* Use modem control lines */
-extern int	inspeed;	/* Input/Output speed requested */
-extern u_int32_t netmask;	/* IP netmask to set on interface */
-extern bool	lockflag;	/* Create lock file to lock the serial dev */
-extern bool	nodetach;	/* Don't detach from controlling tty */
-#ifdef SYSTEMD
-extern bool	up_sdnotify;	/* Notify systemd once link is up (implies nodetach) */
-#endif
-extern bool	updetach;	/* Detach from controlling tty when link up */
-extern bool	master_detach;	/* Detach when multilink master without link */
-extern char	*initializer;	/* Script to initialize physical link */
-extern char	*connect_script; /* Script to establish physical link */
-extern char	*disconnect_script; /* Script to disestablish physical link */
-extern char	*welcomer;	/* Script to welcome client after connection */
-extern char	*ptycommand;	/* Command to run on other side of pty */
-extern int	maxconnect;	/* Maximum connect time (seconds) */
-extern char	user[MAXNAMELEN];/* Our name for authenticating ourselves */
-extern char	passwd[MAXSECRETLEN];	/* Password for PAP or CHAP */
-extern bool	auth_required;	/* Peer is required to authenticate */
-extern bool	persist;	/* Reopen link after it goes down */
-extern bool	uselogin;	/* Use /etc/passwd for checking PAP */
-extern bool	session_mgmt;	/* Do session management (login records) */
-extern char	our_name[MAXNAMELEN];/* Our name for authentication purposes */
-extern char	remote_name[MAXNAMELEN]; /* Peer's name for authentication */
-extern bool	explicit_remote;/* remote_name specified with remotename opt */
-extern bool	demand;		/* Do dial-on-demand */
-extern char	*ipparam;	/* Extra parameter for ip up/down scripts */
-extern bool	cryptpap;	/* Others' PAP passwords are encrypted */
-extern int	idle_time_limit;/* Shut down link if idle for this long */
-extern int	holdoff;	/* Dead time before restarting */
-extern bool	holdoff_specified; /* true if user gave a holdoff value */
-extern bool	notty;		/* Stdin/out is not a tty */
-extern char	*pty_socket;	/* Socket to connect to pty */
-extern char	*record_file;	/* File to record chars sent/received */
-extern bool	sync_serial;	/* Device is synchronous serial device */
-extern int	maxfail;	/* Max # of unsuccessful connection attempts */
-extern char	linkname[];	/* logical name for link */
-extern bool	tune_kernel;	/* May alter kernel settings as necessary */
-extern int	connect_delay;	/* Time to delay after connect script */
-extern int	max_data_rate;	/* max bytes/sec through charshunt */
-extern int	req_unit;	/* interface unit number to use */
-extern char	path_ipup[]; 	/* pathname of ip-up script */
-extern char	path_ipdown[];	/* pathname of ip-down script */
-extern char	req_ifname[]; /* interface name to use (IFNAMSIZ) */
-extern bool	multilink;	/* enable multilink operation */
-extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
-extern char	*bundle_name;	/* bundle name for multilink */
-extern bool	dump_options;	/* print out option values */
-extern bool	show_options;	/* show all option names and descriptions */
-extern bool	dryrun;		/* check everything, print options, exit */
-extern int	child_wait;	/* # seconds to wait for children at end */
-
-#ifdef PPP_WITH_IPV6CP
-extern char	path_ipv6up[]; /* pathname of ipv6-up script */
-extern char	path_ipv6down[]; /* pathname of ipv6-down script */
-#endif
-
-#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP)
-#define TLS_VERIFY_NONE     "none"
-#define TLS_VERIFY_NAME     "name"
-#define TLS_VERIFY_SUBJECT  "subject"
-#define TLS_VERIFY_SUFFIX   "suffix"
-
-extern char *crl_dir;
-extern char *crl_file;
-extern char *ca_path;
-extern char *cacert_file;
-
-extern char *max_tls_version;
-extern bool tls_verify_key_usage;
-extern char *tls_verify_method;
-#endif /* PPP_WITH_EAPTLS || PPP_WITH_PEAP */
-
-#ifdef PPP_WITH_EAPTLS
-extern char *pkcs12_file;
-#endif /* PPP_WITH_EAPTLS */
-
-extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-extern int       maxoctets_dir;      /* Direction :
-				      0 - in+out (default)
-				      1 - in
-				      2 - out
-				      3 - max(in,out) */
-extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-#define PPP_OCTETS_DIRECTION_SUM        0
-#define PPP_OCTETS_DIRECTION_IN         1
-#define PPP_OCTETS_DIRECTION_OUT        2
-#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-/* same as previos, but little different on RADIUS side */
-#define PPP_OCTETS_DIRECTION_MAXSESSION 4
-
-#ifdef PPP_WITH_FILTER
-extern struct	bpf_program pass_filter;   /* Filter for pkts to pass */
-extern struct	bpf_program active_filter; /* Filter for link-active pkts */
-#endif
-
-#ifdef PPP_WITH_MSLANMAN
-extern bool	ms_lanman;	/* Use LanMan password instead of NT */
-				/* Has meaning only with MS-CHAP challenges */
-#endif
-
-/* Values for auth_pending, auth_done */
-#define PAP_WITHPEER	0x1
-#define PAP_PEER	0x2
-#define CHAP_WITHPEER	0x4
-#define CHAP_PEER	0x8
-#define EAP_WITHPEER	0x10
-#define EAP_PEER	0x20
-
-/* Values for auth_done only */
-#define CHAP_MD5_WITHPEER	0x40
-#define CHAP_MD5_PEER		0x80
-#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-#define CHAP_MS_WITHPEER	0x100
-#define CHAP_MS_PEER		0x200
-#define CHAP_MS2_WITHPEER	0x400
-#define CHAP_MS2_PEER		0x800
-
-extern char *current_option;	/* the name of the option being parsed */
-extern int  privileged_option;	/* set iff the current option came from root */
-extern char *option_source;	/* string saying where the option came from */
-extern int  option_priority;	/* priority of current options */
-
 /*
- * Values for phase.
- */
-#define PHASE_DEAD		0
-#define PHASE_INITIALIZE	1
-#define PHASE_SERIALCONN	2
-#define PHASE_DORMANT		3
-#define PHASE_ESTABLISH		4
-#define PHASE_AUTHENTICATE	5
-#define PHASE_CALLBACK		6
-#define PHASE_NETWORK		7
-#define PHASE_RUNNING		8
-#define PHASE_TERMINATE		9
-#define PHASE_DISCONNECT	10
-#define PHASE_HOLDOFF		11
-#define PHASE_MASTER		12
-
-/*
- * The following struct gives the addresses of procedures to call
- * for a particular protocol.
+ * The following struct gives the addresses of procedures to call for a particular protocol.
  */
 struct protent {
-    u_short protocol;		/* PPP protocol number */
+    /* PPP protocol number */
+    unsigned short protocol;
     /* Initialization procedure */
     void (*init)(int unit);
     /* Process a received packet */
-    void (*input)(int unit, u_char *pkt, int len);
+    void (*input)(int unit, unsigned char *pkt, int len);
     /* Process a received protocol-reject */
     void (*protrej)(int unit);
     /* Lower layer has come up */
@@ -471,34 +198,37 @@ struct protent {
     /* Close the protocol */
     void (*close)(int unit, char *reason);
     /* Print a packet in readable form */
-    int  (*printpkt)(u_char *pkt, int len, printer_func printer, void *arg);
+    int  (*printpkt)(unsigned char *pkt, int len, printer_func printer, void *arg);
     /* Process a received data packet */
-    void (*datainput)(int unit, u_char *pkt, int len);
-    bool enabled_flag;		/* 0 iff protocol is disabled */
-    char *name;			/* Text name of protocol */
-    char *data_name;		/* Text name of corresponding data protocol */
-    option_t *options;		/* List of command-line options */
+    void (*datainput)(int unit, unsigned char *pkt, int len);
+    /* 0 iff protocol is disabled */
+    bool enabled_flag;
+    /* Text name of protocol */
+    char *name;
+    /* Text name of corresponding data protocol */
+    char *data_name;
+    /* List of command-line options */
+    struct option *options;
     /* Check requested options, assign defaults */
     void (*check_options)(void);
     /* Configure interface for demand-dial */
     int  (*demand_conf)(int unit);
     /* Say whether to bring up link for this pkt */
-    int  (*active_pkt)(u_char *pkt, int len);
+    int  (*active_pkt)(unsigned char *pkt, int len);
 };
 
 /* Table of pointers to supported protocols */
 extern struct protent *protocols[];
 
+
 /*
- * This struct contains pointers to a set of procedures for
- * doing operations on a "channel".  A channel provides a way
- * to send and receive PPP packets - the canonical example is
- * a serial port device in PPP line discipline (or equivalently
- * with PPP STREAMS modules pushed onto it).
+ * This struct contains pointers to a set of procedures for doing operations on a "channel".  
+ * A channel provides a way to send and receive PPP packets - the canonical example is a serial 
+ * port device in PPP line discipline (or equivalently with PPP STREAMS modules pushed onto it).
  */
 struct channel {
 	/* set of options for this channel */
-	option_t *options;
+	struct option *options;
 	/* find and process a per-channel options file */
 	void (*process_extra_options)(void);
 	/* check all the options that have been given */
@@ -512,9 +242,9 @@ struct channel {
 	/* take the channel out of PPP `mode', restore loopback if demand */
 	void (*disestablish_ppp)(int);
 	/* set the transmit-side PPP parameters of the channel */
-	void (*send_config)(int, u_int32_t, int, int);
+	void (*send_config)(int, uint32_t, int, int);
 	/* set the receive-side PPP parameters of the channel */
-	void (*recv_config)(int, u_int32_t, int, int);
+	void (*recv_config)(int, uint32_t, int, int);
 	/* cleanup on error or normal exit */
 	void (*cleanup)(void);
 	/* close the device, called in children after fork */
@@ -523,470 +253,325 @@ struct channel {
 
 extern struct channel *the_channel;
 
+
 /*
- * This structure contains environment variables that are set or unset
- * by the user.
+ * Functions for string formatting and debugging
  */
-struct userenv {
-	struct userenv *ue_next;
-	char *ue_value;		/* value (set only) */
-	bool ue_isset;		/* 1 for set, 0 for unset */
-	bool ue_priv;		/* from privileged source */
-	const char *ue_source;	/* source name */
-	char ue_name[1];	/* variable name */
-};
 
-extern struct userenv *userenv_list;
-
-/*
- * Prototypes.
- */
-
-/* Procedures exported from main.c. */
-void set_ifunit(int);	/* set stuff that depends on ifunit */
-void detach(void);	/* Detach from controlling tty */
-void die(int);		/* Cleanup and exit */
-void quit(void);		/* like die(1) */
-void novm(char *);	/* Say we ran out of memory, and die */
-void timeout(void (*func)(void *), void *arg, int s, int us);
-				/* Call func(arg) after s.us seconds */
-void untimeout(void (*func)(void *), void *arg);
-				/* Cancel call to func(arg) */
-void record_child(int, char *, void (*) (void *), void *, int);
-pid_t safe_fork(int, int, int);	/* Fork & close stuff in child */
-int  device_script(char *cmd, int in, int out, int dont_wait);
-				/* Run `cmd' with given stdin and stdout */
-pid_t run_program(char *prog, char **args, int must_exist,
-		  void (*done)(void *), void *arg, int wait);
-				/* Run program prog with args in child */
-void reopen_log(void);	/* (re)open the connection to syslog */
-void print_link_stats(void); /* Print stats, if available */
-void reset_link_stats(int); /* Reset (init) stats when link goes up */
-void update_link_stats(int); /* Get stats at link termination */
-void script_setenv(char *, char *, int);	/* set script env var */
-void script_unsetenv(char *);		/* unset script env var */
-void new_phase(int);	/* signal start of new phase */
-void add_notifier(struct notifier **, notify_func, void *);
-void remove_notifier(struct notifier **, notify_func, void *);
-void notify(struct notifier *, int);
-int  ppp_send_config(int, int, u_int32_t, int, int);
-int  ppp_recv_config(int, int, u_int32_t, int, int);
-const char *protocol_name(int);
-void remove_pidfiles(void);
-void lock_db(void);
-void unlock_db(void);
-
-/* Procedures exported from tty.c. */
-void tty_init(void);
-
-/* Procedures exported from utils.c. */
-void log_packet(u_char *, int, char *, int);
-				/* Format a packet and log it with syslog */
-void print_string(char *, int,  printer_func, void *);
-				/* Format a string for output */
-int slprintf(char *, int, char *, ...);		/* sprintf++ */
-int vslprintf(char *, int, char *, va_list);	/* vsprintf++ */
-size_t strlcpy(char *, const char *, size_t);	/* safe strcpy */
-size_t strlcat(char *, const char *, size_t);	/* safe strncpy */
-void dbglog(char *, ...);	/* log a debug message */
-void info(char *, ...);	/* log an informational message */
-void notice(char *, ...);	/* log a notice-level message */
-void warn(char *, ...);	/* log a warning message */
-void error(char *, ...);	/* log an error message */
-void fatal(char *, ...);	/* log an error message and die(1) */
-void init_pr_log(const char *, int); /* initialize for using pr_log */
-void pr_log(void *, char *, ...);	/* printer fn, output to syslog */
-void end_pr_log(void);	/* finish up after using pr_log */
-void dump_packet(const char *, u_char *, int);
-				/* dump packet to debug log if interesting */
-ssize_t complete_read(int, void *, size_t);
-				/* read a complete buffer */
-
-/* Procedures exported from auth.c */
-void link_required(int);	  /* we are starting to use the link */
-void start_link(int);	  /* bring the link up now */
-void link_terminated(int);  /* we are finished with the link */
-void link_down(int);	  /* the LCP layer has left the Opened state */
-void upper_layers_down(int);/* take all NCPs down */
-void link_established(int); /* the link is up; authenticate now */
-void start_networks(int);   /* start all the network control protos */
-void continue_networks(int); /* start network [ip, etc] control protos */
-void np_up(int, int);	  /* a network protocol has come up */
-void np_down(int, int);	  /* a network protocol has gone down */
-void np_finished(int, int); /* a network protocol no longer needs link */
-void auth_peer_fail(int, int);
-				/* peer failed to authenticate itself */
-void auth_peer_success(int, int, int, char *, int);
-				/* peer successfully authenticated itself */
-void auth_withpeer_fail(int, int);
-				/* we failed to authenticate ourselves */
-void auth_withpeer_success(int, int, int);
-				/* we successfully authenticated ourselves */
-void auth_check_options(void);
-				/* check authentication options supplied */
-void auth_reset(int);	/* check what secrets we have */
-int  check_passwd(int, char *, int, char *, int, char **);
-				/* Check peer-supplied username/password */
-int  get_secret(int, char *, char *, char *, int *, int);
-				/* get "secret" for chap */
-int  get_srp_secret(int unit, char *client, char *server, char *secret,
-    int am_server);
-int  auth_ip_addr(int, u_int32_t);
-				/* check if IP address is authorized */
-int  auth_number(void);	/* check if remote number is authorized */
-int  bad_ip_adrs(u_int32_t);
-				/* check if IP address is unreasonable */
-
-/* Procedures exported from demand.c */
-void demand_conf(void);	/* config interface(s) for demand-dial */
-void demand_block(void);	/* set all NPs to queue up packets */
-void demand_unblock(void); /* set all NPs to pass packets */
-void demand_discard(void); /* set all NPs to discard packets */
-void demand_rexmit(int);	/* retransmit saved frames for an NP */
-int  loop_chars(unsigned char *, int); /* process chars from loopback */
-int  loop_frame(unsigned char *, int); /* should we bring link up? */
-
-/* Procedures exported from multilink.c */
-#ifdef PPP_WITH_MULTILINK
-void mp_check_options(void); /* Check multilink-related options */
-int  mp_join_bundle(void);  /* join our link to an appropriate bundle */
-void mp_exit_bundle(void);  /* have disconnected our link from bundle */
-void mp_bundle_terminated(void);
-char *epdisc_to_str(struct epdisc *); /* string from endpoint discrim. */
-int  str_to_epdisc(struct epdisc *, char *); /* endpt disc. from str */
-#else
-#define mp_bundle_terminated()	/* nothing */
-#define mp_exit_bundle()	/* nothing */
-#define doing_multilink		0
-#define multilink_master	0
-#endif
+/* Is debug enabled */
+bool debug_on();
 
-/* Procedures exported from sys-*.c */
-void sys_init(void);	/* Do system-dependent initialization */
-void sys_cleanup(void);	/* Restore system state before exiting */
-int  sys_check_options(void); /* Check options specified */
-void sys_close(void);	/* Clean up in a child before execing */
-int  ppp_available(void);	/* Test whether ppp kernel support exists */
-int  get_pty(int *, int *, char *, int);	/* Get pty master/slave */
-int  open_ppp_loopback(void); /* Open loopback for demand-dialling */
-int  tty_establish_ppp(int);  /* Turn serial port into a ppp interface */
-void tty_disestablish_ppp(int); /* Restore port to normal operation */
-void generic_disestablish_ppp(int dev_fd); /* Restore device setting */
-int  generic_establish_ppp(int dev_fd); /* Make a ppp interface */
-void make_new_bundle(int, int, int, int); /* Create new bundle */
-int  bundle_attach(int);	/* Attach link to existing bundle */
-void cfg_bundle(int, int, int, int); /* Configure existing bundle */
-void destroy_bundle(void); /* Tell driver to destroy bundle */
-void clean_check(void);	/* Check if line was 8-bit clean */
-void set_up_tty(int, int); /* Set up port's speed, parameters, etc. */
-void restore_tty(int);	/* Restore port's original parameters */
-void setdtr(int, int);	/* Raise or lower port's DTR line */
-void output(int, u_char *, int); /* Output a PPP packet */
-void wait_input(struct timeval *);
-				/* Wait for input, with timeout */
-void add_fd(int);		/* Add fd to set to wait for */
-void remove_fd(int);	/* Remove fd from set to wait for */
-int  read_packet(u_char *); /* Read PPP packet */
-int  get_loop_output(void); /* Read pkts from loopback */
-void tty_send_config(int, u_int32_t, int, int);
-				/* Configure i/f transmit parameters */
-void tty_set_xaccm(ext_accm);
-				/* Set extended transmit ACCM */
-void tty_recv_config(int, u_int32_t, int, int);
-				/* Configure i/f receive parameters */
-int  ccp_test(int, u_char *, int, int);
-				/* Test support for compression scheme */
-void ccp_flags_set(int, int, int);
-				/* Set kernel CCP state */
-int  ccp_fatal_error(int); /* Test for fatal decomp error in kernel */
-int  get_idle_time(int, struct ppp_idle *);
-				/* Find out how long link has been idle */
-int  get_ppp_stats(int, struct pppd_stats *);
-				/* Return link statistics */
-void netif_set_mtu(int, int); /* Set PPP interface MTU */
-int  netif_get_mtu(int);      /* Get PPP interface MTU */
-int  sifvjcomp(int, int, int, int);
-				/* Configure VJ TCP header compression */
-int  sifup(int);		/* Configure i/f up for one protocol */
-int  sifnpmode(int u, int proto, enum NPmode mode);
-				/* Set mode for handling packets for proto */
-int  sifdown(int);	/* Configure i/f down for one protocol */
-int  sifaddr(int, u_int32_t, u_int32_t, u_int32_t);
-				/* Configure IPv4 addresses for i/f */
-int  cifaddr(int, u_int32_t, u_int32_t);
-				/* Reset i/f IP addresses */
-#ifdef PPP_WITH_IPV6CP
-int  sif6up(int);		/* Configure i/f up for IPv6 */
-int  sif6down(int);	/* Configure i/f down for IPv6 */
-int  sif6addr(int, eui64_t, eui64_t);
-				/* Configure IPv6 addresses for i/f */
-int  cif6addr(int, eui64_t, eui64_t);
-				/* Remove an IPv6 address from i/f */
-#endif
-int  sifdefaultroute(int, u_int32_t, u_int32_t, bool replace_default_rt);
-				/* Create default route through i/f */
-int  cifdefaultroute(int, u_int32_t, u_int32_t);
-				/* Delete default route through i/f */
-#ifdef PPP_WITH_IPV6CP
-int  sif6defaultroute(int, eui64_t, eui64_t);
-				/* Create default IPv6 route through i/f */
-int  cif6defaultroute(int, eui64_t, eui64_t);
-				/* Delete default IPv6 route through i/f */
-#endif
-int  sifproxyarp(int, u_int32_t);
-				/* Add proxy ARP entry for peer */
-int  cifproxyarp(int, u_int32_t);
-				/* Delete proxy ARP entry for peer */
-u_int32_t GetMask(u_int32_t); /* Get appropriate netmask for address */
-int  lock(char *);	/* Create lock file for device */
-int  relock(int);		/* Rewrite lock file with new pid */
-void unlock(void);	/* Delete previously-created lock file */
-void logwtmp(const char *, const char *, const char *);
-				/* Write entry to wtmp file */
-int  get_host_seed(void);	/* Get host-dependent random number seed */
-int  have_route_to(u_int32_t); /* Check if route to addr exists */
-#ifdef PPP_WITH_FILTER
-int  set_filters(struct bpf_program *pass, struct bpf_program *active);
-				/* Set filter programs in kernel */
-#endif
-int  get_if_hwaddr(u_char *addr, char *name);
-int  get_first_ether_hwaddr(u_char *addr);
-int get_time(struct timeval *);
-				/* Get current time, monotonic if possible. */
-
-/* Procedures exported from options.c */
-int setipaddr(char *, char **, int); /* Set local/remote ip addresses */
-int  parse_args(int argc, char **argv);
-				/* Parse options from arguments given */
-int  options_from_file(char *filename, int must_exist, int check_prot,
-		       int privileged);
-				/* Parse options from an options file */
-int  options_from_user(void); /* Parse options from user's .ppprc */
-int  options_for_tty(void); /* Parse options from /etc/ppp/options.tty */
-int  options_from_list(struct wordlist *, int privileged);
-				/* Parse options from a wordlist */
-int  getword(FILE *f, char *word, int *newlinep, char *filename);
-				/* Read a word from a file */
-void option_error(char *fmt, ...);
-				/* Print an error message about an option */
-int int_option(char *, int *);
-				/* Simplified number_option for decimal ints */
-void add_options(option_t *); /* Add extra options */
-void check_options(void);	/* check values after all options parsed */
-int  override_value(char *, int, const char *);
-				/* override value if permitted by priority */
-void print_options(printer_func, void *);
-				/* print out values of all options */
-void showopts(void);
-                /* show all option names and description */
-int parse_dotted_ip(char *, u_int32_t *);
-
-/*
- * Hooks to enable plugins to change various things.
+/* Safe sprintf++ */
+int slprintf(char *, int, char *, ...);		
+
+/* vsprintf++ */
+int vslprintf(char *, int, char *, va_list);
+
+/* safe strcpy */
+size_t strlcpy(char *, const char *, size_t);
+
+/* safe strncpy */
+size_t strlcat(char *, const char *, size_t);
+
+/* log a debug message */
+void dbglog(char *, ...);
+
+/* log an informational message */
+void info(char *, ...);
+
+/* log a notice-level message */
+void notice(char *, ...);
+
+/* log a warning message */
+void warn(char *, ...);
+
+/* log an error message */
+void error(char *, ...);	
+
+/* log an error message and die(1) */
+void fatal(char *, ...);	
+
+/* Say we ran out of memory, and die */
+void novm(char *);
+
+/* Format a packet and log it with syslog */
+void log_packet(unsigned char *, int, char *, int);
+
+/* dump packet to debug log if interesting */
+void dump_packet(const char *, unsigned char *, int);
+
+/* initialize for using pr_log */
+void init_pr_log(const char *, int);
+
+/* printer fn, output to syslog */
+void pr_log(void *, char *, ...);
+
+/* finish up after using pr_log */
+void end_pr_log(void);
+
+/*
+ * Get the current exist status of pppd
  */
-extern int (*new_phase_hook)(int);
-extern int (*idle_time_hook)(struct ppp_idle *);
-extern int (*holdoff_hook)(void);
-extern int (*pap_check_hook)(void);
-extern int (*pap_auth_hook)(char *user, char *passwd, char **msgp,
-			    struct wordlist **paddrs,
-			    struct wordlist **popts);
-extern void (*pap_logout_hook)(void);
-extern int (*pap_passwd_hook)(char *user, char *passwd);
-extern int (*allowed_address_hook)(u_int32_t addr);
-extern void (*ip_up_hook)(void);
-extern void (*ip_down_hook)(void);
-extern void (*ip_choose_hook)(u_int32_t *);
-extern void (*ipv6_up_hook)(void);
-extern void (*ipv6_down_hook)(void);
-
-extern int (*chap_check_hook)(void);
-extern int (*chap_passwd_hook)(char *user, char *passwd);
-extern void (*multilink_join_hook)(void);
-
-#ifdef PPP_WITH_EAPTLS
-extern int (*eaptls_passwd_hook)(char *user, char *passwd);
-#endif
+ppp_exit_code_t ppp_status();
 
-/* Let a plugin snoop sent and received packets.  Useful for L2TP */
-extern void (*snoop_recv_hook)(unsigned char *p, int len);
-extern void (*snoop_send_hook)(unsigned char *p, int len);
+/*
+ * Set the exit status
+ */
+void ppp_set_status(ppp_exit_code_t code);
 
 /*
- * Inline versions of get/put char/short/long.
- * Pointer is advanced; we assume that both arguments
- * are lvalues and will already be in registers.
- * cp MUST be u_char *.
- */
-#define GETCHAR(c, cp) { \
-	(c) = *(cp)++; \
-}
-#define PUTCHAR(c, cp) { \
-	*(cp)++ = (u_char) (c); \
-}
-
-
-#define GETSHORT(s, cp) { \
-	(s) = *(cp)++ << 8; \
-	(s) |= *(cp)++; \
-}
-#define PUTSHORT(s, cp) { \
-	*(cp)++ = (u_char) ((s) >> 8); \
-	*(cp)++ = (u_char) (s); \
-}
-
-#define GETLONG(l, cp) { \
-	(l) = *(cp)++ << 8; \
-	(l) |= *(cp)++; (l) <<= 8; \
-	(l) |= *(cp)++; (l) <<= 8; \
-	(l) |= *(cp)++; \
-}
-#define PUTLONG(l, cp) { \
-	*(cp)++ = (u_char) ((l) >> 24); \
-	*(cp)++ = (u_char) ((l) >> 16); \
-	*(cp)++ = (u_char) ((l) >> 8); \
-	*(cp)++ = (u_char) (l); \
-}
-
-#define INCPTR(n, cp)	((cp) += (n))
-#define DECPTR(n, cp)	((cp) -= (n))
-
-/*
- * System dependent definitions for user-level 4.3BSD UNIX implementation.
- */
-
-#define TIMEOUT(r, f, t)	timeout((r), (f), (t), 0)
-#define UNTIMEOUT(r, f)		untimeout((r), (f))
-
-#define BCOPY(s, d, l)		memcpy(d, s, l)
-#define BZERO(s, n)		memset(s, 0, n)
-#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-
-#define PRINTMSG(m, l)		{ info("Remote message: %0.*v", l, m); }
-
-/*
- * MAKEHEADER - Add Header fields to a packet.
- */
-#define MAKEHEADER(p, t) { \
-    PUTCHAR(PPP_ALLSTATIONS, p); \
-    PUTCHAR(PPP_UI, p); \
-    PUTSHORT(t, p); }
-
-/*
- * Exit status values.
- */
-#define EXIT_OK			0
-#define EXIT_FATAL_ERROR	1
-#define EXIT_OPTION_ERROR	2
-#define EXIT_NOT_ROOT		3
-#define EXIT_NO_KERNEL_SUPPORT	4
-#define EXIT_USER_REQUEST	5
-#define EXIT_LOCK_FAILED	6
-#define EXIT_OPEN_FAILED	7
-#define EXIT_CONNECT_FAILED	8
-#define EXIT_PTYCMD_FAILED	9
-#define EXIT_NEGOTIATION_FAILED	10
-#define EXIT_PEER_AUTH_FAILED	11
-#define EXIT_IDLE_TIMEOUT	12
-#define EXIT_CONNECT_TIME	13
-#define EXIT_CALLBACK		14
-#define EXIT_PEER_DEAD		15
-#define EXIT_HANGUP		16
-#define EXIT_LOOPBACK		17
-#define EXIT_INIT_FAILED	18
-#define EXIT_AUTH_TOPEER_FAILED	19
-#define EXIT_TRAFFIC_LIMIT	20
-#define EXIT_CNID_AUTH_FAILED	21
-
-/*
- * Debug macros.  Slightly useful for finding bugs in pppd, not particularly
- * useful for finding out why your connection isn't being established.
- */
-#ifdef DEBUGALL
-#define DEBUGMAIN	1
-#define DEBUGFSM	1
-#define DEBUGLCP	1
-#define DEBUGIPCP	1
-#define DEBUGIPV6CP	1
-#define DEBUGUPAP	1
-#define DEBUGCHAP	1
-#endif
+ * Configure the session's maximum number of octets
+ */
+void ppp_set_session_limit(unsigned int octets);
 
-#ifndef LOG_PPP			/* we use LOG_LOCAL2 for syslog by default */
-#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
-  || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
-  || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
-#define LOG_PPP LOG_LOCAL2
-#else
-#define LOG_PPP LOG_DAEMON
-#endif
-#endif /* LOG_PPP */
+/*
+ * Which direction to limit the number of octets
+ */
+void ppp_set_session_limit_dir(unsigned int direction);
 
-#ifdef DEBUGMAIN
-#define MAINDEBUG(x)	if (debug) dbglog x
-#else
-#define MAINDEBUG(x)
-#endif
+/*
+ * Get the current link stats, returns true when valid and false if otherwise
+ */
+bool ppp_get_link_stats(ppp_link_stats_st *stats);
 
-#ifdef DEBUGSYS
-#define SYSDEBUG(x)	if (debug) dbglog x
-#else
-#define SYSDEBUG(x)
-#endif
+/*
+ * Get pppd's notion of time
+ */
+int ppp_get_time(struct timeval *);
 
-#ifdef DEBUGFSM
-#define FSMDEBUG(x)	if (debug) dbglog x
-#else
-#define FSMDEBUG(x)
-#endif
+/*
+ * Schedule a callback in s.us seconds from now
+ */
+typedef void (*ppp_timer_cb)(void *arg);
+void ppp_timeout(ppp_timer_cb func, void *arg, int s, int us);
 
-#ifdef DEBUGLCP
-#define LCPDEBUG(x)	if (debug) dbglog x
-#else
-#define LCPDEBUG(x)
-#endif
+/*
+ * Cancel any pending timer callbacks
+ */
+void ppp_untimeout(void (*func)(void *), void *arg);
 
-#ifdef DEBUGIPCP
-#define IPCPDEBUG(x)	if (debug) dbglog x
-#else
-#define IPCPDEBUG(x)
-#endif
+/*
+ * Clean up in a child before execing
+ */
+void ppp_sys_close(void);
 
-#ifdef DEBUGIPV6CP
-#define IPV6CPDEBUG(x)  if (debug) dbglog x
-#else
-#define IPV6CPDEBUG(x)
-#endif
+/*
+ * Fork & close stuff in child
+ */
+pid_t ppp_safe_fork(int, int, int);
 
-#ifdef DEBUGUPAP
-#define UPAPDEBUG(x)	if (debug) dbglog x
-#else
-#define UPAPDEBUG(x)
-#endif
+/*
+ * Get the current hostname
+ */
+const char *ppp_hostname();
 
-#ifdef DEBUGCHAP
-#define CHAPDEBUG(x)	if (debug) dbglog x
-#else
-#define CHAPDEBUG(x)
-#endif
+/*
+ * Is pppd using pty as a device (opposed to notty or pty opt).
+ */
+bool ppp_using_pty();
 
-#ifndef SIGTYPE
-#if defined(sun) || defined(SYSV) || defined(POSIX_SOURCE)
-#define SIGTYPE void
-#else
-#define SIGTYPE int
-#endif /* defined(sun) || defined(SYSV) || defined(POSIX_SOURCE) */
-#endif /* SIGTYPE */
+/*
+ * Device is synchronous serial device
+ */
+bool ppp_sync_serial();
 
-#ifndef MIN
-#define MIN(a, b)	((a) < (b)? (a): (b))
-#endif
-#ifndef MAX
-#define MAX(a, b)	((a) > (b)? (a): (b))
-#endif
+/*
+ * Modem mode
+ */
+bool ppp_get_modem();
 
-#ifndef offsetof
-#define offsetof(type, member) ((size_t) &((type *)0)->member)
-#endif
+/*
+ * Control the mode of the tty terminal
+ */
+void ppp_set_modem(bool on);
+
+/*
+ * Set the current session number, e.g. for PPPoE
+ */
+void ppp_set_session_number(int number);
+
+/*
+ * Set the current session number, e.g. for PPPoE
+ */
+int ppp_get_session_number(void);
+
+/*
+ * Check if pppd got signaled, returns 0 if not signaled, returns -1 on failure, and the signal number when signaled.
+ */
+bool ppp_signaled(int sig);
+
+/*
+ * Maximum connect time in seconds
+ */
+int ppp_get_max_connect_time(void);
+
+/*
+ * Set the maximum connect time in seconds
+ */
+void ppp_set_max_connect_time(unsigned int max);
+
+/*
+ * Get the link idle time before shutting the link down
+ */
+int ppp_get_max_idle_time(void);
+
+/*
+ * Set the link idle time before shutting the link down
+ */
+void ppp_set_max_idle_time(unsigned int idle);
+
+/*
+ * Get the duration the link was up (uptime)
+ */
+int ppp_get_link_uptime();
+
+/*
+ * Get the ipparam configured with pppd
+ */
+const char *ppp_ipparam();
+
+/*
+ * check if IP address is unreasonable
+ */
+bool ppp_bad_ip_addr(uint32_t);
+
+/*
+ * Expose an environment variable to scripts
+ */
+void ppp_script_setenv(char *, char *, int);
+
+/*
+ * Unexpose an environment variable to scripts
+ */
+void ppp_script_unsetenv(char *);
+
+/*
+ * Test whether ppp kernel support exists
+ */
+int ppp_check_kernel_support(void);
+
+/*
+ * Restore device setting
+ */
+void ppp_generic_disestablish(int dev_fd);
+
+/*
+ * Set the interface MTU
+ */
+void ppp_set_mtu(int, int);
+
+/*
+ * Get the interface MTU
+ */
+int  ppp_get_mtu(int);
+
+/*
+ * Make a ppp interface
+ */
+int ppp_generic_establish(int dev_fd);
+
+/*
+ * Get the peer's authentication name
+ */
+const char *ppp_peer_authname(char *buf, size_t bufsz);
+
+/*
+ * Get the remote name
+ */
+const char *ppp_remote_name();
+
+/*
+ * Get the remote number (if set), otherwise return NULL
+ */
+const char *ppp_get_remote_number(void);
+
+/*
+ * Set the remote number, typically it's a MAC address
+ */
+void ppp_set_remote_number(const char *buf);
+
+/*
+ * Get the current interface unit for the pppX device
+ */
+int ppp_ifunit();
+
+/*
+ * Get the current interface name
+ */
+const char *ppp_ifname();
+
+/*
+ * Get the current interface name
+ */
+int ppp_get_ifname(char *buf, size_t bufsz);
+
+/*
+ * Set the current interface name, ifname is a \0 terminated string
+ */
+void ppp_set_ifname(const char *ifname);
+
+/*
+ * Set the original devnam (prior to any renaming, etc).
+ */
+int ppp_set_pppdevnam(const char *name);
+
+/*
+ * Get the original devnam (prior to any renaming, etc).
+ */
+const char *ppp_pppdevnam();
+
+/*
+ * Get the current devnam, e.g. /dev/ttyS0, /dev/ptmx
+ */
+const char *ppp_devnam();
+
+/*
+ * Set the device name
+ */
+int ppp_set_devnam(const char *name);
+
+/*
+ * Definition for the notify callback function
+ *   ctx - contextual argument provided with the registration
+ *   arg - anything passed by the notification, e.g. phase, pid, etc
+ */
+typedef void (ppp_notify_fn)(void *ctx, int arg);
+
+/*
+ * Add a callback notification for when a given event has occured
+ */
+void ppp_add_notify(ppp_notify_t type, ppp_notify_fn *func, void *ctx);
+
+/*
+ * Remove a callback notification previously registered
+ */
+void ppp_del_notify(ppp_notify_t type, ppp_notify_fn *func, void *ctx);
+
+/*
+ * Get the path prefix in which a file is installed
+ */
+int ppp_get_path(ppp_path_t type, char *buf, size_t bufsz);
+
+/*
+ * Get the file with path prefix
+ */
+int ppp_get_filepath(ppp_path_t type, const char *name, char *buf, size_t bufsz);
+
+/*
+ * Check if pppd is to re-open link after it goes down
+ */
+bool ppp_persist();
+
+/*
+ * Hooks to enable plugins to hook into various parts of the code
+ */
+
+struct ppp_idle; /* Declared in <linux/ppp_defs.h> */
+extern int (*idle_time_hook)(struct ppp_idle *);
+extern int (*new_phase_hook)(int);
+extern int (*holdoff_hook)(void);
+extern int  (*allowed_address_hook)(uint32_t addr);
+extern void (*snoop_recv_hook)(unsigned char *p, int len);
+extern void (*snoop_send_hook)(unsigned char *p, int len);
 
 #endif /* PPP_PPPD_H */