565e35e50e
o Shuffle things that live at the datalink level into ``show link'' rather than ``show modem''. o Make both ``show'' commands prettier and more consistent, and display carrier status, link type and our name in ``show modem''. o Show redial and reconnect information in ``show link'' and remove ``show redial'' and ``show reconnect''. o Down the correct link in bundle_LinkLost(). o Remove stale -direct and -background links at the end of our main loop, not when we know they're going. This prevents unexpected pointer-invalidations... o If we ``set server'' with the same values twice, notice and don't moan about failure. o Record dial script despite our link mode. The mode may be changed later (next mod) :-) We never run scripts in -direct and -dedicated modes. o Make ``set server none'' functional again. o Correct datalink state array so that we don't report an ``unknown'' state. o Pass struct ipcp to IpcpCleanInterface, not struct fsm. o Create TUN_PREFIX define rather than hard-coding in main.c o prompt_TtyInit now handles a NULL prompt for -direct mode rather than having to create one then destroy it uncleanly. o Mention our mode in the "PPP Started" LogPHASE message. o Bring all auto links up when we have something to send. o Remove some redundant Physical_*() functions. o Show which connection is running a command when logging commands. o Initialise throughput uptime correctly.
104 lines
3.4 KiB
C
104 lines
3.4 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.18.2.20 1998/04/07 00:53:52 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
|
|
|
|
struct in_range {
|
|
struct in_addr ipaddr;
|
|
struct in_addr mask;
|
|
int width;
|
|
};
|
|
|
|
struct ipcp {
|
|
struct fsm fsm; /* The finite state machine */
|
|
|
|
struct {
|
|
int VJInitSlots; /* Maximum VJ slots */
|
|
unsigned VJInitComp : 1; /* Slot compression */
|
|
|
|
struct in_range my_range; /* MYADDR spec */
|
|
struct in_addr netmask; /* netmask (unused by most OSs) */
|
|
struct in_range peer_range; /* HISADDR spec */
|
|
struct iplist peer_list; /* Ranges of HISADDR values */
|
|
|
|
struct in_addr TriggerAddress; /* Address to suggest in REQ */
|
|
unsigned HaveTriggerAddress : 1; /* Trigger address specified */
|
|
|
|
#ifndef NOMSEXT
|
|
struct in_addr ns_entries[2]; /* DNS addresses offered */
|
|
struct in_addr nbns_entries[2]; /* NetBIOS NS addresses offered */
|
|
#endif
|
|
u_int fsmretry; /* FSM retry frequency */
|
|
} cfg;
|
|
|
|
struct {
|
|
struct slcompress cslc; /* VJ state */
|
|
struct slstat slstat; /* VJ statistics */
|
|
} vj;
|
|
|
|
|
|
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 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 in_addr my_ifip; /* My configured interface address */
|
|
struct in_addr peer_ifip; /* My congigured destination address */
|
|
|
|
struct pppThroughput throughput; /* throughput statistics */
|
|
};
|
|
|
|
#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 *l,
|
|
const struct fsm_parent *);
|
|
extern void ipcp_Setup(struct ipcp *);
|
|
|
|
extern int ReportIpcpStatus(struct cmdargs const *);
|
|
extern void IpcpInput(struct ipcp *, struct mbuf *);
|
|
extern void ipcp_AddInOctets(struct ipcp *, int);
|
|
extern void ipcp_AddOutOctets(struct ipcp *, int);
|
|
extern int UseHisaddr(struct bundle *, const char *, int);
|
|
extern int SetInitVJ(struct cmdargs const *);
|
|
extern void IpcpCleanInterface(struct ipcp *);
|