From: Dmitry Tejblum <tejblum@yandex-team.ru>
Date: Mon, 18 Oct 2010 15:05:39 +0000 (+0400)
Subject: zclient: fix router-id calculation for IPv6 (#595)
X-Git-Tag: frr-2.0-rc1~2139
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=08a7a91646a1ee317c402b421e3a7036a640bcf4;p=matthieu%2Ffrr.git

zclient: fix router-id calculation for IPv6 (#595)

If router-id is not specified in ospf6d.conf, ospf6d will get it from
the zebra daemon. But ospf6d originates Link LSAs before the router-id
is returned by zebra, thus this router's Link LSAs will be flooded
with AdvRouter set to 0.

* zclient.c: zclient_start(): send ZEBRA_INTERFACE_ADD message after
  ZEBRA_ROUTER_ID_ADD, not before
---

diff --git a/lib/zclient.c b/lib/zclient.c
index d3d532274d..52a3627d0b 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -339,12 +339,12 @@ zclient_start (struct zclient *zclient)
   /* Create read thread. */
   zclient_event (ZCLIENT_READ, zclient);
 
-  /* We need interface information. */
-  zebra_message_send (zclient, ZEBRA_INTERFACE_ADD);
-
   /* We need router-id information. */
   zebra_message_send (zclient, ZEBRA_ROUTER_ID_ADD);
 
+  /* We need interface information. */
+  zebra_message_send (zclient, ZEBRA_INTERFACE_ADD);
+
   /* Flush all redistribute request. */
   for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
     if (i != zclient->redist_default && zclient->redist[i])