Deleted Added
full compact
if_spppsubr.c (88503) if_spppsubr.c (88506)
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, 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, 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 88503 2001-12-26 20:28:41Z joerg $
20 * $FreeBSD: head/sys/net/if_spppsubr.c 88506 2001-12-26 22:00:13Z 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"

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

2209 /* Gonna NAK it. */
2210 p[2] = nmagic >> 24;
2211 p[3] = nmagic >> 16;
2212 p[4] = nmagic >> 8;
2213 p[5] = nmagic;
2214 break;
2215
2216 case LCP_OPT_ASYNC_MAP:
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"

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

2209 /* Gonna NAK it. */
2210 p[2] = nmagic >> 24;
2211 p[3] = nmagic >> 16;
2212 p[4] = nmagic >> 8;
2213 p[5] = nmagic;
2214 break;
2215
2216 case LCP_OPT_ASYNC_MAP:
2217 /* Async control character map -- check to be zero. */
2218 if (! p[2] && ! p[3] && ! p[4] && ! p[5]) {
2219 if (debug)
2220 log(-1, "[empty] ");
2221 continue;
2222 }
2223 if (debug)
2224 log(-1, "[non-empty] ");
2225 /* suggest a zero one */
2226 p[2] = p[3] = p[4] = p[5] = 0;
2227 break;
2217 /*
2218 * Async control character map -- just ignore it.
2219 *
2220 * Quote from RFC 1662, chapter 6:
2221 * To enable this functionality, synchronous PPP
2222 * implementations MUST always respond to the
2223 * Async-Control-Character-Map Configuration
2224 * Option with the LCP Configure-Ack. However,
2225 * acceptance of the Configuration Option does
2226 * not imply that the synchronous implementation
2227 * will do any ACCM mapping. Instead, all such
2228 * octet mapping will be performed by the
2229 * asynchronous-to-synchronous converter.
2230 */
2231 continue;
2228
2229 case LCP_OPT_MRU:
2230 /*
2231 * Maximum receive unit. Always agreeable,
2232 * but ignored by now.
2233 */
2234 sp->lcp.their_mru = p[2] * 256 + p[3];
2235 if (debug)

--- 2843 unchanged lines hidden ---
2232
2233 case LCP_OPT_MRU:
2234 /*
2235 * Maximum receive unit. Always agreeable,
2236 * but ignored by now.
2237 */
2238 sp->lcp.their_mru = p[2] * 256 + p[3];
2239 if (debug)

--- 2843 unchanged lines hidden ---