SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last fixes and improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-07-27 09:35:44 +00:00
parent 58df21ce75
commit f960599e67
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
399 changed files with 7016 additions and 6902 deletions
Download patch file Download diff file Expand all files Collapse all files

2
usr.sbin/bgpctl/mrtparser.c
View file

@ -435,7 +435,7 @@ mrt_parse_v2_rib(struct mrt_hdr *hdr, void *msg, int verbose)
if ((aid = mrt_afi2aid(afi, safi, verbose)) == AID_UNSPEC)
goto fail;
/* prefix */
ret = mrt_extract_prefix(b, len, aid, &r->prefix,
&r->prefixlen, verbose);

6
usr.sbin/bgpctl/output_json.c
View file

@ -392,7 +392,7 @@ json_fib(struct kroute_full *kf)
if (kf->flags & F_MPLS) {
json_do_array("mplslabel");
json_do_uint("mplslabel",
json_do_uint("mplslabel",
ntohl(kf->mplslabel) >> MPLS_LABEL_OFFSET);
json_do_end();
}
@ -956,7 +956,7 @@ json_rib_mem(struct rde_memstats *stats)
stats->attr_cnt * sizeof(struct attr), stats->attr_refs);
json_rib_mem_element("attributes", stats->attr_dcnt,
stats->attr_data, UINT64_MAX);
json_rib_mem_element("total", UINT64_MAX,
json_rib_mem_element("total", UINT64_MAX,
pts + stats->prefix_cnt * sizeof(struct prefix) +
stats->rib_cnt * sizeof(struct rib_entry) +
stats->path_cnt * sizeof(struct rde_aspath) +
@ -971,7 +971,7 @@ json_rib_mem(struct rde_memstats *stats)
UINT64_MAX);
json_rib_mem_element("prefix_set", stats->pset_cnt, stats->pset_size,
UINT64_MAX);
json_rib_mem_element("total", UINT64_MAX,
json_rib_mem_element("total", UINT64_MAX,
stats->aset_size + stats->pset_size, UINT64_MAX);
json_do_end();
}

4
usr.sbin/bgpctl/output_ometric.c
View file

@ -297,7 +297,7 @@ ometric_rib_mem(struct rde_memstats *stats)
ometric_rib_mem_element("attributes", stats->attr_dcnt,
stats->attr_data, UINT64_MAX);
ometric_rib_mem_element("total", UINT64_MAX,
ometric_rib_mem_element("total", UINT64_MAX,
pts + stats->prefix_cnt * sizeof(struct prefix) +
stats->rib_cnt * sizeof(struct rib_entry) +
stats->path_cnt * sizeof(struct rde_aspath) +
@ -314,7 +314,7 @@ ometric_rib_mem(struct rde_memstats *stats)
OKV("type"), OKV("prefix_set"), NULL);
ometric_set_int_with_labels(rde_set_count, stats->pset_cnt,
OKV("type"), OKV("prefix_set"), NULL);
ometric_rib_mem_element("set_total", UINT64_MAX,
ometric_rib_mem_element("set_total", UINT64_MAX,
stats->aset_size + stats->pset_size, UINT64_MAX);
}