3b0f8d2ed6
o Remove bundle2lcp(), bundle2ccp() and bundle2link().
They're too resource-hungry and we have `owner pointers'
to do their job.
o Make our FSM understand LCPs that are always ST_OPENED
(with a minimum code that != 1).
o Send FSM code rejects for invalid codes.
o Make our bundle fsm_parent deal with multiple links.
o Make timer diagnostics pretty and allow access via ~t
in `term' mode (not just when logging debug) and
`show timers'. Only show timers every second in debug
mode, otherwise we get too many diagnostics to be useful
(we probably still do). Also, don't restrict ~m in term
mode to depend on debug logging.
o Rationalise our bundles' phases.
o Create struct mp (multilink protocol). This is both an
NCP and a type of struct link. It feeds off other NCPs
for output, passing fragmented packets into the queues
of available datalinks. It also gets PROTO_MP input,
reassembles the fragments into ppp frames, and passes
them back to the HDLC layer that the fragments were passed
from.
** It's not yet possible to enter multilink mode :-( **
o Add `set weight' (requires context) for deciding on a links
weighting in multilink mode. Weighting is simplistic (and
probably badly implemented) for now.
o Remove the function pointers in struct link. They ended up
only applying to physical links.
o Configure our tun device with an MTU equal to the MRU from
struct mp's LCP and a speed equal to the sum of our link
speeds.
o `show {lcp,ccp,proto}' and `set deflate' now have optional
context and use ChooseLink() to decide on which `struct link'
to use. This allows behaviour as before when in non-multilink
mode, and allows access to the MP logical link in multilink
mode.
o Ignore reconnect and redial values when in -direct mode and
when cleaning up. Always redial when in -ddial or -dedicated
mode (unless cleaning up).
o Tell our links to `staydown' when we close them due to a signal.
o Remove remaining `#ifdef SIGALRM's (ppp doesn't function without
alarms).
o Don't bother strdup()ing our physical link name.
o Various other cosmetic changes.
155 lines
5.2 KiB
C
155 lines
5.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: fsm.h,v 1.16.2.12 1998/03/24 18:46:59 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
/*
|
|
* State of machine
|
|
*/
|
|
#define ST_INITIAL 0
|
|
#define ST_STARTING 1
|
|
#define ST_CLOSED 2
|
|
#define ST_STOPPED 3
|
|
#define ST_CLOSING 4
|
|
#define ST_STOPPING 5
|
|
#define ST_REQSENT 6
|
|
#define ST_ACKRCVD 7
|
|
#define ST_ACKSENT 8
|
|
#define ST_OPENED 9
|
|
|
|
#define ST_MAX 10
|
|
#define ST_UNDEF -1
|
|
|
|
#define MODE_REQ 0
|
|
#define MODE_NAK 1
|
|
#define MODE_REJ 2
|
|
#define MODE_NOP 3
|
|
#define MODE_ACK 4 /* pseudo mode for ccp negotiations */
|
|
|
|
#define OPEN_PASSIVE -1
|
|
|
|
struct fsm;
|
|
|
|
struct fsm_decode {
|
|
u_char ack[100], *ackend;
|
|
u_char nak[100], *nakend;
|
|
u_char rej[100], *rejend;
|
|
};
|
|
|
|
struct fsm_callbacks {
|
|
void (*LayerUp) (struct fsm *); /* Layer is now up (tlu) */
|
|
void (*LayerDown) (struct fsm *); /* About to come down (tld) */
|
|
void (*LayerStart) (struct fsm *); /* Layer about to start up (tls) */
|
|
void (*LayerFinish) (struct fsm *); /* Layer now down (tlf) */
|
|
void (*InitRestartCounter) (struct fsm *); /* Set fsm timer load */
|
|
void (*SendConfigReq) (struct fsm *); /* Send REQ please */
|
|
void (*SentTerminateReq) (struct fsm *); /* Term REQ just sent */
|
|
void (*SendTerminateAck) (struct fsm *, u_char); /* Send Term ACK please */
|
|
void (*DecodeConfig) (struct fsm *, u_char *, int, int, struct fsm_decode *);
|
|
/* Deal with incoming data */
|
|
void (*RecvResetReq) (struct fsm *fp); /* Reset output */
|
|
void (*RecvResetAck) (struct fsm *fp, u_char); /* Reset input */
|
|
};
|
|
|
|
struct fsm_parent {
|
|
void (*LayerStart) (void *, struct fsm *); /* tls */
|
|
void (*LayerUp) (void *, struct fsm *); /* tlu */
|
|
void (*LayerDown) (void *, struct fsm *); /* tld */
|
|
void (*LayerFinish) (void *, struct fsm *); /* tlf */
|
|
void *object;
|
|
};
|
|
|
|
struct fsm {
|
|
const char *name; /* Name of protocol */
|
|
u_short proto; /* Protocol number */
|
|
u_short min_code;
|
|
u_short max_code;
|
|
int open_mode; /* Delay before config REQ (-1 forever) */
|
|
int state; /* State of the machine */
|
|
u_char reqid; /* Next request id */
|
|
int restart; /* Restart counter value */
|
|
int maxconfig; /* Max config REQ before a close() */
|
|
|
|
struct pppTimer FsmTimer; /* Restart Timer */
|
|
struct pppTimer OpenTimer; /* Delay before opening */
|
|
|
|
/*
|
|
* This timer times the ST_STOPPED state out after the given value
|
|
* (specified via "set stopped ..."). Although this isn't specified in the
|
|
* rfc, the rfc *does* say that "the application may use higher level
|
|
* timers to avoid deadlock". The StoppedTimer takes effect when the other
|
|
* side ABENDs rather than going into ST_ACKSENT (and sending the ACK),
|
|
* causing ppp to time out and drop into ST_STOPPED. At this point,
|
|
* nothing will change this state :-(
|
|
*/
|
|
struct pppTimer StoppedTimer;
|
|
int LogLevel;
|
|
|
|
/* The link layer active with this FSM (may be our bundle below) */
|
|
struct link *link;
|
|
|
|
/* Our high-level link */
|
|
struct bundle *bundle;
|
|
|
|
const struct fsm_parent *parent;
|
|
const struct fsm_callbacks *fn;
|
|
};
|
|
|
|
struct fsmheader {
|
|
u_char code; /* Request code */
|
|
u_char id; /* Identification */
|
|
u_short length; /* Length of packet */
|
|
};
|
|
|
|
#define CODE_CONFIGREQ 1
|
|
#define CODE_CONFIGACK 2
|
|
#define CODE_CONFIGNAK 3
|
|
#define CODE_CONFIGREJ 4
|
|
#define CODE_TERMREQ 5
|
|
#define CODE_TERMACK 6
|
|
#define CODE_CODEREJ 7
|
|
#define CODE_PROTOREJ 8
|
|
#define CODE_ECHOREQ 9 /* Used in LCP */
|
|
#define CODE_ECHOREP 10 /* Used in LCP */
|
|
#define CODE_DISCREQ 11
|
|
#define CODE_IDENT 12 /* Used in LCP Extension */
|
|
#define CODE_TIMEREM 13 /* Used in LCP Extension */
|
|
#define CODE_RESETREQ 14 /* Used in CCP */
|
|
#define CODE_RESETACK 15 /* Used in CCP */
|
|
|
|
/* Minimum config req size. This struct is *only* used for it's size */
|
|
struct fsmconfig {
|
|
u_char type;
|
|
u_char length;
|
|
};
|
|
|
|
extern void fsm_Init(struct fsm *, const char *, u_short, int, int, int, int,
|
|
struct bundle *, struct link *, const struct fsm_parent *,
|
|
struct fsm_callbacks *, const char *[3]);
|
|
extern void FsmOutput(struct fsm *, u_int, u_int, u_char *, int);
|
|
extern void FsmOpen(struct fsm *);
|
|
extern void FsmUp(struct fsm *);
|
|
extern void FsmDown(struct fsm *);
|
|
extern void FsmInput(struct fsm *, struct mbuf *);
|
|
extern void FsmClose(struct fsm *);
|
|
extern void NullRecvResetReq(struct fsm *fp);
|
|
extern void NullRecvResetAck(struct fsm *fp, u_char);
|
|
extern const char *State2Nam(u_int);
|