diff options
| author | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-09-07 10:47:43 +0000 |
|---|---|---|
| committer | YASUOKA Masahiko <yasuoka@cvs.openbsd.org> | 2012-09-07 10:47:43 +0000 |
| commit | 2bcafcc45a1da7872c46fec00dc81b45a923a0fe (patch) | |
| tree | ad48a7648efeb8f7c55c2ad470f58bca1fff302d /usr.sbin/npppd | |
| parent | 482a9128240c2865fb69cb5a69b2f45e65c4688f (diff) | |
fix typo and comment
from umezawa at iij
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/npppd/ppp.c | 26 | ||||
| -rw-r--r-- | usr.sbin/npppd/npppd/ppp.h | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/usr.sbin/npppd/npppd/ppp.c b/usr.sbin/npppd/npppd/ppp.c index 9e69383da75..5ce30531174 100644 --- a/usr.sbin/npppd/npppd/ppp.c +++ b/usr.sbin/npppd/npppd/ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp.c,v 1.14 2012/05/08 13:18:37 yasuoka Exp $ */ +/* $OpenBSD: ppp.c,v 1.15 2012/09/07 10:47:42 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: ppp.c,v 1.14 2012/05/08 13:18:37 yasuoka Exp $ */ +/* $Id: ppp.c,v 1.15 2012/09/07 10:47:42 yasuoka Exp $ */ /**@file * This file provides PPP(Point-to-Point Protocol, RFC 1661) and * {@link :: _npppd_ppp PPP instance} related functions. @@ -543,17 +543,17 @@ static const char * proto_name(uint16_t proto) { switch (proto) { - case PPP_PROTO_IP: return "ip"; - case PPP_PROTO_LCP: return "lcp"; - case PPP_PROTO_PAP: return "pap"; - case PPP_PROTO_CHAP: return "chap"; - case PPP_PROTO_EAP: return "eap"; - case PPP_PROTO_MPPE: return "mppe"; - case PPP_PROTO_NCP | NCP_CCP: return "ccp"; - case PPP_PROTO_NCP | NCP_IPCP: return "ipcp"; + case PPP_PROTO_IP: return "ip"; + case PPP_PROTO_LCP: return "lcp"; + case PPP_PROTO_PAP: return "pap"; + case PPP_PROTO_CHAP: return "chap"; + case PPP_PROTO_EAP: return "eap"; + case PPP_PROTO_MPPE: return "mppe"; + case PPP_PROTO_NCP | NCP_CCP: return "ccp"; + case PPP_PROTO_NCP | NCP_IPCP: return "ipcp"; /* following protocols are just for logging */ - case PPP_PROTO_NCP | NCP_IP6CP: return "ip6cp"; - case PPP_PROTO_ACSP: return "acsp"; + case PPP_PROTO_NCP | NCP_IPV6CP: return "ipv6cp"; + case PPP_PROTO_ACSP: return "acsp"; } return "unknown"; } @@ -854,7 +854,7 @@ ppp_recv_packet(npppd_ppp *_this, unsigned char *pkt, int lpkt, int flags) } /* * Windows sends naked IP packets in condition - * such that MPPE is not opened and IPCP is not + * such that MPPE is not opened and IPCP is * opened(*1). This occurs at a high * probability when the CCP establishment is * delayed because of packet loss etc. If we diff --git a/usr.sbin/npppd/npppd/ppp.h b/usr.sbin/npppd/npppd/ppp.h index 34f5c0dbf4e..24fd21730c3 100644 --- a/usr.sbin/npppd/npppd/ppp.h +++ b/usr.sbin/npppd/npppd/ppp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ppp.h,v 1.11 2012/05/08 13:20:44 yasuoka Exp $ */ +/* $OpenBSD: ppp.h,v 1.12 2012/09/07 10:47:42 yasuoka Exp $ */ /*- * Copyright (c) 2009 Internet Initiative Japan Inc. @@ -43,7 +43,7 @@ #define PPP_PROTO_NCP 0x8000 #define NCP_CCP 0xfd #define NCP_IPCP 0x21 -#define NCP_IP6CP 0x57 +#define NCP_IPV6CP 0x57 #define PPP_PROTO_ACSP 0x8235 /* Apple Client Server Protocol Control */ @@ -494,7 +494,7 @@ struct _npppd_ppp { eap eap; /** eap */ #endif ccp ccp; /** ccp */ - ipcp ipcp; /** ccp */ + ipcp ipcp; /** ipcp */ char username[MAX_USERNAME_LENGTH]; /** Remote username */ int ifidx; /** interface index */ |