fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / net / ip6_route.h

diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 1f2e428..4e927eb 100644 (file)
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -7,6 +7,23 @@
 #define IP6_RT_PRIO_KERN       512
 #define IP6_RT_FLOW_MASK       0x00ff
 
+struct route_info {
+       __u8                    type;
+       __u8                    length;
+       __u8                    prefix_len;
+#if defined(__BIG_ENDIAN_BITFIELD)
+       __u8                    reserved_h:3,
+                               route_pref:2,
+                               reserved_l:3;
+#elif defined(__LITTLE_ENDIAN_BITFIELD)
+       __u8                    reserved_l:3,
+                               route_pref:2,
+                               reserved_h:3;
+#endif
+       __be32                  lifetime;
+       __u8                    prefix[0];      /* 0,8 or 16 */
+};
+
 #ifdef __KERNEL__
 
 #include <net/flow.h>
@@ -15,15 +32,17 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 
-struct pol_chain {
-       int                     type;
-       int                     priority;
-       struct fib6_node        *rules;
-       struct pol_chain        *next;
-};
+#define RT6_LOOKUP_F_IFACE     0x1
+#define RT6_LOOKUP_F_REACHABLE 0x2
+#define RT6_LOOKUP_F_HAS_SADDR 0x4
 
 extern struct rt6_info ip6_null_entry;
 
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+extern struct rt6_info ip6_prohibit_entry;
+extern struct rt6_info ip6_blk_hole_entry;
+#endif
+
 extern int ip6_rt_gc_interval;
 
 extern void                    ip6_route_input(struct sk_buff *skb);
@@ -31,25 +50,14 @@ extern void                 ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *      ip6_route_output(struct sock *sk,
                                                 struct flowi *fl);
 
-extern int                     ip6_route_me_harder(struct sk_buff *skb);
-
 extern void                    ip6_route_init(void);
 extern void                    ip6_route_cleanup(void);
 
 extern int                     ipv6_route_ioctl(unsigned int cmd, void __user *arg);
 
-extern int                     ip6_route_add(struct in6_rtmsg *rtmsg,
-                                             struct nlmsghdr *,
-                                             void *rtattr,
-                                             struct netlink_skb_parms *req);
-extern int                     ip6_ins_rt(struct rt6_info *,
-                                          struct nlmsghdr *,
-                                          void *rtattr,
-                                          struct netlink_skb_parms *req);
-extern int                     ip6_del_rt(struct rt6_info *,
-                                          struct nlmsghdr *,
-                                          void *rtattr,
-                                          struct netlink_skb_parms *req);
+extern int                     ip6_route_add(struct fib6_config *cfg);
+extern int                     ip6_ins_rt(struct rt6_info *);
+extern int                     ip6_del_rt(struct rt6_info *);
 
 extern int                     ip6_rt_addr_add(struct in6_addr *addr,
                                                struct net_device *dev,
@@ -87,13 +95,17 @@ extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
 extern struct rt6_info *       rt6_get_dflt_router(struct in6_addr *addr,
                                                    struct net_device *dev);
 extern struct rt6_info *       rt6_add_dflt_router(struct in6_addr *gwaddr,
-                                                   struct net_device *dev);
+                                                   struct net_device *dev,
+                                                   unsigned int pref);
 
 extern void                    rt6_purge_dflt_routers(void);
 
-extern void                    rt6_reset_dflt_pointer(struct rt6_info *rt);
+extern int                     rt6_route_rcv(struct net_device *dev,
+                                             u8 *opt, int len,
+                                             struct in6_addr *gwaddr);
 
 extern void                    rt6_redirect(struct in6_addr *dest,
+                                            struct in6_addr *src,
                                             struct in6_addr *saddr,
                                             struct neighbour *neigh,
                                             u8 *lladdr,
@@ -111,6 +123,13 @@ extern int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *a
 extern int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 extern int inet6_rtm_getroute(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg);
 
+struct rt6_rtnl_dump_arg
+{
+       struct sk_buff *skb;
+       struct netlink_callback *cb;
+};
+
+extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net_device *dev);
 extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
 
@@ -119,16 +138,25 @@ extern rwlock_t rt6_lock;
 /*
  *     Store a destination cache entry in a socket
  */
-static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                    struct in6_addr *daddr)
+static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
+                                  struct in6_addr *daddr, struct in6_addr *saddr)
 {
        struct ipv6_pinfo *np = inet6_sk(sk);
        struct rt6_info *rt = (struct rt6_info *) dst;
 
-       write_lock(&sk->sk_dst_lock);
-       __sk_dst_set(sk, dst);
+       sk_setup_caps(sk, dst);
        np->daddr_cache = daddr;
+#ifdef CONFIG_IPV6_SUBTREES
+       np->saddr_cache = saddr;
+#endif
        np->dst_cookie = rt->rt6i_node ? rt->rt6i_node->fn_sernum : 0;
+}
+
+static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
+                                struct in6_addr *daddr, struct in6_addr *saddr)
+{
+       write_lock(&sk->sk_dst_lock);
+       __ip6_dst_store(sk, dst, daddr, saddr);
        write_unlock(&sk->sk_dst_lock);
 }