Update roagenerator, check if ASN & prefix is not zero

This commit is contained in:
netravnen 2023-07-30 12:21:11 +00:00
parent 412f8a0647
commit 9a5f9e6a52
2 changed files with 40 additions and 28 deletions

View file

@ -103,6 +103,8 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
// Catch if ASN is actually an integer and larger than zero
if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS"); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix;
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0);
@ -111,6 +113,7 @@ foreach ($raw_array as $sub_array)
$k++; $k++;
} }
}
} }
/* /*
@ -203,6 +206,8 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
// Catch if ASN is actually an integer and larger than zero
if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS"); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix; $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["prefix"] = $_prefix;
$roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0); $roas["locallyAddedAssertions"]["prefixAssertions"][$k]["maxPrefixLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0);
@ -211,6 +216,7 @@ foreach ($raw_array as $sub_array)
$k++; $k++;
} }
}
} }
writeRoutinatorExceptionFile($roas); writeRoutinatorExceptionFile($roas);

View file

@ -97,6 +97,8 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
// Catch if ASN is actually an integer and larger than zero
if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["roas"][$k]["asn"] = trim ($_asn[0], "AS"); $roas["roas"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["roas"][$k]["prefix"] = $_prefix; $roas["roas"][$k]["prefix"] = $_prefix;
$roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0); $roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV6_AS0);
@ -107,6 +109,7 @@ foreach ($raw_array as $sub_array)
$k++; $k++;
} }
}
} }
/* /*
@ -199,6 +202,8 @@ foreach ($raw_array as $sub_array)
// Extract ASxxxxx from string. // Extract ASxxxxx from string.
preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn); preg_match ("/AS[0-9]+/", explode (":", $asn)[1], $_asn);
// Catch if ASN is actually an integer and larger than zero
if (strlen ($_asn[0]) > 0 && strlen ($_prefix) > 0) {
$roas["roas"][$k]["asn"] = trim ($_asn[0], "AS"); $roas["roas"][$k]["asn"] = trim ($_asn[0], "AS");
$roas["roas"][$k]["prefix"] = $_prefix; $roas["roas"][$k]["prefix"] = $_prefix;
$roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0); $roas["roas"][$k]["maxLength"] = ($_asn[0] != "AS0" ? $_maxlength : MAX_LEN_IPV4_AS0);
@ -209,6 +214,7 @@ foreach ($raw_array as $sub_array)
$k++; $k++;
} }
}
} }
/* /*