From 6898008484a562ff5bae178a6fb0bd885fe8b1e5 Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 25 Mar 2003 05:07:42 +0000 Subject: 2003-03-25 Paul Jakma * sync to latest zebra CVS * spec file: updated and added define for ospf-api/client NB: OSPF-API has been broken by the zebra.org changes, which has added struct ospf * as a new arg to many functions --- ospfd/ospfd.h | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'ospfd/ospfd.h') diff --git a/ospfd/ospfd.h b/ospfd/ospfd.h index a46a7931..be806212 100644 --- a/ospfd/ospfd.h +++ b/ospfd/ospfd.h @@ -32,6 +32,11 @@ #define IPPROTO_OSPFIGP 89 #endif /* IPPROTO_OSPFIGP */ +/* IP precedence. */ +#ifndef IPTOS_PREC_INTERNETCONTROL +#define IPTOS_PREC_INTERNETCONTROL 0xC0 +#endif /* IPTOS_PREC_INTERNETCONTROL */ + /* VTY port number. */ #define OSPF_VTY_PORT 2604 #define OSPF_VTYSH_PATH "/tmp/.ospfd" @@ -288,7 +293,7 @@ struct ospf struct ospf_area { /* OSPF instance. */ - struct ospf *top; + struct ospf *ospf; /* Zebra interface list belonging to the area. */ list oiflist; @@ -456,7 +461,7 @@ struct ospf_nbr_nbma #define OSPF_TIMER_ON(T,F,V) \ do { \ if (!(T)) \ - (T) = thread_add_timer (master, (F), NULL, (V)); \ + (T) = thread_add_timer (master, (F), ospf, (V)); \ } while (0) #define OSPF_AREA_TIMER_ON(T,F,V) \ @@ -482,12 +487,6 @@ struct ospf_nbr_nbma } \ } while (0) -#define OSPF_SCHEDULE_MAXAGE(T, F) \ - do { \ - if (!(T)) \ - (T) = thread_add_timer (master, (F), 0, 2); \ - } while (0) - /* Messages */ extern struct message ospf_ism_state_msg[]; extern struct message ospf_nsm_state_msg[]; @@ -521,12 +520,12 @@ int ospf_area_no_summary_unset (struct ospf *, struct in_addr); int ospf_area_nssa_set (struct ospf *, struct in_addr); int ospf_area_nssa_unset (struct ospf *, struct in_addr); int ospf_area_nssa_translator_role_set (struct ospf *, struct in_addr, int); -int ospf_area_export_list_set (struct ospf_area *, char *); -int ospf_area_export_list_unset (struct ospf_area *); -int ospf_area_import_list_set (struct ospf_area *, char *); -int ospf_area_import_list_unset (struct ospf_area *); -int ospf_area_shortcut_set (struct ospf_area *, int); -int ospf_area_shortcut_unset (struct ospf_area *); +int ospf_area_export_list_set (struct ospf *, struct ospf_area *, char *); +int ospf_area_export_list_unset (struct ospf *, struct ospf_area *); +int ospf_area_import_list_set (struct ospf *, struct ospf_area *, char *); +int ospf_area_import_list_unset (struct ospf *, struct ospf_area *); +int ospf_area_shortcut_set (struct ospf *, struct ospf_area *, int); +int ospf_area_shortcut_unset (struct ospf *, struct ospf_area *); int ospf_timers_spf_set (struct ospf *, u_int32_t, u_int32_t); int ospf_timers_spf_unset (struct ospf *); int ospf_timers_refresh_set (struct ospf *, int); @@ -539,18 +538,18 @@ int ospf_nbr_nbma_poll_interval_set (struct ospf *, struct in_addr, int); int ospf_nbr_nbma_poll_interval_unset (struct ospf *, struct in_addr); void ospf_prefix_list_update (struct prefix_list *); void ospf_init (); -void ospf_if_update (); +void ospf_if_update (struct ospf *); void ospf_ls_upd_queue_empty (struct ospf_interface *); void ospf_terminate (); -void ospf_nbr_nbma_if_update (struct ospf_interface *); +void ospf_nbr_nbma_if_update (struct ospf *, struct ospf_interface *); struct ospf_nbr_nbma *ospf_nbr_nbma_lookup (struct ospf *, struct in_addr); -struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next (struct in_addr *, int); +struct ospf_nbr_nbma *ospf_nbr_nbma_lookup_next (struct ospf *, + struct in_addr *, int); int ospf_oi_count (struct interface *); -struct ospf_area *ospf_area_new (struct in_addr); -struct ospf_area *ospf_area_get (struct in_addr, int); -void ospf_area_check_free (struct in_addr); -struct ospf_area *ospf_area_lookup_by_area_id (struct in_addr); +struct ospf_area *ospf_area_get (struct ospf *, struct in_addr, int); +void ospf_area_check_free (struct ospf *, struct in_addr); +struct ospf_area *ospf_area_lookup_by_area_id (struct ospf *, struct in_addr); void ospf_area_add_if (struct ospf_area *, struct ospf_interface *); void ospf_area_del_if (struct ospf_area *, struct ospf_interface *); -- cgit v1.2.1