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

eigrpd: Switch u_int64_t -> uint64_t

Browse Source 
Apparently u_int64_t is not available (or we don't pull
the right headers in for solaris based systems ).

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-04-26 22:10:33 -04:00
parent 171616ccef
commit 838cf8aba5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eigrpd/eigrp_interface.c
View File

@ -589,7 +589,7 @@ eigrp_if_lookup_recv_if (struct eigrp *eigrp, struct in_addr src,
u_int32_t u_int32_t
eigrp_bandwidth_to_scaled (u_int32_t bandwidth) eigrp_bandwidth_to_scaled (u_int32_t bandwidth)
{ {
u_int64_t temp_bandwidth = (256ull * 10000000) / bandwidth; uint64_t temp_bandwidth = (256ull * 10000000) / bandwidth;
temp_bandwidth = temp_bandwidth =
temp_bandwidth < EIGRP_MAX_METRIC ? temp_bandwidth : EIGRP_MAX_METRIC; temp_bandwidth < EIGRP_MAX_METRIC ? temp_bandwidth : EIGRP_MAX_METRIC;
@ -600,7 +600,7 @@ eigrp_bandwidth_to_scaled (u_int32_t bandwidth)
u_int32_t u_int32_t
eigrp_scaled_to_bandwidth (u_int32_t scaled) eigrp_scaled_to_bandwidth (u_int32_t scaled)
{ {
u_int64_t temp_scaled = scaled * (256ull * 10000000); uint64_t temp_scaled = scaled * (256ull * 10000000);
temp_scaled = temp_scaled =
temp_scaled < EIGRP_MAX_METRIC ? temp_scaled : EIGRP_MAX_METRIC; temp_scaled < EIGRP_MAX_METRIC ? temp_scaled : EIGRP_MAX_METRIC;

6
eigrpd/eigrp_network.c
View File

@ -390,7 +390,7 @@ eigrp_network_unset(struct eigrp *eigrp, struct prefix_ipv4 *p)
u_int32_t u_int32_t
eigrp_calculate_metrics(struct eigrp *eigrp, struct eigrp_metrics *metric) eigrp_calculate_metrics(struct eigrp *eigrp, struct eigrp_metrics *metric)
{ {
u_int64_t temp_metric; uint64_t temp_metric;
temp_metric = 0; temp_metric = 0;
if(metric->delay == EIGRP_MAX_METRIC) if(metric->delay == EIGRP_MAX_METRIC)
@ -424,8 +424,8 @@ eigrp_calculate_total_metrics(struct eigrp *eigrp,
struct eigrp_neighbor_entry *entry) struct eigrp_neighbor_entry *entry)
{ {
entry->total_metric = entry->reported_metric; entry->total_metric = entry->reported_metric;
u_int64_t temp_delay = (u_int64_t) entry->total_metric.delay uint64_t temp_delay = (uint64_t) entry->total_metric.delay
+ (u_int64_t) EIGRP_IF_PARAM (entry->ei, delay); + (uint64_t) EIGRP_IF_PARAM (entry->ei, delay);
entry->total_metric.delay = entry->total_metric.delay =
temp_delay > EIGRP_MAX_METRIC ? EIGRP_MAX_METRIC : (u_int32_t) temp_delay; temp_delay > EIGRP_MAX_METRIC ? EIGRP_MAX_METRIC : (u_int32_t) temp_delay;

6
eigrpd/eigrp_structs.h
View File

@ -106,8 +106,8 @@ struct eigrp
struct list *topology_table; struct list *topology_table;
u_int64_t serno; /* Global serial number counter for topology entry changes*/ uint64_t serno; /* Global serial number counter for topology entry changes*/
u_int64_t serno_last_update; /* Highest serial number of information send by last update*/ uint64_t serno_last_update; /* Highest serial number of information send by last update*/
struct list *topology_changes_internalIPV4; struct list *topology_changes_internalIPV4;
struct list *topology_changes_externalIPV4; struct list *topology_changes_externalIPV4;
@ -492,7 +492,7 @@ struct eigrp_prefix_entry
//If network type is REMOTE_EXTERNAL, pointer will have reference to its external TLV //If network type is REMOTE_EXTERNAL, pointer will have reference to its external TLV
struct TLV_IPv4_External_type *extTLV; struct TLV_IPv4_External_type *extTLV;
u_int64_t serno; /*Serial number for this entry. Increased with each change of entry*/ uint64_t serno; /*Serial number for this entry. Increased with each change of entry*/
}; };
/* EIGRP Topology table record structure */ /* EIGRP Topology table record structure */

2
eigrpd/eigrp_topology.c
View File

@ -464,7 +464,7 @@ eigrp_topology_update_node_flags(struct eigrp_prefix_entry *dest)
for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry)) for (ALL_LIST_ELEMENTS_RO(dest->entries, node, entry))
{ {
if ((entry->distance <= (u_int64_t)(dest->distance*eigrp->variance)) && if ((entry->distance <= (uint64_t)(dest->distance*eigrp->variance)) &&
entry->distance != EIGRP_MAX_METRIC) // is successor entry->distance != EIGRP_MAX_METRIC) // is successor
{ {
entry->flags |= EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG; entry->flags |= EIGRP_NEIGHBOR_ENTRY_SUCCESSOR_FLAG;