Tone down the log levels (Log{ERROR,WARN} -> LogCCP)

when we've simply missed a packet.

When our Predictor1 CRC is wrong (implying we've dropped
a packet), don't send a ResetReq().  Instead, send another
CCP ConfigReq().  *shrug*  My tests show this as being far
worse than the ResetReq as we may have further Nak/Rejs etc
and we're basically resetting both our incoming and outgoing
compression dictionaries, but rfc1978 says the ConfigReq is
correct, so we'd better go along...

1 files changed, 5 insertions, 5 deletions

diff --git a/usr.sbin/ppp/ccp.c b/usr.sbin/ppp/ccp.c
index 97a36fba8372..4aa773bc3398 100644
--- a/usr.sbin/ppp/ccp.c
+++ b/usr.sbin/ppp/ccp.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ccp.c,v 1.42 1999/02/06 02:54:44 brian Exp $
+ * $Id: ccp.c,v 1.43 1999/02/26 21:28:07 brian Exp $
  *
  *	TODO:
  *		o Support other compression protocols
@@ -548,17 +548,17 @@ CcpRecvResetAck(struct fsm *fp, u_char id)
 
   if (ccp->reset_sent != -1) {
     if (id != ccp->reset_sent) {
-      log_Printf(LogWARN, "CCP: %s: Incorrect ResetAck (id %d, not %d)"
+      log_Printf(LogCCP, "%s: Incorrect ResetAck (id %d, not %d)"
                 " ignored\n", fp->link->name, id, ccp->reset_sent);
       return;
     }
     /* Whaddaya know - a correct reset ack */
   } else if (id == ccp->last_reset)
     log_Printf(LogCCP, "%s: Duplicate ResetAck (resetting again)\n",
-              fp->link->name);
+               fp->link->name);
   else {
-    log_Printf(LogWARN, "CCP: %s: Unexpected ResetAck (id %d) ignored\n",
-              fp->link->name, id);
+    log_Printf(LogCCP, "%s: Unexpected ResetAck (id %d) ignored\n",
+               fp->link->name, id);
     return;
   }