sctp: remove useless arguments from get_saddr() call
[linux-2.6.git] / include / net / route.h
index 3d814f8..3684c3e 100644 (file)
 #include <linux/cache.h>
 #include <linux/security.h>
 
-#ifndef __KERNEL__
-#warning This file is not supposed to be used outside of kernel.
-#endif
-
 #define RTO_ONLINK     0x01
 
 #define RTO_CONN       0
@@ -64,6 +60,7 @@ struct rtable {
 
        __be32                  rt_dst; /* Path destination     */
        __be32                  rt_src; /* Path source          */
+       int                     rt_route_iif;
        int                     rt_iif;
        int                     rt_oif;
        __u32                   rt_mark;
@@ -80,12 +77,12 @@ struct rtable {
 
 static inline bool rt_is_input_route(struct rtable *rt)
 {
-       return rt->rt_iif != 0;
+       return rt->rt_route_iif != 0;
 }
 
 static inline bool rt_is_output_route(struct rtable *rt)
 {
-       return rt->rt_iif == 0;
+       return rt->rt_route_iif == 0;
 }
 
 struct ip_rt_acct {
@@ -122,12 +119,12 @@ extern void               ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
                                       __be32 src, struct net_device *dev);
 extern void            rt_cache_flush(struct net *net, int how);
 extern void            rt_cache_flush_batch(struct net *net);
-extern struct rtable *__ip_route_output_key(struct net *, const struct flowi *flp);
-extern struct rtable *ip_route_output_flow(struct net *, struct flowi *flp,
+extern struct rtable *__ip_route_output_key(struct net *, const struct flowi4 *flp);
+extern struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,
                                           struct sock *sk);
 extern struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_orig);
 
-static inline struct rtable *ip_route_output_key(struct net *net, struct flowi *flp)
+static inline struct rtable *ip_route_output_key(struct net *net, struct flowi4 *flp)
 {
        return ip_route_output_flow(net, flp, NULL);
 }
@@ -135,13 +132,13 @@ static inline struct rtable *ip_route_output_key(struct net *net, struct flowi *
 static inline struct rtable *ip_route_output(struct net *net, __be32 daddr,
                                             __be32 saddr, u8 tos, int oif)
 {
-       struct flowi fl = {
-               .flowi_oif = oif,
-               .fl4_dst = daddr,
-               .fl4_src = saddr,
-               .fl4_tos = tos,
+       struct flowi4 fl4 = {
+               .flowi4_oif = oif,
+               .daddr = daddr,
+               .saddr = saddr,
+               .flowi4_tos = tos,
        };
-       return ip_route_output_key(net, &fl);
+       return ip_route_output_key(net, &fl4);
 }
 
 static inline struct rtable *ip_route_output_ports(struct net *net, struct sock *sk,
@@ -149,35 +146,30 @@ static inline struct rtable *ip_route_output_ports(struct net *net, struct sock
                                                   __be16 dport, __be16 sport,
                                                   __u8 proto, __u8 tos, int oif)
 {
-       struct flowi fl = {
-               .flowi_oif = oif,
-               .flowi_flags = sk ? inet_sk_flowi_flags(sk) : 0,
-               .flowi_mark = sk ? sk->sk_mark : 0,
-               .fl4_dst = daddr,
-               .fl4_src = saddr,
-               .fl4_tos = tos,
-               .flowi_proto = proto,
-               .fl_ip_dport = dport,
-               .fl_ip_sport = sport,
-       };
+       struct flowi4 fl4;
+
+       flowi4_init_output(&fl4, oif, sk ? sk->sk_mark : 0, tos,
+                          RT_SCOPE_UNIVERSE, proto,
+                          sk ? inet_sk_flowi_flags(sk) : 0,
+                          daddr, saddr, dport, sport);
        if (sk)
-               security_sk_classify_flow(sk, &fl);
-       return ip_route_output_flow(net, &fl, sk);
+               security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+       return ip_route_output_flow(net, &fl4, sk);
 }
 
 static inline struct rtable *ip_route_output_gre(struct net *net,
                                                 __be32 daddr, __be32 saddr,
                                                 __be32 gre_key, __u8 tos, int oif)
 {
-       struct flowi fl = {
-               .flowi_oif = oif,
-               .fl4_dst = daddr,
-               .fl4_src = saddr,
-               .fl4_tos = tos,
-               .flowi_proto = IPPROTO_GRE,
-               .fl_gre_key = gre_key,
+       struct flowi4 fl4 = {
+               .flowi4_oif = oif,
+               .daddr = daddr,
+               .saddr = saddr,
+               .flowi4_tos = tos,
+               .flowi4_proto = IPPROTO_GRE,
+               .fl4_gre_key = gre_key,
        };
-       return ip_route_output_key(net, &fl);
+       return ip_route_output_key(net, &fl4);
 }
 
 extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
@@ -195,7 +187,8 @@ static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 s
        return ip_route_input_common(skb, dst, src, tos, devin, true);
 }
 
-extern unsigned short  ip_rt_frag_needed(struct net *net, struct iphdr *iph, unsigned short new_mtu, struct net_device *dev);
+extern unsigned short  ip_rt_frag_needed(struct net *net, const struct iphdr *iph,
+                                         unsigned short new_mtu, struct net_device *dev);
 extern void            ip_rt_send_redirect(struct sk_buff *skb);
 
 extern unsigned                inet_addr_type(struct net *net, __be32 addr);
@@ -207,6 +200,7 @@ extern int          ip_rt_dump(struct sk_buff *skb,  struct netlink_callback *cb);
 
 struct in_ifaddr;
 extern void fib_add_ifaddr(struct in_ifaddr *);
+extern void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *);
 
 static inline void ip_rt_put(struct rtable * rt)
 {
@@ -228,34 +222,32 @@ static inline struct rtable *ip_route_connect(__be32 dst, __be32 src, u32 tos,
                                              __be16 sport, __be16 dport,
                                              struct sock *sk, bool can_sleep)
 {
-       struct flowi fl = { .flowi_oif = oif,
-                           .flowi_mark = sk->sk_mark,
-                           .fl4_dst = dst,
-                           .fl4_src = src,
-                           .fl4_tos = tos,
-                           .flowi_proto = protocol,
-                           .fl_ip_sport = sport,
-                           .fl_ip_dport = dport };
        struct net *net = sock_net(sk);
        struct rtable *rt;
+       struct flowi4 fl4;
+       __u8 flow_flags;
 
+       flow_flags = 0;
        if (inet_sk(sk)->transparent)
-               fl.flowi_flags |= FLOWI_FLAG_ANYSRC;
+               flow_flags |= FLOWI_FLAG_ANYSRC;
        if (protocol == IPPROTO_TCP)
-               fl.flowi_flags |= FLOWI_FLAG_PRECOW_METRICS;
+               flow_flags |= FLOWI_FLAG_PRECOW_METRICS;
        if (can_sleep)
-               fl.flowi_flags |= FLOWI_FLAG_CAN_SLEEP;
+               flow_flags |= FLOWI_FLAG_CAN_SLEEP;
+
+       flowi4_init_output(&fl4, oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE,
+                          protocol, flow_flags, dst, src, dport, sport);
 
        if (!dst || !src) {
-               rt = __ip_route_output_key(net, &fl);
+               rt = __ip_route_output_key(net, &fl4);
                if (IS_ERR(rt))
                        return rt;
-               fl.fl4_dst = rt->rt_dst;
-               fl.fl4_src = rt->rt_src;
+               fl4.daddr = rt->rt_dst;
+               fl4.saddr = rt->rt_src;
                ip_rt_put(rt);
        }
-       security_sk_classify_flow(sk, &fl);
-       return ip_route_output_flow(net, &fl, sk);
+       security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+       return ip_route_output_flow(net, &fl4, sk);
 }
 
 static inline struct rtable *ip_route_newports(struct rtable *rt,
@@ -264,22 +256,20 @@ static inline struct rtable *ip_route_newports(struct rtable *rt,
                                               __be16 dport, struct sock *sk)
 {
        if (sport != orig_sport || dport != orig_dport) {
-               struct flowi fl = { .flowi_oif = rt->rt_oif,
-                                   .flowi_mark = rt->rt_mark,
-                                   .fl4_dst = rt->rt_key_dst,
-                                   .fl4_src = rt->rt_key_src,
-                                   .fl4_tos = rt->rt_tos,
-                                   .flowi_proto = protocol,
-                                   .fl_ip_sport = sport,
-                                   .fl_ip_dport = dport };
+               struct flowi4 fl4;
+               __u8 flow_flags;
 
+               flow_flags = 0;
                if (inet_sk(sk)->transparent)
-                       fl.flowi_flags |= FLOWI_FLAG_ANYSRC;
+                       flow_flags |= FLOWI_FLAG_ANYSRC;
                if (protocol == IPPROTO_TCP)
-                       fl.flowi_flags |= FLOWI_FLAG_PRECOW_METRICS;
+                       flow_flags |= FLOWI_FLAG_PRECOW_METRICS;
+               flowi4_init_output(&fl4, rt->rt_oif, rt->rt_mark, rt->rt_tos,
+                                  RT_SCOPE_UNIVERSE, protocol, flow_flags,
+                                  rt->rt_dst, rt->rt_src, dport, sport);
                ip_rt_put(rt);
-               security_sk_classify_flow(sk, &fl);
-               return ip_route_output_flow(sock_net(sk), &fl, sk);
+               security_sk_classify_flow(sk, flowi4_to_flowi(&fl4));
+               return ip_route_output_flow(sock_net(sk), &fl4, sk);
        }
        return rt;
 }