From 6c83567192ada1a66822c3f35580ce6a85f51ac9 Mon Sep 17 00:00:00 2001 From: paul Date: Mon, 11 Oct 2004 11:00:30 +0000 Subject: 2004-10-11 Paul Jakma * (global) Const char update and signed/unsigned fixes. * (various headers) size defines should be unsigned. * ospf_interface.h: remove duplicated defines, include the authoritative header - though, these defines should probably be moved to a dedicated header, or ospfd.h. * ospf_lsa.h: (struct lsa) ls_seqnum should be unsigned. * ospf_packet.c: (ospf_write) cast result of shift to unsigned. --- ospfd/ospf_zebra.h | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'ospfd/ospf_zebra.h') diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h index 5dbf5739..e8ad979e 100644 --- a/ospfd/ospf_zebra.h +++ b/ospfd/ospf_zebra.h @@ -50,28 +50,26 @@ void ospf_zebra_delete_discard (struct prefix_ipv4 *); int ospf_default_originate_timer (struct thread *); -int ospf_redistribute_check (struct external_info *, int *); -int ospf_distribute_check_connected (struct external_info *); -void ospf_distribute_list_update (int); +int ospf_redistribute_check (struct ospf *, struct external_info *, int *); +int ospf_distribute_check_connected (struct ospf *, struct external_info *); +void ospf_distribute_list_update (struct ospf *, int); int ospf_is_type_redistributed (int); -int ospf_redistribute_unset (int); - -void ospf_distance_reset (); +void ospf_distance_reset (struct ospf *); u_char ospf_distance_apply (struct prefix_ipv4 *, struct ospf_route *); struct vty; -int ospf_redistribute_set (int, int, int); -int ospf_redistribute_unset (int); -int ospf_redistribute_default_set (int, int, int); -int ospf_redistribute_default_unset (); -int ospf_distribute_list_out_set (int, char *); -int ospf_distribute_list_out_unset (int, char *); -void ospf_routemap_set (int, char *); -void ospf_routemap_unset (int); -int ospf_distance_set (struct vty *, char *, char *, char *); -int ospf_distance_unset (struct vty *, char *, char *, char *); +int ospf_redistribute_set (struct ospf *, int, int, int); +int ospf_redistribute_unset (struct ospf *, int); +int ospf_redistribute_default_set (struct ospf *, int, int, int); +int ospf_redistribute_default_unset (struct ospf *); +int ospf_distribute_list_out_set (struct ospf *, int, const char *); +int ospf_distribute_list_out_unset (struct ospf *, int, const char *); +void ospf_routemap_set (struct ospf *, int, const char *); +void ospf_routemap_unset (struct ospf *, int); +int ospf_distance_set (struct vty *, struct ospf *, const char *, const char *, const char *); +int ospf_distance_unset (struct vty *, struct ospf *, const char *, const char *, const char *); void ospf_zebra_init (); #endif /* _ZEBRA_OSPF_ZEBRA_H */ -- cgit v1.2.1