Deleted Added
full compact
bundle.c (71971) bundle.c (71974)
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 71971 2001-02-04 01:08:24Z brian $
26 * $FreeBSD: head/usr.sbin/ppp/bundle.c 71974 2001-02-04 01:20:33Z 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 TUNS* ioctls */
34#include <arpa/inet.h>

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

125 return;
126
127 if (new <= PHASE_TERMINATE)
128 log_Printf(LogPHASE, "bundle: %s\n", PhaseNames[new]);
129
130 switch (new) {
131 case PHASE_DEAD:
132 bundle->phase = new;
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 TUNS* ioctls */
34#include <arpa/inet.h>

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

125 return;
126
127 if (new <= PHASE_TERMINATE)
128 log_Printf(LogPHASE, "bundle: %s\n", PhaseNames[new]);
129
130 switch (new) {
131 case PHASE_DEAD:
132 bundle->phase = new;
133#ifdef HAVE_DES
133 MPPE_MasterKeyValid = 0;
134 MPPE_MasterKeyValid = 0;
135#endif
134 log_DisplayPrompts();
135 break;
136
137 case PHASE_ESTABLISH:
138 bundle->phase = new;
139 break;
140
141 case PHASE_AUTHENTICATE:

--- 1913 unchanged lines hidden ---
136 log_DisplayPrompts();
137 break;
138
139 case PHASE_ESTABLISH:
140 bundle->phase = new;
141 break;
142
143 case PHASE_AUTHENTICATE:

--- 1913 unchanged lines hidden ---