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

Untangle function and KNF

Browse Source
This commit is contained in:
Job Snijders
2021-08-19 19:59:21 +00:00
parent 8ec260f03f
commit 5ce7d7bfea
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
expander.c
View File

@@ -450,14 +450,27 @@ static void
bgpq_expander_invalidate_asn(struct bgpq_expander *b, const char *q)
{
if (!strncmp(q, "!gas", 4) || !strncmp(q, "!6as", 4)) {
char *eptr;
unsigned long asn = strtoul(q + 4, &eptr, 10), asn0, asn1 = 0;
if (!asn || asn == ULONG_MAX || asn >= 4294967295
|| (eptr && *eptr != '\n')) {
sx_report(SX_ERROR, "some problem invalidating asn"
" %s\n", q);
char *eptr;
unsigned long asn, asn0, asn1 = 0;
asn = strtoul(q + 4, &eptr, 10);
if (q[0] == '\0' || *eptr != '\0') {
sx_report(SX_ERROR, "not a number: %s\n", q);
return;
}
if (errno == ERANGE && asn == ULONG_MAX) {
sx_report(SX_ERROR, "overflow: %s\n", q);
return;
}
if (asn >= 4294967295) {
sx_report(SX_ERROR, "out of range: %s\n", q);
return;
}
if (eptr && *eptr != '\n') {
sx_report(SX_ERROR, "no number? %s\n", q);
return;
}
asn1 = asn % 65536;
asn0 = asn / 65536;
if (!b->asn32s[asn0] ||
@@ -500,8 +513,8 @@ bgpq_write(struct bgpq_expander *b)
static int
bgpq_selread(struct bgpq_expander *b, char *buffer, int size)
{
fd_set rfd, wfd;
int ret;
fd_set rfd, wfd;
int ret;
repeat:
FD_ZERO(&rfd);

10
main.c
View File

@@ -729,19 +729,19 @@ main(int argc, char* argv[])
sx_report(SX_FATAL,"Unreachable point... call snar\n");
exit(1);
case T_ASPATH:
bgpq4_print_aspath(stdout,&expander);
bgpq4_print_aspath(stdout, &expander);
break;
case T_OASPATH:
bgpq4_print_oaspath(stdout,&expander);
bgpq4_print_oaspath(stdout, &expander);
break;
case T_ASSET:
bgpq4_print_asset(stdout,&expander);
bgpq4_print_asset(stdout, &expander);
break;
case T_PREFIXLIST:
bgpq4_print_prefixlist(stdout,&expander);
bgpq4_print_prefixlist(stdout, &expander);
break;
case T_EACL:
bgpq4_print_eacl(stdout,&expander);
bgpq4_print_eacl(stdout, &expander);
break;
case T_ROUTE_FILTER_LIST:
bgpq4_print_route_filter_list(stdout, &expander);