mirror of
https://github.com/kellyjonbrazil/jc.git
synced 2025-06-21 00:19:42 +02:00
add hex and binary representations
This commit is contained in:
@ -102,6 +102,8 @@ def parse(
|
|||||||
network_cidr = int(str(interface.with_prefixlen).split('/')[1])
|
network_cidr = int(str(interface.with_prefixlen).split('/')[1])
|
||||||
network = ipaddress.ip_network(f'{network_string}/{network_cidr}')
|
network = ipaddress.ip_network(f'{network_string}/{network_cidr}')
|
||||||
broadcast_string = str(network.broadcast_address)
|
broadcast_string = str(network.broadcast_address)
|
||||||
|
hostmask_string = str(interface.with_hostmask).split('/')[1]
|
||||||
|
netmask_string = str(interface.with_netmask).split('/')[1]
|
||||||
bare_ip_string = str(interface.ip)
|
bare_ip_string = str(interface.ip)
|
||||||
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
|
||||||
@ -137,8 +139,8 @@ def parse(
|
|||||||
'dns_ptr': ip_ptr,
|
'dns_ptr': ip_ptr,
|
||||||
'network': network_string,
|
'network': network_string,
|
||||||
'broadcast': broadcast_string,
|
'broadcast': broadcast_string,
|
||||||
'hostmask': str(interface.with_hostmask).split('/')[1],
|
'hostmask': hostmask_string,
|
||||||
'netmask': str(interface.with_netmask).split('/')[1],
|
'netmask': netmask_string,
|
||||||
'cidr_netmask': network_cidr,
|
'cidr_netmask': network_cidr,
|
||||||
'hosts': hosts,
|
'hosts': hosts,
|
||||||
'first_host': first_host,
|
'first_host': first_host,
|
||||||
@ -152,21 +154,21 @@ def parse(
|
|||||||
'is_unspecified': interface.is_unspecified,
|
'is_unspecified': interface.is_unspecified,
|
||||||
'hex': {
|
'hex': {
|
||||||
'ip': _b2a(bare_ip.packed),
|
'ip': _b2a(bare_ip.packed),
|
||||||
'network': 1, # implement
|
'network': _b2a(ipaddress.ip_address(network_string).packed),
|
||||||
'broadcast': 2, # implement
|
'broadcast': _b2a(ipaddress.ip_address(broadcast_string).packed),
|
||||||
'hostmask': 3, # implement
|
'hostmask': _b2a(ipaddress.ip_address(hostmask_string).packed),
|
||||||
'netmask': 4, # implement
|
'netmask': _b2a(ipaddress.ip_address(netmask_string).packed),
|
||||||
'first_host': 1, # implement
|
'first_host': _b2a(ipaddress.ip_address(first_host).packed),
|
||||||
'last_host': 2, # implement
|
'last_host': _b2a(ipaddress.ip_address(last_host).packed)
|
||||||
},
|
},
|
||||||
'bin': {
|
'bin': {
|
||||||
'ip': 1, # implement
|
'ip': format(int(bare_ip), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'network': 1, # implement
|
'network': format(int(ipaddress.ip_address(network_string)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'broadcast': 2, # implement
|
'broadcast': format(int(ipaddress.ip_address(broadcast_string)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'hostmask': 3, # implement
|
'hostmask': format(int(ipaddress.ip_address(hostmask_string)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'netmask': 4, # implement
|
'netmask': format(int(ipaddress.ip_address(netmask_string)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'first_host': 1, # implement
|
'first_host': format(int(ipaddress.ip_address(first_host)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
'last_host': 2, # implement
|
'last_host': format(int(ipaddress.ip_address(last_host)), '0>' + str(interface.max_prefixlen) +'b'),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user