Deleted Added
full compact
pf.c (172930) pf.c (173018)
1/* $OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */
2
3/*
4 * Copyright (c) 2001 Daniel Hartmeier
5 * Copyright (c) 2002,2003 Henning Brauer
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

35 *
36 */
37
38#ifdef __FreeBSD__
39#include "opt_inet.h"
40#include "opt_inet6.h"
41
42#include <sys/cdefs.h>
1/* $OpenBSD: pf.c,v 1.527 2007/02/22 15:23:23 pyr Exp $ */
2
3/*
4 * Copyright (c) 2001 Daniel Hartmeier
5 * Copyright (c) 2002,2003 Henning Brauer
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

35 *
36 */
37
38#ifdef __FreeBSD__
39#include "opt_inet.h"
40#include "opt_inet6.h"
41
42#include <sys/cdefs.h>
43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf.c 172930 2007-10-24 19:04:04Z rwatson $");
43__FBSDID("$FreeBSD: head/sys/contrib/pf/net/pf.c 173018 2007-10-26 13:18:38Z rwatson $");
44#endif
45
46#ifdef __FreeBSD__
47#include "opt_mac.h"
48#include "opt_bpf.h"
49#include "opt_pf.h"
50
51#ifdef DEV_BPF

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

1815 m = m_gethdr(M_DONTWAIT, MT_HEADER);
1816 if (m == NULL)
1817 return;
1818#ifdef __FreeBSD__
1819#ifdef MAC
1820 if (replyto)
1821 mac_mbuf_create_netlayer(replyto, m);
1822 else
44#endif
45
46#ifdef __FreeBSD__
47#include "opt_mac.h"
48#include "opt_bpf.h"
49#include "opt_pf.h"
50
51#ifdef DEV_BPF

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

1815 m = m_gethdr(M_DONTWAIT, MT_HEADER);
1816 if (m == NULL)
1817 return;
1818#ifdef __FreeBSD__
1819#ifdef MAC
1820 if (replyto)
1821 mac_mbuf_create_netlayer(replyto, m);
1822 else
1823 mac_mbuf_create_from_firewall(m);
1823 mac_netinet_firewall_send(m);
1824#else
1825 (void)replyto;
1826#endif
1827#endif
1828 if ((pf_mtag = pf_get_mtag(m)) == NULL) {
1829 m_freem(m);
1830 return;
1831 }

--- 5729 unchanged lines hidden ---
1824#else
1825 (void)replyto;
1826#endif
1827#endif
1828 if ((pf_mtag = pf_get_mtag(m)) == NULL) {
1829 m_freem(m);
1830 return;
1831 }

--- 5729 unchanged lines hidden ---