mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-17 10:26:15 +00:00
3b0f8d2ed6
o Remove bundle2lcp(), bundle2ccp() and bundle2link().
They're too resource-hungry and we have `owner pointers'
to do their job.
o Make our FSM understand LCPs that are always ST_OPENED
(with a minimum code that != 1).
o Send FSM code rejects for invalid codes.
o Make our bundle fsm_parent deal with multiple links.
o Make timer diagnostics pretty and allow access via ~t
in `term' mode (not just when logging debug) and
`show timers'. Only show timers every second in debug
mode, otherwise we get too many diagnostics to be useful
(we probably still do). Also, don't restrict ~m in term
mode to depend on debug logging.
o Rationalise our bundles' phases.
o Create struct mp (multilink protocol). This is both an
NCP and a type of struct link. It feeds off other NCPs
for output, passing fragmented packets into the queues
of available datalinks. It also gets PROTO_MP input,
reassembles the fragments into ppp frames, and passes
them back to the HDLC layer that the fragments were passed
from.
** It's not yet possible to enter multilink mode :-( **
o Add `set weight' (requires context) for deciding on a links
weighting in multilink mode. Weighting is simplistic (and
probably badly implemented) for now.
o Remove the function pointers in struct link. They ended up
only applying to physical links.
o Configure our tun device with an MTU equal to the MRU from
struct mp's LCP and a speed equal to the sum of our link
speeds.
o `show {lcp,ccp,proto}' and `set deflate' now have optional
context and use ChooseLink() to decide on which `struct link'
to use. This allows behaviour as before when in non-multilink
mode, and allows access to the MP logical link in multilink
mode.
o Ignore reconnect and redial values when in -direct mode and
when cleaning up. Always redial when in -ddial or -dedicated
mode (unless cleaning up).
o Tell our links to `staydown' when we close them due to a signal.
o Remove remaining `#ifdef SIGALRM's (ppp doesn't function without
alarms).
o Don't bother strdup()ing our physical link name.
o Various other cosmetic changes.
110 lines
4.4 KiB
C
110 lines
4.4 KiB
C
/*-
|
|
* Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $Id: bundle.h,v 1.1.2.21 1998/03/25 18:38:40 brian Exp $
|
|
*/
|
|
|
|
#define PHASE_DEAD 0 /* Link is dead */
|
|
#define PHASE_ESTABLISH 1 /* Establishing link */
|
|
#define PHASE_AUTHENTICATE 2 /* Being authenticated */
|
|
#define PHASE_NETWORK 3 /* We're alive ! */
|
|
#define PHASE_TERMINATE 4 /* Terminating link */
|
|
|
|
|
|
struct datalink;
|
|
struct physical;
|
|
struct link;
|
|
|
|
struct bundle {
|
|
struct descriptor desc; /* really all our datalinks */
|
|
int unit; /* The tun number */
|
|
int ifIndex; /* The interface number */
|
|
int tun_fd; /* The /dev/tunX descriptor */
|
|
char dev[20]; /* The /dev/tunX name */
|
|
char *ifname; /* The interface name */
|
|
int routing_seq; /* The current routing sequence number */
|
|
u_int phase; /* Curent phase */
|
|
|
|
unsigned CleaningUp : 1; /* Going to exit.... */
|
|
|
|
struct fsm_parent fsm; /* Our callback functions */
|
|
struct datalink *links; /* Our data links */
|
|
|
|
struct {
|
|
int idle_timeout; /* NCP Idle timeout value */
|
|
} cfg;
|
|
|
|
struct {
|
|
struct ipcp ipcp; /* Our IPCP FSM */
|
|
struct mp mp; /* Our MP */
|
|
} ncp;
|
|
|
|
struct {
|
|
struct filter in; /* incoming packet filter */
|
|
struct filter out; /* outgoing packet filter */
|
|
struct filter dial; /* dial-out packet filter */
|
|
struct filter alive; /* keep-alive packet filter */
|
|
} filter;
|
|
|
|
struct {
|
|
struct pppTimer timer; /* timeout after cfg.idle_timeout */
|
|
time_t done;
|
|
} idle;
|
|
|
|
struct {
|
|
int fd; /* write status here */
|
|
} notify;
|
|
};
|
|
|
|
#define descriptor2bundle(d) \
|
|
((d)->type == BUNDLE_DESCRIPTOR ? (struct bundle *)(d) : NULL)
|
|
|
|
extern struct bundle *bundle_Create(const char *);
|
|
extern void bundle_Destroy(struct bundle *);
|
|
extern const char *bundle_PhaseName(struct bundle *);
|
|
#define bundle_Phase(b) ((b)->phase)
|
|
extern void bundle_NewPhase(struct bundle *, u_int);
|
|
extern int bundle_LinkIsUp(const struct bundle *);
|
|
extern void bundle_SetRoute(struct bundle *, int, struct in_addr,
|
|
struct in_addr, struct in_addr, int);
|
|
extern void bundle_LinkLost(struct bundle *, struct link *, int);
|
|
extern void bundle_Close(struct bundle *, const char *, int);
|
|
extern void bundle_Open(struct bundle *, const char *name);
|
|
extern void bundle_LinkClosed(struct bundle *, struct datalink *);
|
|
|
|
extern int bundle_FillQueues(struct bundle *);
|
|
extern int bundle_ShowLinks(struct cmdargs const *);
|
|
extern void bundle_StartIdleTimer(struct bundle *);
|
|
extern void bundle_SetIdleTimer(struct bundle *, int);
|
|
extern void bundle_StopIdleTimer(struct bundle *);
|
|
extern int bundle_RemainingIdleTime(struct bundle *);
|
|
extern void bundle_LayerUp(struct bundle *, struct fsm *);
|
|
extern int bundle_IsDead(struct bundle *);
|
|
|
|
extern struct physical *bundle2physical(struct bundle *, const char *);
|
|
extern struct datalink *bundle2datalink(struct bundle *, const char *);
|
|
extern struct authinfo *bundle2pap(struct bundle *, const char *);
|
|
extern struct chap *bundle2chap(struct bundle *, const char *);
|