diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-02-06 07:49:02 +0100 |
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2020-02-06 08:00:12 +0100 |
| commit | 975a328e2eb3d1bea5fbc3c232580dd4739d59f0 (patch) | |
| tree | 587e51ff3bbf8dc368ecd1c414615d19ff5139ae /eigrpd | |
| parent | Merge pull request #5761 from qlyoung/fix-bgp-gr-cruft (diff) | |
| download | frr-975a328e2eb3d1bea5fbc3c232580dd4739d59f0.tar.xz frr-975a328e2eb3d1bea5fbc3c232580dd4739d59f0.zip | |
*: Replace s_addr 0 => INADDR_ANY
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'eigrpd')
| -rw-r--r-- | eigrpd/eigrp_network.c | 2 | ||||
| -rw-r--r-- | eigrpd/eigrp_northbound.c | 2 | ||||
| -rw-r--r-- | eigrpd/eigrpd.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c index 324f30929..39008a01c 100644 --- a/eigrpd/eigrp_network.c +++ b/eigrpd/eigrp_network.c @@ -230,7 +230,7 @@ int eigrp_network_set(struct eigrp *eigrp, struct prefix *p) rn->info = (void *)pref; /* Schedule Router ID Update. */ - if (eigrp->router_id.s_addr == 0) + if (eigrp->router_id.s_addr == INADDR_ANY) eigrp_router_id_update(eigrp); /* Run network config now. */ /* Get target interface. */ diff --git a/eigrpd/eigrp_northbound.c b/eigrpd/eigrp_northbound.c index 4ccce2ebb..e03ebb4fc 100644 --- a/eigrpd/eigrp_northbound.c +++ b/eigrpd/eigrp_northbound.c @@ -161,7 +161,7 @@ static int eigrpd_instance_router_id_destroy(enum nb_event event, break; case NB_EV_APPLY: eigrp = nb_running_get_entry(dnode, NULL, true); - eigrp->router_id_static.s_addr = 0; + eigrp->router_id_static.s_addr = INADDR_ANY; break; } diff --git a/eigrpd/eigrpd.c b/eigrpd/eigrpd.c index e93dc0cbf..820f015b5 100644 --- a/eigrpd/eigrpd.c +++ b/eigrpd/eigrpd.c @@ -99,10 +99,10 @@ void eigrp_router_id_update(struct eigrp *eigrp) router_id_old = eigrp->router_id; - if (eigrp->router_id_static.s_addr != 0) + if (eigrp->router_id_static.s_addr != INADDR_ANY) router_id = eigrp->router_id_static; - else if (eigrp->router_id.s_addr != 0) + else if (eigrp->router_id.s_addr != INADDR_ANY) router_id = eigrp->router_id; else @@ -142,8 +142,8 @@ static struct eigrp *eigrp_new(uint16_t as, vrf_id_t vrf_id) eigrp->vrf_id = vrf_id; eigrp->vrid = 0; eigrp->AS = as; - eigrp->router_id.s_addr = 0; - eigrp->router_id_static.s_addr = 0; + eigrp->router_id.s_addr = INADDR_ANY; + eigrp->router_id_static.s_addr = INADDR_ANY; eigrp->sequence_number = 1; /*Configure default K Values for EIGRP Process*/ |