zev/pscanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix and shortened a few functions

Browse Source 
The bug was on line 48, which had `if not is_subnet`, checking the truthiness of the `is_subnet` function rather than calling it with `network`.

The other changes shorten up function bodies by, variously, removing an intermediate variable, returning early in a function returning a boolean, and simplifying `is_subnet` to a single line.
This commit is contained in:
Zev Averbach
2022-11-02 15:09:31 +01:00
committed by GitHub
parent 2f447926a3
commit 8b5a88409e
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pscanner/__init__.py
View File

@@ -4,25 +4,26 @@
import ipaddress import ipaddress
import socket import socket
from typing import List from typing import List
from colorama import init, Fore from colorama import init, Fore
from icmplib import async_multiping, ping, multiping from icmplib import async_multiping, ping, multiping
init() init()
GREEN = Fore.GREEN GREEN = Fore.GREEN
RESET = Fore.RESET RESET = Fore.RESET
GRAY = Fore.LIGHTBLACK_EX GRAY = Fore.LIGHTBLACK_EX
def are_alive(addresses: List[str]) -> List[str]: def are_alive(addresses: List[str]) -> List[str]:
hosts = multiping(addresses) return [host.address for host in multiping(addresses) if host.is_alive]
return [host.address for host in hosts if host.is_alive]
def is_host_alive(host: str) -> bool: def is_host_alive(host: str) -> bool:
if ping(host, timeout=1, count=1).is_alive: if not ping(host, timeout=1, count=1).is_alive:
return True
else:
print(f"{GRAY}{host:15} is not alive {RESET}") print(f"{GRAY}{host:15} is not alive {RESET}")
return False return False
return True
def is_port_open(host: str, port: int) -> bool: def is_port_open(host: str, port: int) -> bool:
@@ -40,14 +41,11 @@ def is_port_open(host: str, port: int) -> bool:
def is_subnet(ip: str) -> bool: def is_subnet(ip: str) -> bool:
if "/" in ip: return "/" in ip
return True
else:
return False
def hosts_in_subnet(network: str) -> List[str]: def hosts_in_subnet(network: str) -> List[str]:
if not is_subnet: if not is_subnet(network):
print(f"{network} is not a network") print(f"{network} is not a network")
return [str(_) for _ in ipaddress.ip_network(network).hosts()] return [str(_) for _ in ipaddress.ip_network(network).hosts()]