lib: fix prefix list trie corruption

The specific code here needs to establish an absolute order of more
specific to less specific possible matches in a prefix list.  This is
indirectly checked by an assert on insertion, because the "next best"
entry is required to be consistent even when joining multiple chains
of candidates.

Unfortunately, trie_install_fn() would insert entries too far ahead in
the chain if another entry with higher sequence number was seen.  This
breaks the trie and (rightfully) triggers the assertion failure on
insert.

Fixes: #937
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/lib/plist.c b/lib/plist.c
index 2af13244ff2a34ef0a2268a57a4fd180b5f72cea..56684e82512c7426f7c38ca82faf3ce26fbb9c2d 100644 (file)
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -538,7 +538,8 @@ static void trie_install_fn(struct prefix_list_entry *object,
                        return;
                if ((*updptr)->prefix.prefixlen < object->prefix.prefixlen)
                        break;
-               if ((*updptr)->seq > object->seq)
+               if ((*updptr)->prefix.prefixlen == object->prefix.prefixlen
+                   && (*updptr)->seq > object->seq)
                        break;
                updptr = &(*updptr)->next_best;
        }