Deleted Added
full compact
pf_ioctl.c (153110) pf_ioctl.c (155337)
1/* $FreeBSD: head/sys/contrib/pf/net/pf_ioctl.c 153110 2005-12-05 11:58:35Z ru $ */
1/* $FreeBSD: head/sys/contrib/pf/net/pf_ioctl.c 155337 2006-02-05 17:17:32Z mlaier $ */
2/* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */
3
4/*
5 * Copyright (c) 2001 Daniel Hartmeier
6 * Copyright (c) 2002,2003 Henning Brauer
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

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

103#include <dev/rndvar.h>
104#endif
105#include <net/pfvar.h>
106
107#if NPFSYNC > 0
108#include <net/if_pfsync.h>
109#endif /* NPFSYNC > 0 */
110
2/* $OpenBSD: pf_ioctl.c,v 1.139 2005/03/03 07:13:39 dhartmei Exp $ */
3
4/*
5 * Copyright (c) 2001 Daniel Hartmeier
6 * Copyright (c) 2002,2003 Henning Brauer
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

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

103#include <dev/rndvar.h>
104#endif
105#include <net/pfvar.h>
106
107#if NPFSYNC > 0
108#include <net/if_pfsync.h>
109#endif /* NPFSYNC > 0 */
110
111#ifdef __FreeBSD__
112#include <net/if_pflog.h>
113#endif
114
111#ifdef INET6
112#include <netinet/ip6.h>
113#include <netinet/in_pcb.h>
114#endif /* INET6 */
115
116#ifdef ALTQ
117#include <altq/altq.h>
118#endif

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

225static struct cdevsw pf_cdevsw = {
226 .d_ioctl = pfioctl,
227 .d_name = PF_NAME,
228 .d_version = D_VERSION,
229};
230
231static volatile int pf_pfil_hooked = 0;
232struct mtx pf_task_mtx;
115#ifdef INET6
116#include <netinet/ip6.h>
117#include <netinet/in_pcb.h>
118#endif /* INET6 */
119
120#ifdef ALTQ
121#include <altq/altq.h>
122#endif

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

229static struct cdevsw pf_cdevsw = {
230 .d_ioctl = pfioctl,
231 .d_name = PF_NAME,
232 .d_version = D_VERSION,
233};
234
235static volatile int pf_pfil_hooked = 0;
236struct mtx pf_task_mtx;
237pflog_packet_t *pflog_packet_ptr = NULL;
233
234void
235init_pf_mutex(void)
236{
237 mtx_init(&pf_task_mtx, "pf task mtx", NULL, MTX_DEF);
238}
239
240void

--- 3365 unchanged lines hidden ---
238
239void
240init_pf_mutex(void)
241{
242 mtx_init(&pf_task_mtx, "pf task mtx", NULL, MTX_DEF);
243}
244
245void

--- 3365 unchanged lines hidden ---