proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 11:48:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #818 from donaldsharp/eigrp_afi

Browse Source 
Eigrp afi
This commit is contained in:
Jafar Al-Gharaibeh 2017-07-14 12:55:28 -05:00 committed by GitHub
commit 13c2f50cd5
7 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eigrpd/eigrp_network.c
View File

@ -243,8 +243,8 @@ eigrp_network_set(struct eigrp *eigrp, struct prefix_ipv4 *p)
rn->info = (void *) pref;
/* Schedule Router ID Update. */
// if (eigrp->router_id == 0)
// eigrp_router_id_update(eigrp);
if (eigrp->router_id == 0)
eigrp_router_id_update(eigrp);
/* Run network config now. */
/* Get target interface. */
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(VRF_DEFAULT), node, ifp))

2
eigrpd/eigrp_query.c
View File

@ -119,7 +119,7 @@ eigrp_query_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *e
tlv = eigrp_read_ipv4_tlv(s);
dest_addr.family = AFI_IP;
dest_addr.family = AF_INET;
dest_addr.prefix = tlv->destination;
dest_addr.prefixlen = tlv->prefix_length;
struct eigrp_prefix_entry *dest =

2
eigrpd/eigrp_reply.c
View File

@ -187,7 +187,7 @@ eigrp_reply_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *e
tlv = eigrp_read_ipv4_tlv(s);
dest_addr.family = AFI_IP;
dest_addr.family = AF_INET;
dest_addr.prefix = tlv->destination;
dest_addr.prefixlen = tlv->prefix_length;
struct eigrp_prefix_entry *dest =

2
eigrpd/eigrp_update.c
View File

@ -297,7 +297,7 @@ eigrp_update_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *
tlv = eigrp_read_ipv4_tlv(s);
/*searching if destination exists */
dest_addr.family = AFI_IP;
dest_addr.family = AF_INET;
dest_addr.prefix = tlv->destination;
dest_addr.prefixlen = tlv->prefix_length;
struct eigrp_prefix_entry *dest =

6
eigrpd/eigrp_vty.c
View File

@ -59,6 +59,7 @@ static int
config_write_network (struct vty *vty, struct eigrp *eigrp)
{
struct route_node *rn;
int i;
/* `network area' print. */
for (rn = route_top (eigrp->networks); rn; rn = route_next (rn))
@ -75,6 +76,11 @@ config_write_network (struct vty *vty, struct eigrp *eigrp)
if (eigrp->variance != EIGRP_VARIANCE_DEFAULT)
vty_out (vty, " variance %d\n", eigrp->variance);
for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
if (i != zclient->redist_default &&
vrf_bitmap_check (zclient->redist[AFI_IP][i], VRF_DEFAULT))
vty_outln (vty, " redistribute %s", zebra_route_string(i));
/*Separate EIGRP configuration from the rest of the config*/
vty_out (vty, "!\n");

17
eigrpd/eigrp_zebra.c
View File

@ -496,11 +496,12 @@ eigrp_zebra_route_delete (struct prefix_ipv4 *p)
return;
}
vrf_bitmap_t
int
eigrp_is_type_redistributed (int type)
{
return (DEFAULT_ROUTE_TYPE (type)) ?
zclient->default_information : zclient->redist[AFI_IP][type];
return ((DEFAULT_ROUTE_TYPE (type)) ?
vrf_bitmap_check (zclient->default_information, VRF_DEFAULT) :
vrf_bitmap_check (zclient->redist[AFI_IP][type], VRF_DEFAULT));
}
int
@ -528,11 +529,6 @@ eigrp_redistribute_set (struct eigrp *eigrp, int type, struct eigrp_metrics metr
zclient_redistribute (ZEBRA_REDISTRIBUTE_ADD, zclient,
AFI_IP, type, 0, VRF_DEFAULT);
// if (IS_DEBUG_EIGRP (zebra, ZEBRA_REDISTRIBUTE))
// zlog_debug ("Redistribute[%s]: Start Type[%d], Metric[%d]",
// ospf_redist_string(type),
// metric_type (ospf, type), metric_value (ospf, type));
++eigrp->redistribute;
return CMD_SUCCESS;
@ -550,11 +546,6 @@ eigrp_redistribute_unset (struct eigrp *eigrp, int type)
--eigrp->redistribute;
}
// if (IS_DEBUG_EIGRP (zebra, ZEBRA_REDISTRIBUTE))
// zlog_debug ("Redistribute[%s]: Start Type[%d], Metric[%d]",
// ospf_redist_string(type),
// metric_type (ospf, type), metric_value (ospf, type));
return CMD_SUCCESS;
}

2
eigrpd/eigrp_zebra.h
View File

@ -37,6 +37,6 @@ extern void eigrp_zebra_route_add (struct prefix_ipv4 *, struct list *);
extern void eigrp_zebra_route_delete (struct prefix_ipv4 *);
extern int eigrp_redistribute_set (struct eigrp *, int, struct eigrp_metrics);
extern int eigrp_redistribute_unset (struct eigrp *, int);
extern vrf_bitmap_t eigrp_is_type_redistributed (int);
extern int eigrp_is_type_redistributed (int);
#endif /* _ZEBRA_EIGRP_ZEBRA_H_ */