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

eigrpd: Fix to compile under gcc

Browse Source 
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-03-10 20:14:33 -05:00
parent 2221f1f6a7
commit 511ba2b834
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eigrpd/eigrp_reply.c
View File

@ -90,9 +90,9 @@ eigrp_send_reply (struct eigrp_neighbor *nbr, struct eigrp_prefix_entry *pe)
zlog_info("REPLY SEND Prefix: %s", inet_ntoa(nbr->src)); zlog_info("REPLY SEND Prefix: %s", inet_ntoa(nbr->src));
/* Check if any list fits */ /* Check if any list fits */
if ((alist && access_list_apply (alist, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)|| if ((alist && access_list_apply (alist, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)|| (plist && prefix_list_apply (plist, (struct prefix *) pe2->destination_ipv4) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (struct prefix *) pe2->destination_ipv4) == FILTER_DENY)) (plist_i && prefix_list_apply (plist_i, (struct prefix *) pe2->destination_ipv4) == PREFIX_DENY))
{ {
zlog_info("REPLY SEND: Setting Metric to max"); zlog_info("REPLY SEND: Setting Metric to max");
pe2->reported_metric.delay = EIGRP_MAX_METRIC; pe2->reported_metric.delay = EIGRP_MAX_METRIC;
@ -214,11 +214,11 @@ eigrp_reply_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *e
if ((alist && access_list_apply (alist, if ((alist && access_list_apply (alist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (alist_i && access_list_apply (alist_i,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (plist_i && prefix_list_apply (plist_i,
(struct prefix *) dest_addr) == FILTER_DENY)) (struct prefix *) dest_addr) == PREFIX_DENY))
{ {
zlog_info("REPLY RECEIVE: Setting metric to max"); zlog_info("REPLY RECEIVE: Setting metric to max");
tlv->metric.delay = EIGRP_MAX_METRIC; tlv->metric.delay = EIGRP_MAX_METRIC;

24
eigrpd/eigrp_update.c
View File

@ -80,7 +80,7 @@ static void
remove_received_prefix_gr (struct list *nbr_prefixes, struct eigrp_prefix_entry *recv_prefix) remove_received_prefix_gr (struct list *nbr_prefixes, struct eigrp_prefix_entry *recv_prefix)
{ {
struct listnode *node1, *node11; struct listnode *node1, *node11;
struct eigrp_prefix_entry *prefix; struct eigrp_prefix_entry *prefix = NULL;
/* iterate over all prefixes in list */ /* iterate over all prefixes in list */
for (ALL_LIST_ELEMENTS(nbr_prefixes, node1, node11, prefix)) for (ALL_LIST_ELEMENTS(nbr_prefixes, node1, node11, prefix))
@ -176,7 +176,7 @@ eigrp_update_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *
struct eigrp *e; struct eigrp *e;
u_char graceful_restart; u_char graceful_restart;
u_char graceful_restart_final; u_char graceful_restart_final;
struct list *nbr_prefixes; struct list *nbr_prefixes = NULL;
/* increment statistics. */ /* increment statistics. */
ei->update_in++; ei->update_in++;
@ -382,7 +382,7 @@ eigrp_update_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *
/* Check if prefix-list fits */ /* Check if prefix-list fits */
if (plist && prefix_list_apply (plist, if (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY) (struct prefix *) dest_addr) == PREFIX_DENY)
{ {
/* If yes, set reported metric to Max */ /* If yes, set reported metric to Max */
zlog_info("PLIST PROC IN: Nastavujem metriku na MAX"); zlog_info("PLIST PROC IN: Nastavujem metriku na MAX");
@ -422,7 +422,7 @@ eigrp_update_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header *
/* Check if prefix-list fits */ /* Check if prefix-list fits */
if (plist && prefix_list_apply (plist, if (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY) (struct prefix *) dest_addr) == PREFIX_DENY)
{ {
/* If yes, set reported metric to Max */ /* If yes, set reported metric to Max */
zlog_info("PLIST INT IN: Nastavujem metriku na MAX"); zlog_info("PLIST INT IN: Nastavujem metriku na MAX");
@ -582,11 +582,11 @@ eigrp_update_send_EOT (struct eigrp_neighbor *nbr)
if ((alist && access_list_apply (alist, if ((alist && access_list_apply (alist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (alist_i && access_list_apply (alist_i,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (plist_i && prefix_list_apply (plist_i,
(struct prefix *) dest_addr) == FILTER_DENY)) (struct prefix *) dest_addr) == PREFIX_DENY))
{ {
zlog_info("PROC OUT EOT: Skipping"); zlog_info("PROC OUT EOT: Skipping");
//pe->reported_metric.delay = EIGRP_MAX_METRIC; //pe->reported_metric.delay = EIGRP_MAX_METRIC;
@ -687,11 +687,11 @@ eigrp_update_send (struct eigrp_interface *ei)
if ((alist && access_list_apply (alist, if ((alist && access_list_apply (alist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (alist_i && access_list_apply (alist_i,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (plist_i && prefix_list_apply (plist_i,
(struct prefix *) dest_addr) == FILTER_DENY)) (struct prefix *) dest_addr) == PREFIX_DENY))
{ {
zlog_info("PROC OUT: Skipping"); zlog_info("PROC OUT: Skipping");
//pe->reported_metric.delay = EIGRP_MAX_METRIC; //pe->reported_metric.delay = EIGRP_MAX_METRIC;
@ -887,11 +887,11 @@ eigrp_update_send_GR_part(struct eigrp_neighbor *nbr)
if ((alist && access_list_apply (alist, if ((alist && access_list_apply (alist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (alist_i && access_list_apply (alist_i,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (plist_i && prefix_list_apply (plist_i,
(struct prefix *) dest_addr) == FILTER_DENY)) (struct prefix *) dest_addr) == PREFIX_DENY))
{ {
/* do not send filtered route */ /* do not send filtered route */
zlog_info("Filtered prefix %s won't be sent out.", zlog_info("Filtered prefix %s won't be sent out.",
@ -916,11 +916,11 @@ eigrp_update_send_GR_part(struct eigrp_neighbor *nbr)
if ((alist && access_list_apply (alist, if ((alist && access_list_apply (alist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist && prefix_list_apply (plist, (plist && prefix_list_apply (plist,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == PREFIX_DENY)||
(alist_i && access_list_apply (alist_i, (alist_i && access_list_apply (alist_i,
(struct prefix *) dest_addr) == FILTER_DENY)|| (struct prefix *) dest_addr) == FILTER_DENY)||
(plist_i && prefix_list_apply (plist_i, (plist_i && prefix_list_apply (plist_i,
(struct prefix *) dest_addr) == FILTER_DENY)) (struct prefix *) dest_addr) == PREFIX_DENY))
{ {
/* do not send filtered route */ /* do not send filtered route */
zlog_info("Filtered prefix %s will be removed.", zlog_info("Filtered prefix %s will be removed.",