lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_asbr.h

diff --git a/ospfd/ospf_asbr.h b/ospfd/ospf_asbr.h
index 3d7f14e7f26eb7cfbda2da7ec71db14927f5cdb3..ac7bd68b5f3d7cb9cd20ce341b21efdf1338dcf5 100644 (file)
--- a/ospfd/ospf_asbr.h
+++ b/ospfd/ospf_asbr.h
@@ -30,9 +30,9 @@ struct route_map_set_values {
 /* Redistributed external information. */
 struct external_info {
        /* Type of source protocol. */
-       u_char type;
+       uint8_t type;
 
-       u_short instance;
+       unsigned short instance;
 
        /* Prefix. */
        struct prefix_ipv4 p;
@@ -54,22 +54,23 @@ struct external_info {
 #define OSPF_ASBR_CHECK_DELAY 30
 
 extern void ospf_external_route_remove(struct ospf *, struct prefix_ipv4 *);
-extern struct external_info *ospf_external_info_new(u_char, u_short);
+extern struct external_info *ospf_external_info_new(uint8_t, unsigned short);
 extern void ospf_reset_route_map_set_values(struct route_map_set_values *);
 extern int ospf_route_map_set_compare(struct route_map_set_values *,
                                      struct route_map_set_values *);
-extern struct external_info *ospf_external_info_add(u_char, u_short,
+extern struct external_info *ospf_external_info_add(struct ospf *, uint8_t,
+                                                   unsigned short,
                                                    struct prefix_ipv4,
                                                    ifindex_t, struct in_addr,
                                                    route_tag_t);
-extern void ospf_external_info_delete(u_char, u_short, struct prefix_ipv4);
-extern struct external_info *ospf_external_info_lookup(u_char, u_short,
+extern void ospf_external_info_delete(struct ospf *, uint8_t, unsigned short,
+                                     struct prefix_ipv4);
+extern struct external_info *ospf_external_info_lookup(struct ospf *, uint8_t,
+                                                      unsigned short,
                                                       struct prefix_ipv4 *);
-extern struct ospf_route *ospf_external_route_lookup(struct ospf *,
-                                                    struct prefix_ipv4 *);
-extern void ospf_asbr_status_update(struct ospf *, u_char);
+extern void ospf_asbr_status_update(struct ospf *, uint8_t);
 
-extern void ospf_redistribute_withdraw(struct ospf *, u_char, u_short);
+extern void ospf_redistribute_withdraw(struct ospf *, uint8_t, unsigned short);
 extern void ospf_asbr_check(void);
 extern void ospf_schedule_asbr_check(void);
 extern void ospf_asbr_route_install_lsa(struct ospf_lsa *);