795be649bf
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.
127 lines
4.1 KiB
C
127 lines
4.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: ipcp.h,v 1.23 1999/01/28 01:56:32 brian Exp $
|
|
*
|
|
* TODO:
|
|
*/
|
|
|
|
#define IPCP_MAXCODE CODE_CODEREJ
|
|
|
|
#define TY_IPADDRS 1
|
|
#define TY_COMPPROTO 2
|
|
#define TY_IPADDR 3
|
|
|
|
/* Domain NameServer and NetBIOS NameServer options */
|
|
|
|
#define TY_PRIMARY_DNS 129
|
|
#define TY_PRIMARY_NBNS 130
|
|
#define TY_SECONDARY_DNS 131
|
|
#define TY_SECONDARY_NBNS 132
|
|
#define TY_ADJUST_NS 119 /* subtract from NS val for REJECT bit */
|
|
|
|
#define addr2mask(addr) ( \
|
|
IN_CLASSA(addr) ? \
|
|
htonl(IN_CLASSA_NET) : \
|
|
IN_CLASSB(addr) ? \
|
|
htonl(IN_CLASSB_NET) : htonl(IN_CLASSC_NET) \
|
|
)
|
|
|
|
|
|
struct sticky_route;
|
|
|
|
struct in_range {
|
|
struct in_addr ipaddr;
|
|
struct in_addr mask;
|
|
int width;
|
|
};
|
|
|
|
struct ipcp {
|
|
struct fsm fsm; /* The finite state machine */
|
|
|
|
struct {
|
|
struct {
|
|
int slots; /* Maximum VJ slots */
|
|
unsigned slotcomp : 1; /* Slot compression */
|
|
unsigned neg : 2; /* VJ negotiation */
|
|
} vj;
|
|
|
|
struct in_range my_range; /* MYADDR spec */
|
|
struct in_addr netmask; /* Iface netmask (unused by most OSs) */
|
|
struct in_range peer_range; /* HISADDR spec */
|
|
struct iplist peer_list; /* Ranges of HISADDR values */
|
|
|
|
u_long sendpipe; /* route sendpipe size */
|
|
u_long recvpipe; /* route recvpipe size */
|
|
|
|
struct in_addr TriggerAddress; /* Address to suggest in REQ */
|
|
unsigned HaveTriggerAddress : 1; /* Trigger address specified */
|
|
|
|
struct {
|
|
struct in_addr dns[2]; /* DNS addresses offered */
|
|
unsigned dns_neg : 2; /* dns negotiation */
|
|
struct in_addr nbns[2]; /* NetBIOS NS addresses offered */
|
|
} ns;
|
|
|
|
struct fsm_retry fsm; /* How often/frequently to resend requests */
|
|
} cfg;
|
|
|
|
struct {
|
|
struct slcompress cslc; /* VJ state */
|
|
struct slstat slstat; /* VJ statistics */
|
|
} vj;
|
|
|
|
struct sticky_route *route; /* List of dynamic routes */
|
|
|
|
unsigned heis1172 : 1; /* True if he is speaking rfc1172 */
|
|
|
|
struct in_addr peer_ip; /* IP address he's willing to use */
|
|
u_int32_t peer_compproto; /* VJ params he's willing to use */
|
|
|
|
struct in_addr ifmask; /* Interface netmask */
|
|
|
|
struct in_addr my_ip; /* IP address I'm willing to use */
|
|
u_int32_t my_compproto; /* VJ params I'm willing to use */
|
|
|
|
u_int32_t peer_reject; /* Request codes rejected by peer */
|
|
u_int32_t my_reject; /* Request codes I have rejected */
|
|
|
|
struct pppThroughput throughput; /* throughput statistics */
|
|
struct mqueue Queue[PRI_FAST + 1]; /* Output packet queues */
|
|
};
|
|
|
|
#define fsm2ipcp(fp) (fp->proto == PROTO_IPCP ? (struct ipcp *)fp : NULL)
|
|
|
|
struct bundle;
|
|
struct link;
|
|
struct cmdargs;
|
|
|
|
extern void ipcp_Init(struct ipcp *, struct bundle *, struct link *,
|
|
const struct fsm_parent *);
|
|
extern void ipcp_Setup(struct ipcp *, u_int32_t);
|
|
extern void ipcp_SetLink(struct ipcp *, struct link *);
|
|
|
|
extern int ipcp_Show(struct cmdargs const *);
|
|
extern void ipcp_Input(struct ipcp *, struct bundle *, struct mbuf *);
|
|
extern void ipcp_AddInOctets(struct ipcp *, int);
|
|
extern void ipcp_AddOutOctets(struct ipcp *, int);
|
|
extern int ipcp_UseHisIPaddr(struct bundle *, struct in_addr);
|
|
extern int ipcp_UseHisaddr(struct bundle *, const char *, int);
|
|
extern int ipcp_vjset(struct cmdargs const *);
|
|
extern void ipcp_CleanInterface(struct ipcp *);
|
|
extern int ipcp_InterfaceUp(struct ipcp *);
|