diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
| commit | 1f35b46a2f35d59b86ed3ee557aa1c9fcf2fcac9 (patch) | |
| tree | 27de606b3510b126766ac7a0ac9eb8ddf4573ab0 /ospf6d/ospf6_zebra.c | |
| parent | d47ae3db4cf14c72d8468d61113ac88e19235791 (diff) | |
| parent | c1a003878246ccc84ab5986558ca959f4545f738 (diff) | |
Merge branch 'master' into docuser
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ospf6d/ospf6_zebra.c')
| -rw-r--r-- | ospf6d/ospf6_zebra.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c index 4fb959b952..0decc09a29 100644 --- a/ospf6d/ospf6_zebra.c +++ b/ospf6d/ospf6_zebra.c @@ -55,13 +55,22 @@ static int ospf6_router_id_update_zebra(int command, struct zclient *zclient, zebra_router_id_update_read(zclient->ibuf, &router_id); + om6->zebra_router_id = router_id.u.prefix4.s_addr; + if (o == NULL) return 0; o->router_id_zebra = router_id.u.prefix4; + if (IS_OSPF6_DEBUG_ZEBRA(RECV)) { + char buf[INET_ADDRSTRLEN]; + + zlog_debug("%s: zebra router-id %s update", + __PRETTY_FUNCTION__, + inet_ntop(AF_INET, &router_id.u.prefix4, + buf, INET_ADDRSTRLEN)); + } - if (o->router_id == 0) - o->router_id = (uint32_t)o->router_id_zebra.s_addr; + ospf6_router_id_update(); return 0; } |