mirror/bgp-bgpq4
1
0
Fork 0
mirror of https://github.com/bgp/bgpq4.git synced 2024-05-11 05:55:05 +00:00
Code Releases Activity

KNF

Browse Source
This commit is contained in:
Job Snijders
2021-08-17 10:06:13 +00:00
parent 406b984aa4
commit 0b554d4aa1
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bgpq4.c
View File

@ -169,7 +169,8 @@ main(int argc, char* argv[])
if (getenv("IRRD_SOURCES"))
expander.sources=getenv("IRRD_SOURCES");
while ((c = getopt(argc,argv,"346a:AbBdDEeF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsvz"))
while ((c = getopt(argc, argv,
"346a:AbBdDEeF:S:jJKf:l:L:m:M:NnW:pr:R:G:tTh:UwXsvz"))
!=EOF) {
switch (c) {
case '3':
@ -647,11 +648,11 @@ main(int argc, char* argv[])
if (!strcmp(argv[0], "EXCEPT")) {
exceptmode = 1;
} else if (exceptmode) {
bgpq_expander_add_stop(&expander,argv[0]);
bgpq_expander_add_stop(&expander, argv[0]);
} else if (!strncasecmp(argv[0], "AS-", 3)) {
bgpq_expander_add_asset(&expander,argv[0]);
bgpq_expander_add_asset(&expander, argv[0]);
} else if (!strncasecmp(argv[0], "RS-", 3)) {
bgpq_expander_add_rset(&expander,argv[0]);
bgpq_expander_add_rset(&expander, argv[0]);
} else if (!strncasecmp(argv[0], "AS", 2)) {
char* c;
if ((c = strchr(argv[0], ':'))) {
@ -664,7 +665,7 @@ main(int argc, char* argv[])
" object %s\n", argv[0]);
}
} else {
bgpq_expander_add_as(&expander,argv[0]);
bgpq_expander_add_as(&expander, argv[0]);
}
} else {
char* c = strchr(argv[0], '^');

28
bgpq4_printer.c
View File

@ -812,11 +812,11 @@ bgpq4_print_asset(FILE* f, struct bgpq_expander* b)
{
switch (b->vendor) {
case V_JSON:
return bgpq4_print_json_aspath(f,b);
return bgpq4_print_json_aspath(f, b);
case V_OPENBGPD:
return bgpq4_print_openbgpd_asset(f,b);
return bgpq4_print_openbgpd_asset(f, b);
case V_BIRD:
return bgpq4_print_bird_aspath(f,b);
return bgpq4_print_bird_aspath(f, b);
default:
sx_report(SX_FATAL, "as-sets (-t) supported for JSON, "
"OpenBGPD, and BIRD only\n");
@ -1103,7 +1103,7 @@ bgpq4_print_jrfilter(struct sx_radix_node* n, void* ff)
if (!f)
f = stdout;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
if (!n->isAggregate) {
fprintf(f, " %s%s exact;\n",
@ -1140,7 +1140,7 @@ bgpq4_print_cprefix(struct sx_radix_node* n, void* ff)
if (n->isGlue)
goto checkSon;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
if (seq)
snprintf(seqno, sizeof(seqno), " seq %i", seq++);
@ -1165,7 +1165,7 @@ bgpq4_print_cprefix(struct sx_radix_node* n, void* ff)
checkSon:
if (n->son)
bgpq4_print_cprefix(n->son,ff);
bgpq4_print_cprefix(n->son, ff);
}
void
@ -1180,7 +1180,7 @@ bgpq4_print_cprefixxr(struct sx_radix_node* n, void* ff)
if (n->isGlue)
goto checkSon;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
if (n->isAggregate) {
if (n->aggregateLow>n->prefix->masklen) {
@ -1256,7 +1256,7 @@ bgpq4_print_eprefix(struct sx_radix_node* n, void* ff)
if (n->isGlue)
goto checkSon;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
snprintf(seqno, sizeof(seqno), " seq %i", seq++);
@ -1274,7 +1274,7 @@ bgpq4_print_eprefix(struct sx_radix_node* n, void* ff)
checkSon:
if (n->son)
bgpq4_print_eprefix(n->son,ff);
bgpq4_print_eprefix(n->son, ff);
}
@ -1398,7 +1398,7 @@ bgpq4_print_nokia_md_ipfilter(struct sx_radix_node* n, void* ff)
if (!f)
f = stdout;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
fprintf(f, " prefix %s { }\n", prefix);
@ -1419,7 +1419,7 @@ bgpq4_print_nokia_prefix(struct sx_radix_node* n, void* ff)
if (!f)
f = stdout;
sx_prefix_snprintf(n->prefix,prefix,sizeof(prefix));
sx_prefix_snprintf(n->prefix, prefix, sizeof(prefix));
if (!n->isAggregate) {
fprintf(f, " prefix %s exact\n", prefix);
@ -1757,7 +1757,7 @@ bgpq4_print_nokia_prefixlist(FILE* f, struct bgpq_expander* b)
fprintf(f,"configure router policy-options\nbegin\nno prefix-list \"%s\"\n",
bname);
fprintf(f,"prefix-list \"%s\"\n", bname);
sx_radix_tree_foreach(b->tree,bgpq4_print_nokia_prefix,f);
sx_radix_tree_foreach(b->tree, bgpq4_print_nokia_prefix, f);
fprintf(f,"exit\ncommit\n");
return 0;
}
@ -1882,7 +1882,7 @@ bgpq4_print_kprefix(struct sx_radix_node* n, void* ff)
checkSon:
if (n->son)
bgpq4_print_kprefix(n->son,ff);
bgpq4_print_kprefix(n->son, ff);
}
int
@ -1976,7 +1976,7 @@ bgpq4_print_juniper_route_filter_list(FILE* f, struct bgpq_expander* b)
b->tree->family == AF_INET ? "0.0.0.0" : "::");
} else {
jrfilter_prefixed = 0;
sx_radix_tree_foreach(b->tree,bgpq4_print_jrfilter,f);
sx_radix_tree_foreach(b->tree, bgpq4_print_jrfilter, f);
}
fprintf(f, " }\n}\n");

12
bgpq_expander.c
View File

@ -221,7 +221,7 @@ bgpq_expander_add_prefix(struct bgpq_expander* b, char* prefix)
" masklen %u\n", prefix, p->masklen, b->maxlen);
return 0;
}
sx_radix_tree_insert(b->tree,p);
sx_radix_tree_insert(b->tree, p);
if (p)
sx_prefix_destroy(p);
@ -436,7 +436,7 @@ bgpq_expander_invalidate_asn(struct bgpq_expander* b, const char* q)
asn1 = asn % 65536;
asn0 = asn / 65536;
if (!b->asn32s[asn0] ||
!(b->asn32s[asn0][asn1/8] & (0x80 >> (asn1 % 8)))) {
!(b->asn32s[asn0][asn1/8] & (0x80 >> (asn1 % 8)))) {
sx_report(SX_NOTICE, "strange, invalidating inactive "
"asn %lu(%s)\n", asn, q);
} else {
@ -702,7 +702,7 @@ bgpq_expand_irrd(struct bgpq_expander* b,
int ret, off = 0;
struct bgpq_request *req;
va_start(ap,fmt);
va_start(ap, fmt);
vsnprintf(request, sizeof(request), fmt, ap);
va_end(ap);
@ -750,7 +750,7 @@ repeat:
if (eon && *eon != '\n') {
sx_report(SX_ERROR,"A-code finised with wrong char "
"'%c' (%s)\n", *eon,response);
"'%c' (%s)\n", *eon, response);
exit(1);
}
@ -865,7 +865,7 @@ bgpq_expand(struct bgpq_expander* b)
for (rp=res; rp; rp = rp->ai_next) {
fd = socket(rp->ai_family, rp->ai_socktype, 0);
if (fd == -1) {
if (errno==EPROTONOSUPPORT || errno==EAFNOSUPPORT)
if (errno == EPROTONOSUPPORT || errno == EAFNOSUPPORT)
continue;
sx_report(SX_ERROR,"Unable to create socket: %s\n",
strerror(errno));
@ -1008,7 +1008,7 @@ bgpq_expand(struct bgpq_expander* b)
bgpq_expand_irrd(b, bgpq_expanded_macro, b,
"!i%s,1\n", mc->text);
} else {
bgpq_expander_add_already(b,mc->text);
bgpq_expander_add_already(b, mc->text);
if (pipelining)
bgpq_pipeline(b, bgpq_expanded_macro_limit,
NULL, "!i%s\n", mc->text);

12
sx_prefix.c
View File

@ -12,7 +12,7 @@
#include "sx_prefix.h"
#include "sx_report.h"
int debug_aggregation=0;
int debug_aggregation = 0;
extern int debug_expander;
struct sx_prefix*
@ -62,7 +62,7 @@ sx_prefix_adjust_masklen(struct sx_prefix* p)
return; /* mask is all ones */
for (i = nbytes -1; i > p->masklen / 8; i--) {
p->addr.addrs[i]=0;
p->addr.addrs[i] = 0;
}
for (i = 1; i <= 8 - p->masklen % 8; i++) {
@ -827,7 +827,7 @@ int
sx_radix_node_foreach(struct sx_radix_node* node,
void (*func)(struct sx_radix_node*, void*), void* udata)
{
func(node,udata);
func(node, udata);
if (node->l)
sx_radix_node_foreach(node->l, func, udata);
@ -845,7 +845,7 @@ sx_radix_tree_foreach(struct sx_radix_tree* tree,
if (!func || !tree || !tree->head)
return 0;
sx_radix_node_foreach(tree->head,func,udata);
sx_radix_node_foreach(tree->head, func, udata);
return 0;
}
@ -859,7 +859,7 @@ sx_radix_node_aggregate(struct sx_radix_node* node)
if (debug_aggregation) {
printf("Aggregating on node: ");
sx_prefix_fprint(stdout,node->prefix);
sx_prefix_fprint(stdout, node->prefix);
printf(" %s%s%u,%u\n", node->isGlue?"Glue ":"",
node->isAggregate?"Aggregate ":"",node->aggregateLow,
node->aggregateHi);
@ -1095,7 +1095,7 @@ setGlueFrom(struct sx_radix_node* node, void* udata)
unsigned refine = *(unsigned*)udata;
if (node && node->prefix->masklen <= refine)
node->isGlue=1;
node->isGlue = 1;
}
static int