netfilter: nf_flow_table_offload: add IPv6 match description (d50264f1) · Commits · 戴 / test

net/netfilter/nf_flow_table_offload.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ struct nf_flow_key {
		struct flow_dissector_key_basic basic;
		union {
		struct flow_dissector_key_ipv4_addrs ipv4;
		struct flow_dissector_key_ipv6_addrs ipv6;
		};
		struct flow_dissector_key_tcp tcp;
		struct flow_dissector_key_ports tp;
		@@ -57,6 +58,7 @@ static int nf_flow_rule_match(struct nf_flow_match *match,
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_CONTROL, control);
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_BASIC, basic);
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_IPV4_ADDRS, ipv4);
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_IPV6_ADDRS, ipv6);
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_TCP, tcp);
		NF_FLOW_DISSECTOR(match, FLOW_DISSECTOR_KEY_PORTS, tp);

		@@ -69,9 +71,18 @@ static int nf_flow_rule_match(struct nf_flow_match *match,
		key->ipv4.dst = tuple->dst_v4.s_addr;
		mask->ipv4.dst = 0xffffffff;
		break;
		case AF_INET6:
		key->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS;
		key->basic.n_proto = htons(ETH_P_IPV6);
		key->ipv6.src = tuple->src_v6;
		memset(&mask->ipv6.src, 0xff, sizeof(mask->ipv6.src));
		key->ipv6.dst = tuple->dst_v6;
		memset(&mask->ipv6.dst, 0xff, sizeof(mask->ipv6.dst));
		break;
		default:
		return -EOPNOTSUPP;
		}
		match->dissector.used_keys \|= BIT(key->control.addr_type);
		mask->basic.n_proto = 0xffff;

		switch (tuple->l4proto) {
		@@ -96,7 +107,6 @@ static int nf_flow_rule_match(struct nf_flow_match *match,

		match->dissector.used_keys \|= BIT(FLOW_DISSECTOR_KEY_CONTROL) \|
		BIT(FLOW_DISSECTOR_KEY_BASIC) \|
		BIT(FLOW_DISSECTOR_KEY_IPV4_ADDRS) \|
		BIT(FLOW_DISSECTOR_KEY_PORTS);
		return 0;
		}

Admin message