Deleted Added
full compact
if_spppsubr.c (88709) if_spppsubr.c (88710)
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, 2001 Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
1/*
2 * Synchronous PPP/Cisco link level subroutines.
3 * Keepalive protocol implemented in both Cisco and PPP modes.
4 *
5 * Copyright (C) 1994-1996 Cronyx Engineering Ltd.
6 * Author: Serge Vakulenko, <vak@cronyx.ru>
7 *
8 * Heavily revamped to conform to RFC 1661.
9 * Copyright (C) 1997, 2001 Joerg Wunsch.
10 *
11 * This software is distributed with NO WARRANTIES, not even the implied
12 * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
13 *
14 * Authors grant any other persons or organisations permission to use
15 * or modify this software as long as this message is kept with the software,
16 * all derivative works or modified versions.
17 *
18 * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
19 *
20 * $FreeBSD: head/sys/net/if_spppsubr.c 88709 2001-12-30 18:07:26Z joerg $
20 * $FreeBSD: head/sys/net/if_spppsubr.c 88710 2001-12-30 18:39:38Z joerg $
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

2134 ifp->if_flags |= IFF_RUNNING;
2135 if (sp->state[IDX_LCP] == STATE_INITIAL) {
2136 if (debug)
2137 log(-1, "(incoming call)\n");
2138 sp->pp_flags |= PP_CALLIN;
2139 lcp.Open(sp);
2140 } else if (debug)
2141 log(-1, "\n");
21 */
22
23#include <sys/param.h>
24
25#if defined(__FreeBSD__) && __FreeBSD__ >= 3
26#include "opt_inet.h"
27#include "opt_inet6.h"
28#include "opt_ipx.h"

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

2134 ifp->if_flags |= IFF_RUNNING;
2135 if (sp->state[IDX_LCP] == STATE_INITIAL) {
2136 if (debug)
2137 log(-1, "(incoming call)\n");
2138 sp->pp_flags |= PP_CALLIN;
2139 lcp.Open(sp);
2140 } else if (debug)
2141 log(-1, "\n");
2142 } else if ((ifp->if_flags & (IFF_AUTO | IFF_PASSIVE)) == 0 &&
2143 (sp->state[IDX_LCP] == STATE_INITIAL)) {
2144 ifp->if_flags |= IFF_RUNNING;
2145 lcp.Open(sp);
2142 }
2143
2144 sppp_up_event(&lcp, sp);
2145}
2146
2147static void
2148sppp_lcp_down(struct sppp *sp)
2149{

--- 3176 unchanged lines hidden ---
2146 }
2147
2148 sppp_up_event(&lcp, sp);
2149}
2150
2151static void
2152sppp_lcp_down(struct sppp *sp)
2153{

--- 3176 unchanged lines hidden ---