20c20
< * $FreeBSD: head/usr.sbin/ppp/lcp.c 55146 1999-12-27 11:54:57Z brian $
---
> * $FreeBSD: head/usr.sbin/ppp/lcp.c 58034 2000-03-14 01:46:54Z brian $
107,133c107,136
< static const char * const cftypes[] = {
< /* Check out the latest ``Assigned numbers'' rfc (rfc1700.txt) */
< "???",
< "MRU", /* 1: Maximum-Receive-Unit */
< "ACCMAP", /* 2: Async-Control-Character-Map */
< "AUTHPROTO", /* 3: Authentication-Protocol */
< "QUALPROTO", /* 4: Quality-Protocol */
< "MAGICNUM", /* 5: Magic-Number */
< "RESERVED", /* 6: RESERVED */
< "PROTOCOMP", /* 7: Protocol-Field-Compression */
< "ACFCOMP", /* 8: Address-and-Control-Field-Compression */
< "FCSALT", /* 9: FCS-Alternatives */
< "SDP", /* 10: Self-Describing-Pad */
< "NUMMODE", /* 11: Numbered-Mode */
< "MULTIPROC", /* 12: Multi-Link-Procedure */
< "CALLBACK", /* 13: Callback */
< "CONTIME", /* 14: Connect-Time */
< "COMPFRAME", /* 15: Compound-Frames */
< "NDE", /* 16: Nominal-Data-Encapsulation */
< "MRRU", /* 17: Multilink-MRRU */
< "SHORTSEQ", /* 18: Multilink-Short-Sequence-Number-Header */
< "ENDDISC", /* 19: Multilink-Endpoint-Discriminator */
< "PROPRIETRY", /* 20: Proprietary */
< "DCEID", /* 21: DCE-Identifier */
< "MULTIPP", /* 22: Multi-Link-Plus-Procedure */
< "LDBACP", /* 23: Link Discriminator for BACP */
< };
---
> static const char *
> protoname(int proto)
> {
> static const char * const cftypes[] = {
> /* Check out the latest ``Assigned numbers'' rfc (1700) */
> NULL,
> "MRU", /* 1: Maximum-Receive-Unit */
> "ACCMAP", /* 2: Async-Control-Character-Map */
> "AUTHPROTO", /* 3: Authentication-Protocol */
> "QUALPROTO", /* 4: Quality-Protocol */
> "MAGICNUM", /* 5: Magic-Number */
> "RESERVED", /* 6: RESERVED */
> "PROTOCOMP", /* 7: Protocol-Field-Compression */
> "ACFCOMP", /* 8: Address-and-Control-Field-Compression */
> "FCSALT", /* 9: FCS-Alternatives */
> "SDP", /* 10: Self-Describing-Pad */
> "NUMMODE", /* 11: Numbered-Mode */
> "MULTIPROC", /* 12: Multi-Link-Procedure */
> "CALLBACK", /* 13: Callback */
> "CONTIME", /* 14: Connect-Time */
> "COMPFRAME", /* 15: Compound-Frames */
> "NDE", /* 16: Nominal-Data-Encapsulation */
> "MRRU", /* 17: Multilink-MRRU */
> "SHORTSEQ", /* 18: Multilink-Short-Sequence-Number-Header */
> "ENDDISC", /* 19: Multilink-Endpoint-Discriminator */
> "PROPRIETRY", /* 20: Proprietary */
> "DCEID", /* 21: DCE-Identifier */
> "MULTIPP", /* 22: Multi-Link-Plus-Procedure */
> "LDBACP", /* 23: Link Discriminator for BACP */
> };
135c138,140
< #define NCFTYPES (sizeof cftypes/sizeof cftypes[0])
---
> if (proto < 0 || proto > sizeof cftypes / sizeof *cftypes ||
> cftypes[proto] == NULL)
> return HexStr(proto, NULL, 0);
136a142,144
> return cftypes[proto];
> }
>
549,552c557
< if (type < 0 || type >= NCFTYPES)
< snprintf(request, sizeof request, " <%d>[%d]", type, length);
< else
< snprintf(request, sizeof request, " %s[%d]", cftypes[type], length);
---
> snprintf(request, sizeof request, " %s[%d]", protoname(type), length);