Deleted Added
full compact
ip_fw_dynamic.c (283291) ip_fw_dynamic.c (291001)
1/*-
2 * Copyright (c) 2002 Luigi Rizzo, Universita` di Pisa
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Luigi Rizzo, Universita` di Pisa
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions
6 * are met:
7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.

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

19 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
20 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
21 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
22 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: head/sys/netpfil/ipfw/ip_fw_dynamic.c 283291 2015-05-22 17:05:21Z jkim $");
27__FBSDID("$FreeBSD: head/sys/netpfil/ipfw/ip_fw_dynamic.c 291001 2015-11-17 20:42:08Z bdrewery $");
28
29#define DEB(x)
30#define DDB(x) x
31
32/*
33 * Dynamic rule support for ipfw
34 */
35

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

730 )
731
732 id.dst_ip = id.src_ip = id.dst_port = id.src_port = 0;
733 id.proto = args->f_id.proto;
734 id.addr_type = args->f_id.addr_type;
735 id.fib = M_GETFIB(args->m);
736
737 if (IS_IP6_FLOW_ID (&(args->f_id))) {
28
29#define DEB(x)
30#define DDB(x) x
31
32/*
33 * Dynamic rule support for ipfw
34 */
35

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

730 )
731
732 id.dst_ip = id.src_ip = id.dst_port = id.src_port = 0;
733 id.proto = args->f_id.proto;
734 id.addr_type = args->f_id.addr_type;
735 id.fib = M_GETFIB(args->m);
736
737 if (IS_IP6_FLOW_ID (&(args->f_id))) {
738 bzero(&id.src_ip6, sizeof(id.src_ip6));
739 bzero(&id.dst_ip6, sizeof(id.dst_ip6));
740
738 if (limit_mask & DYN_SRC_ADDR)
739 id.src_ip6 = args->f_id.src_ip6;
740 if (limit_mask & DYN_DST_ADDR)
741 id.dst_ip6 = args->f_id.dst_ip6;
742 } else {
743 if (limit_mask & DYN_SRC_ADDR)
744 id.src_ip = args->f_id.src_ip;
745 if (limit_mask & DYN_DST_ADDR)

--- 860 unchanged lines hidden ---
741 if (limit_mask & DYN_SRC_ADDR)
742 id.src_ip6 = args->f_id.src_ip6;
743 if (limit_mask & DYN_DST_ADDR)
744 id.dst_ip6 = args->f_id.dst_ip6;
745 } else {
746 if (limit_mask & DYN_SRC_ADDR)
747 id.src_ip = args->f_id.src_ip;
748 if (limit_mask & DYN_DST_ADDR)

--- 860 unchanged lines hidden ---