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.
114 lines
3.5 KiB
C
114 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: hdlc.h,v 1.14.2.7 1998/03/13 00:44:04 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
/*
|
|
* Definition for Async HDLC
|
|
*/
|
|
#define HDLC_SYN 0x7e /* SYNC character */
|
|
#define HDLC_ESC 0x7d /* Escape character */
|
|
#define HDLC_XOR 0x20 /* Modifier value */
|
|
|
|
#define HDLC_ADDR 0xff
|
|
#define HDLC_UI 0x03
|
|
/*
|
|
* Definition for HDLC Frame Check Sequence
|
|
*/
|
|
#define INITFCS 0xffff /* Initial value for FCS computation */
|
|
#define GOODFCS 0xf0b8 /* Good FCS value */
|
|
|
|
#define DEF_MRU 1500
|
|
#define MAX_MRU 2048
|
|
#define MIN_MRU 296
|
|
|
|
#define DEF_MTU 0 /* whatever peer says */
|
|
#define MAX_MTU 2048
|
|
#define MIN_MTU 296
|
|
|
|
/*
|
|
* Output priority
|
|
*/
|
|
/* PRI_NORMAL and PRI_FAST have meaning only on the IP queue.
|
|
* All IP frames have the same priority once they are compressed.
|
|
* IP frames stay on the IP queue till they can be sent on the
|
|
* link. They are compressed at that time.
|
|
*/
|
|
#define PRI_NORMAL 0 /* Normal priority */
|
|
#define PRI_FAST 1 /* Fast (interractive) */
|
|
#define PRI_LINK 1 /* Urgent (LQR packets) */
|
|
#define PRI_MAX 1
|
|
|
|
struct physical;
|
|
struct link;
|
|
|
|
struct hdlc {
|
|
struct pppTimer ReportTimer;
|
|
|
|
struct {
|
|
int badfcs;
|
|
int badaddr;
|
|
int badcommand;
|
|
int unknownproto;
|
|
} laststats, stats;
|
|
|
|
struct {
|
|
struct lcp *owner; /* parent LCP */
|
|
struct pppTimer timer; /* When to send */
|
|
int method; /* bit-mask for LQM_* from lqr.h */
|
|
|
|
u_int32_t OutPackets; /* Packets sent by me */
|
|
u_int32_t OutOctets; /* Octets sent by me */
|
|
u_int32_t SaveInPackets; /* Packets received from peer */
|
|
u_int32_t SaveInDiscards; /* Discards */
|
|
u_int32_t SaveInErrors; /* Errors */
|
|
u_int32_t SaveInOctets; /* Octets received from peer */
|
|
|
|
struct {
|
|
u_int32_t OutLQRs; /* LQRs sent by me */
|
|
u_int32_t SaveInLQRs; /* LQRs received from peer */
|
|
struct lqrdata peer; /* Last LQR from peer */
|
|
int peer_timeout; /* peers max lqr timeout */
|
|
int resent; /* Resent last packet `resent' times */
|
|
} lqr;
|
|
|
|
struct {
|
|
u_int32_t seq_sent; /* last echo sent */
|
|
u_int32_t seq_recv; /* last echo received */
|
|
} echo;
|
|
} lqm;
|
|
|
|
};
|
|
|
|
|
|
extern void hdlc_Init(struct hdlc *);
|
|
extern void hdlc_StartTimer(struct hdlc *);
|
|
extern void hdlc_StopTimer(struct hdlc *);
|
|
extern int hdlc_ReportStatus(struct cmdargs const *);
|
|
extern const char *hdlc_Protocol2Nam(u_short);
|
|
|
|
extern void HdlcInput(struct bundle *, struct mbuf *, struct physical *);
|
|
extern void HdlcOutput(struct link *, int, u_short, struct mbuf *bp);
|
|
extern u_short HdlcFcs(u_short, u_char *, int);
|
|
extern int ReportProtStatus(struct cmdargs const *);
|
|
extern u_char *HdlcDetect(struct physical *, u_char *, int);
|
|
extern void hdlc_DecodePacket(struct bundle *, u_short, struct mbuf *,
|
|
struct link *);
|