]> git.puffer.fish Git - matthieu/frr.git/commitdiff
ospf6d: don't create Adv-ID:0.0.0.0 LSAs at start
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Jun 2021 14:29:56 +0000 (16:29 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Tue, 20 Jul 2021 09:22:21 +0000 (11:22 +0200)
When ospf6d comes up, it gets interface and address state before it
decides on its router ID.  This results in a bunch of LSAs with
advertising router ID 0.0.0.0 in the LSDB.  Not quite right.

There's a whole bunch of paths leading to this, so just drop the LSA in
ospf6_lsa_originate.  The router-ID change causes everything to be
readvertised anyway (... but the delete doesn't catch the 0.0.0.0 stuff
because the router-ID is now different.)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
ospf6d/ospf6_flood.c

index 738c2218fa43a7c6e0aa4d719749278a06a60fcb..0a384a98e696176e5efc0f6838ad89100fc05ad0 100644 (file)
@@ -89,6 +89,16 @@ void ospf6_lsa_originate(struct ospf6_lsa *lsa)
        struct ospf6_lsa *old;
        struct ospf6_lsdb *lsdb_self;
 
+       if (lsa->header->adv_router == INADDR_ANY) {
+               if (IS_OSPF6_DEBUG_ORIGINATE_TYPE(lsa->header->type))
+                       zlog_debug(
+                               "Refusing to originate LSA (zero router ID): %s",
+                               lsa->name);
+
+               ospf6_lsa_delete(lsa);
+               return;
+       }
+
        /* find previous LSA */
        old = ospf6_lsdb_lookup(lsa->header->type, lsa->header->id,
                                lsa->header->adv_router, lsa->lsdb);