Updated config.h.in

[ppp.git] / pppd / pppd.h

diff --git a/pppd/pppd.h b/pppd/pppd.h
index 03dd28a20261656685cbc28b9dd6a7572cc1d8e1..9e9f87b340fbbb0153355a44162d084723026c5f 100644 (file)
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pppd.h,v 1.58 2001/03/08 05:11:16 paulus Exp $
+ * $Id: pppd.h,v 1.64 2002/01/22 16:02:58 dfs Exp $
  */
 
 /*
@@ -71,7 +71,7 @@ enum opt_type {
        o_int,
        o_uint32,
        o_string,
-       o_wild,
+       o_wild
 };
 
 typedef struct {
@@ -147,6 +147,8 @@ struct permitted_ip {
 struct pppd_stats {
     unsigned int       bytes_in;
     unsigned int       bytes_out;
+    unsigned int       pkts_in;
+    unsigned int       pkts_out;
 };
 
 /* Used for storing a sequence of words.  Usually malloced. */
@@ -212,11 +214,18 @@ 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 char    ppp_devnam[MAXPATHLEN];
+extern char     remote_number[MAXNAMELEN]; /* Remote telephone number, if avail. */
+extern int      ppp_session_number; /* Session number (eg PPPoE session) */
+
+extern int     listen_time;    /* time to listen first (ms) */
 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 int     listen_time;    /* time to listen first (ms) */
+extern struct notifier *ip_up_notifier; /* IPCP has come up */
+extern struct notifier *ip_down_notifier; /* IPCP has gone down */
+extern struct notifier *auth_up_notifier; /* peer has authenticated */
+extern struct notifier *link_down_notifier; /* link has gone down */
 
 /* Values for do_callback and doing_callback */
 #define CALLBACK_DIALIN                1       /* we are expecting the call back */
@@ -361,8 +370,12 @@ struct channel {
        void (*check_options) __P((void));
        /* get the channel ready to do PPP, return a file descriptor */
        int  (*connect) __P((void));
-       /* we're finished doing PPP on the channel */
+       /* we're finished with the channel */
        void (*disconnect) __P((void));
+       /* put the channel into PPP `mode' */
+       int  (*establish_ppp) __P((int));
+       /* take the channel out of PPP `mode', restore loopback if demand */
+       void (*disestablish_ppp) __P((int));
        /* set the transmit-side PPP parameters of the channel */
        void (*send_config) __P((int, u_int32_t, int, int));
        /* set the receive-side PPP parameters of the channel */
@@ -437,6 +450,8 @@ void fatal __P((char *, ...));      /* log an error message and die(1) */
 void init_pr_log __P((char *, int));   /* initialize for using pr_log */
 void pr_log __P((void *, char *, ...));        /* printer fn, output to syslog */
 void end_pr_log __P((void));   /* finish up after using pr_log */
+void dump_packet __P((const char *, u_char *, int));
+                               /* dump packet to debug log if interesting */
 
 /* Procedures exported from auth.c */
 void link_required __P((int));   /* we are starting to use the link */
@@ -490,9 +505,10 @@ void sys_close __P((void));        /* Clean up in a child before execing */
 int  ppp_available __P((void));        /* Test whether ppp kernel support exists */
 int  get_pty __P((int *, int *, char *, int)); /* Get pty master/slave */
 int  open_ppp_loopback __P((void)); /* Open loopback for demand-dialling */
-int  establish_ppp __P((int)); /* Turn serial port into a ppp interface */
-void restore_loop __P((void)); /* Transfer ppp unit back to loopback */
-void disestablish_ppp __P((int)); /* Restore port to normal operation */
+int  tty_establish_ppp __P((int));  /* Turn serial port into a ppp interface */
+void tty_disestablish_ppp __P((int)); /* Restore port to normal operation */
+void generic_disestablish_ppp __P((int dev_fd)); /* Restore device setting */
+int  generic_establish_ppp __P((int dev_fd)); /* Make a ppp interface */
 void make_new_bundle __P((int, int, int, int)); /* Create new bundle */
 int  bundle_attach __P((int)); /* Attach link to existing bundle */
 void cfg_bundle __P((int, int, int, int)); /* Configure existing bundle */
@@ -567,6 +583,7 @@ int  get_if_hwaddr __P((u_char *addr, char *name));
 char *get_first_ethernet __P((void));
 
 /* Procedures exported from options.c */
+int setipaddr __P((char *, char **, int)); /* Set local/remote ip addresses */
 int  parse_args __P((int argc, char **argv));
                                /* Parse options from arguments given */
 int  options_from_file __P((char *filename, int must_exist, int check_prot,
@@ -603,10 +620,14 @@ extern int (*pap_auth_hook) __P((char *user, char *passwd, char **msgp,
                                 struct wordlist **popts));
 extern void (*pap_logout_hook) __P((void));
 extern int (*pap_passwd_hook) __P((char *user, char *passwd));
+extern int (*allowed_address_hook) __P((u_int32_t addr));
 extern void (*ip_up_hook) __P((void));
 extern void (*ip_down_hook) __P((void));
 extern void (*ip_choose_hook) __P((u_int32_t *));
 
+extern int (*chap_check_hook) __P((void));
+extern int (*chap_passwd_hook) __P((char *user, char *passwd));
+
 /*
  * Inline versions of get/put char/short/long.
  * Pointer is advanced; we assume that both arguments