If we receive a config request while Open, call TLD *before* decoding

the request as TLD may initialise fields that are set when decoding the
request.

MFC after:	1 week

1 files changed, 7 insertions, 3 deletions

diff --git a/usr.sbin/ppp/fsm.c b/usr.sbin/ppp/fsm.c
index 2a108c2..bfa3eed 100644
--- a/usr.sbin/ppp/fsm.c
+++ b/usr.sbin/ppp/fsm.c
@@ -482,6 +482,12 @@ FsmRecvConfigReq(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
     return;
   }
 
+  /* Some things must be done before we Decode the packet */
+  switch (fp->state) {
+  case ST_OPENED:
+    (*fp->fn->LayerDown)(fp);
+  }
+
   dec.ackend = dec.ack;
   dec.nakend = dec.nak;
   dec.rejend = dec.rej;
@@ -526,10 +532,8 @@ FsmRecvConfigReq(struct fsm *fp, struct fsmheader *lhp, struct mbuf *bp)
     return;
   case ST_STOPPED:
     FsmInitRestartCounter(fp, FSM_REQ_TIMER);
-    FsmSendConfigReq(fp);
-    break;
+    /* Drop through */
   case ST_OPENED:
-    (*fp->fn->LayerDown)(fp);
     FsmSendConfigReq(fp);
     break;
   }