From 511ba2b8343ca4dfda9ed2d93b67019b3a5ca272 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 10 Mar 2017 20:14:33 -0500 Subject: [PATCH] eigrpd: Fix to compile under gcc Signed-off-by: Donald Sharp --- eigrpd/eigrp_reply.c | 8 ++++---- eigrpd/eigrp_update.c | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c index ff40e2e5c5..e90d2aa9fa 100644 --- a/eigrpd/eigrp_reply.c +++ b/eigrpd/eigrp_reply.c @@ -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)); /* Check if any list fits */ 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)|| - (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"); 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, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist && prefix_list_apply (plist, - (struct prefix *) dest_addr) == FILTER_DENY)|| + (struct prefix *) dest_addr) == PREFIX_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) dest_addr) == FILTER_DENY)|| (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"); tlv->metric.delay = EIGRP_MAX_METRIC; diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c index 358d77c84c..63c0eb27bf 100644 --- a/eigrpd/eigrp_update.c +++ b/eigrpd/eigrp_update.c @@ -80,7 +80,7 @@ static void remove_received_prefix_gr (struct list *nbr_prefixes, struct eigrp_prefix_entry *recv_prefix) { struct listnode *node1, *node11; - struct eigrp_prefix_entry *prefix; + struct eigrp_prefix_entry *prefix = NULL; /* iterate over all prefixes in list */ 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; u_char graceful_restart; u_char graceful_restart_final; - struct list *nbr_prefixes; + struct list *nbr_prefixes = NULL; /* increment statistics. */ ei->update_in++; @@ -382,7 +382,7 @@ eigrp_update_receive (struct eigrp *eigrp, struct ip *iph, struct eigrp_header * /* Check if prefix-list fits */ 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 */ 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 */ 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 */ 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, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist && prefix_list_apply (plist, - (struct prefix *) dest_addr) == FILTER_DENY)|| + (struct prefix *) dest_addr) == PREFIX_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) dest_addr) == FILTER_DENY)|| (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"); //pe->reported_metric.delay = EIGRP_MAX_METRIC; @@ -687,11 +687,11 @@ eigrp_update_send (struct eigrp_interface *ei) if ((alist && access_list_apply (alist, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist && prefix_list_apply (plist, - (struct prefix *) dest_addr) == FILTER_DENY)|| + (struct prefix *) dest_addr) == PREFIX_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist_i && prefix_list_apply (plist_i, - (struct prefix *) dest_addr) == FILTER_DENY)) + (struct prefix *) dest_addr) == PREFIX_DENY)) { zlog_info("PROC OUT: Skipping"); //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, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist && prefix_list_apply (plist, - (struct prefix *) dest_addr) == FILTER_DENY)|| + (struct prefix *) dest_addr) == PREFIX_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist_i && prefix_list_apply (plist_i, - (struct prefix *) dest_addr) == FILTER_DENY)) + (struct prefix *) dest_addr) == PREFIX_DENY)) { /* do not send filtered route */ 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, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist && prefix_list_apply (plist, - (struct prefix *) dest_addr) == FILTER_DENY)|| + (struct prefix *) dest_addr) == PREFIX_DENY)|| (alist_i && access_list_apply (alist_i, (struct prefix *) dest_addr) == FILTER_DENY)|| (plist_i && prefix_list_apply (plist_i, - (struct prefix *) dest_addr) == FILTER_DENY)) + (struct prefix *) dest_addr) == PREFIX_DENY)) { /* do not send filtered route */ zlog_info("Filtered prefix %s will be removed.", -- 2.39.5