summaryrefslogtreecommitdiffstats
path: root/ospfd/ospf_neighbor.h
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2018-03-27 21:13:34 +0200
committerQuentin Young <qlyoung@cumulusnetworks.com>2018-03-27 21:13:34 +0200
commitd7c0a89a3a5697783a6dd89333ab660074790890 (patch)
treeeefa73e502f919b524b8a345437260d4acc23083 /ospfd/ospf_neighbor.h
parenttools, doc: update checkpatch for u_int_* (diff)
downloadfrr-d7c0a89a3a5697783a6dd89333ab660074790890.tar.xz
frr-d7c0a89a3a5697783a6dd89333ab660074790890.zip
*: use C99 standard fixed-width integer types
The following types are nonstandard: - u_char - u_short - u_int - u_long - u_int8_t - u_int16_t - u_int32_t Replace them with the C99 standard types: - uint8_t - unsigned short - unsigned int - unsigned long - uint8_t - uint16_t - uint32_t Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'ospfd/ospf_neighbor.h')
-rw-r--r--ospfd/ospf_neighbor.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/ospfd/ospf_neighbor.h b/ospfd/ospf_neighbor.h
index b19cf5b3e..91dfc7a27 100644
--- a/ospfd/ospf_neighbor.h
+++ b/ospfd/ospf_neighbor.h
@@ -30,16 +30,16 @@ struct ospf_neighbor {
struct ospf_interface *oi;
/* OSPF neighbor Information */
- u_char state; /* NSM status. */
- u_char dd_flags; /* DD bit flags. */
- u_int32_t dd_seqnum; /* DD Sequence Number. */
+ uint8_t state; /* NSM status. */
+ uint8_t dd_flags; /* DD bit flags. */
+ uint32_t dd_seqnum; /* DD Sequence Number. */
/* Neighbor Information from Hello. */
struct prefix address; /* Neighbor Interface Address. */
struct in_addr src; /* Src address. */
struct in_addr router_id; /* Router ID. */
- u_char options; /* Options. */
+ uint8_t options; /* Options. */
int priority; /* Router Priority. */
struct in_addr d_router; /* Designated Router. */
struct in_addr bd_router; /* Backup Designated Router. */
@@ -51,9 +51,9 @@ struct ospf_neighbor {
/* Last received Databse Description packet. */
struct {
- u_char options;
- u_char flags;
- u_int32_t dd_seqnum;
+ uint8_t options;
+ uint8_t flags;
+ uint32_t dd_seqnum;
} last_recv;
/* LSA data. */
@@ -62,13 +62,13 @@ struct ospf_neighbor {
struct ospf_lsdb ls_req;
struct ospf_lsa *ls_req_last;
- u_int32_t crypt_seqnum; /* Cryptographic Sequence Number. */
+ uint32_t crypt_seqnum; /* Cryptographic Sequence Number. */
/* Timer values. */
- u_int32_t v_inactivity;
- u_int32_t v_db_desc;
- u_int32_t v_ls_req;
- u_int32_t v_ls_upd;
+ uint32_t v_inactivity;
+ uint32_t v_db_desc;
+ uint32_t v_ls_req;
+ uint32_t v_ls_upd;
/* Threads. */
struct thread *t_inactivity;
@@ -84,7 +84,7 @@ struct ospf_neighbor {
struct timeval ts_last_progress; /* last advance of NSM */
struct timeval ts_last_regress; /* last regressive NSM change */
const char *last_regress_str; /* Event which last regressed NSM */
- u_int32_t state_change; /* NSM state change counter */
+ uint32_t state_change; /* NSM state change counter */
/* BFD information */
void *bfd_info;