added packet filtering; malloc VJ state

diff --git a/netbsd-1.1/if_pppvar.h b/netbsd-1.1/if_pppvar.h
index 5038dfac507575dbea3488fe98dc96c0b60b0ccb..2b4709feea98a8f845fce0d6b165d60d10881486 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.2 1996/04/04 03:22:02 paulus Exp $ */
+

 /*
  * if_pppvar.h - private structures and declarations for PPP.
  *
 /*
  * 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 */
        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 */
        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,6 +76,11 @@ 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 */
        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 */

+       struct  bpf_program sc_pass_filt;   /* filter for packets to pass */
+       struct  bpf_program sc_active_filt; /* filter for "non-idle" packets */
+#ifdef VJC
+       struct  slcompress *sc_comp;    /* vjc control buffer */
+#endif

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