Cosmetic:

  Move prototypes into the correct headers.

17 files changed, 46 insertions, 36 deletions

diff --git a/usr.sbin/ppp/chap.h b/usr.sbin/ppp/chap.h
index 6839269..ba178b6 100644
--- a/usr.sbin/ppp/chap.h
+++ b/usr.sbin/ppp/chap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap.h,v 1.7 1997/09/17 23:17:50 brian Exp $
+ * $Id: chap.h,v 1.8 1997/10/26 01:02:19 brian Exp $
  *
  *	TODO:
  */
@@ -26,3 +26,5 @@
 #define	CHAP_FAILURE	4
 
 extern struct authinfo AuthChapInfo;
+
+extern void ChapInput(struct mbuf *);
diff --git a/usr.sbin/ppp/command.c b/usr.sbin/ppp/command.c
index cf184ee..b84d094 100644
--- a/usr.sbin/ppp/command.c
+++ b/usr.sbin/ppp/command.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: command.c,v 1.87 1997/10/24 22:36:28 brian Exp $
+ * $Id: command.c,v 1.88 1997/10/26 01:02:26 brian Exp $
  *
  */
 #include <sys/param.h>
@@ -65,6 +65,7 @@
 #include "main.h"
 #include "route.h"
 #include "ccp.h"
+#include "ip.h"
 #include "slcompress.h"
 
 struct in_addr ifnetmask;
diff --git a/usr.sbin/ppp/defs.h b/usr.sbin/ppp/defs.h
index 95c4e24..546322a 100644
--- a/usr.sbin/ppp/defs.h
+++ b/usr.sbin/ppp/defs.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: defs.h,v 1.21 1997/10/24 22:36:29 brian Exp $
+ * $Id: defs.h,v 1.22 1997/10/26 01:02:33 brian Exp $
  *
  *	TODO:
  */
@@ -83,9 +83,4 @@ extern int tun_out;
 extern int netfd;
 extern char *dstsystem;
 
-#ifdef SIGALRM
-extern u_int nointr_sleep(u_int);
-extern void nointr_usleep(u_int);
-#endif
-
 extern void randinit(void);
diff --git a/usr.sbin/ppp/hdlc.c b/usr.sbin/ppp/hdlc.c
index c27a79c..ed33038 100644
--- a/usr.sbin/ppp/hdlc.c
+++ b/usr.sbin/ppp/hdlc.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: hdlc.c,v 1.19 1997/09/10 21:36:54 brian Exp $
+ * $Id: hdlc.c,v 1.20 1997/10/26 01:02:43 brian Exp $
  *
  *	TODO:
  */
@@ -35,6 +35,11 @@
 #include "fsm.h"
 #include "hdlc.h"
 #include "lcpproto.h"
+#include "ipcp.h"
+#include "ip.h"
+#include "vjcomp.h"
+#include "pap.h"
+#include "chap.h"
 #include "lcp.h"
 #include "lqr.h"
 #include "loadalias.h"
diff --git a/usr.sbin/ppp/ip.c b/usr.sbin/ppp/ip.c
index 446abee..d7174a9 100644
--- a/usr.sbin/ppp/ip.c
+++ b/usr.sbin/ppp/ip.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ip.c,v 1.25 1997/10/04 00:14:39 brian Exp $
+ * $Id: ip.c,v 1.26 1997/10/26 01:02:52 brian Exp $
  *
  *	TODO:
  *		o Return ICMP message for filterd packet
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 #include <unistd.h>
 
 #include "mbuf.h"
@@ -55,6 +56,7 @@
 #include "ipcp.h"
 #include "vjcomp.h"
 #include "lcp.h"
+#include "modem.h"
 #include "ip.h"
 
 static struct pppTimer IdleTimer;
diff --git a/usr.sbin/ppp/ip.h b/usr.sbin/ppp/ip.h
index 17a8870..056d655 100644
--- a/usr.sbin/ppp/ip.h
+++ b/usr.sbin/ppp/ip.h
@@ -17,10 +17,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ip.h,v 1.5 1997/08/25 00:29:14 brian Exp $
+ * $Id: ip.h,v 1.6 1997/10/26 01:02:53 brian Exp $
  *
  */
 
 extern void IpStartOutput(void);
 extern int PacketCheck(char *, int, int);
 extern void IpEnqueue(int, char *, int);
+extern void IpInput(struct mbuf *);
+extern void StartIdleTimer(void);
+extern void StopIdleTimer(void);
+extern void UpdateIdleTimer(void);
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index f60e5ea..c9942fe 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.c,v 1.30 1997/10/17 00:20:30 brian Exp $
+ * $Id: ipcp.c,v 1.31 1997/10/26 01:02:54 brian Exp $
  *
  *	TODO:
  *		o More RFC1772 backwoard compatibility
@@ -50,6 +50,7 @@
 #include "command.h"
 #include "vars.h"
 #include "vjcomp.h"
+#include "ip.h"
 
 #ifndef NOMSEXT
 struct in_addr ns_entries[2];
diff --git a/usr.sbin/ppp/ipcp.h b/usr.sbin/ppp/ipcp.h
index bf09370..1b83bfc 100644
--- a/usr.sbin/ppp/ipcp.h
+++ b/usr.sbin/ppp/ipcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.h,v 1.10 1997/09/03 02:08:19 brian Exp $
+ * $Id: ipcp.h,v 1.11 1997/10/26 01:02:55 brian Exp $
  *
  *	TODO:
  */
@@ -75,3 +75,4 @@ extern void IpcpDefAddress(void);
 extern void IpcpUp(void);
 extern void IpcpOpen(void);
 extern int ReportIpcpStatus(void);
+extern void IpcpInput(struct mbuf *);
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index 5b697e2..0d1e6a3 100644
--- a/usr.sbin/ppp/lcp.c
+++ b/usr.sbin/ppp/lcp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.c,v 1.39 1997/10/15 01:01:17 brian Exp $
+ * $Id: lcp.c,v 1.40 1997/10/26 01:02:57 brian Exp $
  *
  * TODO:
  *      o Validate magic number received from peer.
@@ -56,6 +56,7 @@
 #include "chap.h"
 #include "async.h"
 #include "main.h"
+#include "ip.h"
 #include "modem.h"
 
 struct lcpstate LcpInfo;
diff --git a/usr.sbin/ppp/lcp.h b/usr.sbin/ppp/lcp.h
index 32e520a..68bc03a 100644
--- a/usr.sbin/ppp/lcp.h
+++ b/usr.sbin/ppp/lcp.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcp.h,v 1.8 1997/08/25 00:29:15 brian Exp $
+ * $Id: lcp.h,v 1.9 1997/10/26 01:02:58 brian Exp $
  *
  *	TODO:
  */
@@ -80,3 +80,4 @@ extern void LcpClose(void);
 extern void LcpDown(void);
 extern void PutConfValue(u_char **, char **, u_char, int, u_long);
 extern int ReportLcpStatus(void);
+extern void LcpInput(struct mbuf *);
diff --git a/usr.sbin/ppp/lcpproto.h b/usr.sbin/ppp/lcpproto.h
index f00e26b..74c5d4d 100644
--- a/usr.sbin/ppp/lcpproto.h
+++ b/usr.sbin/ppp/lcpproto.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lcpproto.h,v 1.8 1997/08/25 00:29:16 brian Exp $
+ * $Id: lcpproto.h,v 1.9 1997/10/26 01:02:59 brian Exp $
  *
  *	TODO:
  */
@@ -37,12 +37,3 @@
 #define	PROTO_PAP	0xc023
 #define	PROTO_LQR	0xc025
 #define	PROTO_CHAP	0xc223
-
-extern void LcpInput(struct mbuf *);
-extern void PapInput(struct mbuf *);
-extern void LqpInput(struct mbuf *);
-extern void ChapInput(struct mbuf *);
-extern void IpInput(struct mbuf *);
-extern struct mbuf *VjCompInput(struct mbuf *, int);
-extern void IpcpInput(struct mbuf *);
-extern void LqrInput(struct mbuf *);
diff --git a/usr.sbin/ppp/lqr.h b/usr.sbin/ppp/lqr.h
index 71f2ee3..fa784e5 100644
--- a/usr.sbin/ppp/lqr.h
+++ b/usr.sbin/ppp/lqr.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: lqr.h,v 1.7 1997/08/25 00:29:19 brian Exp $
+ * $Id: lqr.h,v 1.8 1997/10/26 01:03:10 brian Exp $
  *
  *	TODO:
  */
@@ -61,3 +61,4 @@ extern void StartLqm(void);
 extern void StopLqr(int);
 extern void StopLqrTimer(void);
 extern void RecvEchoLqr(struct mbuf *);
+extern void LqrInput(struct mbuf *);
diff --git a/usr.sbin/ppp/mbuf.h b/usr.sbin/ppp/mbuf.h
index 07cd5ae..b7a246d 100644
--- a/usr.sbin/ppp/mbuf.h
+++ b/usr.sbin/ppp/mbuf.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: mbuf.h,v 1.6 1997/08/25 00:29:20 brian Exp $
+ * $Id: mbuf.h,v 1.7 1997/10/26 01:03:18 brian Exp $
  *
  *	TODO:
  */
@@ -59,7 +59,5 @@ extern void pfree(struct mbuf *);
 extern void mbwrite(struct mbuf *, u_char *, int);
 extern struct mbuf *mbread(struct mbuf *, u_char *, int);
 extern void DumpBp(struct mbuf *);
-extern void Enqueue(struct mqueue *, struct mbuf *);
-extern struct mbuf *Dequeue(struct mqueue *);
 extern void LogMemory(void);
 extern int ShowMemMap(void);
diff --git a/usr.sbin/ppp/modem.h b/usr.sbin/ppp/modem.h
index 34b1e1bf..8ca3868 100644
--- a/usr.sbin/ppp/modem.h
+++ b/usr.sbin/ppp/modem.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: modem.h,v 1.9 1997/08/25 00:29:23 brian Exp $
+ * $Id: modem.h,v 1.10 1997/10/26 01:03:25 brian Exp $
  *
  *	TODO:
  */
@@ -37,3 +37,5 @@ extern void ModemOutput(int, struct mbuf *);
 extern int ChangeParity(char *);
 extern void HangupModem(int);
 extern int ShowModemStatus(void);
+extern void Enqueue(struct mqueue *, struct mbuf *);
+extern struct mbuf *Dequeue(struct mqueue *);
diff --git a/usr.sbin/ppp/pap.h b/usr.sbin/ppp/pap.h
index bfeb3f2..6ef0792 100644
--- a/usr.sbin/ppp/pap.h
+++ b/usr.sbin/ppp/pap.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: pap.h,v 1.3 1997/02/22 16:10:41 peter Exp $
+ * $Id: pap.h,v 1.4 1997/10/26 01:03:29 brian Exp $
  *
  *	TODO:
  */
@@ -25,3 +25,5 @@
 #define	PAP_NAK		3
 
 extern struct authinfo AuthPapInfo;
+
+extern void PapInput(struct mbuf *);
diff --git a/usr.sbin/ppp/timer.h b/usr.sbin/ppp/timer.h
index 0ce8dc3..89439f5 100644
--- a/usr.sbin/ppp/timer.h
+++ b/usr.sbin/ppp/timer.h
@@ -15,7 +15,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: timeout.h,v 1.12 1997/09/03 00:40:51 brian Exp $
+ * $Id: timer.h,v 1.1 1997/10/26 01:03:53 brian Exp $
  *
  *	TODO:
  */
@@ -43,7 +43,9 @@ extern void StartTimer(struct pppTimer *);
 extern void StopTimer(struct pppTimer *);
 extern void TimerService(void);
 extern void TermTimerService(void);
-extern void StartIdleTimer(void);
-extern void StopIdleTimer(void);
-extern void UpdateIdleTimer(void);
 extern void ShowTimers(void);
+
+#ifdef SIGALRM
+extern u_int nointr_sleep(u_int);
+extern void nointr_usleep(u_int);
+#endif
diff --git a/usr.sbin/ppp/vjcomp.h b/usr.sbin/ppp/vjcomp.h
index 4fda8f1..221b591 100644
--- a/usr.sbin/ppp/vjcomp.h
+++ b/usr.sbin/ppp/vjcomp.h
@@ -1,6 +1,7 @@
 /*
- * $Id: $
+ * $Id: vjcomp.h,v 1.1 1997/10/26 01:04:02 brian Exp $
  */
 
 extern void VjInit(int);
 extern void SendPppFrame(struct mbuf *);
+extern struct mbuf *VjCompInput(struct mbuf *, int);