2000-11-25 Antti P Miettinen <antti.p.miettinen@nokia.com>

	* wrapup/Makefile.am: Added modem subdir.
	* configure.in, Makefile.am: Added modem subdir.
	* net/Makefile.am: Added if_pppvar.h, pppcompress.h.
	* pppd/Makefile.am: Added pppmain.c (which needs work).
	* pppd/chat.c, pppd/fsm.c, pppd/fsm.h, pppd/ipxcp.c, pppd/main.c,
	pppd/ppp_tty.c, pppd/upap.c: Changes from Thomas Doerfler
	<Thomas.Doerfler@imd-systems.de> and cosmetic changes by me.
	Actually main.c and ppp_tty.c should be scratched. The modem
	subdir has the real ppp_tty.c and the real pppd main is in pppmain.c.

1 files changed, 111 insertions, 0 deletions

diff --git a/c/src/exec/libnetworking/net/if_pppvar.h b/c/src/exec/libnetworking/net/if_pppvar.h
new file mode 100644
index 0000000000..6eb45a6afb
--- /dev/null
+++ b/c/src/exec/libnetworking/net/if_pppvar.h
@@ -0,0 +1,111 @@
+/*	$Id$	*/
+/*
+ * if_pppvar.h - private structures and declarations for PPP.
+ *
+ * Copyright (c) 1994 The Australian National University.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation is hereby granted, provided that the above copyright
+ * notice appears in all copies.  This software is provided without any
+ * warranty, express or implied. The Australian National University
+ * makes no representations about the suitability of this software for
+ * any purpose.
+ *
+ * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
+ * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+ * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
+ * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
+ * OR MODIFICATIONS.
+ *
+ * Copyright (c) 1989 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.
+ */
+
+/*
+ * Supported network protocols.  These values are used for
+ * indexing sc_npmode.
+ */
+#define NP_IP	0		/* Internet Protocol */
+#define NUM_NP	1		/* Number of NPs. */
+
+/*
+ * Structure describing each ppp unit.
+ */
+struct ppp_softc {
+	struct	ifnet sc_if;		/* network-visible interface */
+	u_int	sc_flags;		/* control/status bits; see if_ppp.h */
+	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 */
+	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 */
+	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	vjcompress *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 */
+	struct	mbuf *sc_outm;		/* mbuf chain currently being output */
+	struct	mbuf *sc_m;		/* pointer to input mbuf chain */
+	struct	mbuf *sc_mc;		/* pointer to current input mbuf */
+	char	*sc_mp;			/* ptr to next char in input mbuf */
+	short	sc_ilen;		/* length of input packet so far */
+	u_short	sc_fcs;			/* FCS so far (input) */
+	u_short	sc_outfcs;		/* FCS so far for output packet */
+	u_char	sc_rawin[16];		/* chars as received */
+	int	sc_rawin_count;		/* # in sc_rawin */
+        rtems_id sem_id;                /* ID of comm semaphore         */
+};
+
+struct	ppp_softc ppp_softc[NPPP];
+
+struct	ppp_softc *pppalloc __P((pid_t pid));
+void	pppdealloc __P((struct ppp_softc *sc));
+int	pppoutput __P((struct ifnet *, struct mbuf *,
+		       struct sockaddr *, struct rtentry *));
+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));