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!
93 lines
3.1 KiB
C
93 lines
3.1 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.12 1998/01/04 20:25:41 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 ccpstate {
|
|
u_long his_proto; /* peer's compression protocol */
|
|
u_long 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 */
|
|
|
|
u_long his_reject; /* Request codes rejected by peer */
|
|
u_long my_reject; /* Request codes I have rejected */
|
|
|
|
int out_init; /* Init called for out algorithm */
|
|
int in_init; /* Init called for in algorithm */
|
|
|
|
u_long uncompout, compout;
|
|
u_long uncompin, compin;
|
|
};
|
|
|
|
extern struct ccpstate CcpInfo;
|
|
|
|
struct ccp_algorithm {
|
|
int id;
|
|
int Conf; /* A Conf value from vars.h */
|
|
const char *(*Disp)(struct lcp_opt *);
|
|
struct {
|
|
void (*Get)(struct lcp_opt *);
|
|
int (*Set)(struct lcp_opt *);
|
|
int (*Init)(void);
|
|
void (*Term)(void);
|
|
void (*Reset)(void);
|
|
struct mbuf *(*Read)(u_short *, struct mbuf *);
|
|
void (*DictSetup)(u_short, struct mbuf *);
|
|
} i;
|
|
struct {
|
|
void (*Get)(struct lcp_opt *);
|
|
int (*Set)(struct lcp_opt *);
|
|
int (*Init)(void);
|
|
void (*Term)(void);
|
|
void (*Reset)(void);
|
|
int (*Write)(int, u_short, struct mbuf *);
|
|
} o;
|
|
};
|
|
|
|
extern struct fsm CcpFsm;
|
|
|
|
extern void CcpRecvResetReq(struct fsm *);
|
|
extern void CcpSendResetReq(struct fsm *);
|
|
extern void CcpInput(struct mbuf *);
|
|
extern void CcpUp(void);
|
|
extern void CcpOpen(void);
|
|
extern void CcpInit(void);
|
|
extern int ReportCcpStatus(struct cmdargs const *);
|
|
extern void CcpResetInput(u_char);
|
|
extern int CcpOutput(int, u_short, struct mbuf *);
|
|
extern struct mbuf *CompdInput(u_short *, struct mbuf *);
|
|
extern void CcpDictSetup(u_short, struct mbuf *);
|