Deleted Added
full compact
vjcomp.c (78189) vjcomp.c (81634)
1/*-
2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
4 * Internet Initiative Japan, Inc (IIJ)
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1996 - 2001 Brian Somers <brian@Awfulhak.org>
3 * based on work by Toshiharu OHNO <tony-o@iij.ad.jp>
4 * Internet Initiative Japan, Inc (IIJ)
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/usr.sbin/ppp/vjcomp.c 78189 2001-06-13 21:52:19Z brian $
28 * $FreeBSD: head/usr.sbin/ppp/vjcomp.c 81634 2001-08-14 16:05:52Z brian $
29 */
30
31#include <sys/param.h>
32#include <netinet/in.h>
33#include <netinet/in_systm.h>
34#include <netinet/ip.h>
29 */
30
31#include <sys/param.h>
32#include <netinet/in.h>
33#include <netinet/in_systm.h>
34#include <netinet/ip.h>
35#include <sys/socket.h>
35#include <sys/un.h>
36
37#include <stdio.h>
38#include <string.h> /* strlen/memcpy */
39#include <termios.h>
40
41#include "layer.h"
42#include "mbuf.h"
43#include "log.h"
44#include "timer.h"
45#include "fsm.h"
46#include "proto.h"
47#include "slcompress.h"
48#include "lqr.h"
49#include "hdlc.h"
50#include "defs.h"
51#include "iplist.h"
52#include "throughput.h"
36#include <sys/un.h>
37
38#include <stdio.h>
39#include <string.h> /* strlen/memcpy */
40#include <termios.h>
41
42#include "layer.h"
43#include "mbuf.h"
44#include "log.h"
45#include "timer.h"
46#include "fsm.h"
47#include "proto.h"
48#include "slcompress.h"
49#include "lqr.h"
50#include "hdlc.h"
51#include "defs.h"
52#include "iplist.h"
53#include "throughput.h"
54#include "ncpaddr.h"
55#include "ip.h"
53#include "ipcp.h"
54#include "lcp.h"
55#include "ccp.h"
56#include "link.h"
57#include "filter.h"
58#include "descriptor.h"
59#include "mp.h"
60#ifndef NORADIUS
61#include "radius.h"
62#endif
56#include "ipcp.h"
57#include "lcp.h"
58#include "ccp.h"
59#include "link.h"
60#include "filter.h"
61#include "descriptor.h"
62#include "mp.h"
63#ifndef NORADIUS
64#include "radius.h"
65#endif
66#include "ipv6cp.h"
67#include "ncp.h"
63#include "bundle.h"
64#include "vjcomp.h"
65
66#define MAX_VJHEADER 16 /* Maximum size of compressed header */
67
68static struct mbuf *
69vj_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp, int pri,
70 u_short *proto)

--- 126 unchanged lines hidden ---
68#include "bundle.h"
69#include "vjcomp.h"
70
71#define MAX_VJHEADER 16 /* Maximum size of compressed header */
72
73static struct mbuf *
74vj_LayerPush(struct bundle *bundle, struct link *l, struct mbuf *bp, int pri,
75 u_short *proto)

--- 126 unchanged lines hidden ---