python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-19 00:17:51 +02:00
Code Issues Releases Activity

add ipv6-only fields

Browse Source
This commit is contained in:
Kelly Brazil
2022-07-27 16:22:32 -07:00
parent 624fba9704
commit b4fb2d102c
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jc/parsers/ip_address.py
View File

@ -108,18 +108,31 @@ def parse(
bare_ip = ipaddress.ip_address(bare_ip_string) bare_ip = ipaddress.ip_address(bare_ip_string)
ip_ptr = bare_ip.reverse_pointer ip_ptr = bare_ip.reverse_pointer
# fix for ipv6-only attributes
scope_id = None
ipv4_mapped = None
sixtofour = None
teredo_client = None
teredo_server = None
if interface.version == 6:
scope_id = interface.scope_id
ipv4_mapped = str(interface.ipv4_mapped) if interface.ipv4_mapped else None
sixtofour = str(interface.sixtofour) if interface.sixtofour else None
teredo_client = str(interface.teredo[1]) if interface.teredo else None
teredo_server = str(interface.teredo[0]) if interface.teredo else None
# Find first and last host IPs. Fix for /31, /32, /127, /128 # Find first and last host IPs. Fix for /31, /32, /127, /128
if any(( if any((
int(interface.version) == 4 and network_cidr == 31, interface.version == 4 and network_cidr == 31,
int(interface.version) == 6 and network_cidr == 127 interface.version == 6 and network_cidr == 127
)): )):
first_host = str(ipaddress.ip_address(network_string)) first_host = str(ipaddress.ip_address(network_string))
last_host = str(ipaddress.ip_address(broadcast_string)) last_host = str(ipaddress.ip_address(broadcast_string))
hosts = 2 hosts = 2
elif any(( elif any((
int(interface.version) == 4 and network_cidr == 32, interface.version == 4 and network_cidr == 32,
int(interface.version) == 6 and network_cidr == 128 interface.version == 6 and network_cidr == 128
)): )):
first_host = bare_ip_string first_host = bare_ip_string
last_host = bare_ip_string last_host = bare_ip_string
@ -132,10 +145,15 @@ def parse(
raw_output = { raw_output = {
'version': int(interface.version), 'version': int(interface.version),
'max_prefix_length': int(interface.max_prefixlen), 'max_prefix_length': interface.max_prefixlen,
'ip': bare_ip_string, 'ip': bare_ip_string,
'ip_compressed': str(interface.compressed), 'ip_compressed': str(interface.compressed),
'ip_exploded': str(interface.exploded), 'ip_exploded': str(interface.exploded),
'scope_id': scope_id,
'ipv4_mapped': ipv4_mapped,
'six_to_four': sixtofour,
'teredo_client': teredo_client,
'teredo_server': teredo_server,
'dns_ptr': ip_ptr, 'dns_ptr': ip_ptr,
'network': network_string, 'network': network_string,
'broadcast': broadcast_string, 'broadcast': broadcast_string,