Commit 047b300e authored by Felix Fietkau's avatar Felix Fietkau Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_flow_table: clean up flow_offload_alloc 



Reduce code duplication and make it much easier to read

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent af81f9e7

net/netfilter/nf_flow_table.c

+34 −59
Original line number Diff line number Diff line
@@ -16,6 +16,38 @@ struct flow_offload_entry { 
	struct rcu_head		rcu_head;

};



static void

flow_offload_fill_dir(struct flow_offload *flow, struct nf_conn *ct,

		      struct nf_flow_route *route,

		      enum flow_offload_tuple_dir dir)

{

	struct flow_offload_tuple *ft = &flow->tuplehash[dir].tuple;

	struct nf_conntrack_tuple *ctt = &ct->tuplehash[dir].tuple;



	ft->dir = dir;



	switch (ctt->src.l3num) {

	case NFPROTO_IPV4:

		ft->src_v4 = ctt->src.u3.in;

		ft->dst_v4 = ctt->dst.u3.in;

		break;

	case NFPROTO_IPV6:

		ft->src_v6 = ctt->src.u3.in6;

		ft->dst_v6 = ctt->dst.u3.in6;

		break;

	}



	ft->l3proto = ctt->src.l3num;

	ft->l4proto = ctt->dst.protonum;

	ft->src_port = ctt->src.u.tcp.port;

	ft->dst_port = ctt->dst.u.tcp.port;



	ft->iifidx = route->tuple[dir].ifindex;

	ft->oifidx = route->tuple[!dir].ifindex;



	ft->dst_cache = route->tuple[dir].dst;

}



struct flow_offload *

flow_offload_alloc(struct nf_conn *ct, struct nf_flow_route *route)

{
@@ -40,65 +72,8 @@ flow_offload_alloc(struct nf_conn *ct, struct nf_flow_route *route) 


	entry->ct = ct;



	switch (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num) {

	case NFPROTO_IPV4:

		flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v4 =

			ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in;

		flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v4 =

			ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in;

		flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_v4 =

			ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.in;

		flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_v4 =

			ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.in;

		break;

	case NFPROTO_IPV6:

		flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_v6 =

			ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u3.in6;

		flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_v6 =

			ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u3.in6;

		flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_v6 =

			ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.in6;

		flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_v6 =

			ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.in6;

		break;

	}



	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.l3proto =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;

	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.l4proto =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.l3proto =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.l4proto =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.protonum;



	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_cache =

		  route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].dst;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_cache =

		  route->tuple[FLOW_OFFLOAD_DIR_REPLY].dst;



	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.src_port =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.tcp.port;

	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dst_port =

		ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.u.tcp.port;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.src_port =

		ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.tcp.port;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dst_port =

		ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.tcp.port;



	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.dir =

						FLOW_OFFLOAD_DIR_ORIGINAL;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.dir =

						FLOW_OFFLOAD_DIR_REPLY;



	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.iifidx =

		route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].ifindex;

	flow->tuplehash[FLOW_OFFLOAD_DIR_ORIGINAL].tuple.oifidx =

		route->tuple[FLOW_OFFLOAD_DIR_REPLY].ifindex;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.iifidx =

		route->tuple[FLOW_OFFLOAD_DIR_REPLY].ifindex;

	flow->tuplehash[FLOW_OFFLOAD_DIR_REPLY].tuple.oifidx =

		route->tuple[FLOW_OFFLOAD_DIR_ORIGINAL].ifindex;

	flow_offload_fill_dir(flow, ct, route, FLOW_OFFLOAD_DIR_ORIGINAL);

	flow_offload_fill_dir(flow, ct, route, FLOW_OFFLOAD_DIR_REPLY);



	if (ct->status & IPS_SRC_NAT)

		flow->flags |= FLOW_OFFLOAD_SNAT;