From dc1270f10fb7f0f98dddcc2a191d01c9769492fc Mon Sep 17 00:00:00 2001 From: Job Snijders Date: Fri, 20 Aug 2021 02:44:37 +0000 Subject: [PATCH] Improve mikrotik output This fixes #32 --- printer.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/printer.c b/printer.c index e54ae9f..0647383 100644 --- a/printer.c +++ b/printer.c @@ -1546,27 +1546,18 @@ bgpq4_print_kprefix(struct sx_radix_node *n, void *ff) sx_prefix_snprintf_sep(n->prefix, prefix, sizeof(prefix), "/"); - if (n->isAggregate) { - if (n->aggregateLow > n->prefix->masklen) { - fprintf(f,"/routing filter add action=accept chain=\"" - "%s-%s\" prefix=%s prefix-length=%d-%d\n", - bname ? bname : "NN", - n->prefix->family == AF_INET ? "V4" : "V6", - prefix, n->aggregateLow, n->aggregateHi); - } else { - fprintf(f,"/routing filter add action=accept chain=\"" - "%s-%s\" prefix=%s prefix-length=%d\n", - bname ? bname : "NN", - n->prefix->family == AF_INET ? "V4" : "V6", - prefix, n->aggregateHi); - } - } else { + if (n->isAggregate) + fprintf(f,"/routing filter add action=accept chain=\"" + "%s-%s\" prefix=%s prefix-length=%d-%d\n", + bname ? bname : "NN", + n->prefix->family == AF_INET ? "V4" : "V6", + prefix, n->aggregateLow, n->aggregateHi); + else fprintf(f,"/routing filter add action=accept chain=\"" "%s-%s\" prefix=%s\n", bname ? bname : "NN", n->prefix->family == AF_INET ? "V4" : "V6", prefix); - } checkSon: if (n->son)