From 585b867394d96ab5f56813946289397ac0b55cd9 Mon Sep 17 00:00:00 2001 From: Christoffer Date: Wed, 26 Dec 2018 21:46:34 +0000 Subject: [PATCH] lib: add constants to define max-length o MAX_LEN_IPV4 o MAX_LEN_IPV6 --- lib/define.php | 2 ++ rfc8416.php | 4 ++-- roagen.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/define.php b/lib/define.php index 8d81432..1729cf9 100644 --- a/lib/define.php +++ b/lib/define.php @@ -9,4 +9,6 @@ $files4 = scandir ("../registry/data/route/"); // Define array() we are gonna store data inside. $roas = array(); +define ("MAX_LEN_IPV4", 28); +define ("MAX_LEN_IPV6", 64); ?> diff --git a/rfc8416.php b/rfc8416.php index 2924e48..bb75782 100755 --- a/rfc8416.php +++ b/rfc8416.php @@ -91,7 +91,7 @@ foreach ($raw_array as $sub_array) $_maxlength = (isset ($maxlength[0]) ? $maxlength[0] : ""); else // Do fallback to default prefix size if max-length was not set. - $_maxlength = ($prefix[2] < 64 ? 64 : $prefix[2]); + $_maxlength = ($prefix[2] < MAX_LEN_IPV6 ? MAX_LEN_IPV6 : $prefix[2]); $_mnt = $mnt[0]; @@ -190,7 +190,7 @@ foreach ($raw_array as $sub_array) $_maxlength = (isset ($maxlength[0]) ? $maxlength[0] : ""); else // Do fallback to default prefix size if max-length was not set. - $_maxlength = ($prefix[2] < 29 ? 29 : $prefix[2]); + $_maxlength = ($prefix[2] < MAX_LEN_IPV4 ? MAX_LEN_IPV4 : $prefix[2]); $_mnt = $mnt[0]; diff --git a/roagen.php b/roagen.php index 761712a..8be16c8 100755 --- a/roagen.php +++ b/roagen.php @@ -77,7 +77,7 @@ foreach ($raw_array as $sub_array) $_maxlength = (isset ($maxlength[0]) ? $maxlength[0] : ""); else // Do fallback to default prefix size if max-length was not set. - $_maxlength = ($prefix[2] < 64 ? 64 : $prefix[2]); + $_maxlength = ($prefix[2] < MAX_LEN_IPV6 ? MAX_LEN_IPV6 : $prefix[2]); // Loop through each asn in single route6 object and assign // other values accordingly. @@ -167,7 +167,7 @@ foreach ($raw_array as $sub_array) $_maxlength = (isset ($maxlength[0]) ? $maxlength[0] : ""); else // Do fallback to default prefix size if max-length was not set. - $_maxlength = ($prefix[2] < 29 ? 29 : $prefix[2]); + $_maxlength = ($prefix[2] < MAX_LEN_IPV4 ? MAX_LEN_IPV4 : $prefix[2]); // Loop through each asn in single route6 object and assign // other values accordingly.