Deleted Added
full compact
bundle.h (38544) bundle.h (40561)
1/*-
2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $Id: bundle.h,v 1.12 1998/08/07 18:42:47 brian Exp $
26 * $Id: bundle.h,v 1.13 1998/08/25 17:48:42 brian Exp $
27 */
28
29#define PHASE_DEAD 0 /* Link is dead */
30#define PHASE_ESTABLISH 1 /* Establishing link */
31#define PHASE_AUTHENTICATE 2 /* Being authenticated */
32#define PHASE_NETWORK 3 /* We're alive ! */
33#define PHASE_TERMINATE 4 /* Terminating link */
34
35/* cfg.opt bit settings */
36#define OPT_IDCHECK 0x01
37#define OPT_LOOPBACK 0x02
38#define OPT_PASSWDAUTH 0x04
39#define OPT_PROXY 0x08
40#define OPT_SROUTES 0x10
41#define OPT_THROUGHPUT 0x20
42#define OPT_UTMP 0x40
27 */
28
29#define PHASE_DEAD 0 /* Link is dead */
30#define PHASE_ESTABLISH 1 /* Establishing link */
31#define PHASE_AUTHENTICATE 2 /* Being authenticated */
32#define PHASE_NETWORK 3 /* We're alive ! */
33#define PHASE_TERMINATE 4 /* Terminating link */
34
35/* cfg.opt bit settings */
36#define OPT_IDCHECK 0x01
37#define OPT_LOOPBACK 0x02
38#define OPT_PASSWDAUTH 0x04
39#define OPT_PROXY 0x08
40#define OPT_SROUTES 0x10
41#define OPT_THROUGHPUT 0x20
42#define OPT_UTMP 0x40
43#define OPT_IFACEALIAS 0x80
43
44#define MAX_ENDDISC_CLASS 5
45
46#define Enabled(b, o) ((b)->cfg.opt & (o))
47
48struct sockaddr_un;
49struct datalink;
50struct physical;
51struct link;
52struct server;
53struct prompt;
44
45#define MAX_ENDDISC_CLASS 5
46
47#define Enabled(b, o) ((b)->cfg.opt & (o))
48
49struct sockaddr_un;
50struct datalink;
51struct physical;
52struct link;
53struct server;
54struct prompt;
55struct iface;
54
55struct bundle {
56 struct descriptor desc; /* really all our datalinks */
57 int unit; /* The device/interface unit number */
58 const char **argv; /* From main() */
59
60 struct {
61 char Name[20]; /* The /dev/XXXX name */
62 int fd; /* The /dev/XXXX descriptor */
63 } dev;
64
56
57struct bundle {
58 struct descriptor desc; /* really all our datalinks */
59 int unit; /* The device/interface unit number */
60 const char **argv; /* From main() */
61
62 struct {
63 char Name[20]; /* The /dev/XXXX name */
64 int fd; /* The /dev/XXXX descriptor */
65 } dev;
66
67#if 0
65 struct {
68 struct {
66 u_long Speed; /* struct tuninfo speed */
67 int Index; /* The interface index */
68 char *Name; /* The interface name */
69 } ifp;
69 int Index; /* The interface index */
70 char *Name; /* The interface name */
71 } ifp;
72#endif
70
73
74 u_long ifSpeed; /* struct tuninfo speed */
75 struct iface *iface; /* Interface information */
76
71 int routing_seq; /* The current routing sequence number */
72 u_int phase; /* Curent phase */
73
74 struct {
75 int all; /* Union of all physical::type's */
76 int open; /* Union of all open physical::type's */
77 } phys_type;
78

--- 105 unchanged lines hidden ---
77 int routing_seq; /* The current routing sequence number */
78 u_int phase; /* Curent phase */
79
80 struct {
81 int all; /* Union of all physical::type's */
82 int open; /* Union of all open physical::type's */
83 } phys_type;
84

--- 105 unchanged lines hidden ---