Deleted Added
full compact
if_spppsubr.c (102412) if_spppsubr.c (103842)
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 102412 2002-08-25 13:23:09Z charnier $
20 * $FreeBSD: head/sys/net/if_spppsubr.c 103842 2002-09-23 06:25:08Z alfred $
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"

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

207#define STATE_ACK_RCVD 7
208#define STATE_ACK_SENT 8
209#define STATE_OPENED 9
210
211struct ppp_header {
212 u_char address;
213 u_char control;
214 u_short protocol;
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"

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

207#define STATE_ACK_RCVD 7
208#define STATE_ACK_SENT 8
209#define STATE_OPENED 9
210
211struct ppp_header {
212 u_char address;
213 u_char control;
214 u_short protocol;
215} __attribute__((__packed__));
215} __packed;
216#define PPP_HEADER_LEN sizeof (struct ppp_header)
217
218struct lcp_header {
219 u_char type;
220 u_char ident;
221 u_short len;
216#define PPP_HEADER_LEN sizeof (struct ppp_header)
217
218struct lcp_header {
219 u_char type;
220 u_char ident;
221 u_short len;
222} __attribute__((__packed__));
222} __packed;
223#define LCP_HEADER_LEN sizeof (struct lcp_header)
224
225struct cisco_packet {
226 u_long type;
227 u_long par1;
228 u_long par2;
229 u_short rel;
230 u_short time0;
231 u_short time1;
223#define LCP_HEADER_LEN sizeof (struct lcp_header)
224
225struct cisco_packet {
226 u_long type;
227 u_long par1;
228 u_long par2;
229 u_short rel;
230 u_short time0;
231 u_short time1;
232} __attribute__((__packed__));
232} __packed;
233#define CISCO_PACKET_LEN sizeof (struct cisco_packet)
234
235/*
236 * We follow the spelling and capitalization of RFC 1661 here, to make
237 * it easier comparing with the standard. Please refer to this RFC in
238 * case you can't make sense out of these abbreviation; it will also
239 * explain the semantics related to the various events and actions.
240 */

--- 5134 unchanged lines hidden ---
233#define CISCO_PACKET_LEN sizeof (struct cisco_packet)
234
235/*
236 * We follow the spelling and capitalization of RFC 1661 here, to make
237 * it easier comparing with the standard. Please refer to this RFC in
238 * case you can't make sense out of these abbreviation; it will also
239 * explain the semantics related to the various events and actions.
240 */

--- 5134 unchanged lines hidden ---