net 03/05: fib_rules: add oif classification

[net-next-2.6.git] / net / core / fib_rules.c

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index bd309384f8b82dcb928c8236cc2901d39f9cee9f..d1a70ad4b544ca7c308f21b7cd00971dbd845dbb 100644 (file)
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -135,7 +135,10 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops,
 {
        int ret = 0;
 
-       if (rule->ifindex && (rule->ifindex != fl->iif))
+       if (rule->iifindex && (rule->iifindex != fl->iif))
+               goto out;
+
+       if (rule->oifindex && (rule->oifindex != fl->oif))
                goto out;
 
        if ((rule->mark ^ fl->mark) & rule->mark_mask)
@@ -248,14 +251,24 @@ static int fib_nl_newrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
        if (tb[FRA_PRIORITY])
                rule->pref = nla_get_u32(tb[FRA_PRIORITY]);
 
-       if (tb[FRA_IFNAME]) {
+       if (tb[FRA_IIFNAME]) {
+               struct net_device *dev;
+
+               rule->iifindex = -1;
+               nla_strlcpy(rule->iifname, tb[FRA_IIFNAME], IFNAMSIZ);
+               dev = __dev_get_by_name(net, rule->iifname);
+               if (dev)
+                       rule->iifindex = dev->ifindex;
+       }
+
+       if (tb[FRA_OIFNAME]) {
                struct net_device *dev;
 
-               rule->ifindex = -1;
-               nla_strlcpy(rule->ifname, tb[FRA_IFNAME], IFNAMSIZ);
-               dev = __dev_get_by_name(net, rule->ifname);
+               rule->oifindex = -1;
+               nla_strlcpy(rule->oifname, tb[FRA_OIFNAME], IFNAMSIZ);
+               dev = __dev_get_by_name(net, rule->oifname);
                if (dev)
-                       rule->ifindex = dev->ifindex;
+                       rule->oifindex = dev->ifindex;
        }
 
        if (tb[FRA_FWMARK]) {
@@ -388,8 +401,12 @@ static int fib_nl_delrule(struct sk_buff *skb, struct nlmsghdr* nlh, void *arg)
                    (rule->pref != nla_get_u32(tb[FRA_PRIORITY])))
                        continue;
 
-               if (tb[FRA_IFNAME] &&
-                   nla_strcmp(tb[FRA_IFNAME], rule->ifname))
+               if (tb[FRA_IIFNAME] &&
+                   nla_strcmp(tb[FRA_IIFNAME], rule->iifname))
+                       continue;
+
+               if (tb[FRA_OIFNAME] &&
+                   nla_strcmp(tb[FRA_OIFNAME], rule->oifname))
                        continue;
 
                if (tb[FRA_FWMARK] &&
@@ -447,7 +464,8 @@ static inline size_t fib_rule_nlmsg_size(struct fib_rules_ops *ops,
                                         struct fib_rule *rule)
 {
        size_t payload = NLMSG_ALIGN(sizeof(struct fib_rule_hdr))
-                        + nla_total_size(IFNAMSIZ) /* FRA_IFNAME */
+                        + nla_total_size(IFNAMSIZ) /* FRA_IIFNAME */
+                        + nla_total_size(IFNAMSIZ) /* FRA_OIFNAME */
                         + nla_total_size(4) /* FRA_PRIORITY */
                         + nla_total_size(4) /* FRA_TABLE */
                         + nla_total_size(4) /* FRA_FWMARK */
@@ -481,11 +499,18 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
        if (rule->action == FR_ACT_GOTO && rule->ctarget == NULL)
                frh->flags |= FIB_RULE_UNRESOLVED;
 
-       if (rule->ifname[0]) {
-               NLA_PUT_STRING(skb, FRA_IFNAME, rule->ifname);
+       if (rule->iifname[0]) {
+               NLA_PUT_STRING(skb, FRA_IIFNAME, rule->iifname);
 
-               if (rule->ifindex == -1)
-                       frh->flags |= FIB_RULE_DEV_DETACHED;
+               if (rule->iifindex == -1)
+                       frh->flags |= FIB_RULE_IIF_DETACHED;
+       }
+
+       if (rule->oifname[0]) {
+               NLA_PUT_STRING(skb, FRA_OIFNAME, rule->oifname);
+
+               if (rule->oifindex == -1)
+                       frh->flags |= FIB_RULE_OIF_DETACHED;
        }
 
        if (rule->pref)
@@ -600,9 +625,12 @@ static void attach_rules(struct list_head *rules, struct net_device *dev)
        struct fib_rule *rule;
 
        list_for_each_entry(rule, rules, list) {
-               if (rule->ifindex == -1 &&
-                   strcmp(dev->name, rule->ifname) == 0)
-                       rule->ifindex = dev->ifindex;
+               if (rule->iifindex == -1 &&
+                   strcmp(dev->name, rule->iifname) == 0)
+                       rule->iifindex = dev->ifindex;
+               if (rule->oifindex == -1 &&
+                   strcmp(dev->name, rule->oifname) == 0)
+                       rule->oifindex = dev->ifindex;
        }
 }
 
@@ -610,9 +638,12 @@ static void detach_rules(struct list_head *rules, struct net_device *dev)
 {
        struct fib_rule *rule;
 
-       list_for_each_entry(rule, rules, list)
-               if (rule->ifindex == dev->ifindex)
-                       rule->ifindex = -1;
+       list_for_each_entry(rule, rules, list) {
+               if (rule->iifindex == dev->ifindex)
+                       rule->iifindex = -1;
+               if (rule->oifindex == dev->ifindex)
+                       rule->oifindex = -1;
+       }
 }