Add support for stateful MPPE (microsoft encryption) providing

encryption compatibility with Windows 2000.  Stateful encryption
uses less CPU but is bad on lossy transports.

The ``set mppe'' command has been expanded.  If it's used with any
arguments, ppp will insist on encryption, closing LCP if the other
end refuses.

Unfortunately, Microsoft have abused the CCP reset request so that
receiving a reset request does not result in a reset ack when using
MPPE...

Sponsored by:	Monzoon Networks AG and FreeBSD Services Limited

1 files changed, 11 insertions, 9 deletions

diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 109241060295..3c4204a21120 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -978,14 +978,15 @@ FsmRecvTimeRemain(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
 static void
 FsmRecvResetReq(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
 {
-  (*fp->fn->RecvResetReq)(fp);
-  /*
-   * All sendable compressed packets are queued in the first (lowest
-   * priority) modem output queue.... dump 'em to the priority queue
-   * so that they arrive at the peer before our ResetAck.
-   */
-  link_SequenceQueue(fp->link);
-  fsm_Output(fp, CODE_RESETACK, lhp->id, NULL, 0, MB_CCPOUT);
+  if ((*fp->fn->RecvResetReq)(fp)) {
+    /*
+     * All sendable compressed packets are queued in the first (lowest
+     * priority) modem output queue.... dump 'em to the priority queue
+     * so that they arrive at the peer before our ResetAck.
+     */
+    link_SequenceQueue(fp->link);
+    fsm_Output(fp, CODE_RESETACK, lhp->id, NULL, 0, MB_CCPOUT);
+  }
   m_freem(bp);
 }
 
@@ -1050,11 +1051,12 @@ fsm_Input(struct fsm *fp, struct mbuf *bp)
   (*codep->recv)(fp, &lh, bp);
 }
 
-void
+int
 fsm_NullRecvResetReq(struct fsm *fp)
 {
   log_Printf(fp->LogLevel, "%s: Oops - received unexpected reset req\n",
             fp->link->name);
+  return 1;
 }
 
 void