From ab7d88ae2d8ea955c6193cc242b9cee4d58f8fd4 Mon Sep 17 00:00:00 2001 From: brian Date: Sat, 8 May 1999 11:07:56 +0000 Subject: o Redesign the layering mechanism and make the aliasing code part of the layering. We now ``stack'' layers as soon as we open the device (when we figure out what we're dealing with). A static set of `dispatch' routines are also declared for dealing with incoming packets after they've been `pulled' up through the stacked layers. Physical devices are now assigned handlers based on the device type when they're opened. For the moment there are three device types; ttys, execs and tcps. o Increment version number to 2.2 o Make an entry in [uw]tmp for non-tty -direct invocations (after pap/chap authentication). o Make throughput counters quad_t's o Account for the absolute number of mbuf malloc()s and free()s in ``show mem''. o ``show modem'' becomes ``show physical''. --- usr.sbin/ppp/lcp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'usr.sbin/ppp/lcp.c') diff --git a/usr.sbin/ppp/lcp.c b/usr.sbin/ppp/lcp.c index 5524082..0e45418 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.69 1999/02/26 21:28:12 brian Exp $ + * $Id: lcp.c,v 1.72 1999/04/11 08:51:04 brian Exp $ * */ @@ -34,6 +34,7 @@ #include #include +#include "layer.h" #include "ua.h" #include "defs.h" #include "command.h" @@ -44,7 +45,7 @@ #include "iplist.h" #include "lcp.h" #include "throughput.h" -#include "lcpproto.h" +#include "proto.h" #include "descriptor.h" #include "lqr.h" #include "hdlc.h" @@ -1147,9 +1148,10 @@ reqreject: } } -void -lcp_Input(struct lcp *lcp, struct mbuf *bp) +extern struct mbuf * +lcp_Input(struct bundle *bundle, struct link *l, struct mbuf *bp) { /* Got PROTO_LCP from link */ - fsm_Input(&lcp->fsm, bp); + fsm_Input(&l->lcp.fsm, bp); + return NULL; } -- cgit v1.1