mirrors/bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4 synced 2025-02-28 08:53:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify the printer for OpenBGPD. In most cases there is no need for line

Browse Source 
continuations with '\'
This commit is contained in:
Claudio Jeker
2018-09-09 09:31:42 +02:00
parent f952ac83e0
commit bbda06abd3
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bgpq3_printer.c
View File

@@ -691,17 +691,16 @@ bgpq3_print_openbgpd_prefix(struct sx_radix_node* n, void* ff)
f=stdout;
sx_prefix_snprintf(&n->prefix, prefix, sizeof(prefix));
if (!n->isAggregate) {
fprintf(f, "\n\t%s \\", prefix);
fprintf(f, "\n\t%s", prefix);
} else if (n->aggregateLow == n->aggregateHi) {
fprintf(f, "\n\t%s prefixlen = %u \\", prefix, n->aggregateHi);
fprintf(f, "\n\t%s prefixlen = %u", prefix, n->aggregateHi);
} else if (n->aggregateLow > n->prefix.masklen) {
fprintf(f, "\n\t%s prefixlen %u - %u \\",
fprintf(f, "\n\t%s prefixlen %u - %u",
prefix, n->aggregateLow, n->aggregateHi);
} else {
fprintf(f, "\n\t%s prefixlen %u - %u \\",
fprintf(f, "\n\t%s prefixlen %u - %u",
prefix, n->prefix.masklen, n->aggregateHi);
};
needscomma=1;
checkSon:
if(n->son)
bgpq3_print_openbgpd_prefix(n->son, ff);
@@ -1010,7 +1009,7 @@ bgpq3_print_openbgpd_prefixlist(FILE* f, struct bgpq_expander* b)
fprintf(f, "%s=\"", b->name);
}
}
fprintf(f,"prefix { \\");
fprintf(f,"prefix { ");
sx_radix_tree_foreach(b->tree,bgpq3_print_openbgpd_prefix,f);
fprintf(f, "\n\t}");
if(b->name){
@@ -1037,9 +1036,9 @@ bgpq3_print_openbgpd_prefixset(FILE* f, struct bgpq_expander* b)
"instead of this list\n");
};
if (!sx_radix_tree_empty(b->tree) || !b->asnumber) {
fprintf(f,"prefix-set %s { \\", b->name);
fprintf(f,"prefix-set %s {", b->name);
sx_radix_tree_foreach(b->tree,bgpq3_print_openbgpd_prefix,f);
fprintf(f, "\n\t}\n");
fprintf(f, "\n}\n");
} else {
fprintf(f, "deny from AS %u\n", b->asnumber);
};