don't use options.leaf any more

[ppp.git] / ultrix / if_pppvar.h

diff --git a/ultrix/if_pppvar.h b/ultrix/if_pppvar.h
index 038070d08d3c1e58ca5c60aaa1dfa9831b9d2244..25b14544c1e4581ab18b9be684cc0a37ae7217b4 100644 (file)
--- a/ultrix/if_pppvar.h
+++ b/ultrix/if_pppvar.h
@@ -1,4 +1,4 @@
-/*     $Id: if_pppvar.h,v 1.2 1994/10/21 06:26:41 paulus Exp $ */
+/*     $Id: if_pppvar.h,v 1.4 1996/07/01 01:24:26 paulus Exp $ */

 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *


@@ -57,24 +57,28 @@ struct ppp_softc {
        void    *sc_devp;               /* pointer to device-dep structure */
        void    (*sc_start) __P((struct ppp_softc *));  /* start output proc */
        void    (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */
        void    *sc_devp;               /* pointer to device-dep structure */
        void    (*sc_start) __P((struct ppp_softc *));  /* start output proc */
        void    (*sc_ctlp) __P((struct ppp_softc *)); /* rcvd control pkt */

+       void    (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */

        short   sc_mru;                 /* max receive unit */
        pid_t   sc_xfer;                /* used in transferring unit */
        struct  ifqueue sc_rawq;        /* received packets */
        struct  ifqueue sc_inq;         /* queue of input packets for daemon */
        struct  ifqueue sc_fastq;       /* interactive output packet q */
        struct  mbuf *sc_togo;          /* output packet ready to go */
        short   sc_mru;                 /* max receive unit */
        pid_t   sc_xfer;                /* used in transferring unit */
        struct  ifqueue sc_rawq;        /* received packets */
        struct  ifqueue sc_inq;         /* queue of input packets for daemon */
        struct  ifqueue sc_fastq;       /* interactive output packet q */
        struct  mbuf *sc_togo;          /* output packet ready to go */

-#ifdef VJC
-       struct  slcompress sc_comp;     /* vjc control buffer */
-#endif
-       u_int   sc_bytessent;           /* count of octets sent */
-       u_int   sc_bytesrcvd;           /* count of octets received */
+       struct  mbuf *sc_npqueue;       /* output packets not to be sent yet */
+       struct  mbuf **sc_npqtail;      /* ptr to last next ptr in npqueue */
+       struct  pppstat sc_stats;       /* count of bytes/pkts sent/rcvd */

        caddr_t sc_bpf;                 /* hook for BPF */
        enum    NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
        struct  compressor *sc_xcomp;   /* transmit compressor */
        void    *sc_xc_state;           /* transmit compressor state */
        struct  compressor *sc_rcomp;   /* receive decompressor */
        void    *sc_rc_state;           /* receive decompressor state */
        caddr_t sc_bpf;                 /* hook for BPF */
        enum    NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
        struct  compressor *sc_xcomp;   /* transmit compressor */
        void    *sc_xc_state;           /* transmit compressor state */
        struct  compressor *sc_rcomp;   /* receive decompressor */
        void    *sc_rc_state;           /* receive decompressor state */

-       
+       time_t  sc_last_sent;           /* time (secs) last NP pkt sent */
+       time_t  sc_last_recv;           /* time (secs) last NP pkt rcvd */
+#ifdef VJC
+       struct  slcompress *sc_comp;    /* vjc control buffer */
+#endif
+

        /* Device-dependent part for async lines. */
        ext_accm sc_asyncmap;           /* async control character map */
        u_long  sc_rasyncmap;           /* receive async control char map */
        /* Device-dependent part for async lines. */
        ext_accm sc_asyncmap;           /* async control character map */
        u_long  sc_rasyncmap;           /* receive async control char map */


@@ -95,5 +99,6 @@ struct        ppp_softc *pppalloc __P((pid_t pid));
 void   pppdealloc __P((struct ppp_softc *sc));
 int    pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data,
                      int flag, struct proc *p));
 void   pppdealloc __P((struct ppp_softc *sc));
 int    pppioctl __P((struct ppp_softc *sc, int cmd, caddr_t data,
                      int flag, struct proc *p));

+void   ppp_restart __P((struct ppp_softc *sc));

 void   ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
 struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));
 void   ppppktin __P((struct ppp_softc *sc, struct mbuf *m, int lost));
 struct mbuf *ppp_dequeue __P((struct ppp_softc *sc));