X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Ffsm.c;h=6c74036aa0bfc2d27070c745abfd658ff9f16358;hp=02640e72d9339182af5d03363b6920f89d5ee971;hb=19872c62b8c5c5f77a4db07e52852f6bd22d4f75;hpb=875d9641d05b4fcb7e186f784c801962bb2670e5 diff --git a/pppd/fsm.c b/pppd/fsm.c index 02640e7..6c74036 100644 --- a/pppd/fsm.c +++ b/pppd/fsm.c @@ -17,9 +17,7 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] = "$Id: fsm.c,v 1.16 1999/08/12 04:25:20 paulus Exp $"; -#endif +#define RCSID "$Id: fsm.c,v 1.18 2002/06/24 12:57:15 dfs Exp $" /* * TODO: @@ -34,6 +32,8 @@ static const char rcsid[] = "$Id: fsm.c,v 1.16 1999/08/12 04:25:20 paulus Exp $" #include "pppd.h" #include "fsm.h" +static const char rcsid[] = RCSID; + static void fsm_timeout __P((void *)); static void fsm_rconfreq __P((fsm *, int, u_char *, int)); static void fsm_rconfack __P((fsm *, int, u_char *, int)); @@ -562,10 +562,10 @@ fsm_rtermreq(f, id, p, len) info("%s terminated by peer (%0.*v)", PROTO_NAME(f), len, p); } else info("%s terminated by peer", PROTO_NAME(f)); - if (f->callbacks->down) - (*f->callbacks->down)(f); /* Inform upper layers */ f->retransmits = 0; f->state = STOPPING; + if (f->callbacks->down) + (*f->callbacks->down)(f); /* Inform upper layers */ TIMEOUT(fsm_timeout, f, f->timeouttime); break; }