1 files changed, 73 insertions, 40 deletions

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index a66e9de16a6c..e4438de3bd6b 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -16,14 +16,35 @@
 #ifdef __KERNEL__
 
 #include <linux/ipv6_route.h>
-
-#include <net/dst.h>
-#include <net/flow.h>
 #include <linux/rtnetlink.h>
 #include <linux/spinlock.h>
+#include <net/dst.h>
+#include <net/flow.h>
+#include <net/netlink.h>
 
 struct rt6_info;
 
+struct fib6_config
+{
+        u32             fc_table;
+        u32             fc_metric;
+        int             fc_dst_len;
+        int             fc_src_len;
+        int             fc_ifindex;
+        u32             fc_flags;
+        u32             fc_protocol;
+
+        struct in6_addr fc_dst;
+        struct in6_addr fc_src;
+        struct in6_addr fc_gateway;
+
+        unsigned long   fc_expires;
+        struct nlattr   *fc_mx;
+        int             fc_mx_len;
+
+        struct nl_info  fc_nlinfo;
+};
+
 struct fib6_node
 {
         struct fib6_node        *parent;
@@ -39,6 +60,11 @@ struct fib6_node
         __u32                   fn_sernum;
 };
 
+#ifndef CONFIG_IPV6_SUBTREES
+#define FIB6_SUBTREE(fn)        NULL
+#else
+#define FIB6_SUBTREE(fn)        ((fn)->subtree)
+#endif
 
 /*
  *      routing information
@@ -51,6 +77,8 @@ struct rt6key
         int             plen;
 };
 
+struct fib6_table;
+
 struct rt6_info
 {
         union {
@@ -71,6 +99,7 @@ struct rt6_info
         u32                             rt6i_flags;
         u32                             rt6i_metric;
         atomic_t                        rt6i_ref;
+        struct fib6_table               *rt6i_table;
 
         struct rt6key                   rt6i_dst;
         struct rt6key                   rt6i_src;
@@ -89,28 +118,6 @@ struct fib6_walker_t
         void *args;
 };
 
-extern struct fib6_walker_t fib6_walker_list;
-extern rwlock_t fib6_walker_lock;
-
-static inline void fib6_walker_link(struct fib6_walker_t *w)
-{
-        write_lock_bh(&fib6_walker_lock);
-        w->next = fib6_walker_list.next;
-        w->prev = &fib6_walker_list;
-        w->next->prev = w;
-        w->prev->next = w;
-        write_unlock_bh(&fib6_walker_lock);
-}
-
-static inline void fib6_walker_unlink(struct fib6_walker_t *w)
-{
-        write_lock_bh(&fib6_walker_lock);
-        w->next->prev = w->prev;
-        w->prev->next = w->next;
-        w->prev = w->next = w;
-        write_unlock_bh(&fib6_walker_lock);
-}
-
 struct rt6_statistics {
         __u32           fib_nodes;
         __u32           fib_route_nodes;
@@ -143,12 +150,41 @@ struct rt6_statistics {
 
 typedef void                    (*f_pnode)(struct fib6_node *fn, void *);
 
-extern struct fib6_node         ip6_routing_table;
+struct fib6_table {
+        struct hlist_node       tb6_hlist;
+        u32                     tb6_id;
+        rwlock_t                tb6_lock;
+        struct fib6_node        tb6_root;
+};
+
+#define RT6_TABLE_UNSPEC        RT_TABLE_UNSPEC
+#define RT6_TABLE_MAIN          RT_TABLE_MAIN
+#define RT6_TABLE_DFLT          RT6_TABLE_MAIN
+#define RT6_TABLE_INFO          RT6_TABLE_MAIN
+#define RT6_TABLE_PREFIX        RT6_TABLE_MAIN
+
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+#define FIB6_TABLE_MIN          1
+#define FIB6_TABLE_MAX          RT_TABLE_MAX
+#define RT6_TABLE_LOCAL         RT_TABLE_LOCAL
+#else
+#define FIB6_TABLE_MIN          RT_TABLE_MAIN
+#define FIB6_TABLE_MAX          FIB6_TABLE_MIN
+#define RT6_TABLE_LOCAL         RT6_TABLE_MAIN
+#endif
+
+typedef struct rt6_info *(*pol_lookup_t)(struct fib6_table *,
+                                         struct flowi *, int);
 
 /*
  *      exported functions
  */
 
+extern struct fib6_table *      fib6_get_table(u32 id);
+extern struct fib6_table *      fib6_new_table(u32 id);
+extern struct dst_entry *       fib6_rule_lookup(struct flowi *fl, int flags,
+                                                 pol_lookup_t lookup);
+
 extern struct fib6_node         *fib6_lookup(struct fib6_node *root,
                                              struct in6_addr *daddr,
                                              struct in6_addr *saddr);
@@ -157,32 +193,29 @@ struct fib6_node		*fib6_locate(struct fib6_node *root,
                                              struct in6_addr *daddr, int dst_len,
                                              struct in6_addr *saddr, int src_len);
 
-extern void                     fib6_clean_tree(struct fib6_node *root,
-                                                int (*func)(struct rt6_info *, void *arg),
-                                                int prune, void *arg);
-
-extern int                      fib6_walk(struct fib6_walker_t *w);
-extern int                      fib6_walk_continue(struct fib6_walker_t *w);
+extern void                     fib6_clean_all(int (*func)(struct rt6_info *, void *arg),
+                                               int prune, void *arg);
 
 extern int                      fib6_add(struct fib6_node *root,
                                          struct rt6_info *rt,
-                                         struct nlmsghdr *nlh,
-                                         void *rtattr,
-                                         struct netlink_skb_parms *req);
+                                         struct nl_info *info);
 
 extern int                      fib6_del(struct rt6_info *rt,
-                                         struct nlmsghdr *nlh,
-                                         void *rtattr,
-                                         struct netlink_skb_parms *req);
+                                         struct nl_info *info);
 
 extern void                     inet6_rt_notify(int event, struct rt6_info *rt,
-                                                struct nlmsghdr *nlh,
-                                                struct netlink_skb_parms *req);
+                                                struct nl_info *info);
 
 extern void                     fib6_run_gc(unsigned long dummy);
 
 extern void                     fib6_gc_cleanup(void);
 
 extern void                     fib6_init(void);
+
+extern void                     fib6_rules_init(void);
+extern void                     fib6_rules_cleanup(void);
+extern int                      fib6_rules_dump(struct sk_buff *,
+                                                struct netlink_callback *);
+
 #endif
 #endif