Deleted Added
full compact
ccp.h (50479) ccp.h (67910)
1/*
2 * Written by Toshiharu OHNO (tony-o@iij.ad.jp)
3 *
4 * Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
5 *
6 * Redistribution and use in source and binary forms are permitted
7 * provided that the above copyright notice and this paragraph are
8 * duplicated in all such forms and that any documentation,
9 * advertising materials, and other materials related to such
10 * distribution and use acknowledge that the software was developed
11 * by the Internet Initiative Japan. The name of the
12 * IIJ may not be used to endorse or promote products derived
13 * from this software without specific prior written permission.
14 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
15 * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
16 * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
17 *
1/*
2 * Written by Toshiharu OHNO (tony-o@iij.ad.jp)
3 *
4 * Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
5 *
6 * Redistribution and use in source and binary forms are permitted
7 * provided that the above copyright notice and this paragraph are
8 * duplicated in all such forms and that any documentation,
9 * advertising materials, and other materials related to such
10 * distribution and use acknowledge that the software was developed
11 * by the Internet Initiative Japan. The name of the
12 * IIJ may not be used to endorse or promote products derived
13 * from this software without specific prior written permission.
14 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
15 * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
16 * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
17 *
18 * $FreeBSD: head/usr.sbin/ppp/ccp.h 50479 1999-08-28 01:35:59Z peter $
18 * $FreeBSD: head/usr.sbin/ppp/ccp.h 67910 2000-10-30 00:15:04Z brian $
19 *
20 * TODO:
21 */
22
23#define CCP_MAXCODE CODE_RESETACK
24
25#define TY_OUI 0 /* OUI */
26#define TY_PRED1 1 /* Predictor type 1 */
27#define TY_PRED2 2 /* Predictor type 2 */
28#define TY_PUDDLE 3 /* Puddle Jumper */
29#define TY_HWPPC 16 /* Hewlett-Packard PPC */
30#define TY_STAC 17 /* Stac Electronics LZS */
31#define TY_MSPPC 18 /* Microsoft PPC */
19 *
20 * TODO:
21 */
22
23#define CCP_MAXCODE CODE_RESETACK
24
25#define TY_OUI 0 /* OUI */
26#define TY_PRED1 1 /* Predictor type 1 */
27#define TY_PRED2 2 /* Predictor type 2 */
28#define TY_PUDDLE 3 /* Puddle Jumper */
29#define TY_HWPPC 16 /* Hewlett-Packard PPC */
30#define TY_STAC 17 /* Stac Electronics LZS */
31#define TY_MSPPC 18 /* Microsoft PPC */
32#define TY_MPPE 18 /* Microsoft PPE */
32#define TY_GAND 19 /* Gandalf FZA */
33#define TY_V42BIS 20 /* V.42bis compression */
34#define TY_BSD 21 /* BSD LZW Compress */
35#define TY_PPPD_DEFLATE 24 /* Deflate (gzip) - (mis) numbered by pppd */
36#define TY_DEFLATE 26 /* Deflate (gzip) - rfc 1979 */
37
38#define CCP_NEG_DEFLATE 0
39#define CCP_NEG_PRED1 1
40#define CCP_NEG_DEFLATE24 2
33#define TY_GAND 19 /* Gandalf FZA */
34#define TY_V42BIS 20 /* V.42bis compression */
35#define TY_BSD 21 /* BSD LZW Compress */
36#define TY_PPPD_DEFLATE 24 /* Deflate (gzip) - (mis) numbered by pppd */
37#define TY_DEFLATE 26 /* Deflate (gzip) - rfc 1979 */
38
39#define CCP_NEG_DEFLATE 0
40#define CCP_NEG_PRED1 1
41#define CCP_NEG_DEFLATE24 2
42#ifdef HAVE_DES
43#define CCP_NEG_MPPE 3
44#define CCP_NEG_TOTAL 4
45#else
41#define CCP_NEG_TOTAL 3
46#define CCP_NEG_TOTAL 3
47#endif
42
43struct mbuf;
44struct link;
45
46struct ccp_config {
47 struct {
48 struct {
49 int winsize;
50 } in, out;
51 } deflate;
48
49struct mbuf;
50struct link;
51
52struct ccp_config {
53 struct {
54 struct {
55 int winsize;
56 } in, out;
57 } deflate;
58#ifdef HAVE_DES
59 struct {
60 int keybits;
61 } mppe;
62#endif
52 struct fsm_retry fsm; /* How often/frequently to resend requests */
53 unsigned neg[CCP_NEG_TOTAL];
54};
55
56struct ccp_opt {
57 struct ccp_opt *next;
58 int algorithm;
59 struct lcp_opt val;

--- 69 unchanged lines hidden ---
63 struct fsm_retry fsm; /* How often/frequently to resend requests */
64 unsigned neg[CCP_NEG_TOTAL];
65};
66
67struct ccp_opt {
68 struct ccp_opt *next;
69 int algorithm;
70 struct lcp_opt val;

--- 69 unchanged lines hidden ---