479508cf28
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
129 lines
4.2 KiB
C
129 lines
4.2 KiB
C
/*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1993, Internet Initiative Japan, Inc. All rights reserverd.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* advertising materials, and other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the Internet Initiative Japan. The name of the
|
|
* IIJ may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* $Id: ccp.h,v 1.19 1998/06/30 23:04:12 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
#define CCP_MAXCODE CODE_RESETACK
|
|
|
|
#define TY_OUI 0 /* OUI */
|
|
#define TY_PRED1 1 /* Predictor type 1 */
|
|
#define TY_PRED2 2 /* Predictor type 2 */
|
|
#define TY_PUDDLE 3 /* Puddle Jumper */
|
|
#define TY_HWPPC 16 /* Hewlett-Packard PPC */
|
|
#define TY_STAC 17 /* Stac Electronics LZS */
|
|
#define TY_MSPPC 18 /* Microsoft PPC */
|
|
#define TY_GAND 19 /* Gandalf FZA */
|
|
#define TY_V42BIS 20 /* V.42bis compression */
|
|
#define TY_BSD 21 /* BSD LZW Compress */
|
|
#define TY_PPPD_DEFLATE 24 /* Deflate (gzip) - (mis) numbered by pppd */
|
|
#define TY_DEFLATE 26 /* Deflate (gzip) - rfc 1979 */
|
|
|
|
#define CCP_NEG_DEFLATE 0
|
|
#define CCP_NEG_PRED1 1
|
|
#define CCP_NEG_DEFLATE24 2
|
|
#define CCP_NEG_TOTAL 3
|
|
|
|
struct mbuf;
|
|
struct link;
|
|
|
|
struct ccp_config {
|
|
struct {
|
|
struct {
|
|
int winsize;
|
|
} in, out;
|
|
} deflate;
|
|
struct fsm_retry fsm; /* How often/frequently to resend requests */
|
|
unsigned neg[CCP_NEG_TOTAL];
|
|
};
|
|
|
|
struct ccp_opt {
|
|
struct ccp_opt *next;
|
|
int algorithm;
|
|
struct lcp_opt val;
|
|
};
|
|
|
|
struct ccp {
|
|
struct fsm fsm; /* The finite state machine */
|
|
|
|
int his_proto; /* peer's compression protocol */
|
|
int my_proto; /* our compression protocol */
|
|
|
|
int reset_sent; /* If != -1, ignore compressed 'till ack */
|
|
int last_reset; /* We can receive more (dups) w/ this id */
|
|
|
|
struct {
|
|
int algorithm; /* Algorithm in use */
|
|
void *state; /* Returned by implementations Init() */
|
|
struct lcp_opt opt; /* Set by implementations OptInit() */
|
|
} in;
|
|
|
|
struct {
|
|
int algorithm; /* Algorithm in use */
|
|
void *state; /* Returned by implementations Init() */
|
|
struct ccp_opt *opt; /* Set by implementations OptInit() */
|
|
} out;
|
|
|
|
u_int32_t his_reject; /* Request codes rejected by peer */
|
|
u_int32_t my_reject; /* Request codes I have rejected */
|
|
|
|
u_long uncompout, compout; /* Outgoing bytes before/after compression */
|
|
u_long uncompin, compin; /* Incoming bytes after/before decompression */
|
|
|
|
struct ccp_config cfg;
|
|
};
|
|
|
|
#define fsm2ccp(fp) (fp->proto == PROTO_CCP ? (struct ccp *)fp : NULL)
|
|
|
|
struct ccp_algorithm {
|
|
int id;
|
|
int Neg; /* ccp_config neg array item */
|
|
const char *(*Disp)(struct lcp_opt *); /* Use result immediately ! */
|
|
struct {
|
|
int (*Set)(struct lcp_opt *, const struct ccp_config *);
|
|
void *(*Init)(struct lcp_opt *);
|
|
void (*Term)(void *);
|
|
void (*Reset)(void *);
|
|
struct mbuf *(*Read)(void *, struct ccp *, u_short *, struct mbuf *);
|
|
void (*DictSetup)(void *, struct ccp *, u_short, struct mbuf *);
|
|
} i;
|
|
struct {
|
|
void (*OptInit)(struct lcp_opt *, const struct ccp_config *);
|
|
int (*Set)(struct lcp_opt *);
|
|
void *(*Init)(struct lcp_opt *);
|
|
void (*Term)(void *);
|
|
void (*Reset)(void *);
|
|
int (*Write)(void *, struct ccp *, struct link *, int, u_short,
|
|
struct mbuf *);
|
|
} o;
|
|
};
|
|
|
|
extern void ccp_Init(struct ccp *, struct bundle *, struct link *,
|
|
const struct fsm_parent *);
|
|
extern void ccp_Setup(struct ccp *);
|
|
|
|
extern void ccp_SendResetReq(struct fsm *);
|
|
extern void ccp_Input(struct ccp *, struct bundle *, struct mbuf *);
|
|
extern int ccp_ReportStatus(struct cmdargs const *);
|
|
extern int ccp_Compress(struct ccp *, struct link *, int, u_short, struct mbuf *);
|
|
extern struct mbuf *ccp_Decompress(struct ccp *, u_short *, struct mbuf *);
|
|
extern u_short ccp_Proto(struct ccp *);
|
|
extern void ccp_SetupCallbacks(struct ccp *);
|
|
extern int ccp_SetOpenMode(struct ccp *);
|