2005-05-06 Paul Jakma <paul.jakma@sun.com>
* (general) extern and static qualifiers added.
unspecified arguments in definitions fixed, typically they should
be 'void'.
function casts added for callbacks.
Guards added to headers which lacked them.
Proper headers included rather than relying on incomplete
definitions.
gcc noreturn function attribute where appropriate.
* ospf_opaque.c: remove the private definition of ospf_lsa's
ospf_lsa_refresh_delay.
* ospf_lsa.h: export ospf_lsa_refresh_delay
* ospf_packet.c: (ospf_make_md5_digest) make *auth_key const,
correct thing to do - removes need for the casts later.
* ospf_vty.c: Use vty.h's VTY_GET_INTEGER rather than ospf_vty's
home-brewed versions, shuts up several warnings.
* ospf_vty.h: remove VTY_GET_UINT32. VTY_GET_IPV4_ADDRESS and
VTY_GET_IPV4_PREFIX moved to lib/vty.h.
* ospf_zebra.c: (ospf_distribute_list_update_timer) hacky
overloading of the THREAD_ARG pointer should at least use
uintptr_t.
diff --git a/ospfd/ospf_route.h b/ospfd/ospf_route.h
index 8aee559..351e014 100644
--- a/ospfd/ospf_route.h
+++ b/ospfd/ospf_route.h
@@ -121,43 +121,45 @@
} u;
};
-struct ospf_path *ospf_path_new ();
-void ospf_path_free (struct ospf_path *);
-struct ospf_path *ospf_path_lookup (struct list *, struct ospf_path *);
-struct ospf_route *ospf_route_new ();
-void ospf_route_free (struct ospf_route *);
-void ospf_route_delete (struct route_table *);
-void ospf_route_table_free (struct route_table *);
+extern struct ospf_path *ospf_path_new (void);
+extern void ospf_path_free (struct ospf_path *);
+extern struct ospf_path *ospf_path_lookup (struct list *, struct ospf_path *);
+extern struct ospf_route *ospf_route_new (void);
+extern void ospf_route_free (struct ospf_route *);
+extern void ospf_route_delete (struct route_table *);
+extern void ospf_route_table_free (struct route_table *);
-void ospf_route_install (struct ospf *, struct route_table *);
-void ospf_route_table_dump (struct route_table *);
+extern void ospf_route_install (struct ospf *, struct route_table *);
+extern void ospf_route_table_dump (struct route_table *);
-void ospf_intra_add_router (struct route_table *, struct vertex *,
- struct ospf_area *);
+extern void ospf_intra_add_router (struct route_table *, struct vertex *,
+ struct ospf_area *);
-void ospf_intra_add_transit (struct route_table *, struct vertex *,
- struct ospf_area *);
+extern void ospf_intra_add_transit (struct route_table *, struct vertex *,
+ struct ospf_area *);
-void ospf_intra_add_stub (struct route_table *, struct router_lsa_link *,
- struct vertex *, struct ospf_area *);
+extern void ospf_intra_add_stub (struct route_table *,
+ struct router_lsa_link *, struct vertex *,
+ struct ospf_area *);
-int ospf_route_cmp (struct ospf *, struct ospf_route *, struct ospf_route *);
-void ospf_route_copy_nexthops (struct ospf_route *, struct list *);
-void ospf_route_copy_nexthops_from_vertex (struct ospf_route *,
- struct vertex * );
-
-void ospf_route_subst (struct route_node *, struct ospf_route *,
- struct ospf_route *);
-void ospf_route_add (struct route_table *, struct prefix_ipv4 *,
- struct ospf_route *, struct ospf_route *);
-
-void ospf_route_subst_nexthops (struct ospf_route *, struct list *);
-void ospf_prune_unreachable_networks (struct route_table *);
-void ospf_prune_unreachable_routers (struct route_table *);
-int ospf_add_discard_route (struct route_table *, struct ospf_area *,
- struct prefix_ipv4 *);
-void ospf_delete_discard_route (struct prefix_ipv4 *);
-int ospf_route_match_same (struct route_table *, struct prefix_ipv4 *,
+extern int ospf_route_cmp (struct ospf *, struct ospf_route *,
struct ospf_route *);
+extern void ospf_route_copy_nexthops (struct ospf_route *, struct list *);
+extern void ospf_route_copy_nexthops_from_vertex (struct ospf_route *,
+ struct vertex *);
+
+extern void ospf_route_subst (struct route_node *, struct ospf_route *,
+ struct ospf_route *);
+extern void ospf_route_add (struct route_table *, struct prefix_ipv4 *,
+ struct ospf_route *, struct ospf_route *);
+
+extern void ospf_route_subst_nexthops (struct ospf_route *, struct list *);
+extern void ospf_prune_unreachable_networks (struct route_table *);
+extern void ospf_prune_unreachable_routers (struct route_table *);
+extern int ospf_add_discard_route (struct route_table *, struct ospf_area *,
+ struct prefix_ipv4 *);
+extern void ospf_delete_discard_route (struct prefix_ipv4 *);
+extern int ospf_route_match_same (struct route_table *, struct prefix_ipv4 *,
+ struct ospf_route *);
#endif /* _ZEBRA_OSPF_ROUTE_H */