Deleted Added
full compact
if_pfsync.c (132767) if_pfsync.c (133720)
1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 132767 2004-07-28 06:14:44Z kan $ */
1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 133720 2004-08-14 15:32:40Z dwmalone $ */
2/* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */
3
4/*
5 * Copyright (c) 2002 Michael Shalayeff
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
26 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#ifdef __FreeBSD__
31#include "opt_inet.h"
32#include "opt_inet6.h"
2/* $OpenBSD: if_pfsync.c,v 1.26 2004/03/28 18:14:20 mcbride Exp $ */
3
4/*
5 * Copyright (c) 2002 Michael Shalayeff
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions

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

25 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
26 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
27 * THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#ifdef __FreeBSD__
31#include "opt_inet.h"
32#include "opt_inet6.h"
33#include "opt_random_ip_id.h"
34#endif
35
36#ifndef __FreeBSD__
37#include "bpfilter.h"
38#include "pfsync.h"
39#elif __FreeBSD__ >= 5
40#include "opt_bpf.h"
41#include "opt_pf.h"

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

102#endif
103
104#ifndef __FreeBSD__
105struct pfsync_softc pfsyncif;
106#endif
107int pfsync_sync_ok;
108struct pfsyncstats pfsyncstats;
109
33#endif
34
35#ifndef __FreeBSD__
36#include "bpfilter.h"
37#include "pfsync.h"
38#elif __FreeBSD__ >= 5
39#include "opt_bpf.h"
40#include "opt_pf.h"

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

101#endif
102
103#ifndef __FreeBSD__
104struct pfsync_softc pfsyncif;
105#endif
106int pfsync_sync_ok;
107struct pfsyncstats pfsyncstats;
108
110#ifndef RANDOM_IP_ID
111extern u_int16_t ip_randomid(void);
112#endif
113
114#ifdef __FreeBSD__
115
116/*
117 * Locking notes:
118 * Whenever we really touch/look at the state table we have to hold the
119 * PF_LOCK. Functions that do just the interface handling, grab the per
120 * softc lock instead.
121 *

--- 1551 unchanged lines hidden ---
109#ifdef __FreeBSD__
110
111/*
112 * Locking notes:
113 * Whenever we really touch/look at the state table we have to hold the
114 * PF_LOCK. Functions that do just the interface handling, grab the per
115 * softc lock instead.
116 *

--- 1551 unchanged lines hidden ---