ipv4: Create and use route lookup helpers.

The idea here is this minimizes the number of places one has to edit
in order to make changes to how flows are defined and used.

Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 75 insertions, 133 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 35a502055018..807d83c02ef6 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1157,22 +1157,10 @@ int inet_sk_rebuild_header(struct sock *sk)
         daddr = inet->inet_daddr;
         if (inet->opt && inet->opt->srr)
                 daddr = inet->opt->faddr;
-        {
-        struct flowi fl = {
-                .oif = sk->sk_bound_dev_if,
-                .mark = sk->sk_mark,
-                .fl4_dst = daddr,
-                .fl4_src = inet->inet_saddr,
-                .fl4_tos = RT_CONN_FLAGS(sk),
-                .proto = sk->sk_protocol,
-                .flags = inet_sk_flowi_flags(sk),
-                .fl_ip_sport = inet->inet_sport,
-                .fl_ip_dport = inet->inet_dport,
-        };
-
-        security_sk_classify_flow(sk, &fl);
-        rt = ip_route_output_flow(sock_net(sk), &fl, sk);
-        }
+        rt = ip_route_output_ports(sock_net(sk), sk, daddr, inet->inet_saddr,
+                                   inet->inet_dport, inet->inet_sport,
+                                   sk->sk_protocol, RT_CONN_FLAGS(sk),
+                                   sk->sk_bound_dev_if);
         if (!IS_ERR(rt)) {
                 err = 0;
                 sk_setup_caps(sk, &rt->dst);
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index fa9988da1da4..090d273d7865 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -433,14 +433,12 @@ static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)
 
 static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
 {
-        struct flowi fl = { .fl4_dst = sip,
-                            .fl4_src = tip };
         struct rtable *rt;
         int flag = 0;
         /*unsigned long now; */
         struct net *net = dev_net(dev);
 
-        rt = ip_route_output_key(net, &fl);
+        rt = ip_route_output(net, sip, tip, 0, 0);
         if (IS_ERR(rt))
                 return 1;
         if (rt->dst.dev != dev) {
@@ -1062,9 +1060,7 @@ static int arp_req_set(struct net *net, struct arpreq *r,
         if (r->arp_flags & ATF_PERM)
                 r->arp_flags |= ATF_COM;
         if (dev == NULL) {
-                struct flowi fl = { .fl4_dst = ip,
-                                    .fl4_tos = RTO_ONLINK };
-                struct rtable *rt = ip_route_output_key(net, &fl);
+                struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);
 
                 if (IS_ERR(rt))
                         return PTR_ERR(rt);
@@ -1185,9 +1181,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r,
 
         ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
         if (dev == NULL) {
-                struct flowi fl = { .fl4_dst = ip,
-                                    .fl4_tos = RTO_ONLINK };
-                struct rtable *rt = ip_route_output_key(net, &fl);
+                struct rtable *rt = ip_route_output(net, ip, 0, RTO_ONLINK, 0);
                 if (IS_ERR(rt))
                         return PTR_ERR(rt);
                 dev = rt->dst.dev;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index 12b65ccca8e9..1fd3d9ce8398 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -321,15 +321,12 @@ static struct sk_buff *igmpv3_newpack(struct net_device *dev, int size)
         }
         igmp_skb_size(skb) = size;
 
-        {
-                struct flowi fl = { .oif = dev->ifindex,
-                                    .fl4_dst = IGMPV3_ALL_MCR,
-                                    .proto = IPPROTO_IGMP };
-                rt = ip_route_output_key(net, &fl);
-                if (IS_ERR(rt)) {
-                        kfree_skb(skb);
-                        return NULL;
-                }
+        rt = ip_route_output_ports(net, NULL, IGMPV3_ALL_MCR, 0,
+                                   0, 0,
+                                   IPPROTO_IGMP, 0, dev->ifindex);
+        if (IS_ERR(rt)) {
+                kfree_skb(skb);
+                return NULL;
         }
         if (rt->rt_src == 0) {
                 kfree_skb(skb);
@@ -667,14 +664,12 @@ static int igmp_send_report(struct in_device *in_dev, struct ip_mc_list *pmc,
         else
                 dst = group;
 
-        {
-                struct flowi fl = { .oif = dev->ifindex,
-                                    .fl4_dst = dst,
-                                    .proto = IPPROTO_IGMP };
-                rt = ip_route_output_key(net, &fl);
-                if (IS_ERR(rt))
-                        return -1;
-        }
+        rt = ip_route_output_ports(net, NULL, dst, 0,
+                                   0, 0,
+                                   IPPROTO_IGMP, 0, dev->ifindex);
+        if (IS_ERR(rt))
+                return -1;
+
         if (rt->rt_src == 0) {
                 ip_rt_put(rt);
                 return -1;
@@ -1441,7 +1436,6 @@ void ip_mc_destroy_dev(struct in_device *in_dev)
 /* RTNL is locked */
 static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr)
 {
-        struct flowi fl = { .fl4_dst = imr->imr_multiaddr.s_addr };
         struct net_device *dev = NULL;
         struct in_device *idev = NULL;
 
@@ -1456,7 +1450,9 @@ static struct in_device *ip_mc_find_dev(struct net *net, struct ip_mreqn *imr)
         }
 
         if (!dev) {
-                struct rtable *rt = ip_route_output_key(net, &fl);
+                struct rtable *rt = ip_route_output(net,
+                                                    imr->imr_multiaddr.s_addr,
+                                                    0, 0, 0);
                 if (!IS_ERR(rt)) {
                         dev = rt->dst.dev;
                         ip_rt_put(rt);
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 71465955520b..da5941f18c3c 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -769,20 +769,12 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
                         tos = ipv6_get_dsfield((struct ipv6hdr *)old_iph);
         }
 
-        {
-                struct flowi fl = {
-                        .oif = tunnel->parms.link,
-                        .fl4_dst = dst,
-                        .fl4_src = tiph->saddr,
-                        .fl4_tos = RT_TOS(tos),
-                        .proto = IPPROTO_GRE,
-                        .fl_gre_key = tunnel->parms.o_key
-                };
-                rt = ip_route_output_key(dev_net(dev), &fl);
-                if (IS_ERR(rt)) {
-                        dev->stats.tx_carrier_errors++;
-                        goto tx_error;
-                }
+        rt = ip_route_output_gre(dev_net(dev), dst, tiph->saddr,
+                                 tunnel->parms.o_key, RT_TOS(tos),
+                                 tunnel->parms.link);
+        if (IS_ERR(rt)) {
+                dev->stats.tx_carrier_errors++;
+                goto tx_error;
         }
         tdev = rt->dst.dev;
 
@@ -946,15 +938,11 @@ static int ipgre_tunnel_bind_dev(struct net_device *dev)
         /* Guess output device to choose reasonable mtu and needed_headroom */
 
         if (iph->daddr) {
-                struct flowi fl = {
-                        .oif = tunnel->parms.link,
-                        .fl4_dst = iph->daddr,
-                        .fl4_src = iph->saddr,
-                        .fl4_tos = RT_TOS(iph->tos),
-                        .proto = IPPROTO_GRE,
-                        .fl_gre_key = tunnel->parms.o_key
-                };
-                struct rtable *rt = ip_route_output_key(dev_net(dev), &fl);
+                struct rtable *rt = ip_route_output_gre(dev_net(dev),
+                                                        iph->daddr, iph->saddr,
+                                                        tunnel->parms.o_key,
+                                                        RT_TOS(iph->tos),
+                                                        tunnel->parms.link);
 
                 if (!IS_ERR(rt)) {
                         tdev = rt->dst.dev;
@@ -1208,15 +1196,12 @@ static int ipgre_open(struct net_device *dev)
         struct ip_tunnel *t = netdev_priv(dev);
 
         if (ipv4_is_multicast(t->parms.iph.daddr)) {
-                struct flowi fl = {
-                        .oif = t->parms.link,
-                        .fl4_dst = t->parms.iph.daddr,
-                        .fl4_src = t->parms.iph.saddr,
-                        .fl4_tos = RT_TOS(t->parms.iph.tos),
-                        .proto = IPPROTO_GRE,
-                        .fl_gre_key = t->parms.o_key
-                };
-                struct rtable *rt = ip_route_output_key(dev_net(dev), &fl);
+                struct rtable *rt = ip_route_output_gre(dev_net(dev),
+                                                        t->parms.iph.daddr,
+                                                        t->parms.iph.saddr,
+                                                        t->parms.o_key,
+                                                        RT_TOS(t->parms.iph.tos),
+                                                        t->parms.link);
 
                 if (IS_ERR(rt))
                         return -EADDRNOTAVAIL;
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 171f483b21d5..916152dbdce4 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -339,26 +339,19 @@ int ip_queue_xmit(struct sk_buff *skb)
                 if(opt && opt->srr)
                         daddr = opt->faddr;
 
-                {
-                        struct flowi fl = { .oif = sk->sk_bound_dev_if,
-                                            .mark = sk->sk_mark,
-                                            .fl4_dst = daddr,
-                                            .fl4_src = inet->inet_saddr,
-                                            .fl4_tos = RT_CONN_FLAGS(sk),
-                                            .proto = sk->sk_protocol,
-                                            .flags = inet_sk_flowi_flags(sk),
-                                            .fl_ip_sport = inet->inet_sport,
-                                            .fl_ip_dport = inet->inet_dport };
-
-                        /* If this fails, retransmit mechanism of transport layer will
-                         * keep trying until route appears or the connection times
-                         * itself out.
-                         */
-                        security_sk_classify_flow(sk, &fl);
-                        rt = ip_route_output_flow(sock_net(sk), &fl, sk);
-                        if (IS_ERR(rt))
-                                goto no_route;
-                }
+                /* If this fails, retransmit mechanism of transport layer will
+                 * keep trying until route appears or the connection times
+                 * itself out.
+                 */
+                rt = ip_route_output_ports(sock_net(sk), sk,
+                                           daddr, inet->inet_saddr,
+                                           inet->inet_dport,
+                                           inet->inet_sport,
+                                           sk->sk_protocol,
+                                           RT_CONN_FLAGS(sk),
+                                           sk->sk_bound_dev_if);
+                if (IS_ERR(rt))
+                        goto no_route;
                 sk_setup_caps(sk, &rt->dst);
         }
         skb_dst_set_noref(skb, &rt->dst);
diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 65008f45addc..bfc17c5914e7 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -460,20 +460,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                         goto tx_error_icmp;
         }
 
-        {
-                struct flowi fl = {
-                        .oif = tunnel->parms.link,
-                        .fl4_dst = dst,
-                        .fl4_src= tiph->saddr,
-                        .fl4_tos = RT_TOS(tos),
-                        .proto = IPPROTO_IPIP
-                };
-
-                rt = ip_route_output_key(dev_net(dev), &fl);
-                if (IS_ERR(rt)) {
-                        dev->stats.tx_carrier_errors++;
-                        goto tx_error_icmp;
-                }
+        rt = ip_route_output_ports(dev_net(dev), NULL,
+                                   dst, tiph->saddr,
+                                   0, 0,
+                                   IPPROTO_IPIP, RT_TOS(tos),
+                                   tunnel->parms.link);
+        if (IS_ERR(rt)) {
+                dev->stats.tx_carrier_errors++;
+                goto tx_error_icmp;
         }
         tdev = rt->dst.dev;
 
@@ -584,14 +578,12 @@ static void ipip_tunnel_bind_dev(struct net_device *dev)
         iph = &tunnel->parms.iph;
 
         if (iph->daddr) {
-                struct flowi fl = {
-                        .oif = tunnel->parms.link,
-                        .fl4_dst = iph->daddr,
-                        .fl4_src = iph->saddr,
-                        .fl4_tos = RT_TOS(iph->tos),
-                        .proto = IPPROTO_IPIP
-                };
-                struct rtable *rt = ip_route_output_key(dev_net(dev), &fl);
+                struct rtable *rt = ip_route_output_ports(dev_net(dev), NULL,
+                                                          iph->daddr, iph->saddr,
+                                                          0, 0,
+                                                          IPPROTO_IPIP,
+                                                          RT_TOS(iph->tos),
+                                                          tunnel->parms.link);
 
                 if (!IS_ERR(rt)) {
                         tdev = rt->dst.dev;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 74909bac8817..594a3004367b 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1611,25 +1611,19 @@ static void ipmr_queue_xmit(struct net *net, struct mr_table *mrt,
 #endif
 
         if (vif->flags & VIFF_TUNNEL) {
-                struct flowi fl = {
-                        .oif = vif->link,
-                        .fl4_dst = vif->remote,
-                        .fl4_src = vif->local,
-                        .fl4_tos = RT_TOS(iph->tos),
-                        .proto = IPPROTO_IPIP
-                };
-                rt = ip_route_output_key(net, &fl);
+                rt = ip_route_output_ports(net, NULL,
+                                           vif->remote, vif->local,
+                                           0, 0,
+                                           IPPROTO_IPIP,
+                                           RT_TOS(iph->tos), vif->link);
                 if (IS_ERR(rt))
                         goto out_free;
                 encap = sizeof(struct iphdr);
         } else {
-                struct flowi fl = {
-                        .oif = vif->link,
-                        .fl4_dst = iph->daddr,
-                        .fl4_tos = RT_TOS(iph->tos),
-                        .proto = IPPROTO_IPIP
-                };
-                rt = ip_route_output_key(net, &fl);
+                rt = ip_route_output_ports(net, NULL, iph->daddr, 0,
+                                           0, 0,
+                                           IPPROTO_IPIP,
+                                           RT_TOS(iph->tos), vif->link);
                 if (IS_ERR(rt))
                         goto out_free;
         }