diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-05-08 13:20:45 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-05-08 13:20:45 +0000 |
| commit | cf7dd13c3c89d689f3f7a7047c1c40e32433bb16 (patch) | |
| tree | a7d8eb81fa515c2a7eb3d5c176fb353223fd91f8 /usr.sbin/npppd | |
| parent | 873ad9ae691b0cb4252232642bf6d7c57c4a7318 (diff) | |
Ignore ACCM option on LCP. This was required by some LAC that uses
the option in proxied LCP.
ok mcbride henning
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/npppd/lcp.c | 16 | ||||
| -rw-r--r-- | usr.sbin/npppd/npppd/ppp.h | 3 |
2 files changed, 16 insertions, 3 deletions
diff --git a/usr.sbin/npppd/npppd/lcp.c b/usr.sbin/npppd/npppd/lcp.c index 780e4470f9b..25440db62bb 100644 --- a/usr.sbin/npppd/npppd/lcp.c +++ b/usr.sbin/npppd/npppd/lcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lcp.c,v 1.5 2012/05/08 13:15:11 yasuoka Exp $ */ +/* $OpenBSD: lcp.c,v 1.6 2012/05/08 13:20:44 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $Id: lcp.c,v 1.5 2012/05/08 13:15:11 yasuoka Exp $ */ +/* $Id: lcp.c,v 1.6 2012/05/08 13:20:44 yasuoka Exp $ */ /**@file * This file provides LCP related functions. *<pre> @@ -1237,6 +1237,12 @@ lcp_proxy_recv_ci(fsm *f, u_char *inp, int inlen) goto fail; LCP_OPT_PEER_ACCEPTED(acfc); break; + case PPP_LCP_ACCM: + if (len != 6) + goto fail; + /* we don't use async framing. ignore this */ + inp += (len - 2); + break; default: goto fail; } @@ -1344,6 +1350,12 @@ lcp_proxy_sent_ci(fsm *f, u_char *inp, int inlen) goto fail; LCP_OPT_ACCEPTED(acfc); break; + case PPP_LCP_ACCM: + if (len != 6) + goto fail; + /* we don't use async framing. ignore this */ + inp += (len - 2); + break; default: goto fail; } diff --git a/usr.sbin/npppd/npppd/ppp.h b/usr.sbin/npppd/npppd/ppp.h index d0ed2deaa7e..34f5c0dbf4e 100644 --- a/usr.sbin/npppd/npppd/ppp.h +++ b/usr.sbin/npppd/npppd/ppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp.h,v 1.10 2012/05/08 13:15:12 yasuoka Exp $ */ +/* $OpenBSD: ppp.h,v 1.11 2012/05/08 13:20:44 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -48,6 +48,7 @@ Control */ #define PPP_LCP_MRU 1 /* Maximum-Receive-Unit */ +#define PPP_LCP_ACCM 2 /* Async-Control-Character-Map*/ #define PPP_LCP_AUTH_PROTOCOL 3 /* Authentication-Protcol */ #define PPP_LCP_QUALITY_PROTOCOL 4 /* Quality-Control */ #define PPP_LCP_MAGICNUMBER 5 /* Magic-Number */ |