update

[ppp.git] / netbsd-1.1 / if_pppvar.h

diff --git a/netbsd-1.1/if_pppvar.h b/netbsd-1.1/if_pppvar.h
index 5038dfac507575dbea3488fe98dc96c0b60b0ccb..061c1c17a4ab499154bcc49917642b7a77c2a39c 100644 (file)
--- a/netbsd-1.1/if_pppvar.h
+++ b/netbsd-1.1/if_pppvar.h
@@ -1,4 +1,5 @@
-/*     $Id: if_pppvar.h,v 1.1 1995/12/11 05:17:07 paulus Exp $ */
+/*     $Id: if_pppvar.h,v 1.4 1997/04/30 05:47:02 paulus Exp $ */
+
 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
@@ -66,11 +67,7 @@ struct ppp_softc {
        struct  mbuf *sc_togo;          /* output packet ready to go */
        struct  mbuf *sc_npqueue;       /* output packets not to be sent yet */
        struct  mbuf **sc_npqtail;      /* ptr to last next ptr in npqueue */
-#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  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 */
@@ -79,7 +76,14 @@ struct ppp_softc {
        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 PPP_FILTER
+       struct  bpf_program sc_pass_filt;   /* filter for packets to pass */
+       struct  bpf_program sc_active_filt; /* filter for "non-idle" packets */
+#endif /* PPP_FILTER */
+#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_int32_t sc_rasyncmap;         /* receive async control char map */
@@ -94,11 +98,16 @@ struct ppp_softc {
        int     sc_rawin_count;         /* # in sc_rawin */
 };
 
+#ifdef _KERNEL
 struct ppp_softc ppp_softc[NPPP];
 
 struct ppp_softc *pppalloc __P((pid_t pid));
 void   pppdealloc __P((struct ppp_softc *sc));
 int    pppioctl __P((struct ppp_softc *sc, u_long 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));
+int    pppoutput __P((struct ifnet *, struct mbuf *,
+                      struct sockaddr *, struct rtentry *));
+#endif /* _KERNEL */