summaryrefslogtreecommitdiffstats
path: root/tests/aspath_test.c
diff options
context:
space:
mode:
authorpaul <paul>2006-08-06 15:52:11 +0000
committerpaul <paul>2006-08-06 15:52:11 +0000
commit2c5ad1b10b71dcf8606ca8cead31ee6e4246ac17 (patch)
tree22d439cc24cedd3bbcf31eddb6df6bb987c426b0 /tests/aspath_test.c
parent116008fe8eab1c67ab91d1851a659cc9e77d2f6d (diff)
downloadquagga-2c5ad1b10b71dcf8606ca8cead31ee6e4246ac17.tar.bz2
quagga-2c5ad1b10b71dcf8606ca8cead31ee6e4246ac17.tar.xz
[bgpd] aspath_loop_check was broken, fix it and the aspath unit test code.
2006-08-06 Paul Jakma <paul.jakma@sun.com> * bgp_aspath.c: (aspath_loop_check) Fix the typo-bug which essentially had disabled this check. Problem reported by Bartek Kania <mrbk@gnarf.org> in [quagga-users 7388]. * aspath_test.c: (validate) Fix the sense of the aspath_loop_check, which was the wrong way around and had actually been testing for aspath_loop_check to be buggy.
Diffstat (limited to 'tests/aspath_test.c')
-rw-r--r--tests/aspath_test.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/aspath_test.c b/tests/aspath_test.c
index 5d510cca..1d28dbed 100644
--- a/tests/aspath_test.c
+++ b/tests/aspath_test.c
@@ -76,7 +76,7 @@ static struct test_segment {
10,
{ "8482 51457 {5204}",
"8482 51457 {5204}",
- 3, 0, NOT_ALL_PRIVATE, 5204, 51457, 8482},
+ 3, 0, NOT_ALL_PRIVATE, 5204, 51456, 8482},
},
{ /* 4 */
"seqset2",
@@ -618,8 +618,8 @@ validate (struct aspath *as, const struct test_spec *sp)
}
/* loop, private and first as checks */
- if (aspath_loop_check (as, sp->does_loop)
- || aspath_loop_check (as, sp->doesnt_loop)
+ if ((sp->does_loop && aspath_loop_check (as, sp->does_loop) == 0)
+ || (sp->doesnt_loop && aspath_loop_check (as, sp->doesnt_loop) != 0)
|| (aspath_private_as_check (as) != sp->private_as)
|| (aspath_firstas_check (as,sp->first)
&& sp->first == 0))