98baf7c8fd
(I completely mis-read the rfc last time 'round!)
This means:
o Better CCP/WARN Reset diagnostics.
o After we've sent a REQ and before we've received an ACK, we drop
incoming compressed data and send another REQ.
o Before sending an ACK, re-sequence all pending PRI_NORMAL data in
the modem queue so that pending packets won't get to the peer
*after* the ResetAck.
o Send ACKs with the `identifier' from the REQ frame.
o After we've received a correct ACK, duplicate ACKs are ok (and will
reset our history).
o Incorrect ACKs (not matching the last REQ) are moaned about and dropped.
Also,
o Calculate the correct FCS after compressing a packet. DEFLATE
*may* produce an mbuf with more than a single link in the chain,
but HdlcOutput didn't know how to calculate the FCS :-(
o Make `struct fsm'::reqid a u_char, not an int.
This fix will prevent us from sending id `255' 2,000,000,000 times
before wrapping to `0' for another 2,000,000,000 sends :-/
o Bump the version number a little.
The end result: DEFLATE now works over an unreliable link layer.
I can txfr a 1.5Mb kernel over a (rather bad) null-modem
cable at an average of 21679 bytes per second using rcp.
Repeat after me: Don't test compression using a loopback ppp/tcp setup as
we never lose packets and therefore never have to reset!
134 lines
3.9 KiB
C
134 lines
3.9 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.13 1997/12/03 10:23:47 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_ACTIVE 0
|
|
#define OPEN_PASSIVE 1
|
|
|
|
struct fsm {
|
|
const char *name; /* Name of protocol */
|
|
u_short proto; /* Protocol number */
|
|
u_short max_code;
|
|
int open_mode;
|
|
int state; /* State of the machine */
|
|
u_char reqid; /* Next request id */
|
|
int restart; /* Restart counter value */
|
|
int maxconfig;
|
|
|
|
int reqcode; /* Request code sent */
|
|
struct pppTimer FsmTimer; /* Restart Timer */
|
|
|
|
/*
|
|
* 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;
|
|
|
|
void (*LayerUp) (struct fsm *);
|
|
void (*LayerDown) (struct fsm *);
|
|
void (*LayerStart) (struct fsm *);
|
|
void (*LayerFinish) (struct fsm *);
|
|
void (*InitRestartCounter) (struct fsm *);
|
|
void (*SendConfigReq) (struct fsm *);
|
|
void (*SendTerminateReq) (struct fsm *);
|
|
void (*SendTerminateAck) (struct fsm *);
|
|
void (*DecodeConfig) (u_char *, int, int);
|
|
};
|
|
|
|
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 */
|
|
|
|
struct fsmcodedesc {
|
|
void (*action) (struct fsm *, struct fsmheader *, struct mbuf *);
|
|
const char *name;
|
|
};
|
|
|
|
struct fsmconfig {
|
|
u_char type;
|
|
u_char length;
|
|
};
|
|
|
|
extern u_char AckBuff[200];
|
|
extern u_char NakBuff[200];
|
|
extern u_char RejBuff[100];
|
|
extern u_char ReqBuff[200];
|
|
extern u_char *ackp;
|
|
extern u_char *nakp;
|
|
extern u_char *rejp;
|
|
|
|
extern char const *StateNames[];
|
|
|
|
extern void FsmInit(struct fsm *);
|
|
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 *);
|