Merge pull request #3543 from donaldsharp/eigrp_router_id_is_the_bee

[mirror_frr.git] / eigrpd / eigrpd.c

diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c
index 38d54edfca124f31348e5cf6fdd74dd743843810..5541ec15f343f695971ee2f63624d5244533b555 100644 (file)
--- a/eigrpd/eigrpd.c
+++ b/eigrpd/eigrpd.c
@@ -97,21 +97,21 @@ void eigrp_router_id_update(struct eigrp *eigrp)
 {
        struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
        struct interface *ifp;
-       uint32_t router_id, router_id_old;
+       struct in_addr router_id, router_id_old;
 
        router_id_old = eigrp->router_id;
 
-       if (eigrp->router_id_static != 0)
+       if (eigrp->router_id_static.s_addr != 0)
                router_id = eigrp->router_id_static;
 
-       else if (eigrp->router_id != 0)
+       else if (eigrp->router_id.s_addr != 0)
                router_id = eigrp->router_id;
 
        else
-               router_id = router_id_zebra.s_addr;
+               router_id = router_id_zebra;
 
        eigrp->router_id = router_id;
-       if (router_id_old != router_id) {
+       if (router_id_old.s_addr != router_id.s_addr) {
                //      if (IS_DEBUG_EIGRP_EVENT)
                //        zlog_debug("Router-ID[NEW:%s]: Update",
                //        inet_ntoa(eigrp->router_id));
@@ -144,8 +144,8 @@ static struct eigrp *eigrp_new(const char *AS)
        /* init information relevant to peers */
        eigrp->vrid = 0;
        eigrp->AS = atoi(AS);
-       eigrp->router_id = 0L;
-       eigrp->router_id_static = 0L;
+       eigrp->router_id.s_addr = 0;
+       eigrp->router_id_static.s_addr = 0;
        eigrp->sequence_number = 1;
 
        /*Configure default K Values for EIGRP Process*/