diff options
Diffstat (limited to 'ospf6d/ospf6_route.h')
| -rw-r--r-- | ospf6d/ospf6_route.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/ospf6d/ospf6_route.h b/ospf6d/ospf6_route.h index b759828c3..7ad1f19fc 100644 --- a/ospf6d/ospf6_route.h +++ b/ospf6d/ospf6_route.h @@ -63,9 +63,9 @@ struct ospf6_nexthop { /* Path */ struct ospf6_ls_origin { - u_int16_t type; - u_int32_t id; - u_int32_t adv_router; + uint16_t type; + uint32_t id; + uint32_t adv_router; }; struct ospf6_path { @@ -73,29 +73,29 @@ struct ospf6_path { struct ospf6_ls_origin origin; /* Router bits */ - u_char router_bits; + uint8_t router_bits; /* Optional Capabilities */ - u_char options[3]; + uint8_t options[3]; /* Prefix Options */ - u_char prefix_options; + uint8_t prefix_options; /* Associated Area */ - u_int32_t area_id; + uint32_t area_id; /* Path-type */ - u_char type; - u_char subtype; /* only used for redistribute i.e ZEBRA_ROUTE_XXX */ + uint8_t type; + uint8_t subtype; /* only used for redistribute i.e ZEBRA_ROUTE_XXX */ /* Cost */ - u_int8_t metric_type; - u_int32_t cost; + uint8_t metric_type; + uint32_t cost; union { - u_int32_t cost_e2; - u_int32_t cost_config; + uint32_t cost_e2; + uint32_t cost_config; } u; - u_int32_t tag; + uint32_t tag; /* nh list for this path */ struct list *nh_list; @@ -126,7 +126,7 @@ struct ospf6_route { unsigned int lock; /* Destination Type */ - u_char type; + uint8_t type; /* XXX: It would likely be better to use separate struct in_addr's * for the advertising router-ID and prefix IDs, instead of stuffing @@ -141,13 +141,13 @@ struct ospf6_route { struct timeval changed; /* flag */ - u_char flag; + uint8_t flag; /* route option */ void *route_option; /* link state id for advertising */ - u_int32_t linkstate_id; + uint32_t linkstate_id; /* path */ struct ospf6_path path; @@ -184,7 +184,7 @@ struct ospf6_route_table { /* patricia tree */ struct route_table *table; - u_int32_t count; + uint32_t count; bitfield_t idspace; @@ -256,7 +256,7 @@ extern const char *ospf6_path_type_substr[OSPF6_PATH_TYPE_MAX]; #define ADV_ROUTER_IN_PREFIX(x) ((x)->u.lp.id.s_addr) /* Function prototype */ -extern void ospf6_linkstate_prefix(u_int32_t adv_router, u_int32_t id, +extern void ospf6_linkstate_prefix(uint32_t adv_router, uint32_t id, struct prefix *prefix); extern void ospf6_linkstate_prefix2str(struct prefix *prefix, char *buf, int size); |