Deleted Added
full compact
bundle.c (55066) bundle.c (55146)
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 * $FreeBSD: head/usr.sbin/ppp/bundle.c 55066 1999-12-23 21:43:25Z brian $
26 * $FreeBSD: head/usr.sbin/ppp/bundle.c 55146 1999-12-27 11:54:57Z brian $
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> /* For TUNSIFMODE & TUNSLMODE */
34#include <arpa/inet.h>

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

98#define SCATTER_SEGMENTS 6 /* version, datalink, name, physical,
99 throughput, device */
100
101#define SEND_MAXFD 3 /* Max file descriptors passed through
102 the local domain socket */
103
104static int bundle_RemainingIdleTime(struct bundle *);
105
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> /* For TUNSIFMODE & TUNSLMODE */
34#include <arpa/inet.h>

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

98#define SCATTER_SEGMENTS 6 /* version, datalink, name, physical,
99 throughput, device */
100
101#define SEND_MAXFD 3 /* Max file descriptors passed through
102 the local domain socket */
103
104static int bundle_RemainingIdleTime(struct bundle *);
105
106static const char *PhaseNames[] = {
106static const char * const PhaseNames[] = {
107 "Dead", "Establish", "Authenticate", "Network", "Terminate"
108};
109
110const char *
111bundle_PhaseName(struct bundle *bundle)
112{
113 return bundle->phase <= PHASE_TERMINATE ?
114 PhaseNames[bundle->phase] : "unknown";

--- 1828 unchanged lines hidden ---
107 "Dead", "Establish", "Authenticate", "Network", "Terminate"
108};
109
110const char *
111bundle_PhaseName(struct bundle *bundle)
112{
113 return bundle->phase <= PHASE_TERMINATE ?
114 PhaseNames[bundle->phase] : "unknown";

--- 1828 unchanged lines hidden ---