Deleted Added
full compact
pf_ioctl.c (280169) pf_ioctl.c (281613)
1/*-
2 * Copyright (c) 2001 Daniel Hartmeier
3 * Copyright (c) 2002,2003 Henning Brauer
4 * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

31 * Effort sponsored in part by the Defense Advanced Research Projects
32 * Agency (DARPA) and Air Force Research Laboratory, Air Force
33 * Materiel Command, USAF, under agreement number F30602-01-2-0537.
34 *
35 * $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $
36 */
37
38#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Daniel Hartmeier
3 * Copyright (c) 2002,2003 Henning Brauer
4 * Copyright (c) 2012 Gleb Smirnoff <glebius@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

31 * Effort sponsored in part by the Defense Advanced Research Projects
32 * Agency (DARPA) and Air Force Research Laboratory, Air Force
33 * Materiel Command, USAF, under agreement number F30602-01-2-0537.
34 *
35 * $OpenBSD: pf_ioctl.c,v 1.213 2009/02/15 21:46:12 mbalmer Exp $
36 */
37
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/sys/netpfil/pf/pf_ioctl.c 280169 2015-03-17 12:19:28Z glebius $");
39__FBSDID("$FreeBSD: head/sys/netpfil/pf/pf_ioctl.c 281613 2015-04-16 20:22:40Z glebius $");
40
41#include "opt_inet.h"
42#include "opt_inet6.h"
43#include "opt_bpf.h"
44#include "opt_pf.h"
45
46#include <sys/param.h>
47#include <sys/bus.h>

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

79#include <netinet6/ip6_var.h>
80#include <netinet/ip_icmp.h>
81
82#ifdef INET6
83#include <netinet/ip6.h>
84#endif /* INET6 */
85
86#ifdef ALTQ
40
41#include "opt_inet.h"
42#include "opt_inet6.h"
43#include "opt_bpf.h"
44#include "opt_pf.h"
45
46#include <sys/param.h>
47#include <sys/bus.h>

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

79#include <netinet6/ip6_var.h>
80#include <netinet/ip_icmp.h>
81
82#ifdef INET6
83#include <netinet/ip6.h>
84#endif /* INET6 */
85
86#ifdef ALTQ
87#include
87#include <net/altq/altq.h>
88#endif
89
90static int pfattach(void);
91static struct pf_pool *pf_get_pool(char *, u_int32_t, u_int8_t, u_int32_t,
92 u_int8_t, u_int8_t, u_int8_t);
93
94static void pf_mv_pool(struct pf_palist *, struct pf_palist *);
95static void pf_empty_pool(struct pf_palist *);

--- 3712 unchanged lines hidden ---
88#endif
89
90static int pfattach(void);
91static struct pf_pool *pf_get_pool(char *, u_int32_t, u_int8_t, u_int32_t,
92 u_int8_t, u_int8_t, u_int8_t);
93
94static void pf_mv_pool(struct pf_palist *, struct pf_palist *);
95static void pf_empty_pool(struct pf_palist *);

--- 3712 unchanged lines hidden ---