[INET]: Small possible memory leak in FIB rules

[net-next-2.6.git] / include / net / fib_rules.h

diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index d585ea9fa97d3887435e064922f5e65a62748851..41a301e386433006e659ae14409e1373f905d36b 100644 (file)
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -5,7 +5,7 @@
 #include <linux/netdevice.h>
 #include <linux/fib_rules.h>
 #include <net/flow.h>
-#include <net/netlink.h>
+#include <net/rtnetlink.h>
 
 struct fib_rule
 {
@@ -19,6 +19,8 @@ struct fib_rule
        u32                     flags;
        u32                     table;
        u8                      action;
+       u32                     target;
+       struct fib_rule *       ctarget;
        struct rcu_head         rcu;
 };
 
@@ -35,6 +37,8 @@ struct fib_rules_ops
        struct list_head        list;
        int                     rule_size;
        int                     addr_size;
+       int                     unresolved_rules;
+       int                     nr_goto_rules;
 
        int                     (*action)(struct fib_rule *,
                                          struct flowi *, int,
@@ -55,9 +59,13 @@ struct fib_rules_ops
        u32                     (*default_pref)(void);
        size_t                  (*nlmsg_payload)(struct fib_rule *);
 
+       /* Called after modifications to the rules set, must flush
+        * the route cache if one exists. */
+       void                    (*flush_cache)(void);
+
        int                     nlgroup;
-       struct nla_policy       *policy;
-       struct list_head        *rules_list;
+       const struct nla_policy *policy;
+       struct list_head        rules_list;
        struct module           *owner;
 };
 
@@ -66,7 +74,8 @@ struct fib_rules_ops
        [FRA_PRIORITY]  = { .type = NLA_U32 }, \
        [FRA_FWMARK]    = { .type = NLA_U32 }, \
        [FRA_FWMASK]    = { .type = NLA_U32 }, \
-       [FRA_TABLE]     = { .type = NLA_U32 }
+       [FRA_TABLE]     = { .type = NLA_U32 }, \
+       [FRA_GOTO]      = { .type = NLA_U32 }
 
 static inline void fib_rule_get(struct fib_rule *rule)
 {
@@ -98,11 +107,7 @@ extern int                  fib_rules_unregister(struct fib_rules_ops *);
 extern int                     fib_rules_lookup(struct fib_rules_ops *,
                                                 struct flowi *, int flags,
                                                 struct fib_lookup_arg *);
-
-extern int                     fib_nl_newrule(struct sk_buff *,
-                                              struct nlmsghdr *, void *);
-extern int                     fib_nl_delrule(struct sk_buff *,
-                                              struct nlmsghdr *, void *);
-extern int                     fib_rules_dump(struct sk_buff *,
-                                              struct netlink_callback *, int);
+extern int                     fib_default_rule_add(struct fib_rules_ops *,
+                                                    u32 pref, u32 table,
+                                                    u32 flags);
 #endif