diff options
| author | Job Snijders <job@cvs.openbsd.org> | 2025-01-03 10:32:22 +0000 |
|---|---|---|
| committer | Job Snijders <job@cvs.openbsd.org> | 2025-01-03 10:32:22 +0000 |
| commit | f96c590eaa41bd16d1a200d8e4248791738239f7 (patch) | |
| tree | 276793285e992d9d45666834bcccdd1595d69692 /usr.sbin/rpki-client | |
| parent | 74091ca9747b0d90c2bf15b8180c4b6a775ee65a (diff) | |
Apply more lipstick
OK tb@
Diffstat (limited to 'usr.sbin/rpki-client')
| -rw-r--r-- | usr.sbin/rpki-client/output-bird.c | 15 | ||||
| -rw-r--r-- | usr.sbin/rpki-client/rpki-client.8 | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/usr.sbin/rpki-client/output-bird.c b/usr.sbin/rpki-client/output-bird.c index 93546be5620..a73f655b57a 100644 --- a/usr.sbin/rpki-client/output-bird.c +++ b/usr.sbin/rpki-client/output-bird.c @@ -1,4 +1,4 @@ -/* $OpenBSD: output-bird.c,v 1.21 2025/01/03 10:14:32 job Exp $ */ +/* $OpenBSD: output-bird.c,v 1.22 2025/01/03 10:32:21 job Exp $ */ /* * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org> * Copyright (c) 2020 Robert Scheck <robert@fedoraproject.org> @@ -29,7 +29,7 @@ output_bird(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, time_t now = get_current_time(); size_t i; - if (fprintf(out, "# For BIRD 2.16+\n#\n") < 0) + if (fprintf(out, "# For BIRD %s\n#\n", excludeaspa ? "2" : "2.16+") < 0) return -1; if (outputheader(out, st) < 0) @@ -44,8 +44,8 @@ output_bird(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, return -1; } - if (fprintf(out, "\nprotocol static {\n\troa4 { table ROAS4; };\n" - "\n") < 0) + if (fprintf(out, "\nprotocol static {\n" + "\troa4 { table ROAS4; };\n\n") < 0) return -1; RB_FOREACH(v, vrp_tree, vrps) { @@ -59,8 +59,8 @@ output_bird(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, } } - if (fprintf(out, "}\n\nprotocol static {\n\troa6 { table ROAS6; };\n" - "\n") < 0) + if (fprintf(out, "}\n\nprotocol static {\n" + "\troa6 { table ROAS6; };\n\n") < 0) return -1; RB_FOREACH(v, vrp_tree, vrps) { @@ -87,7 +87,8 @@ output_bird(FILE *out, struct vrp_tree *vrps, struct brk_tree *brks, RB_FOREACH(vap, vap_tree, vaps) { if (vap->overflowed) continue; - if (fprintf(out, "\troute aspa %d providers ", vap->custasid) <0) + if (fprintf(out, "\troute aspa %d providers ", + vap->custasid) < 0) return -1; for (i = 0; i < vap->num_providers; i++) { if (fprintf(out, "%u", vap->providers[i]) < 0) diff --git a/usr.sbin/rpki-client/rpki-client.8 b/usr.sbin/rpki-client/rpki-client.8 index 04dac78b218..026f0001e13 100644 --- a/usr.sbin/rpki-client/rpki-client.8 +++ b/usr.sbin/rpki-client/rpki-client.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rpki-client.8,v 1.118 2025/01/03 10:14:32 job Exp $ +.\" $OpenBSD: rpki-client.8,v 1.119 2025/01/03 10:32:21 job Exp $ .\" .\" Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> .\" @@ -67,13 +67,15 @@ Include hazardous AS0 TALs in the output files. AS0 TALs are not recommended for automatic filtering of BGP routes. The default is not to include them. .It Fl A -Exclude the ASPA-set from the output files that support it (JSON and +Exclude the ASPA-set from the output files that support it (BIRD, JSON, and OpenBGPD). .It Fl B Create output in the file .Pa bird in the output directory suitable for BIRD internet routing daemon version 2.16 and up. +For compatibility with earlier versions, use +.Fl A . The validated payload table names are .Em ROAS4 , .Em ROAS6 , |