Fix PAP, CHAP & LQR req (I broke the byte ordering when

I did the deflate re-org).
Make PAP & CHAP negotiation prettier in the log file.
If both PAP & CHAP are `enabled' and the peer NAKs CHAP
suggesting PAP, be friendly and REQ PAP the next time.
This is in line with the rfc.

3 files changed, 70 insertions, 16 deletions

diff --git a/usr.sbin/ppp/chap.c b/usr.sbin/ppp/chap.c
index 1fb6d25004ea..2668e4628196 100644
--- a/usr.sbin/ppp/chap.c
+++ b/usr.sbin/ppp/chap.c
@@ -17,7 +17,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: chap.c,v 1.25 1997/11/09 03:55:27 brian Exp $
+ * $Id: chap.c,v 1.26 1997/11/22 03:37:25 brian Exp $
  *
  *	TODO:
  */
@@ -129,7 +129,7 @@ RecvChapTalk(struct fsmheader *chp, struct mbuf *bp)
   name = cp + valsize;
   namelen = arglen - valsize - 1;
   name[namelen] = 0;
-  LogPrintf(LogPHASE, " Valsize = %d, Name = %s\n", valsize, name);
+  LogPrintf(LogLCP, " Valsize = %d, Name = \"%s\"\n", valsize, name);
 
   switch (chp->code) {
   case CHAP_CHALLENGE:
diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c
index ac74eed8d37d..3a90487fc2fa 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.48 1997/11/22 03:37:35 brian Exp $
+ * $Id: lcp.c,v 1.49 1997/12/03 10:23:49 brian Exp $
  *
  * TODO:
  *      o Validate magic number received from peer.
@@ -281,7 +281,7 @@ do {								\
   o.id = TY_QUALPROTO;						\
   o.len = 8;							\
   *(u_short *)o.data = htons(PROTO_LQR);			\
-  *(u_long *)(o.data+2) = period;				\
+  *(u_long *)(o.data+2) = htonl(period);			\
   cp += LcpPutConf(LogLCP, cp, &o, cftypes[o.id], "period %ld", period);\
 } while (0)
 
@@ -289,17 +289,19 @@ do {								\
 do {								\
   o.id = TY_AUTHPROTO;						\
   o.len = 4;							\
-  *(u_short *)o.data = PROTO_PAP;				\
-  cp += LcpPutConf(LogLCP, cp, &o, cftypes[o.id], "PAP REQ");	\
+  *(u_short *)o.data = htons(PROTO_PAP);			\
+  cp += LcpPutConf(LogLCP, cp, &o, cftypes[o.id],		\
+		   "0x%04x (PAP)", PROTO_PAP);			\
 } while (0)
   
 #define PUTCHAP(val)						\
 do {								\
   o.id = TY_AUTHPROTO;						\
   o.len = 5;							\
-  *(u_short *)o.data = PROTO_CHAP;				\
-  o.data[4] = val;						\
-  cp += LcpPutConf(LogLCP, cp, &o, cftypes[o.id], "CHAP REQ (0x%02x)", val);\
+  *(u_short *)o.data = htons(PROTO_CHAP);			\
+  o.data[2] = val;						\
+  cp += LcpPutConf(LogLCP, cp, &o, cftypes[o.id],		\
+		   "0x%04x (CHAP 0x%02x)", PROTO_CHAP, val);	\
 } while (0)
 
 #define PUTMD5CHAP() PUTCHAP(0x05)
@@ -344,9 +346,8 @@ LcpSendConfigReq(struct fsm * fp)
     if (VarMSChap)
       PUTMSCHAP();			/* Use MSChap */
     else
-#else
-      PUTMD5CHAP();			/* Use MD5 */
 #endif
+      PUTMD5CHAP();			/* Use MD5 */
     break;
   }
   FsmOutput(fp, CODE_CONFIGREQ, fp->reqid++, ReqBuff, cp - ReqBuff);
@@ -550,7 +551,17 @@ LcpDecodeConfig(u_char *cp, int plen, int mode_type)
     case TY_AUTHPROTO:
       sp = (u_short *) (cp + 2);
       proto = ntohs(*sp);
-      LogPrintf(LogLCP, "%s 0x%04x\n", request, proto);
+      switch (proto) {
+      case PROTO_PAP:
+        LogPrintf(LogLCP, "%s 0x%04x (PAP)\n", request, proto);
+        break;
+      case PROTO_CHAP:
+        LogPrintf(LogLCP, "%s 0x%04x (CHAP 0x%02x)\n", request, proto, cp[4]);
+        break;
+      default:
+        LogPrintf(LogLCP, "%s 0x%04x\n", request, proto);
+        break;
+      }
 
       switch (mode_type) {
       case MODE_REQ:
@@ -569,7 +580,12 @@ LcpDecodeConfig(u_char *cp, int plen, int mode_type)
 	    *nakp++ = 5;
 	    *nakp++ = (unsigned char) (PROTO_CHAP >> 8);
 	    *nakp++ = (unsigned char) PROTO_CHAP;
-	    *nakp++ = 5;
+#ifdef HAVE_DES
+            if (VarMSChap)
+              *nakp++ = 0x80;
+            else
+#endif
+	      *nakp++ = 5;
 	  } else
 	    goto reqreject;
 	  break;
@@ -601,13 +617,36 @@ LcpDecodeConfig(u_char *cp, int plen, int mode_type)
 	  break;
 
 	default:
-	  LogPrintf(LogLCP, " proto %d not implemented, NAK.\n", proto);
+          LogPrintf(LogLCP, "%s 0x%04x - not recognised, NAK\n",
+                    request, proto);
 	  memcpy(nakp, cp, length);
 	  nakp += length;
 	  break;
 	}
 	break;
       case MODE_NAK:
+	switch (proto) {
+	case PROTO_PAP:
+          if (Enabled(ConfPap))
+            LcpInfo.want_auth = PROTO_PAP;
+          else {
+            LogPrintf(LogLCP, "Peer will only send PAP (not enabled)\n");
+	    LcpInfo.his_reject |= (1 << type);
+          }
+          break;
+	case PROTO_CHAP:
+          if (Enabled(ConfChap))
+            LcpInfo.want_auth = PROTO_CHAP;
+          else {
+            LogPrintf(LogLCP, "Peer will only send CHAP (not enabled)\n");
+	    LcpInfo.his_reject |= (1 << type);
+          }
+          break;
+        default:
+          /* We've been NAK'd with something we don't understand :-( */
+	  LcpInfo.his_reject |= (1 << type);
+          break;
+        }
 	break;
       case MODE_REJ:
 	LcpInfo.his_reject |= (1 << type);
diff --git a/usr.sbin/ppp/phase.c b/usr.sbin/ppp/phase.c
index 63695f74cc98..4b6d1759834c 100644
--- a/usr.sbin/ppp/phase.c
+++ b/usr.sbin/ppp/phase.c
@@ -1,5 +1,5 @@
 /*
- * $Id: phase.c,v 1.2 1997/10/29 01:19:50 brian Exp $
+ * $Id: phase.c,v 1.3 1997/11/22 03:37:43 brian Exp $
  */
 
 #include <sys/param.h>
@@ -30,6 +30,20 @@ static const char *PhaseNames[] = {
   "Dead", "Establish", "Authenticate", "Network", "Terminate"
 };
 
+static const char *
+Auth2Nam(u_short auth)
+{
+  switch (auth) {
+  case PROTO_PAP:
+    return "PAP";
+  case PROTO_CHAP:
+    return "CHAP";
+  case 0:
+    return "none";
+  }
+  return "unknown";
+}
+
 void
 NewPhase(int new)
 {
@@ -42,7 +56,8 @@ NewPhase(int new)
     lcp->auth_ineed = lcp->want_auth;
     lcp->auth_iwait = lcp->his_auth;
     if (lcp->his_auth || lcp->want_auth) {
-      LogPrintf(LogPHASE, " his = %x, mine = %x\n", lcp->his_auth, lcp->want_auth);
+      LogPrintf(LogPHASE, " his = %s, mine = %s\n",
+                Auth2Nam(lcp->his_auth), Auth2Nam(lcp->want_auth));
       if (lcp->his_auth == PROTO_PAP)
 	StartAuthChallenge(&AuthPapInfo);
       if (lcp->want_auth == PROTO_CHAP)