lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_route.h

diff --git a/ospfd/ospf_route.h b/ospfd/ospf_route.h
index eb3d3c9f4010d50f14d952888b14a7f64f32b2cc..8cb5d32a8ac7a3aecfc801cd2bf4f3f5bcea2d12 100644 (file)
--- a/ospfd/ospf_route.h
+++ b/ospfd/ospf_route.h
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _ZEBRA_OSPF_ROUTE_H
@@ -65,10 +64,10 @@ struct route_standard {
        int external_routing;
 
        /* Optional Capability. */
-       u_char options; /* Get from LSA header. */
+       uint8_t options; /* Get from LSA header. */
 
        /*  */
-       u_char flags; /* From router-LSA */
+       uint8_t flags; /* From router-LSA */
 };
 
 struct route_external {
@@ -76,10 +75,10 @@ struct route_external {
        struct ospf_lsa *origin;
 
        /* Link State Cost Type2. */
-       u_int32_t type2_cost;
+       uint32_t type2_cost;
 
        /* Tag value. */
-       u_int32_t tag;
+       uint32_t tag;
 
        /* ASBR route. */
        struct ospf_route *asbr;
@@ -87,7 +86,7 @@ struct route_external {
 
 struct ospf_route {
        /* Destination Type. */
-       u_char type;
+       uint8_t type;
 
        /* Destination ID. */ /* i.e. Link State ID. */
        struct in_addr id;
@@ -96,13 +95,13 @@ struct ospf_route {
        struct in_addr mask; /* Only valid for networks. */
 
        /* Path Type. */
-       u_char path_type;
+       uint8_t path_type;
 
        /* List of Paths. */
        struct list *paths;
 
        /* Link State Cost. */
-       u_int32_t cost; /* i.e. metric. */
+       uint32_t cost; /* i.e. metric. */
 
        /* Route specific info. */
        union {
@@ -116,7 +115,7 @@ 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_delete(struct ospf *, struct route_table *);
 extern void ospf_route_table_free(struct route_table *);
 
 extern void ospf_route_install(struct ospf *, struct route_table *);
@@ -146,9 +145,9 @@ extern void ospf_route_add(struct route_table *, struct prefix_ipv4 *,
 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 route_table *,
+extern int ospf_add_discard_route(struct ospf *, struct route_table *,
+                                 struct ospf_area *, struct prefix_ipv4 *);
+extern void ospf_delete_discard_route(struct ospf *, struct route_table *,
                                      struct prefix_ipv4 *);
 extern int ospf_route_match_same(struct route_table *, struct prefix_ipv4 *,
                                 struct ospf_route *);