Deleted Added
full compact
pf_norm.c (133574) pf_norm.c (133720)
1/* $FreeBSD: head/sys/contrib/pf/net/pf_norm.c 133574 2004-08-12 13:59:44Z mlaier $ */
1/* $FreeBSD: head/sys/contrib/pf/net/pf_norm.c 133720 2004-08-14 15:32:40Z dwmalone $ */
2/* $OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */
3/* add $OpenBSD: pf_norm.c,v 1.87 2004/05/11 07:34:11 dhartmei Exp $ */
4
5/*
6 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

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

25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 */
29
30#ifdef __FreeBSD__
31#include "opt_inet.h"
32#include "opt_inet6.h"
2/* $OpenBSD: pf_norm.c,v 1.80.2.1 2004/04/30 21:46:33 brad Exp $ */
3/* add $OpenBSD: pf_norm.c,v 1.87 2004/05/11 07:34:11 dhartmei Exp $ */
4
5/*
6 * Copyright 2001 Niels Provos <provos@citi.umich.edu>
7 * All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without

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

25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27 * THIS SOFTWARE, EVEN IF ADVISED OF 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" /* or ip_var does not export it */
34#include "opt_pf.h"
35#define NPFLOG DEV_PFLOG
36#else
37#include "pflog.h"
38#endif
39
40#include <sys/param.h>
41#include <sys/systm.h>

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

163static int pf_frag_compare(struct pf_fragment *,
164 struct pf_fragment *);
165#endif
166RB_HEAD(pf_frag_tree, pf_fragment) pf_frag_tree, pf_cache_tree;
167RB_PROTOTYPE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
168RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
169
170/* Private prototypes */
33#include "opt_pf.h"
34#define NPFLOG DEV_PFLOG
35#else
36#include "pflog.h"
37#endif
38
39#include <sys/param.h>
40#include <sys/systm.h>

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

162static int pf_frag_compare(struct pf_fragment *,
163 struct pf_fragment *);
164#endif
165RB_HEAD(pf_frag_tree, pf_fragment) pf_frag_tree, pf_cache_tree;
166RB_PROTOTYPE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
167RB_GENERATE(pf_frag_tree, pf_fragment, fr_entry, pf_frag_compare);
168
169/* Private prototypes */
171#ifndef RANDOM_IP_ID
172extern u_int16_t ip_randomid(void);
173#endif
174void pf_ip2key(struct pf_fragment *, struct ip *);
175void pf_remove_fragment(struct pf_fragment *);
176void pf_flush_fragments(void);
177void pf_free_fragment(struct pf_fragment *);
178struct pf_fragment *pf_find_fragment(struct ip *, struct pf_frag_tree *);
179struct mbuf *pf_reassemble(struct mbuf **, struct pf_fragment **,
180 struct pf_frent *, int);
181struct mbuf *pf_fragcache(struct mbuf **, struct ip*,

--- 1551 unchanged lines hidden ---
170void pf_ip2key(struct pf_fragment *, struct ip *);
171void pf_remove_fragment(struct pf_fragment *);
172void pf_flush_fragments(void);
173void pf_free_fragment(struct pf_fragment *);
174struct pf_fragment *pf_find_fragment(struct ip *, struct pf_frag_tree *);
175struct mbuf *pf_reassemble(struct mbuf **, struct pf_fragment **,
176 struct pf_frent *, int);
177struct mbuf *pf_fragcache(struct mbuf **, struct ip*,

--- 1551 unchanged lines hidden ---