lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_zebra.h

diff --git a/ospfd/ospf_zebra.h b/ospfd/ospf_zebra.h
index 8340f49ede9d82b1ed13b10dc1b6c2867ee74aaf..673730653226f6e300ca97f481f41a7a9c21b6ef 100644 (file)
--- a/ospfd/ospf_zebra.h
+++ b/ospfd/ospf_zebra.h
@@ -34,7 +34,7 @@
 /* OSPF distance. */
 struct ospf_distance {
        /* Distance value for the IP source prefix. */
-       u_char distance;
+       uint8_t distance;
 
        /* Name of the access-list to be matched. */
        char *access_list;
@@ -53,22 +53,26 @@ extern int ospf_redistribute_check(struct ospf *, struct external_info *,
                                   int *);
 extern int ospf_distribute_check_connected(struct ospf *,
                                           struct external_info *);
-extern void ospf_distribute_list_update(struct ospf *, int, u_short);
+extern void ospf_distribute_list_update(struct ospf *, int, unsigned short);
 
-extern int ospf_is_type_redistributed(struct ospf *, int, u_short);
+extern int ospf_is_type_redistributed(struct ospf *, int, unsigned short);
 extern void ospf_distance_reset(struct ospf *);
-extern u_char ospf_distance_apply(struct ospf *ospf, struct prefix_ipv4 *,
-                                 struct ospf_route *);
-extern struct ospf_external *ospf_external_lookup(u_char, u_short);
-extern struct ospf_external *ospf_external_add(u_char, u_short);
-extern void ospf_external_del(u_char, u_short);
-extern struct ospf_redist *ospf_redist_lookup(struct ospf *, u_char, u_short);
-extern struct ospf_redist *ospf_redist_add(struct ospf *, u_char, u_short);
-extern void ospf_redist_del(struct ospf *, u_char, u_short);
+extern uint8_t ospf_distance_apply(struct ospf *ospf, struct prefix_ipv4 *,
+                                  struct ospf_route *);
+extern struct ospf_external *ospf_external_lookup(struct ospf *, uint8_t,
+                                                 unsigned short);
+extern struct ospf_external *ospf_external_add(struct ospf *, uint8_t,
+                                              unsigned short);
+extern void ospf_external_del(struct ospf *, uint8_t, unsigned short);
+extern struct ospf_redist *ospf_redist_lookup(struct ospf *, uint8_t,
+                                             unsigned short);
+extern struct ospf_redist *ospf_redist_add(struct ospf *, uint8_t,
+                                          unsigned short);
+extern void ospf_redist_del(struct ospf *, uint8_t, unsigned short);
 
 
-extern int ospf_redistribute_set(struct ospf *, int, u_short, int, int);
-extern int ospf_redistribute_unset(struct ospf *, int, u_short);
+extern int ospf_redistribute_set(struct ospf *, int, unsigned short, int, int);
+extern int ospf_redistribute_unset(struct ospf *, int, unsigned short);
 extern int ospf_redistribute_default_set(struct ospf *, int, int, int);
 extern int ospf_redistribute_default_unset(struct ospf *);
 extern int ospf_distribute_list_out_set(struct ospf *, int, const char *);
@@ -79,7 +83,7 @@ extern int ospf_distance_set(struct vty *, struct ospf *, const char *,
                             const char *, const char *);
 extern int ospf_distance_unset(struct vty *, struct ospf *, const char *,
                               const char *, const char *);
-extern void ospf_zebra_init(struct thread_master *, u_short);
+extern void ospf_zebra_init(struct thread_master *, unsigned short);
 extern void ospf_zebra_vrf_register(struct ospf *ospf);
 extern void ospf_zebra_vrf_deregister(struct ospf *ospf);