Merge pull request #11469 from donaldsharp/fdev2

[mirror_frr.git] / eigrpd / eigrp_network.c

diff --git a/eigrpd/eigrp_network.c b/eigrpd/eigrp_network.c
index bd8ec2f879251fefd064806682a0e141b93ea68a..6b3a0afc12cd4daf490cf167f6783630c0fd2a65 100644 (file)
--- a/eigrpd/eigrp_network.c
+++ b/eigrpd/eigrp_network.c
@@ -219,7 +219,7 @@ int eigrp_network_set(struct eigrp *eigrp, struct prefix *p)
        }
 
        struct prefix *pref = prefix_new();
-       PREFIX_COPY_IPV4(pref, p);
+       prefix_copy(pref, p);
        rn->info = (void *)pref;
 
        /* Schedule Router ID Update. */
@@ -288,11 +288,11 @@ void eigrp_if_update(struct interface *ifp)
         * we need to check eac one and add the interface as approperate
         */
        for (ALL_LIST_ELEMENTS(eigrp_om->eigrp, node, nnode, eigrp)) {
-               if (ifp->vrf_id != eigrp->vrf_id)
+               if (ifp->vrf->vrf_id != eigrp->vrf_id)
                        continue;
 
                /* EIGRP must be on and Router-ID must be configured. */
-               if (eigrp->router_id.s_addr == 0)
+               if (eigrp->router_id.s_addr == INADDR_ANY)
                        continue;
 
                /* Run each network for this interface. */
@@ -346,76 +346,6 @@ int eigrp_network_unset(struct eigrp *eigrp, struct prefix *p)
        return 1;
 }
 
-uint32_t eigrp_calculate_metrics(struct eigrp *eigrp,
-                                struct eigrp_metrics metric)
-{
-       uint64_t temp_metric;
-       temp_metric = 0;
-
-       if (metric.delay == EIGRP_MAX_METRIC)
-               return EIGRP_MAX_METRIC;
-
-       // EIGRP Metric =
-       // {K1*BW+[(K2*BW)/(256-load)]+(K3*delay)}*{K5/(reliability+K4)}
-
-       if (eigrp->k_values[0])
-               temp_metric += (eigrp->k_values[0] * metric.bandwidth);
-       if (eigrp->k_values[1])
-               temp_metric += ((eigrp->k_values[1] * metric.bandwidth)
-                               / (256 - metric.load));
-       if (eigrp->k_values[2])
-               temp_metric += (eigrp->k_values[2] * metric.delay);
-       if (eigrp->k_values[3] && !eigrp->k_values[4])
-               temp_metric *= eigrp->k_values[3];
-       if (!eigrp->k_values[3] && eigrp->k_values[4])
-               temp_metric *= (eigrp->k_values[4] / metric.reliability);
-       if (eigrp->k_values[3] && eigrp->k_values[4])
-               temp_metric *= ((eigrp->k_values[4] / metric.reliability)
-                               + eigrp->k_values[3]);
-
-       if (temp_metric <= EIGRP_MAX_METRIC)
-               return (uint32_t)temp_metric;
-       else
-               return EIGRP_MAX_METRIC;
-}
-
-uint32_t eigrp_calculate_total_metrics(struct eigrp *eigrp,
-                                      struct eigrp_nexthop_entry *entry)
-{
-       struct eigrp_interface *ei = entry->ei;
-
-       entry->total_metric = entry->reported_metric;
-       uint64_t temp_delay =
-               (uint64_t)entry->total_metric.delay
-               + (uint64_t)eigrp_delay_to_scaled(ei->params.delay);
-       entry->total_metric.delay = temp_delay > EIGRP_MAX_METRIC
-                                           ? EIGRP_MAX_METRIC
-                                           : (uint32_t)temp_delay;
-
-       uint32_t bw = eigrp_bandwidth_to_scaled(ei->params.bandwidth);
-       entry->total_metric.bandwidth = entry->total_metric.bandwidth > bw
-                                               ? bw
-                                               : entry->total_metric.bandwidth;
-
-       return eigrp_calculate_metrics(eigrp, entry->total_metric);
-}
-
-uint8_t eigrp_metrics_is_same(struct eigrp_metrics metric1,
-                             struct eigrp_metrics metric2)
-{
-       if ((metric1.bandwidth == metric2.bandwidth)
-           && (metric1.delay == metric2.delay)
-           && (metric1.hop_count == metric2.hop_count)
-           && (metric1.load == metric2.load)
-           && (metric1.reliability == metric2.reliability)
-           && (metric1.mtu[0] == metric2.mtu[0])
-           && (metric1.mtu[1] == metric2.mtu[1])
-           && (metric1.mtu[2] == metric2.mtu[2]))
-               return 1;
-
-       return 0; // if different
-}
-
 void eigrp_external_routes_refresh(struct eigrp *eigrp, int type)
 {
 }