Thomas Graf wrote:
> * David S. Miller <[EMAIL PROTECTED]> 2005-08-23 10:48
>
>>@@ -1508,7 +1508,7 @@ fn_trie_lookup(struct fib_table *tb, con
>> continue;
>> }
>> if (IS_LEAF(n)) {
>>- if (check_leaf(t, (struct leaf *)n, key, &plen, flp,
>>res, &ret))
>>+ if ((ret = check_leaf(t, (struct leaf *)n, key, &plen,
>>flp, res)))
>
>
> This should be <= 0 otherwise we backtrace when we find a "regular"
> route.
Same line as that causes me trouble :) Here's a patch that applies
cleanly to net-2.6.
[FIB_TRIE]: Don't ignore negative results from fib_semantic_match
When a semantic match occurs either success, not found or an error
(for matching unreachable routes/blackholes) is returned. fib_trie
ignores the errors and looks for a different matching route. Treat
results other than "no match" as success and end lookup.
Signed-off-by: Patrick McHardy <[EMAIL PROTECTED]>
---
commit 8ef1930642b6a24673263b8ef7e87eb20b891295
tree 812212ca8eab703d8cbbb2eb95ab798c37659244
parent dc16aaf29d64b8c5e0b88f49a4d541edf5b61e42
author Patrick McHardy <[EMAIL PROTECTED]> Tue, 23 Aug 2005 22:07:11 +0200
committer Patrick McHardy <[EMAIL PROTECTED]> Tue, 23 Aug 2005 22:07:11 +0200
net/ipv4/fib_trie.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1333,9 +1333,9 @@ err:;
}
static inline int check_leaf(struct trie *t, struct leaf *l, t_key key, int
*plen, const struct flowi *flp,
- struct fib_result *res, int *err)
+ struct fib_result *res)
{
- int i;
+ int err, i;
t_key mask;
struct leaf_info *li;
struct hlist_head *hhead = &l->list;
@@ -1348,18 +1348,18 @@ static inline int check_leaf(struct trie
if (l->key != (key & mask))
continue;
- if (((*err) = fib_semantic_match(&li->falh, flp, res, l->key,
mask, i)) == 0) {
+ if ((err = fib_semantic_match(&li->falh, flp, res, l->key,
mask, i)) <= 0) {
*plen = i;
#ifdef CONFIG_IP_FIB_TRIE_STATS
t->stats.semantic_match_passed++;
#endif
- return 1;
+ return err;
}
#ifdef CONFIG_IP_FIB_TRIE_STATS
t->stats.semantic_match_miss++;
#endif
}
- return 0;
+ return 1;
}
static int
@@ -1386,7 +1386,7 @@ fn_trie_lookup(struct fib_table *tb, con
/* Just a leaf? */
if (IS_LEAF(n)) {
- if (check_leaf(t, (struct leaf *)n, key, &plen, flp, res, &ret))
+ if ((ret = check_leaf(t, (struct leaf *)n, key, &plen, flp,
res)) <= 0)
goto found;
goto failed;
}
@@ -1508,7 +1508,7 @@ fn_trie_lookup(struct fib_table *tb, con
continue;
}
if (IS_LEAF(n)) {
- if (check_leaf(t, (struct leaf *)n, key, &plen, flp,
res, &ret))
+ if ((ret = check_leaf(t, (struct leaf *)n, key, &plen,
flp, res)) <= 0)
goto found;
}
backtrace:
