Deleted Added
full compact
if_pflog.c (191148) if_pflog.c (193900)
1/* $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $ */
2/*
3 * The authors of this code are John Ioannidis (ji@tla.org),
4 * Angelos D. Keromytis (kermit@csd.uch.gr) and
5 * Niels Provos (provos@physnet.uni-hamburg.de).
6 *
7 * This code was written by John Ioannidis for BSD/OS in Athens, Greece,
8 * in November 1995.

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

35
36#ifdef __FreeBSD__
37#include "opt_inet.h"
38#include "opt_inet6.h"
39#include "opt_bpf.h"
40#include "opt_pf.h"
41
42#include <sys/cdefs.h>
1/* $OpenBSD: if_pflog.c,v 1.22 2006/12/15 09:31:20 otto Exp $ */
2/*
3 * The authors of this code are John Ioannidis (ji@tla.org),
4 * Angelos D. Keromytis (kermit@csd.uch.gr) and
5 * Niels Provos (provos@physnet.uni-hamburg.de).
6 *
7 * This code was written by John Ioannidis for BSD/OS in Athens, Greece,
8 * in November 1995.

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

35
36#ifdef __FreeBSD__
37#include "opt_inet.h"
38#include "opt_inet6.h"
39#include "opt_bpf.h"
40#include "opt_pf.h"
41
42#include <sys/cdefs.h>
43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/if_pflog.c 191148 2009-04-16 20:30:28Z kmacy $");
43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/if_pflog.c 193900 2009-06-10 11:19:34Z bz $");
44
45#ifdef DEV_BPF
46#define NBPFILTER DEV_BPF
47#else
48#define NBPFILTER 0
49#endif
50
51#ifdef DEV_PFLOG

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

94#include <netinet/in.h>
95#endif
96#include <netinet6/nd6.h>
97#endif /* INET6 */
98
99#include <net/pfvar.h>
100#include <net/if_pflog.h>
101
44
45#ifdef DEV_BPF
46#define NBPFILTER DEV_BPF
47#else
48#define NBPFILTER 0
49#endif
50
51#ifdef DEV_PFLOG

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

94#include <netinet/in.h>
95#endif
96#include <netinet6/nd6.h>
97#endif /* INET6 */
98
99#include <net/pfvar.h>
100#include <net/if_pflog.h>
101
102#ifdef INET
102#ifdef __FreeBSD__
103#include <machine/in_cksum.h>
104#endif
103#ifdef __FreeBSD__
104#include <machine/in_cksum.h>
105#endif
106#endif
105
106#define PFLOGMTU (32768 + MHLEN + MLEN)
107
108#ifdef PFLOGDEBUG
109#define DPRINTF(x) do { if (pflogdebug) printf x ; } while (0)
110#else
111#define DPRINTF(x)
112#endif

--- 322 unchanged lines hidden ---
107
108#define PFLOGMTU (32768 + MHLEN + MLEN)
109
110#ifdef PFLOGDEBUG
111#define DPRINTF(x) do { if (pflogdebug) printf x ; } while (0)
112#else
113#define DPRINTF(x)
114#endif

--- 322 unchanged lines hidden ---