axsy/whois
1
0
Fork 0
mirror of https://git.photon.obnh.io/AXSY/whois.git synced 2026-03-12 18:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add automatic decimal AS number conversion for SCION AS entries

Browse Source 
- Implement scion_as_to_decimal() function in both add-as and add-as-batch scripts
- Automatically converts SCION AS format (ISD:AS:Instance) to decimal when in BGP range
- Handles both ISD:AS:Instance format and colon-separated hex format
- Follows SCION AS numbering specification from https://github.com/scionproto/scion/wiki/ISD-and-AS-numbering
This commit is contained in:
Olaf Baumert
2025-06-03 11:04:25 +00:00
parent 34c631a06d
commit 7f548110ff
2 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
add-as
View File

@@ -12,34 +12,37 @@ def scion_as_to_decimal(as_id):
if ':' not in as_id: if ':' not in as_id:
return as_id return as_id
# Parse SCION format (ISD:AS:Instance or AS parts in hex) # Parse SCION format
parts = as_id.split(':') parts = as_id.split(':')
# For ISD:AS:Instance format, extract the AS part # Check if this looks like ISD:AS:Instance format (first part is single digit ISD)
if len(parts) == 3: if len(parts) == 3 and len(parts[0]) == 1 and parts[0].isdigit():
# ISD:AS:Instance format - AS is the middle part # ISD:AS:Instance format - convert the AS part (middle) and instance (last)
try: try:
# Convert hex AS to decimal # AS is 16-bit hex, instance is 16-bit hex
# Combine them as 32-bit number: AS << 16 | Instance
as_num = int(parts[1], 16) as_num = int(parts[1], 16)
if 0 <= as_num <= 0xFFFFFFFF: # BGP AS range instance = int(parts[2], 16)
return str(as_num) total = (as_num << 16) | instance
if 0 <= total <= 0xFFFFFFFF: # BGP AS range
return str(total)
except ValueError: except ValueError:
pass pass
return "" return ""
# For colon-separated hex format (e.g., 0:1:f) # For standard colon-separated hex format (e.g., 0:1:f)
if len(parts) <= 3: # Each part is up to 16 bits
try: try:
# Convert each hex part and combine total = 0
total = 0 for part in parts:
for i, part in enumerate(parts): total = (total << 16) + int(part, 16)
total = total * 65536 + int(part, 16)
# Check if in BGP AS range # Check if in BGP AS range
if 0 <= total <= 0xFFFFFFFF: # 2^32 - 1 if 0 <= total <= 0xFFFFFFFF: # 2^32 - 1
return str(total) return str(total)
except ValueError: except ValueError:
pass pass
return "" return ""

41
add-as-batch
View File

@@ -17,34 +17,37 @@ def scion_as_to_decimal(as_id):
if ':' not in as_id: if ':' not in as_id:
return as_id return as_id
# Parse SCION format (ISD:AS:Instance or AS parts in hex) # Parse SCION format
parts = as_id.split(':') parts = as_id.split(':')
# For ISD:AS:Instance format, extract the AS part # Check if this looks like ISD:AS:Instance format (first part is single digit ISD)
if len(parts) == 3: if len(parts) == 3 and len(parts[0]) == 1 and parts[0].isdigit():
# ISD:AS:Instance format - AS is the middle part # ISD:AS:Instance format - convert the AS part (middle) and instance (last)
try: try:
# Convert hex AS to decimal # AS is 16-bit hex, instance is 16-bit hex
# Combine them as 32-bit number: AS << 16 | Instance
as_num = int(parts[1], 16) as_num = int(parts[1], 16)
if 0 <= as_num <= 0xFFFFFFFF: # BGP AS range instance = int(parts[2], 16)
return str(as_num) total = (as_num << 16) | instance
if 0 <= total <= 0xFFFFFFFF: # BGP AS range
return str(total)
except ValueError: except ValueError:
pass pass
return "" return ""
# For colon-separated hex format (e.g., 0:1:f) # For standard colon-separated hex format (e.g., 0:1:f)
if len(parts) <= 3: # Each part is up to 16 bits
try: try:
# Convert each hex part and combine total = 0
total = 0 for part in parts:
for i, part in enumerate(parts): total = (total << 16) + int(part, 16)
total = total * 65536 + int(part, 16)
# Check if in BGP AS range # Check if in BGP AS range
if 0 <= total <= 0xFFFFFFFF: # 2^32 - 1 if 0 <= total <= 0xFFFFFFFF: # 2^32 - 1
return str(total) return str(total)
except ValueError: except ValueError:
pass pass
return "" return ""