diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-23 14:19:45 -0400 | 
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-24 08:04:20 -0400 | 
| commit | 02b459988199f05c81d4353d6fd6812c196c7a5d (patch) | |
| tree | 7f8b8c45ee83df4fc2b3875e78910da3b6d5140b /eigrpd/eigrp_interface.c | |
| parent | 348addb4e7e44f614f84d75d41a0af1a8ad2e6c1 (diff) | |
eigrpd: Convert pe->destination_ipv4 to pe->destination
Convert the destination_ipv4 to a struct prefix and just
call it destination.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'eigrpd/eigrp_interface.c')
| -rw-r--r-- | eigrpd/eigrp_interface.c | 13 | 
1 files changed, 6 insertions, 7 deletions
diff --git a/eigrpd/eigrp_interface.c b/eigrpd/eigrp_interface.c index 207001778d..bc9172dee6 100644 --- a/eigrpd/eigrp_interface.c +++ b/eigrpd/eigrp_interface.c @@ -289,21 +289,20 @@ int eigrp_if_up(struct eigrp_interface *ei)  	ne->adv_router = eigrp->neighbor_self;  	ne->flags = EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG; -	struct prefix_ipv4 dest_addr; +	struct prefix dest_addr;  	dest_addr.family = AF_INET; -	dest_addr.prefix = ei->connected->address->u.prefix4; +	dest_addr.u.prefix4 = ei->connected->address->u.prefix4;  	dest_addr.prefixlen = ei->connected->address->prefixlen; -	apply_mask_ipv4(&dest_addr); +	apply_mask(&dest_addr);  	pe = eigrp_topology_table_lookup_ipv4(eigrp->topology_table, -					      &dest_addr); +					      (struct prefix_ipv4 *)&dest_addr);  	if (pe == NULL) {  		pe = eigrp_prefix_entry_new();  		pe->serno = eigrp->serno; -		pe->destination_ipv4 = prefix_ipv4_new(); -		prefix_copy((struct prefix *)pe->destination_ipv4, -			    (struct prefix *)&dest_addr); +		pe->destination = (struct prefix *)prefix_ipv4_new(); +		prefix_copy(pe->destination, &dest_addr);  		pe->af = AF_INET;  		pe->nt = EIGRP_TOPOLOGY_TYPE_CONNECTED;  | 
