MFMP: Make ppp multilink capable.

      See the file README.changes, and re-read the man page.

1 files changed, 51 insertions, 37 deletions

diff --git a/usr.sbin/ppp/log.h b/usr.sbin/ppp/log.h
index 875159e..4e34ee1 100644
--- a/usr.sbin/ppp/log.h
+++ b/usr.sbin/ppp/log.h
@@ -23,46 +23,60 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: log.h,v 1.18.2.8 1998/05/01 22:39:37 brian Exp $
  */
 
 #define LogMIN		(1)
 #define LogASYNC	(1)	/* syslog(LOG_INFO, ....)	 */
-#define LogCARRIER	(2)
-#define LogCCP		(3)
-#define LogCHAT		(4)
-#define LogCOMMAND	(5)
-#define LogCONNECT	(6)
-#define LogDEBUG	(7)	/* syslog(LOG_DEBUG, ....)	 */
-#define LogHDLC		(8)
-#define LogID0		(9)
-#define LogIPCP		(10)
-#define LogLCP		(11)
-#define LogLINK		(12)
-#define LogLQM		(13)
-#define LogPHASE	(14)
-#define LogTCPIP	(15)
-#define LogTUN		(16)	/* If set, tun%d is output with each message */
-#define LogMAXCONF	(16)
-#define LogWARN		(17)	/* Sent to VarTerm else syslog(LOG_WARNING, ) */
-#define LogERROR	(18)	/* syslog(LOG_ERR, ....), + sent to VarTerm */
-#define LogALERT	(19)	/* syslog(LOG_ALERT, ....)	 */
-#define LogMAX		(19)
+#define LogCCP		(2)
+#define LogCHAT		(3)
+#define LogCOMMAND	(4)
+#define LogCONNECT	(5)
+#define LogDEBUG	(6)	/* syslog(LOG_DEBUG, ....)	 */
+#define LogHDLC		(7)
+#define LogID0		(8)
+#define LogIPCP		(9)
+#define LogLCP		(10)
+#define LogLQM		(11)
+#define LogPHASE	(12)
+#define LogTCPIP	(13)
+#define LogTIMER	(14)	/* syslog(LOG_DEBUG, ....)	 */
+#define LogTUN		(15)	/* If set, tun%d is output with each message */
+#define LogMAXCONF	(15)
+#define LogWARN		(16)	/* Sent to VarTerm else syslog(LOG_WARNING, ) */
+#define LogERROR	(17)	/* syslog(LOG_ERR, ....), + sent to VarTerm */
+#define LogALERT	(18)	/* syslog(LOG_ALERT, ....)	 */
+#define LogMAX		(18)
+
+struct mbuf;
+struct cmdargs;
+struct prompt;
 
 /* The first int arg for all of the following is one of the above values */
-extern const char *LogName(int);
-extern void LogKeep(int);
-extern void LogKeepLocal(int);
-extern void LogDiscard(int);
-extern void LogDiscardLocal(int);
-extern void LogDiscardAll(void);
-extern void LogDiscardAllLocal(void);
-#define LOG_KEPT_SYSLOG (1)	/* Results of LogIsKept() */
-#define LOG_KEPT_LOCAL  (2)	/* Results of LogIsKept() */
-extern int LogIsKept(int);
-extern void LogOpen(const char *);
-extern void LogSetTun(int);
-extern void LogClose(void);
-extern void LogPrintf(int, const char *,...);
-extern void LogDumpBp(int, const char *, const struct mbuf *);
-extern void LogDumpBuff(int, const char *, const u_char *, int);
+extern const char *log_Name(int);
+extern void log_Keep(int);
+extern void log_KeepLocal(int, u_long *);
+extern void log_Discard(int);
+extern void log_DiscardLocal(int, u_long *);
+extern void log_DiscardAll(void);
+extern void log_DiscardAllLocal(u_long *);
+#define LOG_KEPT_SYSLOG (1)	/* Results of log_IsKept() */
+#define LOG_KEPT_LOCAL  (2)	/* Results of log_IsKept() */
+extern int log_IsKept(int);
+extern int log_IsKeptLocal(int, u_long);
+extern void log_Open(const char *);
+extern void log_SetTun(int);
+extern void log_Close(void);
+#ifdef __GNUC__
+extern void log_Printf(int, const char *,...)
+            __attribute__ ((format (printf, 2, 3)));
+#else
+extern void log_Printf(int, const char *,...);
+#endif
+extern void log_DumpBp(int, const char *, const struct mbuf *);
+extern void log_DumpBuff(int, const char *, const u_char *, int);
+extern void log_RegisterPrompt(struct prompt *);
+extern void log_UnRegisterPrompt(struct prompt *);
+extern int log_ShowLevel(struct cmdargs const *);
+extern int log_SetLevel(struct cmdargs const *);
+extern int log_ShowWho(struct cmdargs const *);