4bc84b8c11
(I *really* meant to do this *before* committing the deflate changes in the first place - oops). Pppd is horribly broken in this respect - refer to the ppp man page for details. Ppp *WON'T* negotiate deflate with pppd by default - you must ``enable'' and ``accept'' ``pppd-deflate'' in your config. While I'm in there, update the cftypes in ccp.c so that we recognise some more protocols (we don't actually do anything with them - just send a REJ).
422 lines
10 KiB
C
422 lines
10 KiB
C
/*
|
|
* PPP Compression Control Protocol (CCP) Module
|
|
*
|
|
* Written by Toshiharu OHNO (tony-o@iij.ad.jp)
|
|
*
|
|
* Copyright (C) 1994, 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, Inc. 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.c,v 1.21 1997/12/03 10:23:44 brian Exp $
|
|
*
|
|
* TODO:
|
|
* o Support other compression protocols
|
|
*/
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "command.h"
|
|
#include "mbuf.h"
|
|
#include "log.h"
|
|
#include "defs.h"
|
|
#include "timer.h"
|
|
#include "fsm.h"
|
|
#include "lcpproto.h"
|
|
#include "lcp.h"
|
|
#include "ccp.h"
|
|
#include "phase.h"
|
|
#include "loadalias.h"
|
|
#include "vars.h"
|
|
#include "pred.h"
|
|
#include "deflate.h"
|
|
|
|
struct ccpstate CcpInfo;
|
|
|
|
static void CcpSendConfigReq(struct fsm *);
|
|
static void CcpSendTerminateReq(struct fsm *);
|
|
static void CcpSendTerminateAck(struct fsm *);
|
|
static void CcpDecodeConfig(u_char *, int, int);
|
|
static void CcpLayerStart(struct fsm *);
|
|
static void CcpLayerFinish(struct fsm *);
|
|
static void CcpLayerUp(struct fsm *);
|
|
static void CcpLayerDown(struct fsm *);
|
|
static void CcpInitRestartCounter(struct fsm *);
|
|
|
|
struct fsm CcpFsm = {
|
|
"CCP",
|
|
PROTO_CCP,
|
|
CCP_MAXCODE,
|
|
OPEN_ACTIVE,
|
|
ST_INITIAL,
|
|
0, 0, 0,
|
|
0,
|
|
{0, 0, 0, NULL, NULL, NULL},
|
|
{0, 0, 0, NULL, NULL, NULL},
|
|
LogCCP,
|
|
|
|
CcpLayerUp,
|
|
CcpLayerDown,
|
|
CcpLayerStart,
|
|
CcpLayerFinish,
|
|
CcpInitRestartCounter,
|
|
CcpSendConfigReq,
|
|
CcpSendTerminateReq,
|
|
CcpSendTerminateAck,
|
|
CcpDecodeConfig,
|
|
};
|
|
|
|
static char const *cftypes[] = {
|
|
/* Check out the latest ``Compression Control Protocol'' rfc (rfc1962.txt) */
|
|
"OUI", /* 0: OUI */
|
|
"PRED1", /* 1: Predictor type 1 */
|
|
"PRED2", /* 2: Predictor type 2 */
|
|
"PUDDLE", /* 3: Puddle Jumber */
|
|
"???", "???", "???", "???", "???", "???",
|
|
"???", "???", "???", "???", "???", "???",
|
|
"HWPPC", /* 16: Hewlett-Packard PPC */
|
|
"STAC", /* 17: Stac Electronics LZS (rfc1974) */
|
|
"MSPPC", /* 18: Microsoft PPC */
|
|
"GAND", /* 19: Gandalf FZA (rfc1993) */
|
|
"V42BIS", /* 20: ARG->DATA.42bis compression */
|
|
"BSD", /* 21: BSD LZW Compress */
|
|
"???",
|
|
"LZS-DCP", /* 23: LZS-DCP Compression Protocol (rfc1967) */
|
|
"MAGNALINK/DEFLATE", /* 24: Magnalink Variable Resource (rfc1975) */
|
|
/* 24: Deflate (according to pppd-2.3.1) */
|
|
"DCE", /* 25: Data Circuit-Terminating Equip (rfc1976) */
|
|
"DEFLATE", /* 26: Deflate (rfc1979) */
|
|
};
|
|
|
|
#define NCFTYPES (sizeof(cftypes)/sizeof(char *))
|
|
|
|
static const char *
|
|
protoname(int proto)
|
|
{
|
|
if (proto < 0 || proto > NCFTYPES)
|
|
return "none";
|
|
return cftypes[proto];
|
|
}
|
|
|
|
/* We support these algorithms, and Req them in the given order */
|
|
static const struct ccp_algorithm *algorithm[] = {
|
|
&DeflateAlgorithm,
|
|
&Pred1Algorithm,
|
|
&PppdDeflateAlgorithm
|
|
};
|
|
|
|
static int in_algorithm = -1;
|
|
static int out_algorithm = -1;
|
|
#define NALGORITHMS (sizeof(algorithm)/sizeof(algorithm[0]))
|
|
|
|
int
|
|
ReportCcpStatus(struct cmdargs const *arg)
|
|
{
|
|
struct ccpstate *icp = &CcpInfo;
|
|
struct fsm *fp = &CcpFsm;
|
|
|
|
if (VarTerm) {
|
|
fprintf(VarTerm, "%s [%s]\n", fp->name, StateNames[fp->state]);
|
|
fprintf(VarTerm, "My protocol = %s, His protocol = %s\n",
|
|
protoname(icp->my_proto), protoname(icp->his_proto));
|
|
fprintf(VarTerm, "Output: %ld --> %ld, Input: %ld --> %ld\n",
|
|
icp->uncompout, icp->compout, icp->compin, icp->uncompin);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
CcpInit()
|
|
{
|
|
struct ccpstate *icp = &CcpInfo;
|
|
|
|
FsmInit(&CcpFsm);
|
|
memset(icp, '\0', sizeof(struct ccpstate));
|
|
icp->his_proto = icp->my_proto = -1;
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS) {
|
|
(*algorithm[in_algorithm]->i.Term)();
|
|
in_algorithm = -1;
|
|
}
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS) {
|
|
(*algorithm[out_algorithm]->o.Term)();
|
|
out_algorithm = -1;
|
|
}
|
|
CcpFsm.maxconfig = 10;
|
|
}
|
|
|
|
static void
|
|
CcpInitRestartCounter(struct fsm *fp)
|
|
{
|
|
fp->FsmTimer.load = VarRetryTimeout * SECTICKS;
|
|
fp->restart = 5;
|
|
}
|
|
|
|
static void
|
|
CcpSendConfigReq(struct fsm *fp)
|
|
{
|
|
u_char *cp;
|
|
struct ccpstate *icp = &CcpInfo;
|
|
int f;
|
|
|
|
LogPrintf(LogCCP, "CcpSendConfigReq\n");
|
|
cp = ReqBuff;
|
|
CcpInfo.my_proto = -1;
|
|
out_algorithm = -1;
|
|
for (f = 0; f < NALGORITHMS; f++)
|
|
if (Enabled(algorithm[f]->Conf) && !REJECTED(icp, algorithm[f]->id)) {
|
|
struct lcp_opt o;
|
|
|
|
(*algorithm[f]->o.Get)(&o);
|
|
cp += LcpPutConf(LogCCP, cp, &o, cftypes[o.id],
|
|
(*algorithm[f]->Disp)(&o));
|
|
CcpInfo.my_proto = o.id;
|
|
out_algorithm = f;
|
|
}
|
|
FsmOutput(fp, CODE_CONFIGREQ, fp->reqid++, ReqBuff, cp - ReqBuff);
|
|
}
|
|
|
|
void
|
|
CcpSendResetReq(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpSendResetReq\n");
|
|
FsmOutput(fp, CODE_RESETREQ, fp->reqid, NULL, 0);
|
|
}
|
|
|
|
static void
|
|
CcpSendTerminateReq(struct fsm *fp)
|
|
{
|
|
/* XXX: No code yet */
|
|
}
|
|
|
|
static void
|
|
CcpSendTerminateAck(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpSendTerminateAck\n");
|
|
FsmOutput(fp, CODE_TERMACK, fp->reqid++, NULL, 0);
|
|
}
|
|
|
|
void
|
|
CcpRecvResetReq(struct fsm *fp)
|
|
{
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS)
|
|
(*algorithm[out_algorithm]->o.Reset)();
|
|
}
|
|
|
|
static void
|
|
CcpLayerStart(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpLayerStart.\n");
|
|
}
|
|
|
|
static void
|
|
CcpLayerFinish(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpLayerFinish.\n");
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS) {
|
|
(*algorithm[in_algorithm]->i.Term)();
|
|
in_algorithm = -1;
|
|
}
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS) {
|
|
(*algorithm[out_algorithm]->o.Term)();
|
|
out_algorithm = -1;
|
|
}
|
|
}
|
|
|
|
static void
|
|
CcpLayerDown(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpLayerDown.\n");
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS) {
|
|
(*algorithm[in_algorithm]->i.Term)();
|
|
in_algorithm = -1;
|
|
}
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS) {
|
|
(*algorithm[out_algorithm]->o.Term)();
|
|
out_algorithm = -1;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Called when CCP has reached the OPEN state
|
|
*/
|
|
static void
|
|
CcpLayerUp(struct fsm *fp)
|
|
{
|
|
LogPrintf(LogCCP, "CcpLayerUp(%d).\n", fp->state);
|
|
LogPrintf(LogCCP, "Out = %s[%d], In = %s[%d]\n",
|
|
protoname(CcpInfo.my_proto), CcpInfo.my_proto,
|
|
protoname(CcpInfo.his_proto), CcpInfo.his_proto);
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS)
|
|
(*algorithm[in_algorithm]->i.Init)();
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS)
|
|
(*algorithm[out_algorithm]->o.Init)();
|
|
}
|
|
|
|
void
|
|
CcpUp()
|
|
{
|
|
FsmUp(&CcpFsm);
|
|
LogPrintf(LogCCP, "CCP Up event!!\n");
|
|
}
|
|
|
|
void
|
|
CcpOpen()
|
|
{
|
|
int f;
|
|
|
|
for (f = 0; f < NALGORITHMS; f++)
|
|
if (Enabled(algorithm[f]->Conf)) {
|
|
CcpFsm.open_mode = OPEN_ACTIVE;
|
|
FsmOpen(&CcpFsm);
|
|
break;
|
|
}
|
|
|
|
if (f == NALGORITHMS)
|
|
for (f = 0; f < NALGORITHMS; f++)
|
|
if (Acceptable(algorithm[f]->Conf)) {
|
|
CcpFsm.open_mode = OPEN_PASSIVE;
|
|
FsmOpen(&CcpFsm);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
CcpDecodeConfig(u_char *cp, int plen, int mode_type)
|
|
{
|
|
int type, length;
|
|
int f;
|
|
|
|
ackp = AckBuff;
|
|
nakp = NakBuff;
|
|
rejp = RejBuff;
|
|
|
|
while (plen >= sizeof(struct fsmconfig)) {
|
|
if (plen < 0)
|
|
break;
|
|
type = *cp;
|
|
length = cp[1];
|
|
if (type < NCFTYPES)
|
|
LogPrintf(LogCCP, " %s[%d]\n", cftypes[type], length);
|
|
else
|
|
LogPrintf(LogCCP, " ???[%d]\n", length);
|
|
|
|
for (f = NALGORITHMS-1; f > -1; f--)
|
|
if (algorithm[f]->id == type)
|
|
break;
|
|
|
|
if (f == -1) {
|
|
/* Don't understand that :-( */
|
|
if (mode_type == MODE_REQ) {
|
|
CcpInfo.my_reject |= (1 << type);
|
|
memcpy(rejp, cp, length);
|
|
rejp += length;
|
|
}
|
|
} else {
|
|
struct lcp_opt o;
|
|
|
|
switch (mode_type) {
|
|
case MODE_REQ:
|
|
if (Acceptable(algorithm[f]->Conf) && in_algorithm == -1) {
|
|
memcpy(&o, cp, length);
|
|
switch ((*algorithm[f]->i.Set)(&o)) {
|
|
case MODE_REJ:
|
|
memcpy(rejp, &o, o.len);
|
|
rejp += o.len;
|
|
break;
|
|
case MODE_NAK:
|
|
memcpy(nakp, &o, o.len);
|
|
nakp += o.len;
|
|
break;
|
|
case MODE_ACK:
|
|
memcpy(ackp, cp, length);
|
|
ackp += length;
|
|
CcpInfo.his_proto = type;
|
|
in_algorithm = f; /* This one'll do ! */
|
|
break;
|
|
}
|
|
} else {
|
|
memcpy(rejp, cp, length);
|
|
rejp += length;
|
|
}
|
|
break;
|
|
case MODE_NAK:
|
|
memcpy(&o, cp, length);
|
|
if ((*algorithm[f]->o.Set)(&o) == MODE_ACK)
|
|
CcpInfo.my_proto = algorithm[f]->id;
|
|
else {
|
|
CcpInfo.his_reject |= (1 << type);
|
|
CcpInfo.my_proto = -1;
|
|
}
|
|
break;
|
|
case MODE_REJ:
|
|
CcpInfo.his_reject |= (1 << type);
|
|
CcpInfo.my_proto = -1;
|
|
break;
|
|
}
|
|
}
|
|
|
|
plen -= length;
|
|
cp += length;
|
|
}
|
|
|
|
if (rejp != RejBuff) {
|
|
ackp = AckBuff; /* let's not send both ! */
|
|
CcpInfo.his_proto = -1;
|
|
in_algorithm = -1;
|
|
}
|
|
}
|
|
|
|
void
|
|
CcpInput(struct mbuf *bp)
|
|
{
|
|
if (phase == PHASE_NETWORK)
|
|
FsmInput(&CcpFsm, bp);
|
|
else {
|
|
if (phase > PHASE_NETWORK)
|
|
LogPrintf(LogERROR, "Unexpected CCP in phase %d\n", phase);
|
|
pfree(bp);
|
|
}
|
|
}
|
|
|
|
void
|
|
CcpResetInput()
|
|
{
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS)
|
|
(*algorithm[in_algorithm]->i.Reset)();
|
|
}
|
|
|
|
int
|
|
CcpOutput(int pri, u_short proto, struct mbuf *m)
|
|
{
|
|
if (out_algorithm >= 0 && out_algorithm < NALGORITHMS)
|
|
return (*algorithm[out_algorithm]->o.Write)(pri, proto, m);
|
|
return 0;
|
|
}
|
|
|
|
struct mbuf *
|
|
CompdInput(u_short *proto, struct mbuf *m)
|
|
{
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS)
|
|
return (*algorithm[in_algorithm]->i.Read)(proto, m);
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
CcpDictSetup(u_short proto, struct mbuf *m)
|
|
{
|
|
if (in_algorithm >= 0 && in_algorithm < NALGORITHMS)
|
|
(*algorithm[in_algorithm]->i.DictSetup)(proto, m);
|
|
}
|