1995-01-31 06:29:58 +00:00
|
|
|
/*
|
|
|
|
* 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.
|
1995-05-30 03:57:47 +00:00
|
|
|
*
|
1999-03-31 14:21:46 +00:00
|
|
|
* $Id: ccp.c,v 1.44 1999/03/11 01:49:15 brian Exp $
|
1995-05-30 03:57:47 +00:00
|
|
|
*
|
1995-01-31 06:29:58 +00:00
|
|
|
* TODO:
|
|
|
|
* o Support other compression protocols
|
|
|
|
*/
|
1999-01-28 01:56:34 +00:00
|
|
|
#include <sys/param.h>
|
1997-10-26 01:04:02 +00:00
|
|
|
#include <netinet/in.h>
|
1998-03-16 22:54:35 +00:00
|
|
|
#include <netinet/in_systm.h>
|
|
|
|
#include <netinet/ip.h>
|
1998-04-28 01:25:46 +00:00
|
|
|
#include <sys/un.h>
|
1997-10-26 01:04:02 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
1998-03-17 22:29:12 +00:00
|
|
|
#include <stdlib.h>
|
1999-03-31 14:21:46 +00:00
|
|
|
#include <string.h>
|
1998-02-10 03:23:50 +00:00
|
|
|
#include <termios.h>
|
1997-10-26 01:04:02 +00:00
|
|
|
|
1998-06-15 19:06:25 +00:00
|
|
|
#include "defs.h"
|
1997-11-22 03:37:54 +00:00
|
|
|
#include "command.h"
|
1997-10-26 01:04:02 +00:00
|
|
|
#include "mbuf.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "timer.h"
|
1995-01-31 06:29:58 +00:00
|
|
|
#include "fsm.h"
|
|
|
|
#include "lcpproto.h"
|
|
|
|
#include "lcp.h"
|
|
|
|
#include "ccp.h"
|
1996-01-11 17:48:59 +00:00
|
|
|
#include "pred.h"
|
1997-12-03 10:23:54 +00:00
|
|
|
#include "deflate.h"
|
1998-03-13 21:07:46 +00:00
|
|
|
#include "throughput.h"
|
|
|
|
#include "iplist.h"
|
1998-03-16 22:54:35 +00:00
|
|
|
#include "slcompress.h"
|
1998-08-26 17:39:37 +00:00
|
|
|
#include "lqr.h"
|
|
|
|
#include "hdlc.h"
|
1998-03-13 21:07:46 +00:00
|
|
|
#include "ipcp.h"
|
1998-03-16 22:52:54 +00:00
|
|
|
#include "filter.h"
|
1998-02-10 03:23:50 +00:00
|
|
|
#include "descriptor.h"
|
|
|
|
#include "prompt.h"
|
1998-02-21 01:45:26 +00:00
|
|
|
#include "link.h"
|
1998-04-03 19:21:56 +00:00
|
|
|
#include "mp.h"
|
1998-04-24 19:15:26 +00:00
|
|
|
#include "async.h"
|
|
|
|
#include "physical.h"
|
1999-01-28 01:56:34 +00:00
|
|
|
#ifndef NORADIUS
|
|
|
|
#include "radius.h"
|
|
|
|
#endif
|
1998-04-03 19:21:56 +00:00
|
|
|
#include "bundle.h"
|
1995-01-31 06:29:58 +00:00
|
|
|
|
1997-06-09 03:27:43 +00:00
|
|
|
static void CcpSendConfigReq(struct fsm *);
|
1998-03-20 19:47:10 +00:00
|
|
|
static void CcpSentTerminateReq(struct fsm *);
|
|
|
|
static void CcpSendTerminateAck(struct fsm *, u_char);
|
1998-03-13 21:08:05 +00:00
|
|
|
static void CcpDecodeConfig(struct fsm *, u_char *, int, int,
|
|
|
|
struct fsm_decode *);
|
1997-06-09 03:27:43 +00:00
|
|
|
static void CcpLayerStart(struct fsm *);
|
|
|
|
static void CcpLayerFinish(struct fsm *);
|
1998-04-30 23:53:56 +00:00
|
|
|
static int CcpLayerUp(struct fsm *);
|
1997-06-09 03:27:43 +00:00
|
|
|
static void CcpLayerDown(struct fsm *);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
static void CcpInitRestartCounter(struct fsm *, int);
|
1998-02-21 01:45:26 +00:00
|
|
|
static void CcpRecvResetReq(struct fsm *);
|
|
|
|
static void CcpRecvResetAck(struct fsm *, u_char);
|
1995-01-31 06:29:58 +00:00
|
|
|
|
1998-02-06 02:24:29 +00:00
|
|
|
static struct fsm_callbacks ccp_Callbacks = {
|
1995-01-31 06:29:58 +00:00
|
|
|
CcpLayerUp,
|
|
|
|
CcpLayerDown,
|
|
|
|
CcpLayerStart,
|
|
|
|
CcpLayerFinish,
|
|
|
|
CcpInitRestartCounter,
|
|
|
|
CcpSendConfigReq,
|
1998-03-20 19:47:10 +00:00
|
|
|
CcpSentTerminateReq,
|
1995-01-31 06:29:58 +00:00
|
|
|
CcpSendTerminateAck,
|
|
|
|
CcpDecodeConfig,
|
1998-02-21 01:45:26 +00:00
|
|
|
CcpRecvResetReq,
|
|
|
|
CcpRecvResetAck
|
1995-01-31 06:29:58 +00:00
|
|
|
};
|
|
|
|
|
1998-04-30 23:53:56 +00:00
|
|
|
static const char *ccp_TimerNames[] =
|
|
|
|
{"CCP restart", "CCP openmode", "CCP stopped"};
|
|
|
|
|
1996-01-30 20:04:34 +00:00
|
|
|
static char const *cftypes[] = {
|
1997-11-14 15:39:15 +00:00
|
|
|
/* Check out the latest ``Compression Control Protocol'' rfc (rfc1962.txt) */
|
1997-12-03 23:28:02 +00:00
|
|
|
"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) */
|
1998-03-18 23:16:05 +00:00
|
|
|
"MPPC", /* 18: Microsoft PPC (rfc2118) */
|
1997-12-03 23:28:02 +00:00
|
|
|
"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) */
|
1998-04-16 00:26:21 +00:00
|
|
|
/* 24: Deflate (according to pppd-2.3.*) */
|
1997-12-03 23:28:02 +00:00
|
|
|
"DCE", /* 25: Data Circuit-Terminating Equip (rfc1976) */
|
|
|
|
"DEFLATE", /* 26: Deflate (rfc1979) */
|
1995-01-31 06:29:58 +00:00
|
|
|
};
|
|
|
|
|
1997-12-24 09:29:17 +00:00
|
|
|
#define NCFTYPES (sizeof cftypes/sizeof cftypes[0])
|
1997-11-14 15:39:15 +00:00
|
|
|
|
1997-12-03 10:23:54 +00:00
|
|
|
static const char *
|
|
|
|
protoname(int proto)
|
|
|
|
{
|
|
|
|
if (proto < 0 || proto > NCFTYPES)
|
|
|
|
return "none";
|
|
|
|
return cftypes[proto];
|
|
|
|
}
|
|
|
|
|
1997-12-03 23:28:02 +00:00
|
|
|
/* We support these algorithms, and Req them in the given order */
|
1997-12-03 10:23:54 +00:00
|
|
|
static const struct ccp_algorithm *algorithm[] = {
|
1997-12-03 23:28:02 +00:00
|
|
|
&DeflateAlgorithm,
|
1997-12-03 10:23:54 +00:00
|
|
|
&Pred1Algorithm,
|
1997-12-03 23:28:02 +00:00
|
|
|
&PppdDeflateAlgorithm
|
1997-12-03 10:23:54 +00:00
|
|
|
};
|
|
|
|
|
1997-12-24 09:29:17 +00:00
|
|
|
#define NALGORITHMS (sizeof algorithm/sizeof algorithm[0])
|
1997-12-03 10:23:54 +00:00
|
|
|
|
1997-05-10 01:22:19 +00:00
|
|
|
int
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp_ReportStatus(struct cmdargs const *arg)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-05-15 23:58:30 +00:00
|
|
|
struct link *l;
|
|
|
|
struct ccp *ccp;
|
|
|
|
|
1998-06-27 23:48:54 +00:00
|
|
|
l = command_ChooseLink(arg);
|
1998-05-15 23:58:30 +00:00
|
|
|
ccp = &l->ccp;
|
1998-02-21 01:45:26 +00:00
|
|
|
|
1998-04-03 19:26:02 +00:00
|
|
|
prompt_Printf(arg->prompt, "%s: %s [%s]\n", l->name, ccp->fsm.name,
|
1998-03-24 18:47:32 +00:00
|
|
|
State2Nam(ccp->fsm.state));
|
1998-04-03 19:26:02 +00:00
|
|
|
prompt_Printf(arg->prompt, " My protocol = %s, His protocol = %s\n",
|
1998-02-21 01:45:26 +00:00
|
|
|
protoname(ccp->my_proto), protoname(ccp->his_proto));
|
1998-04-03 19:26:02 +00:00
|
|
|
prompt_Printf(arg->prompt, " Output: %ld --> %ld, Input: %ld --> %ld\n",
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp->uncompout, ccp->compout,
|
|
|
|
ccp->compin, ccp->uncompin);
|
1998-04-03 19:24:07 +00:00
|
|
|
|
1998-04-03 19:26:02 +00:00
|
|
|
prompt_Printf(arg->prompt, "\n Defaults: ");
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
prompt_Printf(arg->prompt, "FSM retry = %us, max %u Config"
|
|
|
|
" REQ%s, %u Term REQ%s\n", ccp->cfg.fsm.timeout,
|
|
|
|
ccp->cfg.fsm.maxreq, ccp->cfg.fsm.maxreq == 1 ? "" : "s",
|
|
|
|
ccp->cfg.fsm.maxtrm, ccp->cfg.fsm.maxtrm == 1 ? "" : "s");
|
1998-04-16 00:26:21 +00:00
|
|
|
prompt_Printf(arg->prompt, " deflate windows: ");
|
1998-04-03 19:26:02 +00:00
|
|
|
prompt_Printf(arg->prompt, "incoming = %d, ", ccp->cfg.deflate.in.winsize);
|
|
|
|
prompt_Printf(arg->prompt, "outgoing = %d\n", ccp->cfg.deflate.out.winsize);
|
1998-04-16 00:26:21 +00:00
|
|
|
prompt_Printf(arg->prompt, " DEFLATE: %s\n",
|
|
|
|
command_ShowNegval(ccp->cfg.neg[CCP_NEG_DEFLATE]));
|
|
|
|
prompt_Printf(arg->prompt, " PREDICTOR1: %s\n",
|
|
|
|
command_ShowNegval(ccp->cfg.neg[CCP_NEG_PRED1]));
|
|
|
|
prompt_Printf(arg->prompt, " DEFLATE24: %s\n",
|
|
|
|
command_ShowNegval(ccp->cfg.neg[CCP_NEG_DEFLATE24]));
|
1997-05-10 01:22:19 +00:00
|
|
|
return 0;
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
1998-04-30 23:53:56 +00:00
|
|
|
void
|
|
|
|
ccp_SetupCallbacks(struct ccp *ccp)
|
|
|
|
{
|
|
|
|
ccp->fsm.fn = &ccp_Callbacks;
|
|
|
|
ccp->fsm.FsmTimer.name = ccp_TimerNames[0];
|
|
|
|
ccp->fsm.OpenTimer.name = ccp_TimerNames[1];
|
|
|
|
ccp->fsm.StoppedTimer.name = ccp_TimerNames[2];
|
|
|
|
}
|
|
|
|
|
1998-01-29 00:44:16 +00:00
|
|
|
void
|
1998-02-27 01:22:39 +00:00
|
|
|
ccp_Init(struct ccp *ccp, struct bundle *bundle, struct link *l,
|
|
|
|
const struct fsm_parent *parent)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Initialise ourselves */
|
1998-04-03 19:21:56 +00:00
|
|
|
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
fsm_Init(&ccp->fsm, "CCP", PROTO_CCP, 1, CCP_MAXCODE, LogCCP,
|
1998-04-30 23:53:56 +00:00
|
|
|
bundle, l, parent, &ccp_Callbacks, ccp_TimerNames);
|
1998-04-03 19:24:07 +00:00
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
ccp->cfg.deflate.in.winsize = 0;
|
|
|
|
ccp->cfg.deflate.out.winsize = 15;
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
ccp->cfg.fsm.timeout = DEF_FSMRETRY;
|
|
|
|
ccp->cfg.fsm.maxreq = DEF_FSMTRIES;
|
|
|
|
ccp->cfg.fsm.maxtrm = DEF_FSMTRIES;
|
1998-04-16 00:26:21 +00:00
|
|
|
ccp->cfg.neg[CCP_NEG_DEFLATE] = NEG_ENABLED|NEG_ACCEPTED;
|
|
|
|
ccp->cfg.neg[CCP_NEG_PRED1] = NEG_ENABLED|NEG_ACCEPTED;
|
|
|
|
ccp->cfg.neg[CCP_NEG_DEFLATE24] = 0;
|
1998-04-03 19:24:07 +00:00
|
|
|
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp_Setup(ccp);
|
1997-12-04 18:49:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp_Setup(struct ccp *ccp)
|
1997-12-04 18:49:32 +00:00
|
|
|
{
|
1998-02-21 01:45:26 +00:00
|
|
|
/* Set ourselves up for a startup */
|
|
|
|
ccp->fsm.open_mode = 0;
|
|
|
|
ccp->his_proto = ccp->my_proto = -1;
|
|
|
|
ccp->reset_sent = ccp->last_reset = -1;
|
1998-03-17 22:29:12 +00:00
|
|
|
ccp->in.algorithm = ccp->out.algorithm = -1;
|
|
|
|
ccp->in.state = ccp->out.state = NULL;
|
|
|
|
ccp->in.opt.id = -1;
|
|
|
|
ccp->out.opt = NULL;
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp->his_reject = ccp->my_reject = 0;
|
|
|
|
ccp->uncompout = ccp->compout = 0;
|
|
|
|
ccp->uncompin = ccp->compin = 0;
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
CcpInitRestartCounter(struct fsm *fp, int what)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Set fsm timer load */
|
1998-04-03 19:24:07 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
|
|
|
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
fp->FsmTimer.load = ccp->cfg.fsm.timeout * SECTICKS;
|
|
|
|
switch (what) {
|
|
|
|
case FSM_REQ_TIMER:
|
|
|
|
fp->restart = ccp->cfg.fsm.maxreq;
|
|
|
|
break;
|
|
|
|
case FSM_TRM_TIMER:
|
|
|
|
fp->restart = ccp->cfg.fsm.maxtrm;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
fp->restart = 1;
|
|
|
|
break;
|
|
|
|
}
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1997-10-26 01:04:02 +00:00
|
|
|
CcpSendConfigReq(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Send config REQ please */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
1998-03-17 22:29:12 +00:00
|
|
|
struct ccp_opt **o;
|
1998-03-13 21:08:05 +00:00
|
|
|
u_char *cp, buff[100];
|
1998-03-17 22:29:12 +00:00
|
|
|
int f, alloc;
|
1998-01-29 00:44:16 +00:00
|
|
|
|
1998-03-13 21:08:05 +00:00
|
|
|
cp = buff;
|
1998-03-17 22:29:12 +00:00
|
|
|
o = &ccp->out.opt;
|
|
|
|
alloc = ccp->his_reject == 0 && ccp->out.opt == NULL;
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->my_proto = -1;
|
1998-03-17 22:29:12 +00:00
|
|
|
ccp->out.algorithm = -1;
|
1997-12-03 10:23:54 +00:00
|
|
|
for (f = 0; f < NALGORITHMS; f++)
|
1998-04-16 00:26:21 +00:00
|
|
|
if (IsEnabled(ccp->cfg.neg[algorithm[f]->Neg]) &&
|
|
|
|
!REJECTED(ccp, algorithm[f]->id)) {
|
1998-04-19 03:41:01 +00:00
|
|
|
|
|
|
|
if (!alloc)
|
|
|
|
for (o = &ccp->out.opt; *o != NULL; o = &(*o)->next)
|
|
|
|
if ((*o)->val.id == algorithm[f]->id && (*o)->algorithm == f)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (alloc || *o == NULL) {
|
1998-03-17 22:29:12 +00:00
|
|
|
*o = (struct ccp_opt *)malloc(sizeof(struct ccp_opt));
|
|
|
|
(*o)->val.id = algorithm[f]->id;
|
|
|
|
(*o)->val.len = 2;
|
|
|
|
(*o)->next = NULL;
|
|
|
|
(*o)->algorithm = f;
|
|
|
|
(*algorithm[f]->o.OptInit)(&(*o)->val, &ccp->cfg);
|
|
|
|
}
|
1998-01-29 00:44:16 +00:00
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
if (cp + (*o)->val.len > buff + sizeof buff) {
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogERROR, "%s: CCP REQ buffer overrun !\n", fp->link->name);
|
1998-03-13 21:08:05 +00:00
|
|
|
break;
|
|
|
|
}
|
1998-03-20 19:47:10 +00:00
|
|
|
memcpy(cp, &(*o)->val, (*o)->val.len);
|
|
|
|
cp += (*o)->val.len;
|
1998-03-17 22:29:12 +00:00
|
|
|
|
|
|
|
ccp->my_proto = (*o)->val.id;
|
|
|
|
ccp->out.algorithm = f;
|
|
|
|
|
|
|
|
if (alloc)
|
|
|
|
o = &(*o)->next;
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
1998-03-20 19:47:10 +00:00
|
|
|
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Output(fp, CODE_CONFIGREQ, fp->reqid, buff, cp - buff);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-05-01 19:26:12 +00:00
|
|
|
ccp_SendResetReq(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* We can't read our input - ask peer to reset */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
1998-03-20 19:47:10 +00:00
|
|
|
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->reset_sent = fp->reqid;
|
|
|
|
ccp->last_reset = -1;
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Output(fp, CODE_RESETREQ, fp->reqid, NULL, 0);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-03-20 19:47:10 +00:00
|
|
|
CcpSentTerminateReq(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Term REQ just sent by FSM */
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-03-20 19:47:10 +00:00
|
|
|
CcpSendTerminateAck(struct fsm *fp, u_char id)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Send Term ACK please */
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Output(fp, CODE_TERMACK, id, NULL, 0);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
1998-02-21 01:45:26 +00:00
|
|
|
static void
|
1997-10-26 01:04:02 +00:00
|
|
|
CcpRecvResetReq(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Got a reset REQ, reset outgoing dictionary */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->out.state != NULL)
|
|
|
|
(*algorithm[ccp->out.algorithm]->o.Reset)(ccp->out.state);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1997-10-26 01:04:02 +00:00
|
|
|
CcpLayerStart(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* We're about to start up ! */
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
|
|
|
|
1998-06-27 23:48:54 +00:00
|
|
|
log_Printf(LogCCP, "%s: LayerStart.\n", fp->link->name);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
fp->more.reqs = fp->more.naks = fp->more.rejs = ccp->cfg.fsm.maxreq * 3;
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-06-25 22:33:31 +00:00
|
|
|
CcpLayerDown(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-06-25 22:33:31 +00:00
|
|
|
/* About to come down */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
1998-04-19 03:41:01 +00:00
|
|
|
struct ccp_opt *next;
|
|
|
|
|
1998-06-27 23:48:54 +00:00
|
|
|
log_Printf(LogCCP, "%s: LayerDown.\n", fp->link->name);
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->in.state != NULL) {
|
|
|
|
(*algorithm[ccp->in.algorithm]->i.Term)(ccp->in.state);
|
|
|
|
ccp->in.state = NULL;
|
1998-04-19 02:23:21 +00:00
|
|
|
ccp->in.algorithm = -1;
|
1998-01-31 02:48:30 +00:00
|
|
|
}
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->out.state != NULL) {
|
|
|
|
(*algorithm[ccp->out.algorithm]->o.Term)(ccp->out.state);
|
|
|
|
ccp->out.state = NULL;
|
1998-04-19 02:23:21 +00:00
|
|
|
ccp->out.algorithm = -1;
|
1998-01-31 02:48:30 +00:00
|
|
|
}
|
1998-04-19 02:23:21 +00:00
|
|
|
ccp->his_reject = ccp->my_reject = 0;
|
1998-04-19 03:41:01 +00:00
|
|
|
|
|
|
|
while (ccp->out.opt) {
|
|
|
|
next = ccp->out.opt->next;
|
|
|
|
free(ccp->out.opt);
|
|
|
|
ccp->out.opt = next;
|
|
|
|
}
|
1998-06-25 22:33:31 +00:00
|
|
|
ccp_Setup(ccp);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-06-25 22:33:31 +00:00
|
|
|
CcpLayerFinish(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-06-25 22:33:31 +00:00
|
|
|
/* We're now down */
|
1998-06-27 23:48:54 +00:00
|
|
|
log_Printf(LogCCP, "%s: LayerFinish.\n", fp->link->name);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
1997-12-03 10:23:54 +00:00
|
|
|
* Called when CCP has reached the OPEN state
|
1995-01-31 06:29:58 +00:00
|
|
|
*/
|
1998-04-30 23:53:56 +00:00
|
|
|
static int
|
1997-10-26 01:04:02 +00:00
|
|
|
CcpLayerUp(struct fsm *fp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* We're now up */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
|
1998-06-27 23:48:54 +00:00
|
|
|
log_Printf(LogCCP, "%s: LayerUp.\n", fp->link->name);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->in.state == NULL && ccp->in.algorithm >= 0 &&
|
|
|
|
ccp->in.algorithm < NALGORITHMS) {
|
|
|
|
ccp->in.state = (*algorithm[ccp->in.algorithm]->i.Init)(&ccp->in.opt);
|
|
|
|
if (ccp->in.state == NULL) {
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogERROR, "%s: %s (in) initialisation failure\n",
|
1998-04-24 19:15:48 +00:00
|
|
|
fp->link->name, protoname(ccp->his_proto));
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->his_proto = ccp->my_proto = -1;
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Close(fp);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
return 0;
|
1998-01-29 20:45:16 +00:00
|
|
|
}
|
1998-01-04 20:25:41 +00:00
|
|
|
}
|
1995-01-31 06:29:58 +00:00
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->out.state == NULL && ccp->out.algorithm >= 0 &&
|
|
|
|
ccp->out.algorithm < NALGORITHMS) {
|
|
|
|
ccp->out.state = (*algorithm[ccp->out.algorithm]->o.Init)
|
|
|
|
(&ccp->out.opt->val);
|
|
|
|
if (ccp->out.state == NULL) {
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogERROR, "%s: %s (out) initialisation failure\n",
|
1998-04-24 19:15:48 +00:00
|
|
|
fp->link->name, protoname(ccp->my_proto));
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->his_proto = ccp->my_proto = -1;
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Close(fp);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
return 0;
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
1998-03-17 22:29:12 +00:00
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
fp->more.reqs = fp->more.naks = fp->more.rejs = ccp->cfg.fsm.maxreq * 3;
|
|
|
|
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, "%s: Out = %s[%d], In = %s[%d]\n",
|
1998-04-24 19:15:48 +00:00
|
|
|
fp->link->name, protoname(ccp->my_proto), ccp->my_proto,
|
1998-02-06 02:24:29 +00:00
|
|
|
protoname(ccp->his_proto), ccp->his_proto);
|
Allow control over the number of ConfigREQ & TermREQ attempts
that are made in each of the FSMs (LCP, CCP & IPCP) and the
number of REQs/Challenges for PAP/CHAP by accepting more arguments
in the ``set {c,ip,l}cpretry'' and ``set {ch,p}apretry'' commands.
Change the non-convergence thresholds to 3 times the number of configured
REQ tries (rather than the previous fixed ``10''). We now notice
repeated NAKs and REJs rather than just REQs.
Don't suggest that CHAP 0x05 isn't supported when it's not configured.
Fix some bugs that expose themselves with smaller numbers of retries:
o Handle instantaneous disconnects (set device /dev/null) correctly
by stopping all fsm timers in fsm2initial.
o Don't forget to uu_unlock() devices that are files but are not
ttys (set device /dev/zero).
Fix a *HORRENDOUS* bug in RFC1661 (already fixed for an Open event in state
``Closed''):
According to the state transition table, a RCR+ or RCR- received in
the ``Stopped'' state are supposed to InitRestartCounter, SendConfigReq
and SendConfig{Ack,Nak}. However, in ``Stopped'', we haven't yet
done a TLS (or the last thing we did is a TLF). We must therefore
do the TLS at this point !
This was never noticed before because LCP and CCP used not use
LayerStart() for anything interesting, and IPCP tends to go into
Stopped then get a Down because of an LCP RTR rather than getting a
RCR again.
1999-02-26 21:28:14 +00:00
|
|
|
|
1998-04-30 23:53:56 +00:00
|
|
|
return 1;
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
1998-03-13 21:08:05 +00:00
|
|
|
CcpDecodeConfig(struct fsm *fp, u_char *cp, int plen, int mode_type,
|
|
|
|
struct fsm_decode *dec)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Deal with incoming data */
|
1998-02-08 11:05:01 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
1995-02-26 12:18:08 +00:00
|
|
|
int type, length;
|
1997-12-03 10:23:54 +00:00
|
|
|
int f;
|
1998-03-17 22:29:12 +00:00
|
|
|
const char *end;
|
1995-01-31 06:29:58 +00:00
|
|
|
|
|
|
|
while (plen >= sizeof(struct fsmconfig)) {
|
|
|
|
type = *cp;
|
|
|
|
length = cp[1];
|
1998-03-17 22:29:12 +00:00
|
|
|
|
1998-04-24 19:15:48 +00:00
|
|
|
if (length == 0) {
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, "%s: CCP size zero\n", fp->link->name);
|
1998-04-24 19:15:48 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
if (length > sizeof(struct lcp_opt)) {
|
|
|
|
length = sizeof(struct lcp_opt);
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, "%s: Warning: Truncating length to %d\n",
|
1998-04-24 19:15:48 +00:00
|
|
|
fp->link->name, length);
|
1998-03-17 22:29:12 +00:00
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
|
|
|
|
for (f = NALGORITHMS-1; f > -1; f--)
|
|
|
|
if (algorithm[f]->id == type)
|
|
|
|
break;
|
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
end = f == -1 ? "" : (*algorithm[f]->Disp)((struct lcp_opt *)cp);
|
|
|
|
if (end == NULL)
|
|
|
|
end = "";
|
|
|
|
|
|
|
|
if (type < NCFTYPES)
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, " %s[%d] %s\n", cftypes[type], length, end);
|
1998-03-17 22:29:12 +00:00
|
|
|
else
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, " ???[%d] %s\n", length, end);
|
1998-03-17 22:29:12 +00:00
|
|
|
|
1997-12-03 10:23:54 +00:00
|
|
|
if (f == -1) {
|
|
|
|
/* Don't understand that :-( */
|
|
|
|
if (mode_type == MODE_REQ) {
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->my_reject |= (1 << type);
|
1998-03-13 21:08:05 +00:00
|
|
|
memcpy(dec->rejend, cp, length);
|
|
|
|
dec->rejend += length;
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
|
|
|
} else {
|
1998-03-17 22:29:12 +00:00
|
|
|
struct ccp_opt *o;
|
1995-01-31 06:29:58 +00:00
|
|
|
|
1997-11-08 00:28:11 +00:00
|
|
|
switch (mode_type) {
|
1995-01-31 06:29:58 +00:00
|
|
|
case MODE_REQ:
|
1998-04-16 00:26:21 +00:00
|
|
|
if (IsAccepted(ccp->cfg.neg[algorithm[f]->Neg]) &&
|
|
|
|
ccp->in.algorithm == -1) {
|
1998-03-17 22:29:12 +00:00
|
|
|
memcpy(&ccp->in.opt, cp, length);
|
|
|
|
switch ((*algorithm[f]->i.Set)(&ccp->in.opt, &ccp->cfg)) {
|
1997-12-03 10:23:54 +00:00
|
|
|
case MODE_REJ:
|
1998-03-17 22:29:12 +00:00
|
|
|
memcpy(dec->rejend, &ccp->in.opt, ccp->in.opt.len);
|
|
|
|
dec->rejend += ccp->in.opt.len;
|
1997-12-03 10:23:54 +00:00
|
|
|
break;
|
|
|
|
case MODE_NAK:
|
1998-03-17 22:29:12 +00:00
|
|
|
memcpy(dec->nakend, &ccp->in.opt, ccp->in.opt.len);
|
|
|
|
dec->nakend += ccp->in.opt.len;
|
1997-12-03 10:23:54 +00:00
|
|
|
break;
|
|
|
|
case MODE_ACK:
|
1998-03-13 21:08:05 +00:00
|
|
|
memcpy(dec->ackend, cp, length);
|
|
|
|
dec->ackend += length;
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->his_proto = type;
|
1998-03-17 22:29:12 +00:00
|
|
|
ccp->in.algorithm = f; /* This one'll do :-) */
|
1997-12-03 10:23:54 +00:00
|
|
|
break;
|
|
|
|
}
|
1995-01-31 06:29:58 +00:00
|
|
|
} else {
|
1998-03-13 21:08:05 +00:00
|
|
|
memcpy(dec->rejend, cp, length);
|
|
|
|
dec->rejend += length;
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case MODE_NAK:
|
1998-03-17 22:29:12 +00:00
|
|
|
for (o = ccp->out.opt; o != NULL; o = o->next)
|
|
|
|
if (o->val.id == cp[0])
|
|
|
|
break;
|
|
|
|
if (o == NULL)
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, "%s: Warning: Ignoring peer NAK of unsent option\n",
|
1998-04-24 19:15:48 +00:00
|
|
|
fp->link->name);
|
1997-12-03 10:23:54 +00:00
|
|
|
else {
|
1998-03-17 22:29:12 +00:00
|
|
|
memcpy(&o->val, cp, length);
|
|
|
|
if ((*algorithm[f]->o.Set)(&o->val) == MODE_ACK)
|
|
|
|
ccp->my_proto = algorithm[f]->id;
|
|
|
|
else {
|
|
|
|
ccp->his_reject |= (1 << type);
|
|
|
|
ccp->my_proto = -1;
|
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
|
|
|
break;
|
1995-01-31 06:29:58 +00:00
|
|
|
case MODE_REJ:
|
1998-02-06 02:24:29 +00:00
|
|
|
ccp->his_reject |= (1 << type);
|
|
|
|
ccp->my_proto = -1;
|
1995-01-31 06:29:58 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
|
1998-03-17 22:29:12 +00:00
|
|
|
plen -= cp[1];
|
|
|
|
cp += cp[1];
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
|
1998-04-25 10:49:52 +00:00
|
|
|
if (mode_type != MODE_NOP) {
|
1998-04-16 00:26:21 +00:00
|
|
|
if (dec->rejend != dec->rej) {
|
|
|
|
/* rejects are preferred */
|
|
|
|
dec->ackend = dec->ack;
|
|
|
|
dec->nakend = dec->nak;
|
|
|
|
if (ccp->in.state == NULL) {
|
|
|
|
ccp->his_proto = -1;
|
|
|
|
ccp->in.algorithm = -1;
|
|
|
|
}
|
|
|
|
} else if (dec->nakend != dec->nak) {
|
|
|
|
/* then NAKs */
|
|
|
|
dec->ackend = dec->ack;
|
|
|
|
if (ccp->in.state == NULL) {
|
|
|
|
ccp->his_proto = -1;
|
|
|
|
ccp->in.algorithm = -1;
|
|
|
|
}
|
1998-01-29 20:45:16 +00:00
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
1998-05-01 19:26:12 +00:00
|
|
|
ccp_Input(struct ccp *ccp, struct bundle *bundle, struct mbuf *bp)
|
1995-01-31 06:29:58 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Got PROTO_CCP from link */
|
1998-02-07 20:50:08 +00:00
|
|
|
if (bundle_Phase(bundle) == PHASE_NETWORK)
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Input(&ccp->fsm, bp);
|
1995-01-31 06:29:58 +00:00
|
|
|
else {
|
1998-05-21 01:26:10 +00:00
|
|
|
if (bundle_Phase(bundle) < PHASE_NETWORK)
|
|
|
|
log_Printf(LogCCP, "%s: Error: Unexpected CCP in phase %s (ignored)\n",
|
|
|
|
ccp->fsm.link->name, bundle_PhaseName(bundle));
|
1998-05-01 19:26:12 +00:00
|
|
|
mbuf_Free(bp);
|
1995-01-31 06:29:58 +00:00
|
|
|
}
|
|
|
|
}
|
1997-12-03 10:23:54 +00:00
|
|
|
|
1998-02-21 01:45:26 +00:00
|
|
|
static void
|
|
|
|
CcpRecvResetAck(struct fsm *fp, u_char id)
|
1997-12-03 10:23:54 +00:00
|
|
|
{
|
1998-01-31 02:48:30 +00:00
|
|
|
/* Got a reset ACK, reset incoming dictionary */
|
1998-02-23 00:38:44 +00:00
|
|
|
struct ccp *ccp = fsm2ccp(fp);
|
|
|
|
|
|
|
|
if (ccp->reset_sent != -1) {
|
|
|
|
if (id != ccp->reset_sent) {
|
1999-03-11 01:49:15 +00:00
|
|
|
log_Printf(LogCCP, "%s: Incorrect ResetAck (id %d, not %d)"
|
1998-04-24 19:15:48 +00:00
|
|
|
" ignored\n", fp->link->name, id, ccp->reset_sent);
|
Implement Reset{Req,Ack} properly, as per rfc 1962.
(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!
1998-01-10 01:55:11 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* Whaddaya know - a correct reset ack */
|
1998-02-23 00:38:44 +00:00
|
|
|
} else if (id == ccp->last_reset)
|
1998-05-01 19:26:12 +00:00
|
|
|
log_Printf(LogCCP, "%s: Duplicate ResetAck (resetting again)\n",
|
1999-03-11 01:49:15 +00:00
|
|
|
fp->link->name);
|
Implement Reset{Req,Ack} properly, as per rfc 1962.
(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!
1998-01-10 01:55:11 +00:00
|
|
|
else {
|
1999-03-11 01:49:15 +00:00
|
|
|
log_Printf(LogCCP, "%s: Unexpected ResetAck (id %d) ignored\n",
|
|
|
|
fp->link->name, id);
|
Implement Reset{Req,Ack} properly, as per rfc 1962.
(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!
1998-01-10 01:55:11 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1998-02-23 00:38:44 +00:00
|
|
|
ccp->last_reset = ccp->reset_sent;
|
|
|
|
ccp->reset_sent = -1;
|
1998-03-17 22:29:12 +00:00
|
|
|
if (ccp->in.state != NULL)
|
|
|
|
(*algorithm[ccp->in.algorithm]->i.Reset)(ccp->in.state);
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
1998-04-03 19:21:56 +00:00
|
|
|
ccp_Compress(struct ccp *ccp, struct link *l, int pri, u_short proto,
|
|
|
|
struct mbuf *m)
|
1997-12-03 10:23:54 +00:00
|
|
|
{
|
1998-05-15 18:21:12 +00:00
|
|
|
/*
|
|
|
|
* Compress outgoing data. It's already deemed to be suitable Network
|
|
|
|
* Layer data.
|
|
|
|
*/
|
|
|
|
if (ccp->fsm.state == ST_OPENED && ccp->out.state != NULL)
|
1998-03-17 22:29:12 +00:00
|
|
|
return (*algorithm[ccp->out.algorithm]->o.Write)
|
|
|
|
(ccp->out.state, ccp, l, pri, proto, m);
|
1997-12-03 10:23:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct mbuf *
|
1998-02-21 01:45:26 +00:00
|
|
|
ccp_Decompress(struct ccp *ccp, u_short *proto, struct mbuf *bp)
|
1997-12-03 10:23:54 +00:00
|
|
|
{
|
1998-02-18 19:36:13 +00:00
|
|
|
/*
|
1998-04-24 19:15:26 +00:00
|
|
|
* If proto isn't PROTO_[I]COMPD, we still want to pass it to the
|
1998-02-18 19:36:13 +00:00
|
|
|
* decompression routines so that the dictionary's updated
|
|
|
|
*/
|
1998-04-25 10:49:52 +00:00
|
|
|
if (ccp->fsm.state == ST_OPENED) {
|
1998-04-24 19:15:26 +00:00
|
|
|
if (*proto == PROTO_COMPD || *proto == PROTO_ICOMPD) {
|
1998-02-18 19:36:13 +00:00
|
|
|
/* Decompress incoming data */
|
1998-03-20 19:47:10 +00:00
|
|
|
if (ccp->reset_sent != -1)
|
1998-02-18 19:36:13 +00:00
|
|
|
/* Send another REQ and put the packet in the bit bucket */
|
1998-05-01 19:26:12 +00:00
|
|
|
fsm_Output(&ccp->fsm, CODE_RESETREQ, ccp->reset_sent, NULL, 0);
|
1998-03-20 19:47:10 +00:00
|
|
|
else if (ccp->in.state != NULL)
|
1998-03-17 22:29:12 +00:00
|
|
|
return (*algorithm[ccp->in.algorithm]->i.Read)
|
|
|
|
(ccp->in.state, ccp, proto, bp);
|
1998-05-01 19:26:12 +00:00
|
|
|
mbuf_Free(bp);
|
1998-02-18 19:36:13 +00:00
|
|
|
bp = NULL;
|
1998-05-15 18:21:12 +00:00
|
|
|
} else if (PROTO_COMPRESSIBLE(*proto) && ccp->in.state != NULL)
|
1998-02-18 19:36:13 +00:00
|
|
|
/* Add incoming Network Layer traffic to our dictionary */
|
1998-03-17 22:29:12 +00:00
|
|
|
(*algorithm[ccp->in.algorithm]->i.DictSetup)
|
|
|
|
(ccp->in.state, ccp, *proto, bp);
|
1998-04-25 10:49:52 +00:00
|
|
|
}
|
1998-02-18 19:36:13 +00:00
|
|
|
|
|
|
|
return bp;
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
|
|
|
|
1998-04-24 19:15:26 +00:00
|
|
|
u_short
|
|
|
|
ccp_Proto(struct ccp *ccp)
|
1997-12-03 10:23:54 +00:00
|
|
|
{
|
1998-04-24 19:15:26 +00:00
|
|
|
return !link2physical(ccp->fsm.link) || !ccp->fsm.bundle->ncp.mp.active ?
|
|
|
|
PROTO_COMPD : PROTO_ICOMPD;
|
1997-12-03 10:23:54 +00:00
|
|
|
}
|
1998-05-23 13:38:09 +00:00
|
|
|
|
1998-06-30 23:04:17 +00:00
|
|
|
int
|
1998-05-23 13:38:09 +00:00
|
|
|
ccp_SetOpenMode(struct ccp *ccp)
|
|
|
|
{
|
|
|
|
int f;
|
|
|
|
|
|
|
|
for (f = 0; f < CCP_NEG_TOTAL; f++)
|
1998-06-30 23:04:17 +00:00
|
|
|
if (IsEnabled(ccp->cfg.neg[f])) {
|
1998-05-23 13:38:09 +00:00
|
|
|
ccp->fsm.open_mode = 0;
|
1998-06-30 23:04:17 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ccp->fsm.open_mode = OPEN_PASSIVE; /* Go straight to ST_STOPPED ? */
|
|
|
|
|
|
|
|
for (f = 0; f < CCP_NEG_TOTAL; f++)
|
|
|
|
if (IsAccepted(ccp->cfg.neg[f]))
|
|
|
|
return 1;
|
1998-05-23 13:38:09 +00:00
|
|
|
|
1998-06-30 23:04:17 +00:00
|
|
|
return 0; /* No CCP at all */
|
1998-05-23 13:38:09 +00:00
|
|
|
}
|