diff options
| author | Lou Berger <lberger@labn.net> | 2018-03-28 16:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 16:30:54 +0200 |
| commit | 615e608d76bd3e1acf1769c914142210ac88e3f7 (patch) | |
| tree | 1159398cc86aa18901a73480303fb52e09b1f9cc /ospf6d/ospf6_abr.h | |
| parent | Merge pull request #1928 from pguibert6WIND/flowspec_get_vrf_from_rt (diff) | |
| parent | *: use C99 standard fixed-width integer types (diff) | |
| download | frr-615e608d76bd3e1acf1769c914142210ac88e3f7.tar.xz frr-615e608d76bd3e1acf1769c914142210ac88e3f7.zip | |
Merge pull request #1854 from qlyoung/integer-standards-compliance
*: use C99 standard fixed-width integer types
Diffstat (limited to 'ospf6d/ospf6_abr.h')
| -rw-r--r-- | ospf6d/ospf6_abr.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ospf6d/ospf6_abr.h b/ospf6d/ospf6_abr.h index 61a6a7342..abc383463 100644 --- a/ospf6d/ospf6_abr.h +++ b/ospf6d/ospf6_abr.h @@ -35,17 +35,17 @@ extern unsigned char conf_debug_ospf6_abr; /* Inter-Area-Prefix-LSA */ #define OSPF6_INTER_PREFIX_LSA_MIN_SIZE 4U /* w/o IPv6 prefix */ struct ospf6_inter_prefix_lsa { - u_int32_t metric; + uint32_t metric; struct ospf6_prefix prefix; }; /* Inter-Area-Router-LSA */ #define OSPF6_INTER_ROUTER_LSA_FIX_SIZE 12U struct ospf6_inter_router_lsa { - u_char mbz; - u_char options[3]; - u_int32_t metric; - u_int32_t router_id; + uint8_t mbz; + uint8_t options[3]; + uint32_t metric; + uint32_t router_id; }; #define OSPF6_ABR_SUMMARY_METRIC(E) (ntohl ((E)->metric & htonl (0x00ffffff))) @@ -68,7 +68,7 @@ extern void ospf6_abr_originate_summary(struct ospf6_route *route); extern void ospf6_abr_examin_summary(struct ospf6_lsa *lsa, struct ospf6_area *oa); extern void ospf6_abr_defaults_to_stub(struct ospf6 *); -extern void ospf6_abr_examin_brouter(u_int32_t router_id); +extern void ospf6_abr_examin_brouter(uint32_t router_id); extern void ospf6_abr_reimport(struct ospf6_area *oa); extern void ospf6_abr_range_reset_cost(struct ospf6 *ospf6); extern void ospf6_abr_prefix_resummarize(struct ospf6 *ospf6); |