Deleted Added
full compact
bundle.c (46686) bundle.c (47061)
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.c,v 1.51 1999/04/26 08:54:33 brian Exp $
26 * $Id: bundle.c,v 1.52 1999/05/08 11:06:08 brian Exp $
27 */
28
29#include <sys/param.h>
30#include <sys/socket.h>
31#include <netinet/in.h>
32#include <net/if.h>
33#include <net/if_tun.h>
34#include <arpa/inet.h>

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

82#include "tun.h"
83#include "prompt.h"
84#include "chat.h"
85#include "cbcp.h"
86#include "datalink.h"
87#include "ip.h"
88#include "iface.h"
89
27 */
28
29#include <sys/param.h>
30#include <sys/socket.h>
31#include <netinet/in.h>
32#include <net/if.h>
33#include <net/if_tun.h>
34#include <arpa/inet.h>

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

82#include "tun.h"
83#include "prompt.h"
84#include "chat.h"
85#include "cbcp.h"
86#include "datalink.h"
87#include "ip.h"
88#include "iface.h"
89
90#define SCATTER_SEGMENTS 4 /* version, datalink, name, physical */
90#define SCATTER_SEGMENTS 5 /* version, datalink, name, physical, device */
91#define SOCKET_OVERHEAD 100 /* additional buffer space for large */
92 /* {recv,send}msg() calls */
93
94static int bundle_RemainingIdleTime(struct bundle *);
95static int bundle_RemainingAutoLoadTime(struct bundle *);
96
97static const char *PhaseNames[] = {
98 "Dead", "Establish", "Authenticate", "Network", "Terminate"

--- 1671 unchanged lines hidden ---
91#define SOCKET_OVERHEAD 100 /* additional buffer space for large */
92 /* {recv,send}msg() calls */
93
94static int bundle_RemainingIdleTime(struct bundle *);
95static int bundle_RemainingAutoLoadTime(struct bundle *);
96
97static const char *PhaseNames[] = {
98 "Dead", "Establish", "Authenticate", "Network", "Terminate"

--- 1671 unchanged lines hidden ---