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.
91 lines
3.5 KiB
C
91 lines
3.5 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: lcp.h,v 1.16.2.15 1998/03/20 19:46:58 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
#define REJECTED(p, x) ((p)->his_reject & (1<<(x)))
|
|
|
|
struct lcp {
|
|
struct fsm fsm; /* The finite state machine */
|
|
u_int16_t his_mru; /* Peers maximum packet size */
|
|
u_int32_t his_accmap; /* Peeers async char control map */
|
|
u_int32_t his_magic; /* Peers magic number */
|
|
u_int32_t his_lqrperiod; /* Peers LQR frequency */
|
|
int his_protocomp : 1; /* Does peer do Protocol field compression */
|
|
int his_acfcomp : 1; /* Does peer do addr & cntrl fld compression */
|
|
u_short his_auth; /* Peer wants this type of authentication */
|
|
|
|
u_short want_mru; /* Our maximum packet size */
|
|
u_int32_t want_accmap; /* Our async char control map */
|
|
u_int32_t want_magic; /* Our magic number */
|
|
u_int32_t want_lqrperiod; /* Our LQR frequency */
|
|
int want_protocomp : 1; /* Do we do protocol field compression */
|
|
int want_acfcomp : 1; /* Do we do addr & cntrl fld compression */
|
|
u_short want_auth; /* We want this type of authentication */
|
|
|
|
u_int32_t his_reject; /* Request codes rejected by peer */
|
|
u_int32_t my_reject; /* Request codes I have rejected */
|
|
|
|
u_short auth_iwait; /* I must authenticate to the peer */
|
|
u_short auth_ineed; /* I require that the peer authenticates */
|
|
|
|
int LcpFailedMagic; /* Number of `magic is same' errors */
|
|
};
|
|
|
|
#define LCP_MAXCODE CODE_DISCREQ
|
|
#define LCP_MINMPCODE CODE_CODEREJ
|
|
|
|
#define TY_MRU 1 /* Maximum-Receive-Unit */
|
|
#define TY_ACCMAP 2 /* Async-Control-Character-Map */
|
|
#define TY_AUTHPROTO 3 /* Authentication-Protocol */
|
|
#define TY_QUALPROTO 4 /* Quality-Protocol */
|
|
#define TY_MAGICNUM 5 /* Magic-Number */
|
|
#define TY_RESERVED 6 /* RESERVED */
|
|
#define TY_PROTOCOMP 7 /* Protocol-Field-Compression */
|
|
#define TY_ACFCOMP 8 /* Address-and-Control-Field-Compression */
|
|
#define TY_FCSALT 9 /* FCS-Alternatives */
|
|
#define TY_SDP 10 /* Self-Describing-Padding */
|
|
|
|
#define MAX_LCP_OPT_LEN 10
|
|
struct lcp_opt {
|
|
u_char id;
|
|
u_char len;
|
|
u_char data[MAX_LCP_OPT_LEN-2];
|
|
};
|
|
|
|
#define INC_LCP_OPT(ty, length, o) \
|
|
do { \
|
|
(o)->id = (ty); \
|
|
(o)->len = (length); \
|
|
(o) = (struct lcp_opt *)((char *)(o) + (length)); \
|
|
} while (0)
|
|
|
|
struct physical;
|
|
|
|
#define fsm2lcp(fp) (fp->proto == PROTO_LCP ? (struct lcp *)fp : NULL)
|
|
|
|
extern void lcp_Init(struct lcp *, struct bundle *, struct link *,
|
|
const struct fsm_parent *);
|
|
extern void lcp_Setup(struct lcp *, int);
|
|
|
|
extern void lcp_SendProtoRej(struct lcp *, u_char *, int);
|
|
extern int lcp_ReportStatus(struct cmdargs const *);
|
|
extern void LcpInput(struct lcp *, struct mbuf *);
|