From cb1e8a46445a90f2c379b4b71a542f3633358071 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 27 Feb 2002 22:43:31 +0000 Subject: 2002-02-27 Ilya Alexeev * net/if_ppp.c, pppd/auth.c, pppd/chat.c, pppd/pppd.h, pppd/sys-rtems.c: Add server with pap-authorization capabilities as well as eliminate some warnings. --- c/src/exec/libnetworking/ChangeLog | 6 ++++++ c/src/exec/libnetworking/net/if_ppp.c | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'c/src/exec') diff --git a/c/src/exec/libnetworking/ChangeLog b/c/src/exec/libnetworking/ChangeLog index 57af52c6d8..58a13fe4b8 100644 --- a/c/src/exec/libnetworking/ChangeLog +++ b/c/src/exec/libnetworking/ChangeLog @@ -1,3 +1,9 @@ +2002-02-27 Ilya Alexeev + + * net/if_ppp.c, pppd/auth.c, pppd/chat.c, pppd/pppd.h, + pppd/sys-rtems.c: Add server with pap-authorization + capabilities as well as eliminate some warnings. + 2002-02-27 Eric Norum * net/radix.c: Properly handle fetching the default route when there diff --git a/c/src/exec/libnetworking/net/if_ppp.c b/c/src/exec/libnetworking/net/if_ppp.c index 8c8b58745d..9fd7dde6f3 100644 --- a/c/src/exec/libnetworking/net/if_ppp.c +++ b/c/src/exec/libnetworking/net/if_ppp.c @@ -624,7 +624,7 @@ pppioctl(sc, cmd, data, flag, p) if (sc->sc_flags & SC_CCP_OPEN && !(flags & SC_CCP_OPEN)) ppp_ccp_closed(sc); #endif - splimp(); + s = splimp(); sc->sc_flags = (sc->sc_flags & ~SC_MASK) | flags; splx(s); break; @@ -1136,7 +1136,10 @@ struct mbuf * ppp_dequeue(sc) struct ppp_softc *sc; { - struct mbuf *m, *mp; + struct mbuf *m; +#ifdef VJC + struct mbuf *mp; +#endif u_char *cp; int address, control, protocol; @@ -1400,14 +1403,17 @@ ppp_inproc(sc, m) struct mbuf *mf = (struct mbuf *)0; struct ifnet *ifp = &sc->sc_if; struct ifqueue *inq; - int s, ilen, xlen, proto, rv; + int s, ilen, proto, rv; u_char *cp, adrs, ctrl; struct mbuf *mp; #ifdef PPP_COMPRESS struct mbuf *dmp = NULL; #endif +#ifdef VJC u_char *iphdr; - u_int hlen; + u_int hlen; + int xlen; +#endif sc->sc_stats.ppp_ipackets++; -- cgit v1.2.3