ok
On Sat, 5 Feb 2022, 01:08 Claudio Jeker, <[email protected]> wrote:
> This is something I wanted to do for a while. Switch from u_intXY_t to
> uintXY_t from stdint.h. The diff is mostly mechanical and was done with
> sed -i 's/u_intX_t/uintX_t/g' but uint8_t changes the tab spacing and so
> I had a look over the code and reindented where it made sense.
> Using stdint.h types will mostly help portability.
>
> Sorry for the size of this diff.
> --
> :wq Claudio
>
> Index: bgpctl/bgpctl.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/bgpctl.c,v
> retrieving revision 1.274
> diff -u -p -r1.274 bgpctl.c
> --- bgpctl/bgpctl.c 4 Feb 2022 12:01:33 -0000 1.274
> +++ bgpctl/bgpctl.c 4 Feb 2022 14:31:26 -0000
> @@ -54,9 +54,9 @@ void show_mrt_dump(struct mrt_rib *, s
> void network_mrt_dump(struct mrt_rib *, struct mrt_peer *,
> void *);
> void show_mrt_state(struct mrt_bgp_state *, void *);
> void show_mrt_msg(struct mrt_bgp_msg *, void *);
> -const char *msg_type(u_int8_t);
> +const char *msg_type(uint8_t);
> void network_bulk(struct parse_result *);
> -int match_aspath(void *, u_int16_t, struct filter_as *);
> +int match_aspath(void *, uint16_t, struct filter_as *);
>
> struct imsgbuf *ibuf;
> struct mrt_parser show_mrt = { show_mrt_dump, show_mrt_state,
> show_mrt_msg };
> @@ -624,7 +624,7 @@ fmt_monotime(time_t t)
> }
>
> const char *
> -fmt_fib_flags(u_int16_t flags)
> +fmt_fib_flags(uint16_t flags)
> {
> static char buf[8];
>
> @@ -665,7 +665,7 @@ fmt_fib_flags(u_int16_t flags)
> }
>
> const char *
> -fmt_origin(u_int8_t origin, int sum)
> +fmt_origin(uint8_t origin, int sum)
> {
> switch (origin) {
> case ORIGIN_IGP:
> @@ -680,7 +680,7 @@ fmt_origin(u_int8_t origin, int sum)
> }
>
> const char *
> -fmt_flags(u_int8_t flags, int sum)
> +fmt_flags(uint8_t flags, int sum)
> {
> static char buf[80];
> char flagstr[5];
> @@ -723,7 +723,7 @@ fmt_flags(u_int8_t flags, int sum)
> }
>
> const char *
> -fmt_ovs(u_int8_t validation_state, int sum)
> +fmt_ovs(uint8_t validation_state, int sum)
> {
> switch (validation_state) {
> case ROA_INVALID:
> @@ -747,7 +747,7 @@ fmt_mem(long long num)
> }
>
> const char *
> -fmt_errstr(u_int8_t errcode, u_int8_t subcode)
> +fmt_errstr(uint8_t errcode, uint8_t subcode)
> {
> static char errbuf[256];
> const char *errstr = NULL;
> @@ -814,7 +814,7 @@ fmt_errstr(u_int8_t errcode, u_int8_t su
> }
>
> const char *
> -fmt_attr(u_int8_t type, int flags)
> +fmt_attr(uint8_t type, int flags)
> {
> #define CHECK_FLAGS(s, t, m) \
> if (((s) & ~(ATTR_DEFMASK | (m))) != (t)) pflags = 1
> @@ -909,7 +909,7 @@ fmt_attr(u_int8_t type, int flags)
> }
>
> const char *
> -fmt_community(u_int16_t a, u_int16_t v)
> +fmt_community(uint16_t a, uint16_t v)
> {
> static char buf[12];
>
> @@ -936,7 +936,7 @@ fmt_community(u_int16_t a, u_int16_t v)
> }
>
> const char *
> -fmt_large_community(u_int32_t d1, u_int32_t d2, u_int32_t d3)
> +fmt_large_community(uint32_t d1, uint32_t d2, uint32_t d3)
> {
> static char buf[33];
>
> @@ -945,14 +945,14 @@ fmt_large_community(u_int32_t d1, u_int3
> }
>
> const char *
> -fmt_ext_community(u_int8_t *data)
> +fmt_ext_community(uint8_t *data)
> {
> static char buf[32];
> - u_int64_t ext;
> + uint64_t ext;
> struct in_addr ip;
> - u_int32_t as4, u32;
> - u_int16_t as2, u16;
> - u_int8_t type, subtype;
> + uint32_t as4, u32;
> + uint16_t as2, u16;
> + uint8_t type, subtype;
>
> type = data[0];
> subtype = data[1];
> @@ -1057,7 +1057,7 @@ network_bulk(struct parse_result *res)
> char *line = NULL;
> size_t linesize = 0;
> ssize_t linelen;
> - u_int8_t len;
> + uint8_t len;
> FILE *f;
>
> if ((f = fdopen(STDIN_FILENO, "r")) == NULL)
> @@ -1108,7 +1108,7 @@ show_mrt_dump_neighbors(struct mrt_rib *
> {
> struct mrt_peer_entry *p;
> struct in_addr ina;
> - u_int16_t i;
> + uint16_t i;
>
> ina.s_addr = htonl(mp->bgp_id);
> printf("view: %s BGP ID: %s Number of peers: %u\n\n",
> @@ -1132,7 +1132,7 @@ show_mrt_dump(struct mrt_rib *mr, struct
> struct ctl_show_rib_request *req = arg;
> struct mrt_rib_entry *mre;
> time_t now;
> - u_int16_t i, j;
> + uint16_t i, j;
>
> memset(&res, 0, sizeof(res));
> res.flags = req->flags;
> @@ -1214,7 +1214,7 @@ network_mrt_dump(struct mrt_rib *mr, str
> struct mrt_rib_entry *mre;
> struct ibuf *msg;
> time_t now;
> - u_int16_t i, j;
> + uint16_t i, j;
>
> /* can't announce more than one path so ignore add-path */
> if (mr->add_path)
> @@ -1315,10 +1315,10 @@ show_mrt_state(struct mrt_bgp_state *ms,
> }
>
> static void
> -print_afi(u_char *p, u_int8_t len)
> +print_afi(u_char *p, uint8_t len)
> {
> - u_int16_t afi;
> - u_int8_t safi, aid;
> + uint16_t afi;
> + uint8_t safi, aid;
>
> if (len != 4) {
> printf("bad length");
> @@ -1340,7 +1340,7 @@ print_afi(u_char *p, u_int8_t len)
> }
>
> static void
> -print_capability(u_int8_t capa_code, u_char *p, u_int8_t len)
> +print_capability(uint8_t capa_code, u_char *p, uint8_t len)
> {
> switch (capa_code) {
> case CAPA_MP:
> @@ -1357,7 +1357,7 @@ print_capability(u_int8_t capa_code, u_c
> case CAPA_AS4BYTE:
> printf("4-byte AS num capability: ");
> if (len == 4) {
> - u_int32_t as;
> + uint32_t as;
> memcpy(&as, p, sizeof(as));
> as = ntohl(as);
> printf("AS %u", as);
> @@ -1378,7 +1378,7 @@ print_capability(u_int8_t capa_code, u_c
> }
>
> static void
> -print_notification(u_int8_t errcode, u_int8_t subcode)
> +print_notification(uint8_t errcode, uint8_t subcode)
> {
> const char *suberrname = NULL;
> int uk = 0;
> @@ -1435,10 +1435,10 @@ print_notification(u_int8_t errcode, u_i
> }
>
> static int
> -show_mrt_capabilities(u_char *p, u_int16_t len)
> +show_mrt_capabilities(u_char *p, uint16_t len)
> {
> - u_int16_t totlen = len;
> - u_int8_t capa_code, capa_len;
> + uint16_t totlen = len;
> + uint8_t capa_code, capa_len;
>
> while (len > 2) {
> memcpy(&capa_code, p, sizeof(capa_code));
> @@ -1465,10 +1465,10 @@ show_mrt_capabilities(u_char *p, u_int16
> }
>
> static void
> -show_mrt_open(u_char *p, u_int16_t len)
> +show_mrt_open(u_char *p, uint16_t len)
> {
> - u_int8_t version, optparamlen;
> - u_int16_t short_as, holdtime;
> + uint16_t short_as, holdtime;
> + uint8_t version, optparamlen;
> struct in_addr bgpid;
>
> /* length check up to optparamlen already happened */
> @@ -1498,7 +1498,7 @@ show_mrt_open(u_char *p, u_int16_t len)
> return;
> }
> while (len > 2) {
> - u_int8_t op_type, op_len;
> + uint8_t op_type, op_len;
> int r;
>
> memcpy(&op_type, p, sizeof(op_type));
> @@ -1532,10 +1532,10 @@ show_mrt_open(u_char *p, u_int16_t len)
> }
>
> static void
> -show_mrt_notification(u_char *p, u_int16_t len)
> +show_mrt_notification(u_char *p, uint16_t len)
> {
> - u_int16_t i;
> - u_int8_t errcode, subcode;
> + uint16_t i;
> + uint8_t errcode, subcode;
> size_t reason_len;
> char reason[REASON_LEN];
>
> @@ -1595,13 +1595,13 @@ show_mrt_notification(u_char *p, u_int16
>
> /* XXX this function does not handle JSON output */
> static void
> -show_mrt_update(u_char *p, u_int16_t len, int reqflags, int addpath)
> +show_mrt_update(u_char *p, uint16_t len, int reqflags, int addpath)
> {
> struct bgpd_addr prefix;
> int pos;
> - u_int32_t pathid;
> - u_int16_t wlen, alen;
> - u_int8_t prefixlen;
> + uint32_t pathid;
> + uint16_t wlen, alen;
> + uint8_t prefixlen;
>
> if (len < sizeof(wlen)) {
> printf("bad length");
> @@ -1660,8 +1660,8 @@ show_mrt_update(u_char *p, u_int16_t len
> printf("\n");
> /* alen attributes here */
> while (alen > 3) {
> - u_int8_t flags;
> - u_int16_t attrlen;
> + uint8_t flags;
> + uint16_t attrlen;
>
> flags = p[0];
> /* type = p[1]; */
> @@ -1714,12 +1714,12 @@ show_mrt_update(u_char *p, u_int16_t len
> void
> show_mrt_msg(struct mrt_bgp_msg *mm, void *arg)
> {
> - static const u_int8_t marker[MSGSIZE_HEADER_MARKER] = {
> + static const uint8_t marker[MSGSIZE_HEADER_MARKER] = {
> 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
> 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
> u_char *p;
> - u_int16_t len;
> - u_int8_t type;
> + uint16_t len;
> + uint8_t type;
> struct ctl_show_rib_request *req = arg;
>
> printf("%s %s[%u] -> ", fmt_time(&mm->time),
> @@ -1802,7 +1802,7 @@ show_mrt_msg(struct mrt_bgp_msg *mm, voi
> }
>
> const char *
> -msg_type(u_int8_t type)
> +msg_type(uint8_t type)
> {
> if (type >= sizeof(msgtypenames)/sizeof(msgtypenames[0]))
> return "BAD";
> @@ -1810,13 +1810,13 @@ msg_type(u_int8_t type)
> }
>
> int
> -match_aspath(void *data, u_int16_t len, struct filter_as *f)
> +match_aspath(void *data, uint16_t len, struct filter_as *f)
> {
> - u_int8_t *seg;
> + uint8_t *seg;
> int final;
> - u_int16_t seg_size;
> - u_int8_t i, seg_len;
> - u_int32_t as = 0;
> + uint16_t seg_size;
> + uint8_t i, seg_len;
> + uint32_t as = 0;
>
> if (f->type == AS_EMPTY) {
> if (len == 0)
> @@ -1838,7 +1838,7 @@ match_aspath(void *data, u_int16_t len,
>
> for (; len >= 6; len -= seg_size, seg += seg_size) {
> seg_len = seg[1];
> - seg_size = 2 + sizeof(u_int32_t) * seg_len;
> + seg_size = 2 + sizeof(uint32_t) * seg_len;
>
> final = (len == seg_size);
>
> Index: bgpctl/bgpctl.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/bgpctl.h,v
> retrieving revision 1.12
> diff -u -p -r1.12 bgpctl.h
> --- bgpctl/bgpctl.h 27 Jul 2021 07:42:37 -0000 1.12
> +++ bgpctl/bgpctl.h 4 Feb 2022 14:31:26 -0000
> @@ -45,15 +45,15 @@ time_t get_monotime(time_t);
> char *fmt_peer(const char *, const struct bgpd_addr *, int);
> const char *fmt_timeframe(time_t);
> const char *fmt_monotime(time_t);
> -const char *fmt_fib_flags(u_int16_t);
> -const char *fmt_origin(u_int8_t, int);
> -const char *fmt_flags(u_int8_t, int);
> -const char *fmt_ovs(u_int8_t, int);
> +const char *fmt_fib_flags(uint16_t);
> +const char *fmt_origin(uint8_t, int);
> +const char *fmt_flags(uint8_t, int);
> +const char *fmt_ovs(uint8_t, int);
> const char *fmt_auth_method(enum auth_method);
> const char *fmt_mem(long long);
> -const char *fmt_errstr(u_int8_t, u_int8_t);
> -const char *fmt_attr(u_int8_t, int);
> -const char *fmt_community(u_int16_t, u_int16_t);
> -const char *fmt_large_community(u_int32_t, u_int32_t, u_int32_t);
> -const char *fmt_ext_community(u_int8_t *);
> +const char *fmt_errstr(uint8_t, uint8_t);
> +const char *fmt_attr(uint8_t, int);
> +const char *fmt_community(uint16_t, uint16_t);
> +const char *fmt_large_community(uint32_t, uint32_t, uint32_t);
> +const char *fmt_ext_community(uint8_t *);
> const char *fmt_set_type(struct ctl_show_set *);
> Index: bgpctl/mrtparser.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/mrtparser.c,v
> retrieving revision 1.16
> diff -u -p -r1.16 mrtparser.c
> --- bgpctl/mrtparser.c 22 Sep 2021 18:17:49 -0000 1.16
> +++ bgpctl/mrtparser.c 4 Feb 2022 14:31:26 -0000
> @@ -38,18 +38,17 @@ int mrt_parse_dump(struct mrt_hdr *, voi
> struct mrt_rib **);
> int mrt_parse_dump_mp(struct mrt_hdr *, void *, struct mrt_peer **,
> struct mrt_rib **, int);
> -int mrt_extract_attr(struct mrt_rib_entry *, u_char *, int, u_int8_t,
> - int);
> +int mrt_extract_attr(struct mrt_rib_entry *, u_char *, int, uint8_t,
> int);
>
> void mrt_free_peers(struct mrt_peer *);
> void mrt_free_rib(struct mrt_rib *);
> void mrt_free_bgp_state(struct mrt_bgp_state *);
> void mrt_free_bgp_msg(struct mrt_bgp_msg *);
>
> -u_char *mrt_aspath_inflate(void *, u_int16_t, u_int16_t *);
> -int mrt_extract_addr(void *, u_int, struct bgpd_addr *, u_int8_t);
> -int mrt_extract_prefix(void *, u_int, u_int8_t, struct bgpd_addr *,
> - u_int8_t *, int);
> +u_char *mrt_aspath_inflate(void *, uint16_t, uint16_t *);
> +int mrt_extract_addr(void *, u_int, struct bgpd_addr *, uint8_t);
> +int mrt_extract_prefix(void *, u_int, uint8_t, struct bgpd_addr *,
> + uint8_t *, int);
>
> struct mrt_bgp_state *mrt_parse_state(struct mrt_hdr *, void *, int);
> struct mrt_bgp_msg *mrt_parse_msg(struct mrt_hdr *, void *, int);
> @@ -267,9 +266,9 @@ mrt_parse_v2_peer(struct mrt_hdr *hdr, v
> {
> struct mrt_peer_entry *peers = NULL;
> struct mrt_peer *p;
> - u_int8_t *b = msg;
> - u_int32_t bid, as4;
> - u_int16_t cnt, i, as2;
> + uint8_t *b = msg;
> + uint32_t bid, as4;
> + uint16_t cnt, i, as2;
> u_int len = ntohl(hdr->length);
>
> if (len < 8) /* min msg size */
> @@ -317,9 +316,9 @@ mrt_parse_v2_peer(struct mrt_hdr *hdr, v
> if ((peers = calloc(cnt, sizeof(struct mrt_peer_entry))) == NULL)
> err(1, "calloc");
> for (i = 0; i < cnt; i++) {
> - u_int8_t type;
> + uint8_t type;
>
> - if (len < sizeof(u_int8_t) + sizeof(u_int32_t))
> + if (len < sizeof(uint8_t) + sizeof(uint32_t))
> goto fail;
> type = *b++;
> len -= 1;
> @@ -369,11 +368,11 @@ mrt_parse_v2_rib(struct mrt_hdr *hdr, vo
> {
> struct mrt_rib_entry *entries = NULL;
> struct mrt_rib *r;
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
> u_int len = ntohl(hdr->length);
> - u_int32_t snum, path_id = 0;
> - u_int16_t cnt, i, afi;
> - u_int8_t safi, aid;
> + uint32_t snum, path_id = 0;
> + uint16_t cnt, i, afi;
> + uint8_t safi, aid;
> int ret;
>
> if (len < sizeof(snum) + 1)
> @@ -464,9 +463,9 @@ mrt_parse_v2_rib(struct mrt_hdr *hdr, vo
> if ((entries = calloc(cnt, sizeof(struct mrt_rib_entry))) == NULL)
> err(1, "calloc");
> for (i = 0; i < cnt; i++) {
> - u_int32_t otm;
> - u_int16_t pix, alen;
> - if (len < 2 * sizeof(u_int16_t) + sizeof(u_int32_t))
> + uint32_t otm;
> + uint16_t pix, alen;
> + if (len < 2 * sizeof(uint16_t) + sizeof(uint32_t))
> goto fail;
> /* peer index */
> memcpy(&pix, b, sizeof(pix));
> @@ -520,9 +519,9 @@ mrt_parse_dump(struct mrt_hdr *hdr, void
> struct mrt_peer *p;
> struct mrt_rib *r;
> struct mrt_rib_entry *re;
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
> u_int len = ntohl(hdr->length);
> - u_int16_t asnum, alen;
> + uint16_t asnum, alen;
>
> if (*pp == NULL) {
> *pp = calloc(1, sizeof(struct mrt_peer));
> @@ -544,15 +543,15 @@ mrt_parse_dump(struct mrt_hdr *hdr, void
> r->nentries = 1;
> r->entries = re;
>
> - if (len < 2 * sizeof(u_int16_t))
> + if (len < 2 * sizeof(uint16_t))
> goto fail;
> /* view */
> - b += sizeof(u_int16_t);
> - len -= sizeof(u_int16_t);
> + b += sizeof(uint16_t);
> + len -= sizeof(uint16_t);
> /* seqnum */
> - memcpy(&r->seqnum, b, sizeof(u_int16_t));
> - b += sizeof(u_int16_t);
> - len -= sizeof(u_int16_t);
> + memcpy(&r->seqnum, b, sizeof(uint16_t));
> + b += sizeof(uint16_t);
> + len -= sizeof(uint16_t);
> r->seqnum = ntohs(r->seqnum);
>
> switch (ntohs(hdr->subtype)) {
> @@ -569,7 +568,7 @@ mrt_parse_dump(struct mrt_hdr *hdr, void
> len -= sizeof(struct in6_addr);
> break;
> }
> - if (len < 2 * sizeof(u_int32_t) + 2 * sizeof(u_int16_t) + 2)
> + if (len < 2 * sizeof(uint32_t) + 2 * sizeof(uint16_t) + 2)
> goto fail;
> r->prefixlen = *b++;
> len -= 1;
> @@ -577,9 +576,9 @@ mrt_parse_dump(struct mrt_hdr *hdr, void
> b += 1;
> len -= 1;
> /* originated */
> - memcpy(&re->originated, b, sizeof(u_int32_t));
> - b += sizeof(u_int32_t);
> - len -= sizeof(u_int32_t);
> + memcpy(&re->originated, b, sizeof(uint32_t));
> + b += sizeof(uint32_t);
> + len -= sizeof(uint32_t);
> re->originated = ntohl(re->originated);
> /* peer ip */
> switch (ntohs(hdr->subtype)) {
> @@ -627,16 +626,16 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, v
> struct mrt_peer *p;
> struct mrt_rib *r;
> struct mrt_rib_entry *re;
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
> u_int len = ntohl(hdr->length);
> - u_int16_t asnum, alen, afi;
> - u_int8_t safi, nhlen, aid;
> + uint16_t asnum, alen, afi;
> + uint8_t safi, nhlen, aid;
> int ret;
>
> /* just ignore the microsec field for _ET header for now */
> if (ntohs(hdr->type) == MSG_PROTOCOL_BGP4MP_ET) {
> - b = (char *)b + sizeof(u_int32_t);
> - len -= sizeof(u_int32_t);
> + b = (char *)b + sizeof(uint32_t);
> + len -= sizeof(uint32_t);
> }
>
> if (*pp == NULL) {
> @@ -659,19 +658,19 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, v
> r->nentries = 1;
> r->entries = re;
>
> - if (len < 4 * sizeof(u_int16_t))
> + if (len < 4 * sizeof(uint16_t))
> goto fail;
> /* source AS */
> - b += sizeof(u_int16_t);
> - len -= sizeof(u_int16_t);
> + b += sizeof(uint16_t);
> + len -= sizeof(uint16_t);
> /* dest AS */
> memcpy(&asnum, b, sizeof(asnum));
> b += sizeof(asnum);
> len -= sizeof(asnum);
> p->peers->asnum = ntohs(asnum);
> /* iface index */
> - b += sizeof(u_int16_t);
> - len -= sizeof(u_int16_t);
> + b += sizeof(uint16_t);
> + len -= sizeof(uint16_t);
> /* afi */
> memcpy(&afi, b, sizeof(afi));
> b += sizeof(afi);
> @@ -706,15 +705,15 @@ mrt_parse_dump_mp(struct mrt_hdr *hdr, v
> break;
> }
>
> - if (len < 2 * sizeof(u_int16_t) + 2 * sizeof(u_int32_t))
> + if (len < 2 * sizeof(uint16_t) + 2 * sizeof(uint32_t))
> goto fail;
> /* view + status */
> - b += 2 * sizeof(u_int16_t);
> - len -= 2 * sizeof(u_int16_t);
> + b += 2 * sizeof(uint16_t);
> + len -= 2 * sizeof(uint16_t);
> /* originated */
> - memcpy(&re->originated, b, sizeof(u_int32_t));
> - b += sizeof(u_int32_t);
> - len -= sizeof(u_int32_t);
> + memcpy(&re->originated, b, sizeof(uint32_t));
> + b += sizeof(uint32_t);
> + len -= sizeof(uint32_t);
> re->originated = ntohl(re->originated);
>
> /* afi */
> @@ -770,13 +769,13 @@ fail:
> }
>
> int
> -mrt_extract_attr(struct mrt_rib_entry *re, u_char *a, int alen, u_int8_t
> aid,
> +mrt_extract_attr(struct mrt_rib_entry *re, u_char *a, int alen, uint8_t
> aid,
> int as4)
> {
> struct mrt_attr *ap;
> - u_int32_t tmp;
> - u_int16_t attr_len;
> - u_int8_t type, flags, *attr;
> + uint32_t tmp;
> + uint16_t attr_len;
> + uint8_t type, flags, *attr;
>
> do {
> if (alen < 3)
> @@ -864,21 +863,21 @@ mrt_extract_attr(struct mrt_rib_entry *r
> sizeof(struct in6_addr));
> break;
> case AID_VPN_IPv4:
> - if (attr_len < sizeof(u_int64_t) +
> + if (attr_len < sizeof(uint64_t) +
> sizeof(struct in_addr))
> return (-1);
> re->nexthop.aid = aid;
> - memcpy(&tmp, a + 1 + sizeof(u_int64_t),
> + memcpy(&tmp, a + 1 + sizeof(uint64_t),
> sizeof(tmp));
> re->nexthop.v4.s_addr = tmp;
> break;
> case AID_VPN_IPv6:
> - if (attr_len < sizeof(u_int64_t) +
> + if (attr_len < sizeof(uint64_t) +
> sizeof(struct in6_addr))
> return (-1);
> re->nexthop.aid = aid;
> memcpy(&re->nexthop.v6,
> - a + 1 + sizeof(u_int64_t),
> + a + 1 + sizeof(uint64_t),
> sizeof(struct in6_addr));
> break;
> }
> @@ -927,7 +926,7 @@ mrt_free_peers(struct mrt_peer *p)
> void
> mrt_free_rib(struct mrt_rib *r)
> {
> - u_int16_t i, j;
> + uint16_t i, j;
>
> for (i = 0; i < r->nentries && r->entries; i++) {
> for (j = 0; j < r->entries[i].nattrs; j++)
> @@ -954,19 +953,19 @@ mrt_free_bgp_msg(struct mrt_bgp_msg *m)
> }
>
> u_char *
> -mrt_aspath_inflate(void *data, u_int16_t len, u_int16_t *newlen)
> +mrt_aspath_inflate(void *data, uint16_t len, uint16_t *newlen)
> {
> - u_int8_t *seg, *nseg, *ndata;
> - u_int16_t seg_size, olen, nlen;
> - u_int8_t seg_len;
> + uint8_t *seg, *nseg, *ndata;
> + uint16_t seg_size, olen, nlen;
> + uint8_t seg_len;
>
> /* first calculate the length of the aspath */
> seg = data;
> nlen = 0;
> for (olen = len; olen > 0; olen -= seg_size, seg += seg_size) {
> seg_len = seg[1];
> - seg_size = 2 + sizeof(u_int16_t) * seg_len;
> - nlen += 2 + sizeof(u_int32_t) * seg_len;
> + seg_size = 2 + sizeof(uint16_t) * seg_len;
> + nlen += 2 + sizeof(uint32_t) * seg_len;
>
> if (seg_size > olen)
> return NULL;
> @@ -993,9 +992,9 @@ mrt_aspath_inflate(void *data, u_int16_t
> }
>
> int
> -mrt_extract_addr(void *msg, u_int len, struct bgpd_addr *addr, u_int8_t
> aid)
> +mrt_extract_addr(void *msg, u_int len, struct bgpd_addr *addr, uint8_t
> aid)
> {
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
>
> memset(addr, 0, sizeof(*addr));
> switch (aid) {
> @@ -1012,29 +1011,29 @@ mrt_extract_addr(void *msg, u_int len, s
> memcpy(&addr->v6, b, sizeof(struct in6_addr));
> return sizeof(struct in6_addr);
> case AID_VPN_IPv4:
> - if (len < sizeof(u_int64_t) + sizeof(struct in_addr))
> + if (len < sizeof(uint64_t) + sizeof(struct in_addr))
> return (-1);
> addr->aid = aid;
> /* XXX labelstack and rd missing */
> - memcpy(&addr->v4, b + sizeof(u_int64_t),
> + memcpy(&addr->v4, b + sizeof(uint64_t),
> sizeof(struct in_addr));
> - return (sizeof(u_int64_t) + sizeof(struct in_addr));
> + return (sizeof(uint64_t) + sizeof(struct in_addr));
> case AID_VPN_IPv6:
> - if (len < sizeof(u_int64_t) + sizeof(struct in6_addr))
> + if (len < sizeof(uint64_t) + sizeof(struct in6_addr))
> return (-1);
> addr->aid = aid;
> /* XXX labelstack and rd missing */
> - memcpy(&addr->v6, b + sizeof(u_int64_t),
> + memcpy(&addr->v6, b + sizeof(uint64_t),
> sizeof(struct in6_addr));
> - return (sizeof(u_int64_t) + sizeof(struct in6_addr));
> + return (sizeof(uint64_t) + sizeof(struct in6_addr));
> default:
> return (-1);
> }
> }
>
> int
> -mrt_extract_prefix(void *msg, u_int len, u_int8_t aid,
> - struct bgpd_addr *prefix, u_int8_t *prefixlen, int verbose)
> +mrt_extract_prefix(void *msg, u_int len, uint8_t aid,
> + struct bgpd_addr *prefix, uint8_t *prefixlen, int verbose)
> {
> int r;
>
> @@ -1066,12 +1065,12 @@ mrt_parse_state(struct mrt_hdr *hdr, voi
> {
> struct timespec t;
> struct mrt_bgp_state *s;
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
> u_int len = ntohl(hdr->length);
> - u_int32_t sas, das, usec;
> - u_int16_t tmp16, afi;
> + uint32_t sas, das, usec;
> + uint16_t tmp16, afi;
> int r;
> - u_int8_t aid;
> + uint8_t aid;
>
> t.tv_sec = ntohl(hdr->timestamp);
> t.tv_nsec = 0;
> @@ -1174,12 +1173,12 @@ mrt_parse_msg(struct mrt_hdr *hdr, void
> {
> struct timespec t;
> struct mrt_bgp_msg *m;
> - u_int8_t *b = msg;
> + uint8_t *b = msg;
> u_int len = ntohl(hdr->length);
> - u_int32_t sas, das, usec;
> - u_int16_t tmp16, afi;
> + uint32_t sas, das, usec;
> + uint16_t tmp16, afi;
> int r, addpath = 0;
> - u_int8_t aid;
> + uint8_t aid;
>
> t.tv_sec = ntohl(hdr->timestamp);
> t.tv_nsec = 0;
> Index: bgpctl/mrtparser.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/mrtparser.h,v
> retrieving revision 1.4
> diff -u -p -r1.4 mrtparser.h
> --- bgpctl/mrtparser.h 27 Jul 2021 07:42:37 -0000 1.4
> +++ bgpctl/mrtparser.h 4 Feb 2022 14:31:26 -0000
> @@ -20,15 +20,15 @@
> /* data structures for the MSG_TABLE_DUMP_V2 format */
> struct mrt_peer_entry {
> struct bgpd_addr addr;
> - u_int32_t bgp_id;
> - u_int32_t asnum;
> + uint32_t bgp_id;
> + uint32_t asnum;
> };
>
> struct mrt_peer {
> char *view;
> struct mrt_peer_entry *peers;
> - u_int32_t bgp_id;
> - u_int16_t npeers;
> + uint32_t bgp_id;
> + uint16_t npeers;
> };
>
> struct mrt_attr {
> @@ -41,22 +41,22 @@ struct mrt_rib_entry {
> struct mrt_attr *attrs;
> struct bgpd_addr nexthop;
> time_t originated;
> - u_int32_t local_pref;
> - u_int32_t med;
> - u_int32_t path_id;
> - u_int16_t peer_idx;
> - u_int16_t aspath_len;
> - u_int16_t nattrs;
> - u_int8_t origin;
> + uint32_t local_pref;
> + uint32_t med;
> + uint32_t path_id;
> + uint16_t peer_idx;
> + uint16_t aspath_len;
> + uint16_t nattrs;
> + uint8_t origin;
> };
>
> struct mrt_rib {
> struct mrt_rib_entry *entries;
> struct bgpd_addr prefix;
> - u_int32_t seqnum;
> - u_int16_t nentries;
> - u_int8_t prefixlen;
> - u_int8_t add_path;
> + uint32_t seqnum;
> + uint16_t nentries;
> + uint8_t prefixlen;
> + uint8_t add_path;
> };
>
> /* data structures for the BGP4MP MESSAGE and STATE types */
> @@ -64,20 +64,20 @@ struct mrt_bgp_state {
> struct timespec time;
> struct bgpd_addr src;
> struct bgpd_addr dst;
> - u_int32_t src_as;
> - u_int32_t dst_as;
> - u_int16_t old_state;
> - u_int16_t new_state;
> + uint32_t src_as;
> + uint32_t dst_as;
> + uint16_t old_state;
> + uint16_t new_state;
> };
>
> struct mrt_bgp_msg {
> struct timespec time;
> struct bgpd_addr src;
> struct bgpd_addr dst;
> - u_int32_t src_as;
> - u_int32_t dst_as;
> - u_int16_t msg_len;
> - u_int8_t add_path;
> + uint32_t src_as;
> + uint32_t dst_as;
> + uint16_t msg_len;
> + uint8_t add_path;
> void *msg;
> };
>
> Index: bgpctl/output.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/output.c,v
> retrieving revision 1.19
> diff -u -p -r1.19 output.c
> --- bgpctl/output.c 30 Jul 2021 09:45:52 -0000 1.19
> +++ bgpctl/output.c 4 Feb 2022 14:31:26 -0000
> @@ -134,8 +134,8 @@ show_summary(struct peer *p)
> static void
> show_neighbor_capa_mp(struct capabilities *capa)
> {
> - int comma;
> - u_int8_t i;
> + int comma;
> + uint8_t i;
>
> printf(" Multiprotocol extensions: ");
> for (i = 0, comma = 0; i < AID_MAX; i++)
> @@ -151,7 +151,7 @@ show_neighbor_capa_add_path(struct capab
> {
> const char *mode;
> int comma;
> - u_int8_t i;
> + uint8_t i;
>
> printf(" Add-path: ");
> for (i = 0, comma = 0; i < AID_MAX; i++) {
> @@ -177,8 +177,8 @@ show_neighbor_capa_add_path(struct capab
> static void
> show_neighbor_capa_restart(struct capabilities *capa)
> {
> - int comma;
> - u_int8_t i;
> + int comma;
> + uint8_t i;
>
> printf(" Graceful Restart");
> if (capa->grestart.timeout)
> @@ -242,11 +242,11 @@ show_neighbor_msgstats(struct peer *p)
> static void
> show_neighbor_full(struct peer *p, struct parse_result *res)
> {
> - const char *errstr;
> - struct in_addr ina;
> - char *s;
> - int hascapamp, hascapaap;
> - u_int8_t i;
> + const char *errstr;
> + struct in_addr ina;
> + char *s;
> + int hascapamp, hascapaap;
> + uint8_t i;
>
> if ((p->conf.remote_addr.aid == AID_INET &&
> p->conf.remote_masklen != 32) ||
> @@ -455,7 +455,7 @@ show_timer(struct ctl_timer *t)
> static void
> show_fib(struct kroute_full *kf)
> {
> - char *p;
> + char *p;
>
> if (asprintf(&p, "%s/%u", log_addr(&kf->prefix), kf->prefixlen) ==
> -1)
> err(1, NULL);
> @@ -480,9 +480,9 @@ show_fib_table(struct ktable *kt)
> static void
> show_nexthop(struct ctl_show_nexthop *nh)
> {
> - struct kroute *k;
> - struct kroute6 *k6;
> - char *s;
> + struct kroute *k;
> + struct kroute6 *k6;
> + char *s;
>
> printf("%s %-15s ", nh->valid ? "*" : " ", log_addr(&nh->addr));
> if (!nh->krvalid) {
> @@ -548,8 +548,8 @@ show_communities(u_char *data, size_t le
> {
> struct community c;
> size_t i;
> - u_int64_t ext;
> - u_int8_t type = 0;
> + uint64_t ext;
> + uint8_t type = 0;
>
> if (len % sizeof(c))
> return;
> @@ -574,19 +574,19 @@ show_communities(u_char *data, size_t le
> fmt_large_community(c.data1, c.data2,
> c.data3));
> break;
> case COMMUNITY_TYPE_EXT:
> - ext = (u_int64_t)c.data3 << 48;
> + ext = (uint64_t)c.data3 << 48;
> switch (c.data3 >> 8) {
> case EXT_COMMUNITY_TRANS_TWO_AS:
> case EXT_COMMUNITY_TRANS_OPAQUE:
> case EXT_COMMUNITY_TRANS_EVPN:
> case EXT_COMMUNITY_NON_TRANS_OPAQUE:
> - ext |= ((u_int64_t)c.data1 & 0xffff) << 32;
> - ext |= (u_int64_t)c.data2;
> + ext |= ((uint64_t)c.data1 & 0xffff) << 32;
> + ext |= (uint64_t)c.data2;
> break;
> case EXT_COMMUNITY_TRANS_FOUR_AS:
> case EXT_COMMUNITY_TRANS_IPV4:
> - ext |= (u_int64_t)c.data1 << 16;
> - ext |= (u_int64_t)c.data2 & 0xffff;
> + ext |= (uint64_t)c.data1 << 16;
> + ext |= (uint64_t)c.data2 & 0xffff;
> break;
> }
> ext = htobe64(ext);
> @@ -600,10 +600,10 @@ show_communities(u_char *data, size_t le
> }
>
> static void
> -show_community(u_char *data, u_int16_t len)
> +show_community(u_char *data, uint16_t len)
> {
> - u_int16_t a, v;
> - u_int16_t i;
> + uint16_t a, v;
> + uint16_t i;
>
> if (len & 0x3) {
> printf("bad length");
> @@ -623,10 +623,10 @@ show_community(u_char *data, u_int16_t l
> }
>
> static void
> -show_large_community(u_char *data, u_int16_t len)
> +show_large_community(u_char *data, uint16_t len)
> {
> - u_int32_t a, l1, l2;
> - u_int16_t i;
> + uint32_t a, l1, l2;
> + uint16_t i;
>
> if (len % 12) {
> printf("bad length");
> @@ -648,9 +648,9 @@ show_large_community(u_char *data, u_int
> }
>
> static void
> -show_ext_community(u_char *data, u_int16_t len)
> +show_ext_community(u_char *data, uint16_t len)
> {
> - u_int16_t i;
> + uint16_t i;
>
> if (len & 0x7) {
> printf("bad length");
> @@ -672,9 +672,9 @@ show_attr(u_char *data, size_t len, int
> struct in_addr id;
> struct bgpd_addr prefix;
> char *aspath;
> - u_int32_t as, pathid;
> - u_int16_t alen, ioff, short_as, afi;
> - u_int8_t flags, type, safi, aid, prefixlen;
> + uint32_t as, pathid;
> + uint16_t alen, ioff, short_as, afi;
> + uint8_t flags, type, safi, aid, prefixlen;
> int i, pos, e2, e4;
>
> if (len < 3) {
> @@ -691,7 +691,7 @@ show_attr(u_char *data, size_t len, int
> warnx("Too short BGP attrbute");
> return;
> }
> - memcpy(&alen, data+2, sizeof(u_int16_t));
> + memcpy(&alen, data+2, sizeof(uint16_t));
> alen = ntohs(alen);
> data += 4;
> len -= 4;
> @@ -748,7 +748,7 @@ show_attr(u_char *data, size_t len, int
> case ATTR_MED:
> case ATTR_LOCALPREF:
> if (alen == 4) {
> - u_int32_t val;
> + uint32_t val;
> memcpy(&val, data, sizeof(val));
> val = ntohl(val);
> printf("%u", val);
> @@ -810,7 +810,7 @@ show_attr(u_char *data, size_t len, int
>
> if (type == ATTR_MP_REACH_NLRI) {
> struct bgpd_addr nexthop;
> - u_int8_t nhlen;
> + uint8_t nhlen;
> if (len == 0)
> goto bad_len;
> nhlen = *data++;
> @@ -829,14 +829,14 @@ show_attr(u_char *data, size_t len, int
> if (nhlen != 12)
> goto bad_len;
> nexthop.aid = AID_INET;
> - memcpy(&nexthop.v4, data +
> sizeof(u_int64_t),
> + memcpy(&nexthop.v4, data +
> sizeof(uint64_t),
> sizeof(nexthop.v4));
> break;
> case AID_VPN_IPv6:
> if (nhlen != 24)
> goto bad_len;
> nexthop.aid = AID_INET6;
> - memcpy(&nexthop.v6, data +
> sizeof(u_int64_t),
> + memcpy(&nexthop.v6, data +
> sizeof(uint64_t),
> sizeof(nexthop.v6));
> break;
> default:
> Index: bgpctl/output_json.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/output_json.c,v
> retrieving revision 1.12
> diff -u -p -r1.12 output_json.c
> --- bgpctl/output_json.c 27 Jul 2021 07:42:37 -0000 1.12
> +++ bgpctl/output_json.c 4 Feb 2022 14:31:26 -0000
> @@ -543,7 +543,7 @@ static void
> json_do_large_community(u_char *data, uint16_t len)
> {
> uint32_t a, l1, l2;
> - u_int16_t i;
> + uint16_t i;
>
> if (len % 12) {
> json_do_printf("error", "bad length");
> Index: bgpctl/parser.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/parser.c,v
> retrieving revision 1.107
> diff -u -p -r1.107 parser.c
> --- bgpctl/parser.c 9 Aug 2021 08:24:36 -0000 1.107
> +++ bgpctl/parser.c 4 Feb 2022 14:31:26 -0000
> @@ -494,7 +494,7 @@ const struct token *match_token(int *arg
> void show_valid_args(const struct token []);
>
> int parse_addr(const char *, struct bgpd_addr *);
> -int parse_asnum(const char *, size_t, u_int32_t *);
> +int parse_asnum(const char *, size_t, uint32_t *);
> int parse_number(const char *, struct parse_result *, enum token_type);
> void parsecommunity(struct community *c, int type, char *s);
> void parseextcommunity(struct community *c, const char *t, char *s);
> @@ -610,7 +610,8 @@ match_token(int *argc, char **argv[], co
> }
> break;
> case PREFIX:
> - if (parse_prefix(word, wordlen, &res.addr,
> &res.prefixlen)) {
> + if (parse_prefix(word, wordlen, &res.addr,
> + &res.prefixlen)) {
> match++;
> t = &table[i];
> }
> @@ -718,7 +719,7 @@ match_token(int *argc, char **argv[], co
> if (word != NULL && wordlen > 0) {
> char *p = strdup(word);
> struct community ext;
> - u_int64_t rd;
> + uint64_t rd;
>
> if (p == NULL)
> err(1, NULL);
> @@ -728,19 +729,19 @@ match_token(int *argc, char **argv[], co
> switch (ext.data3 >> 8) {
> case EXT_COMMUNITY_TRANS_TWO_AS:
> rd = (0ULL << 48);
> - rd |= ((u_int64_t)ext.data1 &
> 0xffff)
> + rd |= ((uint64_t)ext.data1 &
> 0xffff)
> << 32;
> - rd |= (u_int64_t)ext.data2;
> + rd |= (uint64_t)ext.data2;
> break;
> case EXT_COMMUNITY_TRANS_IPV4:
> rd = (1ULL << 48);
> - rd |= (u_int64_t)ext.data1 << 16;
> - rd |= (u_int64_t)ext.data2 &
> 0xffff;
> + rd |= (uint64_t)ext.data1 << 16;
> + rd |= (uint64_t)ext.data2 & 0xffff;
> break;
> case EXT_COMMUNITY_TRANS_FOUR_AS:
> rd = (2ULL << 48);
> - rd |= (u_int64_t)ext.data1 << 16;
> - rd |= (u_int64_t)ext.data2 &
> 0xffff;
> + rd |= (uint64_t)ext.data1 << 16;
> + rd |= (uint64_t)ext.data2 & 0xffff;
> break;
> default:
> errx(1, "bad encoding of rd");
> @@ -929,7 +930,8 @@ parse_addr(const char *word, struct bgpd
> }
>
> int
> -parse_prefix(const char *word, size_t wordlen, struct bgpd_addr *addr,
> u_int8_t *prefixlen)
> +parse_prefix(const char *word, size_t wordlen, struct bgpd_addr *addr,
> + uint8_t *prefixlen)
> {
> char *p, *ps;
> const char *errstr;
> @@ -982,11 +984,11 @@ parse_prefix(const char *word, size_t wo
> }
>
> int
> -parse_asnum(const char *word, size_t wordlen, u_int32_t *asnum)
> +parse_asnum(const char *word, size_t wordlen, uint32_t *asnum)
> {
> const char *errstr;
> char *dot, *parseword;
> - u_int32_t uval, uvalh = 0;
> + uint32_t uval, uvalh = 0;
>
> if (word == NULL)
> return (0);
> @@ -1081,7 +1083,7 @@ parse_number(const char *word, struct pa
> }
>
> static void
> -getcommunity(char *s, int large, u_int32_t *val, u_int32_t *flag)
> +getcommunity(char *s, int large, uint32_t *val, uint32_t *flag)
> {
> long long max = USHRT_MAX;
> const char *errstr;
> @@ -1106,8 +1108,8 @@ getcommunity(char *s, int large, u_int32
> }
>
> static void
> -setcommunity(struct community *c, u_int32_t as, u_int32_t data,
> - u_int32_t asflag, u_int32_t dataflag)
> +setcommunity(struct community *c, uint32_t as, uint32_t data,
> + uint32_t asflag, uint32_t dataflag)
> {
> c->flags = COMMUNITY_TYPE_BASIC;
> c->flags |= asflag << 8;
> @@ -1121,7 +1123,7 @@ static void
> parselargecommunity(struct community *c, char *s)
> {
> char *p, *q;
> - u_int32_t dflag1, dflag2, dflag3;
> + uint32_t dflag1, dflag2, dflag3;
>
> if ((p = strchr(s, ':')) == NULL)
> errx(1, "Bad community syntax");
> @@ -1145,7 +1147,7 @@ void
> parsecommunity(struct community *c, int type, char *s)
> {
> char *p;
> - u_int32_t as, data, asflag, dataflag;
> + uint32_t as, data, asflag, dataflag;
>
> if (type == COMMUNITY_TYPE_LARGE) {
> parselargecommunity(c, s);
> @@ -1209,12 +1211,12 @@ parsesubtype(const char *name, int *type
> }
>
> static int
> -parseextvalue(int type, char *s, u_int32_t *v, u_int32_t *flag)
> +parseextvalue(int type, char *s, uint32_t *v, uint32_t *flag)
> {
> const char *errstr;
> char *p;
> struct in_addr ip;
> - u_int32_t uvalh, uval;
> + uint32_t uvalh, uval;
>
> if (type != -1) {
> /* nothing */
> @@ -1282,8 +1284,8 @@ parseextcommunity(struct community *c, c
> {
> const struct ext_comm_pairs *cp;
> char *p, *ep;
> - u_int64_t ullval;
> - u_int32_t uval, uval2, dflag1 = 0, dflag2 = 0;
> + uint64_t ullval;
> + uint32_t uval, uval2, dflag1 = 0, dflag2 = 0;
> int type = 0, subtype = 0;
>
> if (strcmp(t, "*") == 0 && strcmp(s, "*") == 0) {
> Index: bgpctl/parser.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpctl/parser.h,v
> retrieving revision 1.41
> diff -u -p -r1.41 parser.h
> --- bgpctl/parser.h 9 Aug 2021 08:24:36 -0000 1.41
> +++ bgpctl/parser.h 4 Feb 2022 14:31:26 -0000
> @@ -68,19 +68,19 @@ struct parse_result {
> char rib[PEER_DESCR_LEN];
> char reason[REASON_LEN];
> const char *ext_comm_subtype;
> - u_int64_t rd;
> + uint64_t rd;
> int flags;
> int is_group;
> u_int rtableid;
> - u_int32_t pathid;
> + uint32_t pathid;
> enum actions action;
> - u_int8_t validation_state;
> - u_int8_t prefixlen;
> - u_int8_t aid;
> + uint8_t validation_state;
> + uint8_t prefixlen;
> + uint8_t aid;
> int mrtfd;
> };
>
> __dead void usage(void);
> struct parse_result *parse(int, char *[]);
> int parse_prefix(const char *, size_t, struct
> bgpd_addr *,
> - u_int8_t *);
> + uint8_t *);
> Index: bgpd/bgpd.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
> retrieving revision 1.241
> diff -u -p -r1.241 bgpd.c
> --- bgpd/bgpd.c 23 Jan 2022 11:59:40 -0000 1.241
> +++ bgpd/bgpd.c 4 Feb 2022 14:31:17 -0000
> @@ -68,7 +68,7 @@ char *rcname;
>
> struct connect_elm {
> TAILQ_ENTRY(connect_elm) entry;
> - u_int32_t id;
> + uint32_t id;
> int fd;
> };
>
> @@ -702,7 +702,7 @@ send_config(struct bgpd_config *conf)
> /* as-sets for filters in the RDE */
> while ((aset = SIMPLEQ_FIRST(&conf->as_sets)) != NULL) {
> struct ibuf *wbuf;
> - u_int32_t *as;
> + uint32_t *as;
> size_t i, l, n;
>
> SIMPLEQ_REMOVE_HEAD(&conf->as_sets, entry);
> @@ -1090,7 +1090,7 @@ send_nexthop_update(struct kroute_nextho
> }
>
> void
> -send_imsg_session(int type, pid_t pid, void *data, u_int16_t datalen)
> +send_imsg_session(int type, pid_t pid, void *data, uint16_t datalen)
> {
> imsg_compose(ibuf_se, type, 0, pid, -1, data, datalen);
> }
> Index: bgpd/bgpd.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/bgpd.h,v
> retrieving revision 1.418
> diff -u -p -r1.418 bgpd.h
> --- bgpd/bgpd.h 1 Sep 2021 12:39:52 -0000 1.418
> +++ bgpd/bgpd.h 4 Feb 2022 14:31:17 -0000
> @@ -30,6 +30,7 @@
>
> #include <poll.h>
> #include <stdarg.h>
> +#include <stdint.h>
>
> #include <imsg.h>
>
> @@ -150,9 +151,9 @@ enum reconf_action {
> #define SAFI_MPLSVPN 128
>
> struct aid {
> - u_int16_t afi;
> + uint16_t afi;
> sa_family_t af;
> - u_int8_t safi;
> + uint8_t safi;
> char *name;
> };
>
> @@ -192,11 +193,11 @@ struct bgpd_addr {
> struct in6_addr v6;
> /* maximum size for a prefix is 256 bits */
> } ba; /* 128-bit address */
> - u_int64_t rd; /* route distinguisher for VPN
> addrs */
> - u_int32_t scope_id; /* iface scope id for v6 */
> - u_int8_t aid;
> - u_int8_t labellen; /* size of the labelstack */
> - u_int8_t labelstack[18]; /* max that makes sense */
> + uint64_t rd; /* route distinguisher for VPN
> addrs */
> + uint32_t scope_id; /* iface scope id for v6 */
> + uint8_t aid;
> + uint8_t labellen; /* size of the labelstack */
> + uint8_t labelstack[18]; /* max that makes sense */
> #define v4 ba.v4
> #define v6 ba.v6
> };
> @@ -210,7 +211,7 @@ struct listen_addr {
> int fd;
> enum reconf_action reconf;
> socklen_t sa_len;
> - u_int8_t flags;
> + uint8_t flags;
> };
>
> TAILQ_HEAD(listen_addrs, listen_addr);
> @@ -295,14 +296,14 @@ struct bgpd_config {
> int flags;
> int log;
> u_int default_tableid;
> - u_int32_t bgpid;
> - u_int32_t clusterid;
> - u_int32_t as;
> - u_int16_t short_as;
> - u_int16_t holdtime;
> - u_int16_t min_holdtime;
> - u_int16_t connectretry;
> - u_int8_t fib_priority;
> + uint32_t bgpid;
> + uint32_t clusterid;
> + uint32_t as;
> + uint16_t short_as;
> + uint16_t holdtime;
> + uint16_t min_holdtime;
> + uint16_t connectretry;
> + uint8_t fib_priority;
> };
>
> extern int cmd_opts;
> @@ -334,18 +335,18 @@ struct peer_auth {
> char auth_key_out[IPSEC_AUTH_KEY_LEN];
> char enc_key_in[IPSEC_ENC_KEY_LEN];
> char enc_key_out[IPSEC_ENC_KEY_LEN];
> - u_int32_t spi_in;
> - u_int32_t spi_out;
> + uint32_t spi_in;
> + uint32_t spi_out;
> enum auth_method method;
> - u_int8_t md5key_len;
> - u_int8_t auth_alg_in;
> - u_int8_t auth_alg_out;
> - u_int8_t auth_keylen_in;
> - u_int8_t auth_keylen_out;
> - u_int8_t enc_alg_in;
> - u_int8_t enc_alg_out;
> - u_int8_t enc_keylen_in;
> - u_int8_t enc_keylen_out;
> + uint8_t md5key_len;
> + uint8_t auth_alg_in;
> + uint8_t auth_alg_out;
> + uint8_t auth_keylen_in;
> + uint8_t auth_keylen_out;
> + uint8_t enc_alg_in;
> + uint8_t enc_alg_out;
> + uint8_t enc_keylen_in;
> + uint8_t enc_keylen_out;
> };
>
> struct capabilities {
> @@ -387,30 +388,30 @@ struct peer_config {
> char rib[PEER_DESCR_LEN];
> char if_depend[IFNAMSIZ];
> char demote_group[IFNAMSIZ];
> - u_int32_t id;
> - u_int32_t groupid;
> - u_int32_t remote_as;
> - u_int32_t local_as;
> - u_int32_t max_prefix;
> - u_int32_t max_out_prefix;
> + uint32_t id;
> + uint32_t groupid;
> + uint32_t remote_as;
> + uint32_t local_as;
> + uint32_t max_prefix;
> + uint32_t max_out_prefix;
> enum export_type export_type;
> enum enforce_as enforce_as;
> enum enforce_as enforce_local_as;
> - u_int16_t max_prefix_restart;
> - u_int16_t max_out_prefix_restart;
> - u_int16_t holdtime;
> - u_int16_t min_holdtime;
> - u_int16_t local_short_as;
> - u_int8_t template;
> - u_int8_t remote_masklen;
> - u_int8_t ebgp; /* 0 = ibgp else ebgp */
> - u_int8_t distance; /* 1 = direct, >1 =
> multihop */
> - u_int8_t passive;
> - u_int8_t down;
> - u_int8_t announce_capa;
> - u_int8_t reflector_client;
> - u_int8_t ttlsec; /* TTL security hack */
> - u_int8_t flags;
> + uint16_t max_prefix_restart;
> + uint16_t max_out_prefix_restart;
> + uint16_t holdtime;
> + uint16_t min_holdtime;
> + uint16_t local_short_as;
> + uint8_t template;
> + uint8_t remote_masklen;
> + uint8_t ebgp; /* 0 = ibgp else ebgp */
> + uint8_t distance; /* 1 = direct, >1 =
> multihop */
> + uint8_t passive;
> + uint8_t down;
> + uint8_t announce_capa;
> + uint8_t reflector_client;
> + uint8_t ttlsec; /* TTL security hack */
> + uint8_t flags;
> };
>
> #define PEER_ID_NONE 0
> @@ -438,12 +439,12 @@ struct network_config {
> struct bgpd_addr prefix;
> struct filter_set_head attrset;
> char psname[SET_NAME_LEN];
> - u_int64_t rd;
> - u_int16_t rtlabel;
> + uint64_t rd;
> + uint16_t rtlabel;
> enum network_type type;
> - u_int8_t prefixlen;
> - u_int8_t priority;
> - u_int8_t old; /* used for reloading */
> + uint8_t prefixlen;
> + uint8_t priority;
> + uint8_t old; /* used for reloading */
> };
>
> struct network {
> @@ -469,7 +470,7 @@ struct rtr_config {
> char descr[PEER_DESCR_LEN];
> struct bgpd_addr remote_addr;
> struct bgpd_addr local_addr;
> - u_int32_t id;
> + uint32_t id;
> in_addr_t remote_port;
> };
>
> @@ -663,62 +664,62 @@ struct ktable {
> u_int nhtableid; /* rdomain id for nexthop
> lookup */
> int nhrefcnt; /* refcnt for nexthop table */
> enum reconf_action state;
> - u_int8_t fib_conf; /* configured FIB sync flag */
> - u_int8_t fib_sync; /* is FIB synced with kernel?
> */
> + uint8_t fib_conf; /* configured FIB sync flag */
> + uint8_t fib_sync; /* is FIB synced with kernel?
> */
> };
>
> struct kroute_full {
> struct bgpd_addr prefix;
> struct bgpd_addr nexthop;
> char label[RTLABEL_LEN];
> - u_int16_t labelid;
> - u_int16_t flags;
> + uint16_t labelid;
> + uint16_t flags;
> u_short ifindex;
> - u_int8_t prefixlen;
> - u_int8_t priority;
> + uint8_t prefixlen;
> + uint8_t priority;
> };
>
> struct kroute {
> struct in_addr prefix;
> struct in_addr nexthop;
> - u_int32_t mplslabel;
> - u_int16_t flags;
> - u_int16_t labelid;
> + uint32_t mplslabel;
> + uint16_t flags;
> + uint16_t labelid;
> u_short ifindex;
> - u_int8_t prefixlen;
> - u_int8_t priority;
> + uint8_t prefixlen;
> + uint8_t priority;
> };
>
> struct kroute6 {
> struct in6_addr prefix;
> struct in6_addr nexthop;
> - u_int32_t mplslabel;
> - u_int16_t flags;
> - u_int16_t labelid;
> + uint32_t mplslabel;
> + uint16_t flags;
> + uint16_t labelid;
> u_short ifindex;
> - u_int8_t prefixlen;
> - u_int8_t priority;
> + uint8_t prefixlen;
> + uint8_t priority;
> };
>
> struct kroute_nexthop {
> struct bgpd_addr nexthop;
> struct bgpd_addr gateway;
> struct bgpd_addr net;
> - u_int8_t valid;
> - u_int8_t connected;
> - u_int8_t netlen;
> + uint8_t valid;
> + uint8_t connected;
> + uint8_t netlen;
> };
>
> struct kif {
> char ifname[IFNAMSIZ];
> - u_int64_t baudrate;
> + uint64_t baudrate;
> u_int rdomain;
> int flags;
> u_short ifindex;
> - u_int8_t if_type;
> - u_int8_t link_state;
> - u_int8_t nh_reachable; /* for nexthop
> verification */
> - u_int8_t depend_state; /* for session depend on */
> + uint8_t if_type;
> + uint8_t link_state;
> + uint8_t nh_reachable; /* for nexthop
> verification */
> + uint8_t depend_state; /* for session depend on */
> };
>
> struct session_up {
> @@ -726,13 +727,13 @@ struct session_up {
> struct bgpd_addr local_v6_addr;
> struct bgpd_addr remote_addr;
> struct capabilities capa;
> - u_int32_t remote_bgpid;
> - u_int16_t short_as;
> + uint32_t remote_bgpid;
> + uint16_t short_as;
> };
>
> struct route_refresh {
> - u_int8_t aid;
> - u_int8_t subtype;
> + uint8_t aid;
> + uint8_t subtype;
> };
> #define ROUTE_REFRESH_REQUEST 0
> #define ROUTE_REFRESH_BEGIN_RR 1
> @@ -741,17 +742,17 @@ struct route_refresh {
> struct pftable_msg {
> struct bgpd_addr addr;
> char pftable[PFTABLE_LEN];
> - u_int8_t len;
> + uint8_t len;
> };
>
> struct ctl_show_interface {
> char ifname[IFNAMSIZ];
> char linkstate[32];
> char media[32];
> - u_int64_t baudrate;
> + uint64_t baudrate;
> u_int rdomain;
> - u_int8_t nh_reachable;
> - u_int8_t is_up;
> + uint8_t nh_reachable;
> + uint8_t is_up;
> };
>
> struct ctl_show_nexthop {
> @@ -761,8 +762,8 @@ struct ctl_show_nexthop {
> struct kroute kr4;
> struct kroute6 kr6;
> } kr;
> - u_int8_t valid;
> - u_int8_t krvalid;
> + uint8_t valid;
> + uint8_t krvalid;
> };
>
> struct ctl_show_set {
> @@ -802,15 +803,15 @@ struct ctl_show_rib {
> struct bgpd_addr remote_addr;
> char descr[PEER_DESCR_LEN];
> time_t age;
> - u_int32_t remote_id;
> - u_int32_t path_id;
> - u_int32_t local_pref;
> - u_int32_t med;
> - u_int32_t weight;
> - u_int32_t flags;
> - u_int8_t prefixlen;
> - u_int8_t origin;
> - u_int8_t validation_state;
> + uint32_t remote_id;
> + uint32_t path_id;
> + uint32_t local_pref;
> + uint32_t med;
> + uint32_t weight;
> + uint32_t flags;
> + uint8_t prefixlen;
> + uint8_t origin;
> + uint8_t validation_state;
> /* plus an aspath */
> };
>
> @@ -836,11 +837,11 @@ enum aslen_spec {
> struct filter_as {
> char name[SET_NAME_LEN];
> struct as_set *aset;
> - u_int32_t as_min;
> - u_int32_t as_max;
> + uint32_t as_min;
> + uint32_t as_max;
> enum as_spec type;
> - u_int8_t flags;
> - u_int8_t op;
> + uint8_t flags;
> + uint8_t op;
> };
>
> struct filter_aslen {
> @@ -865,8 +866,8 @@ struct filter_originset {
> };
>
> struct filter_ovs {
> - u_int8_t validity;
> - u_int8_t is_set;
> + uint8_t validity;
> + uint8_t is_set;
> };
>
> /*
> @@ -877,13 +878,13 @@ struct filter_ovs {
> * for e.g. COMMUNITY_ANY and the low byte is the community type.
> * If flags is 0 the community struct is unused. If the upper 24bit of
> * flags is 0 a fast compare can be used.
> - * The code uses a type cast to u_int8_t to access the type.
> + * The code uses a type cast to uint8_t to access the type.
> */
> struct community {
> - u_int32_t flags;
> - u_int32_t data1;
> - u_int32_t data2;
> - u_int32_t data3;
> + uint32_t flags;
> + uint32_t data1;
> + uint32_t data2;
> + uint32_t data3;
> };
>
> struct ctl_show_rib_request {
> @@ -892,13 +893,13 @@ struct ctl_show_rib_request {
> struct bgpd_addr prefix;
> struct filter_as as;
> struct community community;
> - u_int32_t flags;
> - u_int32_t path_id;
> + uint32_t flags;
> + uint32_t path_id;
> pid_t pid;
> enum imsg_type type;
> - u_int8_t validation_state;
> - u_int8_t prefixlen;
> - u_int8_t aid;
> + uint8_t validation_state;
> + uint8_t prefixlen;
> + uint8_t aid;
> };
>
> enum filter_actions {
> @@ -932,12 +933,12 @@ enum comp_ops {
> };
>
> struct filter_peers {
> - u_int32_t peerid;
> - u_int32_t groupid;
> - u_int32_t remote_as;
> - u_int16_t ribid;
> - u_int8_t ebgp;
> - u_int8_t ibgp;
> + uint32_t peerid;
> + uint32_t groupid;
> + uint32_t remote_as;
> + uint16_t ribid;
> + uint8_t ebgp;
> + uint8_t ibgp;
> };
>
> /* special community type, keep in sync with the attribute type */
> @@ -988,7 +989,7 @@ struct filter_peers {
>
> struct ext_comm_pairs {
> short type;
> - u_int8_t subtype;
> + uint8_t subtype;
> const char *subname;
> };
>
> @@ -1029,15 +1030,15 @@ extern const struct ext_comm_pairs iana_
>
> struct filter_prefix {
> struct bgpd_addr addr;
> - u_int8_t op;
> - u_int8_t len;
> - u_int8_t len_min;
> - u_int8_t len_max;
> + uint8_t op;
> + uint8_t len;
> + uint8_t len_min;
> + uint8_t len_max;
> };
>
> struct filter_nexthop {
> struct bgpd_addr addr;
> - u_int8_t flags;
> + uint8_t flags;
> #define FILTER_NEXTHOP_ADDR 1
> #define FILTER_NEXTHOP_NEIGHBOR 2
> };
> @@ -1067,7 +1068,7 @@ struct filter_rule {
> struct filter_rule *skip[RDE_FILTER_SKIP_COUNT];
> enum filter_actions action;
> enum directions dir;
> - u_int8_t quick;
> + uint8_t quick;
> };
>
> enum action_types {
> @@ -1099,23 +1100,23 @@ struct nexthop;
> struct filter_set {
> TAILQ_ENTRY(filter_set) entry;
> union {
> - u_int8_t prepend;
> - u_int16_t id;
> - u_int32_t metric;
> + uint8_t prepend;
> + uint16_t id;
> + uint32_t metric;
> int32_t relative;
> struct bgpd_addr nexthop;
> struct nexthop *nh_ref;
> struct community community;
> char pftable[PFTABLE_LEN];
> char rtlabel[RTLABEL_LEN];
> - u_int8_t origin;
> - } action;
> + uint8_t origin;
> + } action;
> enum action_types type;
> };
>
> struct roa_set {
> - u_int32_t as; /* must be first */
> - u_int32_t maxlen; /* change type for better struct layout */
> + uint32_t as; /* must be first */
> + uint32_t maxlen; /* change type for better struct layout */
> };
>
> struct prefixset_item {
> @@ -1146,7 +1147,7 @@ struct l3vpn {
> struct filter_set_head import;
> struct filter_set_head export;
> struct network_head net_l;
> - u_int64_t rd;
> + uint64_t rd;
> u_int rtableid;
> u_int label;
> int flags;
> @@ -1156,8 +1157,8 @@ struct rde_rib {
> SIMPLEQ_ENTRY(rde_rib) entry;
> char name[PEER_DESCR_LEN];
> u_int rtableid;
> - u_int16_t id;
> - u_int16_t flags;
> + uint16_t id;
> + uint16_t flags;
> };
> SIMPLEQ_HEAD(rib_names, rde_rib);
> extern struct rib_names ribnames;
> @@ -1232,11 +1233,11 @@ struct mrt {
> char rib[PEER_DESCR_LEN];
> struct msgbuf wbuf;
> LIST_ENTRY(mrt) entry;
> - u_int32_t peer_id;
> - u_int32_t group_id;
> + uint32_t peer_id;
> + uint32_t group_id;
> enum mrt_type type;
> enum mrt_state state;
> - u_int16_t seqnum;
> + uint16_t seqnum;
> };
>
> struct mrt_config {
> @@ -1250,7 +1251,7 @@ struct mrt_config {
> /* prototypes */
> /* bgpd.c */
> void send_nexthop_update(struct kroute_nexthop *);
> -void send_imsg_session(int, pid_t, void *, u_int16_t);
> +void send_imsg_session(int, pid_t, void *, uint16_t);
> int send_network(int, struct network_config *,
> struct filter_set_head *);
> int bgpd_filternexthop(struct kroute *, struct kroute6 *);
> @@ -1271,8 +1272,8 @@ void free_prefixtree(struct prefixset_t
> void free_roatree(struct roa_tree *);
> void free_rtrs(struct rtr_config_head *);
> void filterlist_free(struct filter_head *);
> -int host(const char *, struct bgpd_addr *, u_int8_t *);
> -u_int32_t get_bgpid(void);
> +int host(const char *, struct bgpd_addr *, uint8_t *);
> +uint32_t get_bgpid(void);
> void expand_networks(struct bgpd_config *);
> RB_PROTOTYPE(prefixset_tree, prefixset_item, entry, prefixset_cmp);
> int roa_cmp(struct roa *, struct roa *);
> @@ -1280,29 +1281,29 @@ RB_PROTOTYPE(roa_tree, roa, entry, roa_c
>
> /* kroute.c */
> int kr_init(int *);
> -int ktable_update(u_int, char *, int, u_int8_t);
> +int ktable_update(u_int, char *, int, uint8_t);
> void ktable_preload(void);
> -void ktable_postload(u_int8_t);
> +void ktable_postload(uint8_t);
> int ktable_exists(u_int, u_int *);
> -int kr_change(u_int, struct kroute_full *, u_int8_t);
> -int kr_delete(u_int, struct kroute_full *, u_int8_t);
> +int kr_change(u_int, struct kroute_full *, uint8_t);
> +int kr_delete(u_int, struct kroute_full *, uint8_t);
> int kr_flush(u_int);
> -void kr_shutdown(u_int8_t, u_int);
> -void kr_fib_couple(u_int, u_int8_t);
> -void kr_fib_couple_all(u_int8_t);
> -void kr_fib_decouple(u_int, u_int8_t);
> -void kr_fib_decouple_all(u_int8_t);
> -void kr_fib_update_prio_all(u_int8_t);
> +void kr_shutdown(uint8_t, u_int);
> +void kr_fib_couple(u_int, uint8_t);
> +void kr_fib_couple_all(uint8_t);
> +void kr_fib_decouple(u_int, uint8_t);
> +void kr_fib_decouple_all(uint8_t);
> +void kr_fib_update_prio_all(uint8_t);
> int kr_dispatch_msg(u_int rdomain);
> -int kr_nexthop_add(u_int32_t, struct bgpd_addr *,
> +int kr_nexthop_add(uint32_t, struct bgpd_addr *,
> struct bgpd_config *);
> -void kr_nexthop_delete(u_int32_t, struct bgpd_addr *,
> +void kr_nexthop_delete(uint32_t, struct bgpd_addr *,
> struct bgpd_config *);
> void kr_show_route(struct imsg *);
> void kr_ifinfo(char *);
> -void kr_net_reload(u_int, u_int64_t, struct network_head *);
> +void kr_net_reload(u_int, uint64_t, struct network_head *);
> int kr_reload(void);
> -struct in6_addr *prefixlen2mask6(u_int8_t prefixlen);
> +struct in6_addr *prefixlen2mask6(uint8_t prefixlen);
> int get_mpe_config(const char *, u_int *, u_int *);
>
> /* log.c */
> @@ -1325,18 +1326,18 @@ struct mrt *mrt_get(struct mrt_head *, s
> void mrt_mergeconfig(struct mrt_head *, struct mrt_head *);
>
> /* name2id.c */
> -u_int16_t rib_name2id(const char *);
> -const char *rib_id2name(u_int16_t);
> -void rib_unref(u_int16_t);
> -void rib_ref(u_int16_t);
> -u_int16_t rtlabel_name2id(const char *);
> -const char *rtlabel_id2name(u_int16_t);
> -void rtlabel_unref(u_int16_t);
> -u_int16_t rtlabel_ref(u_int16_t);
> -u_int16_t pftable_name2id(const char *);
> -const char *pftable_id2name(u_int16_t);
> -void pftable_unref(u_int16_t);
> -u_int16_t pftable_ref(u_int16_t);
> +uint16_t rib_name2id(const char *);
> +const char *rib_id2name(uint16_t);
> +void rib_unref(uint16_t);
> +void rib_ref(uint16_t);
> +uint16_t rtlabel_name2id(const char *);
> +const char *rtlabel_id2name(uint16_t);
> +void rtlabel_unref(uint16_t);
> +uint16_t rtlabel_ref(uint16_t);
> +uint16_t pftable_name2id(const char *);
> +const char *pftable_id2name(uint16_t);
> +void pftable_unref(uint16_t);
> +uint16_t pftable_ref(uint16_t);
>
> /* parse.y */
> int cmdline_symset(char *);
> @@ -1365,26 +1366,26 @@ struct as_set *as_sets_new(struct as_set
> size_t);
> void as_sets_free(struct as_set_head *);
> void as_sets_mark_dirty(struct as_set_head *, struct
> as_set_head *);
> -int as_set_match(const struct as_set *, u_int32_t);
> +int as_set_match(const struct as_set *, uint32_t);
>
> struct set_table *set_new(size_t, size_t);
> void set_free(struct set_table *);
> int set_add(struct set_table *, void *, size_t);
> void *set_get(struct set_table *, size_t *);
> void set_prep(struct set_table *);
> -void *set_match(const struct set_table *, u_int32_t);
> +void *set_match(const struct set_table *, uint32_t);
> int set_equal(const struct set_table *,
> const struct set_table *);
> size_t set_nmemb(const struct set_table *);
>
> /* rde_trie.c */
> -int trie_add(struct trie_head *, struct bgpd_addr *, u_int8_t,
> u_int8_t,
> - u_int8_t);
> +int trie_add(struct trie_head *, struct bgpd_addr *, uint8_t, uint8_t,
> + uint8_t);
> int trie_roa_add(struct trie_head *, struct roa *);
> void trie_free(struct trie_head *);
> -int trie_match(struct trie_head *, struct bgpd_addr *, u_int8_t, int);
> -int trie_roa_check(struct trie_head *, struct bgpd_addr *, u_int8_t,
> - u_int32_t);
> +int trie_match(struct trie_head *, struct bgpd_addr *, uint8_t, int);
> +int trie_roa_check(struct trie_head *, struct bgpd_addr *, uint8_t,
> + uint32_t);
> void trie_dump(struct trie_head *);
> int trie_equal(struct trie_head *, struct trie_head *);
>
> @@ -1395,42 +1396,42 @@ time_t getmonotime(void);
> const char *log_addr(const struct bgpd_addr *);
> const char *log_in6addr(const struct in6_addr *);
> const char *log_sockaddr(struct sockaddr *, socklen_t);
> -const char *log_as(u_int32_t);
> -const char *log_rd(u_int64_t);
> -const char *log_ext_subtype(short, u_int8_t);
> +const char *log_as(uint32_t);
> +const char *log_rd(uint64_t);
> +const char *log_ext_subtype(short, uint8_t);
> const char *log_reason(const char *);
> const char *log_rtr_error(enum rtr_error);
> -int aspath_snprint(char *, size_t, void *, u_int16_t);
> -int aspath_asprint(char **, void *, u_int16_t);
> -size_t aspath_strlen(void *, u_int16_t);
> -u_int32_t aspath_extract(const void *, int);
> -int aspath_verify(void *, u_int16_t, int, int);
> +int aspath_snprint(char *, size_t, void *, uint16_t);
> +int aspath_asprint(char **, void *, uint16_t);
> +size_t aspath_strlen(void *, uint16_t);
> +uint32_t aspath_extract(const void *, int);
> +int aspath_verify(void *, uint16_t, int, int);
> #define AS_ERR_LEN -1
> #define AS_ERR_TYPE -2
> #define AS_ERR_BAD -3
> #define AS_ERR_SOFT -4
> -u_char *aspath_inflate(void *, u_int16_t, u_int16_t *);
> -int nlri_get_prefix(u_char *, u_int16_t, struct bgpd_addr *,
> - u_int8_t *);
> -int nlri_get_prefix6(u_char *, u_int16_t, struct bgpd_addr *,
> - u_int8_t *);
> -int nlri_get_vpn4(u_char *, u_int16_t, struct bgpd_addr *,
> - u_int8_t *, int);
> -int nlri_get_vpn6(u_char *, u_int16_t, struct bgpd_addr *,
> - u_int8_t *, int);
> +u_char *aspath_inflate(void *, uint16_t, uint16_t *);
> +int nlri_get_prefix(u_char *, uint16_t, struct bgpd_addr *,
> + uint8_t *);
> +int nlri_get_prefix6(u_char *, uint16_t, struct bgpd_addr *,
> + uint8_t *);
> +int nlri_get_vpn4(u_char *, uint16_t, struct bgpd_addr *,
> + uint8_t *, int);
> +int nlri_get_vpn6(u_char *, uint16_t, struct bgpd_addr *,
> + uint8_t *, int);
> int prefix_compare(const struct bgpd_addr *,
> const struct bgpd_addr *, int);
> -in_addr_t prefixlen2mask(u_int8_t);
> +in_addr_t prefixlen2mask(uint8_t);
> void inet4applymask(struct in_addr *, const struct in_addr *,
> int);
> void inet6applymask(struct in6_addr *, const struct in6_addr *,
> int);
> -const char *aid2str(u_int8_t);
> -int aid2afi(u_int8_t, u_int16_t *, u_int8_t *);
> -int afi2aid(u_int16_t, u_int8_t, u_int8_t *);
> -sa_family_t aid2af(u_int8_t);
> -int af2aid(sa_family_t, u_int8_t, u_int8_t *);
> -struct sockaddr *addr2sa(const struct bgpd_addr *, u_int16_t,
> socklen_t *);
> -void sa2addr(struct sockaddr *, struct bgpd_addr *, u_int16_t
> *);
> +const char *aid2str(uint8_t);
> +int aid2afi(uint8_t, uint16_t *, uint8_t *);
> +int afi2aid(uint16_t, uint8_t, uint8_t *);
> +sa_family_t aid2af(uint8_t);
> +int af2aid(sa_family_t, uint8_t, uint8_t *);
> +struct sockaddr *addr2sa(const struct bgpd_addr *, uint16_t,
> socklen_t *);
> +void sa2addr(struct sockaddr *, struct bgpd_addr *, uint16_t
> *);
> const char * get_baudrate(unsigned long long, char *);
>
> static const char * const log_procnames[] = {
> Index: bgpd/config.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/config.c,v
> retrieving revision 1.99
> diff -u -p -r1.99 config.c
> --- bgpd/config.c 16 Feb 2021 08:29:16 -0000 1.99
> +++ bgpd/config.c 4 Feb 2022 14:31:17 -0000
> @@ -31,7 +31,7 @@
> #include "session.h"
> #include "log.h"
>
> -int host_ip(const char *, struct bgpd_addr *, u_int8_t *);
> +int host_ip(const char *, struct bgpd_addr *, uint8_t *);
> void free_networks(struct network_head *);
>
> struct bgpd_config *
> @@ -356,11 +356,11 @@ merge_config(struct bgpd_config *xconf,
> free_config(conf);
> }
>
> -u_int32_t
> +uint32_t
> get_bgpid(void)
> {
> struct ifaddrs *ifap, *ifa;
> - u_int32_t ip = 0, cur, localnet;
> + uint32_t ip = 0, cur, localnet;
>
> localnet = htonl(INADDR_LOOPBACK & IN_CLASSA_NET);
>
> @@ -383,7 +383,7 @@ get_bgpid(void)
> }
>
> int
> -host(const char *s, struct bgpd_addr *h, u_int8_t *len)
> +host(const char *s, struct bgpd_addr *h, uint8_t *len)
> {
> int mask = 128;
> char *p, *ps;
> @@ -417,7 +417,7 @@ host(const char *s, struct bgpd_addr *h,
> }
>
> int
> -host_ip(const char *s, struct bgpd_addr *h, u_int8_t *len)
> +host_ip(const char *s, struct bgpd_addr *h, uint8_t *len)
> {
> struct addrinfo hints, *res;
> int bits;
> Index: bgpd/kroute.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/kroute.c,v
> retrieving revision 1.241
> diff -u -p -r1.241 kroute.c
> --- bgpd/kroute.c 18 Jan 2021 12:15:36 -0000 1.241
> +++ bgpd/kroute.c 4 Feb 2022 14:31:17 -0000
> @@ -45,7 +45,7 @@ struct ktable **krt;
> u_int krt_size;
>
> struct {
> - u_int32_t rtseq;
> + uint32_t rtseq;
> pid_t pid;
> int fd;
> } kr_state;
> @@ -71,9 +71,9 @@ struct knexthop_node {
> struct kredist_node {
> RB_ENTRY(kredist_node) entry;
> struct bgpd_addr prefix;
> - u_int64_t rd;
> - u_int8_t prefixlen;
> - u_int8_t dynamic;
> + uint64_t rd;
> + uint8_t prefixlen;
> + uint8_t dynamic;
> };
>
> struct kif_kr {
> @@ -96,21 +96,21 @@ struct kif_node {
> struct kif_kr6_head kroute6_l;
> };
>
> -int ktable_new(u_int, u_int, char *, int, u_int8_t);
> -void ktable_free(u_int, u_int8_t);
> -void ktable_destroy(struct ktable *, u_int8_t);
> +int ktable_new(u_int, u_int, char *, int, uint8_t);
> +void ktable_free(u_int, uint8_t);
> +void ktable_destroy(struct ktable *, uint8_t);
> struct ktable *ktable_get(u_int);
>
> -int kr4_change(struct ktable *, struct kroute_full *, u_int8_t);
> -int kr6_change(struct ktable *, struct kroute_full *, u_int8_t);
> -int krVPN4_change(struct ktable *, struct kroute_full *, u_int8_t);
> -int krVPN6_change(struct ktable *, struct kroute_full *, u_int8_t);
> -int kr4_delete(struct ktable *, struct kroute_full *, u_int8_t);
> -int kr6_delete(struct ktable *, struct kroute_full *, u_int8_t);
> -int krVPN4_delete(struct ktable *, struct kroute_full *, u_int8_t);
> -int krVPN6_delete(struct ktable *, struct kroute_full *, u_int8_t);
> +int kr4_change(struct ktable *, struct kroute_full *, uint8_t);
> +int kr6_change(struct ktable *, struct kroute_full *, uint8_t);
> +int krVPN4_change(struct ktable *, struct kroute_full *, uint8_t);
> +int krVPN6_change(struct ktable *, struct kroute_full *, uint8_t);
> +int kr4_delete(struct ktable *, struct kroute_full *, uint8_t);
> +int kr6_delete(struct ktable *, struct kroute_full *, uint8_t);
> +int krVPN4_delete(struct ktable *, struct kroute_full *, uint8_t);
> +int krVPN6_delete(struct ktable *, struct kroute_full *, uint8_t);
> void kr_net_delete(struct network *);
> -int kr_net_match(struct ktable *, struct network_config *, u_int16_t,
> int);
> +int kr_net_match(struct ktable *, struct network_config *, uint16_t,
> int);
> struct network *kr_net_find(struct ktable *, struct network *);
> void kr_net_clear(struct ktable *);
> void kr_redistribute(int, struct ktable *, struct kroute *);
> @@ -122,10 +122,10 @@ int kroute6_compare(struct kroute6_node
> int knexthop_compare(struct knexthop_node *, struct knexthop_node *);
> int kredist_compare(struct kredist_node *, struct kredist_node *);
> int kif_compare(struct kif_node *, struct kif_node *);
> -void kr_fib_update_prio(u_int, u_int8_t);
> +void kr_fib_update_prio(u_int, uint8_t);
>
> -struct kroute_node *kroute_find(struct ktable *, in_addr_t, u_int8_t,
> - u_int8_t);
> +struct kroute_node *kroute_find(struct ktable *, in_addr_t, uint8_t,
> + uint8_t);
> struct kroute_node *kroute_matchgw(struct kroute_node *,
> struct sockaddr_in *);
> int kroute_insert(struct ktable *, struct kroute_node
> *);
> @@ -133,7 +133,7 @@ int kroute_remove(struct ktable *, st
> void kroute_clear(struct ktable *);
>
> struct kroute6_node *kroute6_find(struct ktable *, const struct
> in6_addr *,
> - u_int8_t, u_int8_t);
> + uint8_t, uint8_t);
> struct kroute6_node *kroute6_matchgw(struct kroute6_node *,
> struct sockaddr_in6 *);
> int kroute6_insert(struct ktable *, struct
> kroute6_node *);
> @@ -170,9 +170,9 @@ void
> kroute_detach_nexthop(struct kta
> struct knexthop_node *);
>
> int protect_lo(struct ktable *);
> -u_int8_t prefixlen_classful(in_addr_t);
> -u_int8_t mask2prefixlen(in_addr_t);
> -u_int8_t mask2prefixlen6(struct sockaddr_in6 *);
> +uint8_t prefixlen_classful(in_addr_t);
> +uint8_t mask2prefixlen(in_addr_t);
> +uint8_t mask2prefixlen6(struct sockaddr_in6 *);
> uint64_t ift2ifm(uint8_t);
> const char *get_media_descr(uint64_t);
> const char *get_linkstate(uint8_t, int);
> @@ -181,11 +181,11 @@ void if_change(u_short, int, struct if_
> void if_announce(void *, u_int);
>
> int send_rtmsg(int, int, struct ktable *, struct kroute *,
> - u_int8_t);
> + uint8_t);
> int send_rt6msg(int, int, struct ktable *, struct kroute6 *,
> - u_int8_t);
> + uint8_t);
> int dispatch_rtmsg(u_int);
> -int fetchtable(struct ktable *, u_int8_t);
> +int fetchtable(struct ktable *, uint8_t);
> int fetchifs(int);
> int dispatch_rtmsg_addr(struct rt_msghdr *,
> struct sockaddr *[RTAX_MAX], struct ktable *);
> @@ -262,7 +262,7 @@ kr_init(int *fd)
> }
>
> int
> -ktable_new(u_int rtableid, u_int rdomid, char *name, int fs, u_int8_t
> fib_prio)
> +ktable_new(u_int rtableid, u_int rdomid, char *name, int fs, uint8_t
> fib_prio)
> {
> struct ktable **xkrt;
> struct ktable *kt;
> @@ -318,7 +318,7 @@ ktable_new(u_int rtableid, u_int rdomid,
> }
>
> void
> -ktable_free(u_int rtableid, u_int8_t fib_prio)
> +ktable_free(u_int rtableid, uint8_t fib_prio)
> {
> struct ktable *kt, *nkt;
>
> @@ -346,7 +346,7 @@ ktable_free(u_int rtableid, u_int8_t fib
> }
>
> void
> -ktable_destroy(struct ktable *kt, u_int8_t fib_prio)
> +ktable_destroy(struct ktable *kt, uint8_t fib_prio)
> {
> /* decouple just to be sure, does not hurt */
> kr_fib_decouple(kt->rtableid, fib_prio);
> @@ -373,7 +373,7 @@ ktable_get(u_int rtableid)
> }
>
> int
> -ktable_update(u_int rtableid, char *name, int flags, u_int8_t fib_prio)
> +ktable_update(u_int rtableid, char *name, int flags, uint8_t fib_prio)
> {
> struct ktable *kt, *rkt;
> u_int rdomid;
> @@ -450,7 +450,7 @@ ktable_exists(u_int rtableid, u_int *rdo
> }
>
> int
> -kr_change(u_int rtableid, struct kroute_full *kl, u_int8_t fib_prio)
> +kr_change(u_int rtableid, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct ktable *kt;
>
> @@ -472,11 +472,11 @@ kr_change(u_int rtableid, struct kroute_
> }
>
> int
> -kr4_change(struct ktable *kt, struct kroute_full *kl, u_int8_t fib_prio)
> +kr4_change(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute_node *kr;
> int action = RTM_ADD;
> - u_int16_t labelid;
> + uint16_t labelid;
>
> /* for blackhole and reject routes nexthop needs to be 127.0.0.1 */
> if (kl->flags & (F_BLACKHOLE|F_REJECT))
> @@ -529,12 +529,12 @@ kr4_change(struct ktable *kt, struct kro
> }
>
> int
> -kr6_change(struct ktable *kt, struct kroute_full *kl, u_int8_t fib_prio)
> +kr6_change(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute6_node *kr6;
> struct in6_addr lo6 = IN6ADDR_LOOPBACK_INIT;
> int action = RTM_ADD;
> - u_int16_t labelid;
> + uint16_t labelid;
>
> /* for blackhole and reject routes nexthop needs to be ::1 */
> if (kl->flags & (F_BLACKHOLE|F_REJECT))
> @@ -588,12 +588,12 @@ kr6_change(struct ktable *kt, struct kro
> }
>
> int
> -krVPN4_change(struct ktable *kt, struct kroute_full *kl, u_int8_t
> fib_prio)
> +krVPN4_change(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute_node *kr;
> int action = RTM_ADD;
> - u_int32_t mplslabel = 0;
> - u_int16_t labelid;
> + uint32_t mplslabel = 0;
> + uint16_t labelid;
>
> /* nexthop within 127/8 -> ignore silently */
> if ((kl->nexthop.v4.s_addr & htonl(IN_CLASSA_NET)) ==
> @@ -662,13 +662,13 @@ krVPN4_change(struct ktable *kt, struct
> }
>
> int
> -krVPN6_change(struct ktable *kt, struct kroute_full *kl, u_int8_t
> fib_prio)
> +krVPN6_change(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute6_node *kr6;
> struct in6_addr lo6 = IN6ADDR_LOOPBACK_INIT;
> int action = RTM_ADD;
> - u_int32_t mplslabel = 0;
> - u_int16_t labelid;
> + uint32_t mplslabel = 0;
> + uint16_t labelid;
>
> /* nexthop to loopback -> ignore silently */
> if (IN6_IS_ADDR_LOOPBACK(&kl->nexthop.v6))
> @@ -738,7 +738,7 @@ krVPN6_change(struct ktable *kt, struct
> }
>
> int
> -kr_delete(u_int rtableid, struct kroute_full *kl, u_int8_t fib_prio)
> +kr_delete(u_int rtableid, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct ktable *kt;
>
> @@ -797,7 +797,7 @@ kr_flush(u_int rtableid)
> }
>
> int
> -kr4_delete(struct ktable *kt, struct kroute_full *kl, u_int8_t fib_prio)
> +kr4_delete(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute_node *kr;
>
> @@ -820,7 +820,7 @@ kr4_delete(struct ktable *kt, struct kro
> }
>
> int
> -kr6_delete(struct ktable *kt, struct kroute_full *kl, u_int8_t fib_prio)
> +kr6_delete(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute6_node *kr6;
>
> @@ -843,7 +843,7 @@ kr6_delete(struct ktable *kt, struct kro
> }
>
> int
> -krVPN4_delete(struct ktable *kt, struct kroute_full *kl, u_int8_t
> fib_prio)
> +krVPN4_delete(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute_node *kr;
>
> @@ -866,7 +866,7 @@ krVPN4_delete(struct ktable *kt, struct
> }
>
> int
> -krVPN6_delete(struct ktable *kt, struct kroute_full *kl, u_int8_t
> fib_prio)
> +krVPN6_delete(struct ktable *kt, struct kroute_full *kl, uint8_t fib_prio)
> {
> struct kroute6_node *kr6;
>
> @@ -889,7 +889,7 @@ krVPN6_delete(struct ktable *kt, struct
> }
>
> void
> -kr_shutdown(u_int8_t fib_prio, u_int rdomain)
> +kr_shutdown(uint8_t fib_prio, u_int rdomain)
> {
> u_int i;
>
> @@ -900,7 +900,7 @@ kr_shutdown(u_int8_t fib_prio, u_int rdo
> }
>
> void
> -kr_fib_couple(u_int rtableid, u_int8_t fib_prio)
> +kr_fib_couple(u_int rtableid, uint8_t fib_prio)
> {
> struct ktable *kt;
> struct kroute_node *kr;
> @@ -927,7 +927,7 @@ kr_fib_couple(u_int rtableid, u_int8_t f
> }
>
> void
> -kr_fib_couple_all(u_int8_t fib_prio)
> +kr_fib_couple_all(uint8_t fib_prio)
> {
> u_int i;
>
> @@ -936,7 +936,7 @@ kr_fib_couple_all(u_int8_t fib_prio)
> }
>
> void
> -kr_fib_decouple(u_int rtableid, u_int8_t fib_prio)
> +kr_fib_decouple(u_int rtableid, uint8_t fib_prio)
> {
> struct ktable *kt;
> struct kroute_node *kr;
> @@ -964,7 +964,7 @@ kr_fib_decouple(u_int rtableid, u_int8_t
> }
>
> void
> -kr_fib_decouple_all(u_int8_t fib_prio)
> +kr_fib_decouple_all(uint8_t fib_prio)
> {
> u_int i;
>
> @@ -973,7 +973,7 @@ kr_fib_decouple_all(u_int8_t fib_prio)
> }
>
> void
> -kr_fib_update_prio(u_int rtableid, u_int8_t fib_prio)
> +kr_fib_update_prio(u_int rtableid, uint8_t fib_prio)
> {
> struct ktable *kt;
> struct kroute_node *kr;
> @@ -992,7 +992,7 @@ kr_fib_update_prio(u_int rtableid, u_int
> }
>
> void
> -kr_fib_update_prio_all(u_int8_t fib_prio)
> +kr_fib_update_prio_all(uint8_t fib_prio)
> {
> u_int i;
>
> @@ -1317,7 +1317,7 @@ kr_net_redist_del(struct ktable *kt, str
> }
>
> int
> -kr_net_match(struct ktable *kt, struct network_config *net, u_int16_t
> flags,
> +kr_net_match(struct ktable *kt, struct network_config *net, uint16_t
> flags,
> int loopback)
> {
> struct network *xn;
> @@ -1384,7 +1384,7 @@ kr_net_find(struct ktable *kt, struct ne
> }
>
> void
> -kr_net_reload(u_int rtableid, u_int64_t rd, struct network_head *nh)
> +kr_net_reload(u_int rtableid, uint64_t rd, struct network_head *nh)
> {
> struct network *n, *xn;
> struct ktable *kt;
> @@ -1424,7 +1424,7 @@ void
> kr_redistribute(int type, struct ktable *kt, struct kroute *kr)
> {
> struct network_config net;
> - u_int32_t a;
> + uint32_t a;
> int loflag = 0;
>
> bzero(&net, sizeof(net));
> @@ -1547,7 +1547,7 @@ ktable_preload(void)
> }
>
> void
> -ktable_postload(u_int8_t fib_prio)
> +ktable_postload(uint8_t fib_prio)
> {
> struct ktable *kt;
> struct network *n, *xn;
> @@ -1790,8 +1790,8 @@ kif_compare(struct kif_node *a, struct k
> */
>
> struct kroute_node *
> -kroute_find(struct ktable *kt, in_addr_t prefix, u_int8_t prefixlen,
> - u_int8_t prio)
> +kroute_find(struct ktable *kt, in_addr_t prefix, uint8_t prefixlen,
> + uint8_t prio)
> {
> struct kroute_node s;
> struct kroute_node *kn, *tmp;
> @@ -1941,7 +1941,7 @@ kroute_clear(struct ktable *kt)
>
> struct kroute6_node *
> kroute6_find(struct ktable *kt, const struct in6_addr *prefix,
> - u_int8_t prefixlen, u_int8_t prio)
> + uint8_t prefixlen, uint8_t prio)
> {
> struct kroute6_node s;
> struct kroute6_node *kn6, *tmp;
> @@ -2634,7 +2634,7 @@ protect_lo(struct ktable *kt)
> return (0);
> }
>
> -u_int8_t
> +uint8_t
> prefixlen_classf
