diff options
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_abr.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_flood.c | 1 | ||||
| -rw-r--r-- | ospfd/ospf_route.c | 4 | ||||
| -rw-r--r-- | ospfd/ospf_spf.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c index bacae917..424d1d31 100644 --- a/ospfd/ospf_abr.c +++ b/ospfd/ospf_abr.c @@ -1078,7 +1078,7 @@ ospf_abr_process_network_rt (struct ospf *ospf, if (IS_DEBUG_OSPF_EVENT) zlog_info ("ospf_abr_process_network_rt(): announcing"); - ospf_abr_announce_network (ospf, &rn->p, or); + ospf_abr_announce_network (ospf, (struct prefix_ipv4 *)&rn->p, or); } if (IS_DEBUG_OSPF_EVENT) @@ -1474,7 +1474,7 @@ ospf_abr_announce_aggregates (struct ospf *ospf) " a transit area"); continue; } - ospf_abr_announce_network_to_area (&p, range->cost, ar); + ospf_abr_announce_network_to_area ((struct prefix_ipv4 *)&p, range->cost, ar); } } } diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c index 05fcacda..22611d8d 100644 --- a/ospfd/ospf_flood.c +++ b/ospfd/ospf_flood.c @@ -355,7 +355,6 @@ ospf_flood_through_interface (struct ospf_interface *oi, struct ospf_neighbor *inbr, struct ospf_lsa *lsa) { - struct ospf *ospf = oi->ospf; struct ospf_neighbor *onbr; struct route_node *rn; int retx_flag; diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c index c1c11f19..9889d6be 100644 --- a/ospfd/ospf_route.c +++ b/ospfd/ospf_route.c @@ -192,8 +192,8 @@ ospf_route_delete_same_ext(struct route_table *external_routes, { if (rn && rn->info) { - struct prefix_ipv4 *p = &rn->p; - if ( (ext_rn = route_node_lookup (external_routes, p)) ) + struct prefix_ipv4 *p = (struct prefix_ipv4 *)(&rn->p); + if ( (ext_rn = route_node_lookup (external_routes, (struct prefix *)p)) ) { ospf_zebra_delete (p, ext_rn->info); if (ext_rn->info) diff --git a/ospfd/ospf_spf.c b/ospfd/ospf_spf.c index 8399e18e..5ced71ca 100644 --- a/ospfd/ospf_spf.c +++ b/ospfd/ospf_spf.c @@ -1132,7 +1132,7 @@ ospf_spf_calculate_schedule (struct ospf *ospf) delay = ospf->spf_delay; if (IS_DEBUG_OSPF_EVENT) - zlog_info ("SPF: calculation timer delay = %ld", delay); + zlog_info ("SPF: calculation timer delay = %ld", (long)delay); ospf->t_spf_calc = thread_add_timer (master, ospf_spf_calculate_timer, ospf, delay); } |