portune 0.1.18__tar.gz → 0.1.20__tar.gz

{portune-0.1.18/portune.egg-info → portune-0.1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.18
+Version: 0.1.20
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau
@@ -36,7 +36,7 @@ Dynamic: license-file
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
 [![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
 [![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
-[![bash](https://img.shields.io/badge/OS-Windows%20|Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
+[![bash](https://img.shields.io/badge/OS-%20Windows%20|%20Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
 
 # portune
 

{portune-0.1.18 → portune-0.1.20}/README.md

@@ -3,7 +3,7 @@
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
 [![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
 [![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
-[![bash](https://img.shields.io/badge/OS-Windows%20|Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
+[![bash](https://img.shields.io/badge/OS-%20Windows%20|%20Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
 
 # portune
 

{portune-0.1.18 → portune-0.1.20}/portune/portune.py

@@ -708,7 +708,7 @@ def parse_input_file(filename: str, info_command: Optional[str] = None) -> List[
         hosts.append((fqdn, sorted(ports), desc))
     return (hosts, desc_titles)
 
-def ping_host(ip: str, timeout: float = 2.0) -> bool:
+def ping_host(ip: str, timeout: int = 2) -> bool:
     """Test if a host responds to ICMP ping.
 
     Uses the system ping command to check host availability. The command is
@@ -729,7 +729,25 @@ def ping_host(ip: str, timeout: float = 2.0) -> bool:
     except Exception:
         return False
 
-def resolve_and_ping_host(hostname: str, timeout: float = 2.0, noping: bool = False) -> Tuple[str, Dict[str, Union[str, bool]]]:
+def is_ip(hostname: str) -> bool:
+    """Check if a given hostname is an IP address.
+
+    Uses inet_aton to determine if the input string is a valid
+    IPv4 address.
+
+    Args:
+        hostname: The hostname or IP address to check
+
+    Returns:
+        True if the hostname is an IP address, False otherwise
+    """
+    try:
+        socket.inet_aton(hostname)
+        return True
+    except socket.error:
+        return False
+
+def resolve_and_ping_host(hostname: str, timeout: int = 2, noping: bool = False) -> Tuple[str, Dict[str, Union[str, bool]]]:
     """Resolve a hostname to IP and optionally check if it responds to ping.
 
     Performs DNS resolution and ping check in a single function. For IP addresses,
@@ -749,25 +767,17 @@ def resolve_and_ping_host(hostname: str, timeout: float = 2.0, noping: bool = Fa
                 - 'hostname': Original resolved hostname (only if different from input)
     """
     try:
-        # Check if hostname is already an IP address
-        try:
-            # Try to create an IP address object to validate format
-            socket.inet_aton(hostname)
-            is_ip = True
-        except socket.error:
-            is_ip = False
-
         # If it's an IP, try to get hostname from reverse DNS
-        if is_ip:
+        if is_ip(hostname):
             try:
-                resolved_hosts = socket.gethostbyaddr(hostname)
+                ip = hostname
+                resolved_hosts = socket.gethostbyaddr(ip)
                 if resolved_hosts and resolved_hosts[0]:
                     hostname = resolved_hosts[0]  # Use the resolved hostname
             except (socket.herror, socket.gaierror):
                 pass  # Keep the IP as hostname if reverse lookup fails
-
-        # Now resolve the hostname (or IP) to get its IP
-        ip = socket.gethostbyname(hostname)
+        else:
+            ip = socket.gethostbyname(hostname)
         if noping:
             return hostname, {'ip': ip, 'ping': False}
         ping_status = ping_host(ip, timeout)
@@ -776,7 +786,7 @@ def resolve_and_ping_host(hostname: str, timeout: float = 2.0, noping: bool = Fa
         return hostname, {'ip': 'N/A', 'ping': False}
 
 def ping_hosts(hosts: List[Tuple[str, List[int], str]], 
-             timeout: float = 2.0, 
+             timeout: int = 2, 
              parallelism: int = 10, 
              noping: bool = False) -> Dict[str, Dict[str, Union[str, bool]]]:
     """Process DNS resolution and ping checks for multiple hosts in parallel.
@@ -839,7 +849,7 @@ def check_port(hostname: str,
              port: int, 
              host_info: Dict[str, Union[str, bool]],
              desc: list,
-             timeout: float = 2.0) -> Tuple[str, str, int, str, bool]:
+             timeout: int = 2) -> Tuple[str, str, int, str, bool]:
     """Check if a specific TCP port is accessible on a host.
 
     Attempts to establish a TCP connection to the specified port. Uses pre-resolved
@@ -1101,12 +1111,10 @@ def compute_stats(
     })
     
     for hostname, ip, port, status, _, _ in results:
-        # For IP addresses, use VLAN/16 as domain
-        try:
-            socket.inet_aton(hostname)
-            # It's a valid IP address, use VLAN/16
+        if is_ip(hostname):
+            # For IP addresses, use VLAN/16 as domain
             domain = '.'.join(hostname.split('.')[:2]) + '.0.0'
-        except socket.error:
+        else:
             # Not an IP address, extract domain normally
             parts = hostname.split('.')
             if len(parts) > 1:
@@ -1410,6 +1418,7 @@ def print_statistics(stats, timeout, parallelism):
             first_row = False
         if not first_row:  # Only print separator between domains if domain had data
             print(separator, file=sys.stderr)
+
 def format_table_output(
     results: List[Tuple[str, str, int, str, bool]], 
     noping: bool
@@ -1482,7 +1491,7 @@ def format_table_output(
 def main():
     parser = argparse.ArgumentParser(description='Port accessibility report utility')
     parser.add_argument('-p', '--parallelism', type=int, default=50, help='Number of parallel threads (default: 50)')
-    parser.add_argument('-t', '--timeout', type=float, default=2.0, help='Timeout in seconds for port and ping checks (default: 2.0)')
+    parser.add_argument('-t', '--timeout', type=float, default=2, help='Timeout in seconds for port and ping checks (default: 2)')
     parser.add_argument('-o', '--output', default=f'report_{HOSTNAME}.{time.strftime("%Y%m%d_%H%M%S")}.html', help='Output HTML report file')
     parser.add_argument('-n', '--noping', action="store_true", help='No ping check')
     parser.add_argument('-s', '--summary', action="store_true", help='Print scan summary information')

{portune-0.1.18 → portune-0.1.20}/portune/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.18'
-__version_tuple__ = version_tuple = (0, 1, 18)
+__version__ = version = '0.1.20'
+__version_tuple__ = version_tuple = (0, 1, 20)

{portune-0.1.18 → portune-0.1.20/portune.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.18
+Version: 0.1.20
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau
@@ -36,7 +36,7 @@ Dynamic: license-file
 [![Licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://shields.io/)
 [![](https://pepy.tech/badge/portune)](https://pepy.tech/project/portune)
 [![Python versions](https://img.shields.io/badge/python-3.9+-blue.svg)](https://shields.io/)
-[![bash](https://img.shields.io/badge/OS-Windows%20|Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
+[![bash](https://img.shields.io/badge/OS-%20Windows%20|%20Linux%20|%20macOS%20|%20SunOS%20|%20AIX%20|%20HP_UX%20...-blue.svg)]()
 
 # portune