/*
* if_ppp.h - Point-to-Point Protocol definitions.
*
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
+ * Copyright (c) 1984-2000 Carnegie Mellon University. All rights reserved.
*
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer@andrew.cmu.edu
+ *
+ * 4. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by Computing Services
+ * at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+ *
+ * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * 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.
*/
/* Portions Copyright (C) 1990 Brad K. Clements (streams support)
*/
+#if !(NS_TARGET >= 40)
#import <kernserv/prototypes.h>
+#endif /* NS_TARGET */
/*
* Supported network protocols. These values are used for
/* only defined in the posix universe... */
-typedef int pid_t;
-typedef unsigned short u_int16_t;
+/*typedef int pid_t; */
struct ppp_softc {
netif_t sc_if; /* network-visible interface */
void (*sc_relinq) __P((struct ppp_softc *)); /* relinquish ifunit */
u_int16_t sc_mru; /* max receive unit */
pid_t sc_xfer; /* used in transferring unit */
- netbuf_t sc_m; /* Current TTY input netbuf */
+ NETBUF_T sc_m; /* Current TTY input netbuf */
struct nb_queue sc_freeq; /* reserve netbufs */
struct nb_queue sc_rawq; /* Raw input buffers */
struct nb_queue sc_fastq; /* For telnet, rlogin, and ftp control */
#endif
u_int sc_bytessent; /* count of octets sent */
u_int sc_bytesrcvd; /* count of octets received */
-#if NBPFILTER
- caddr_t sc_bpf; /* hook for BPF */
- int if_pcount; /* Really belongs in ifnet_t */
-#endif
enum NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
#ifdef PPP_COMPRESS
struct compressor *sc_xcomp; /* transmit compressor */
/* Device-dependent part for async lines. */
ext_accm sc_asyncmap; /* async control character map */
u_int32_t sc_rasyncmap; /* receive async control char map */
- netbuf_t sc_outm; /* netbuf currently being output */
+ NETBUF_T sc_outm; /* netbuf currently being output */
char *sc_mp; /* ptr to next char in input netbuf */
u_int16_t sc_ilen; /* length of input packet so far */
u_int16_t sc_fcs; /* FCS so far (input) */
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, void *data, int flag));
-void ppppktin __P((struct ppp_softc *sc, netbuf_t m, int lost));
-netbuf_t ppp_dequeue __P((struct ppp_softc *sc));
+void ppppktin __P((struct ppp_softc *sc, NETBUF_T m, int lost));
+NETBUF_T ppp_dequeue __P((struct ppp_softc *sc));
#define t_sc T_LINEP