mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-15 10:17:20 +00:00
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.
116 lines
3.8 KiB
C
116 lines
3.8 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.14.2.13 1998/03/17 22:29:03 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 */
|
|
|
|
struct ccp_config {
|
|
struct {
|
|
struct {
|
|
int winsize;
|
|
} in, out;
|
|
} deflate;
|
|
};
|
|
|
|
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;
|
|
u_long uncompin, compin;
|
|
|
|
struct ccp_config cfg;
|
|
};
|
|
|
|
#define fsm2ccp(fp) (fp->proto == PROTO_CCP ? (struct ccp *)fp : NULL)
|
|
|
|
struct ccp_algorithm {
|
|
int id;
|
|
int Conf; /* A Conf value from vars.h */
|
|
const char *(*Disp)(struct lcp_opt *);
|
|
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 CcpSendResetReq(struct fsm *);
|
|
extern void CcpInput(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 *);
|