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

fix host number calculations

Browse Source
This commit is contained in:
Kelly Brazil
2022-07-27 14:27:05 -07:00
parent 11d2eb35be
commit fdb629f82b
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jc/parsers/ip_address.py
View File

@ -30,7 +30,6 @@ Examples:
from typing import Dict from typing import Dict
import binascii import binascii
import ipaddress import ipaddress
from collections import deque
import jc.utils import jc.utils
@ -107,9 +106,27 @@ 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
# TODO: fix for /30, /31, /32, etc. # Find first and last host IPs. Fix for /31, /32, /127, /128
first_host = str(ipaddress.ip_address(network_string) + 1) if any((
last_host = str(ipaddress.ip_address(broadcast_string) - 1) int(interface.version) == 4 and network_cidr == 31,
int(interface.version) == 6 and network_cidr == 127
)):
first_host = str(ipaddress.ip_address(network_string))
last_host = str(ipaddress.ip_address(broadcast_string))
hosts = 2
elif any((
int(interface.version) == 4 and network_cidr == 32,
int(interface.version) == 6 and network_cidr == 128
)):
first_host = bare_ip_string
last_host = bare_ip_string
hosts = 1
else:
first_host = str(ipaddress.ip_address(network_string) + 1)
last_host = str(ipaddress.ip_address(broadcast_string) - 1)
hosts = int(ipaddress.ip_address(broadcast_string) - 1) - int(ipaddress.ip_address(network_string) + 1) + 1
raw_output = { raw_output = {
'version': int(interface.version), 'version': int(interface.version),
@ -123,6 +140,7 @@ def parse(
'hostmask': str(interface.with_hostmask).split('/')[1], 'hostmask': str(interface.with_hostmask).split('/')[1],
'netmask': str(interface.with_netmask).split('/')[1], 'netmask': str(interface.with_netmask).split('/')[1],
'cidr_netmask': network_cidr, 'cidr_netmask': network_cidr,
'hosts': hosts,
'first_host': first_host, 'first_host': first_host,
'last_host': last_host, 'last_host': last_host,
'is_multicast': interface.is_multicast, 'is_multicast': interface.is_multicast,