portune 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

portune/portune.py

@@ -906,6 +906,29 @@ def format_percent(value: int, total: int) -> Tuple[str, str]:
         return "0/0", "0.0%"
     return f"{value}/{total}", f"{(value/total*100):.1f}%"
 
+def get_vlan_base(ip: str, bits: int) -> str:
+    """Calculate VLAN base address with end padding 0."""
+    if ip == 'N/A':
+        return 'N/A'
+    try:
+        octets = ip.split('.')
+        if len(octets) != 4:
+            return 'invalid'
+
+        # Convert IP to 32-bit integer
+        ip_int = sum(int(octet) << (24 - 8 * i) for i, octet in enumerate(octets))
+
+        # Apply mask
+        mask = ((1 << bits) - 1) << (32 - bits)
+        masked_ip = ip_int & mask
+
+        # Convert back to dotted notation
+        result_octets = [(masked_ip >> (24 - 8 * i)) & 255 for i in range(4)]
+        return '.'.join(map(str, result_octets))
+    except:
+        return 'N/A'
+
+
 def compute_stats(
     results: List[Tuple[str, str, int, str, bool]],
     start_time: float,
@@ -954,25 +977,6 @@ def compute_stats(
     }
 
 
-    def get_vlan_base(ip: str, bits: int) -> str:
-        """Calculate VLAN base address with end padding 0."""
-        try:
-            octets = ip.split('.')
-            if len(octets) != 4:
-                return 'invalid'
-
-            # Convert IP to 32-bit integer
-            ip_int = sum(int(octet) << (24 - 8 * i) for i, octet in enumerate(octets))
-
-            # Apply mask
-            mask = ((1 << bits) - 1) << (32 - bits)
-            masked_ip = ip_int & mask
-
-            # Convert back to dotted notation
-            result_octets = [(masked_ip >> (24 - 8 * i)) & 255 for i in range(4)]
-            return '.'.join(map(str, result_octets))
-        except:
-            return 'invalid'
 
     # Collect VLAN statistics for timeouts
     for hostname, ip, port, status, _ in results:
@@ -1179,13 +1183,14 @@ def generate_html_report(
         f.write(f'<h3 class="icon">Port Accessibility Report from {HOSTNAME} ({MY_IP}) to {os.path.basename(input_file)} - {time.strftime("%Y-%m-%d %H:%M:%S", scan_time)}</h3>\n')
         
         # Write detailed results table
-        f.write('''
+        f.write(f'''
         <div class="table-container" id="result-container">
             <table id="commandTable">
                 <thead>
                     <tr>
                         <th>Hostname</th>
                         <th>IP</th>
+                        <th>VLAN/{stats['vlan_bits']}</th>
                         <th>Port</th>
                         <th>Status</th>
                         <th>Ping</th>
@@ -1203,6 +1208,7 @@ def generate_html_report(
                 <tr>
                     <td>{escape(str(hostname))}</td>
                     <td>{escape(str(ip))}</td>
+                    <td>{str(get_vlan_base(ip, stats['vlan_bits']))}</td>
                     <td style="text-align: right;">{port}</td>
                     <td style="text-align: center;"><span class="{status_class} status">{escape(status)}</span></td>
                     <td style="text-align: center;"><span class="{ping_class} ping">{ping_status}</span></td>

portune/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.1'
-__version_tuple__ = version_tuple = (0, 1, 1)
+__version__ = version = '0.1.2'
+__version_tuple__ = version_tuple = (0, 1, 2)

{portune-0.1.1.dist-info → portune-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: portune
-Version: 0.1.1
+Version: 0.1.2
 Summary: Simple Python HTTP Exec Server
 Author: Franck Jouvanceau
 Maintainer: Franck Jouvanceau

portune-0.1.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+portune/__init__.py,sha256=RfXuNfHBqfRt_z4IukwN1a0oeCXahuMOO8_eBt4T8NM,58
+portune/portune.py,sha256=ODPpO7E9-pXoFRxKavyn22_b9dhVjxUp-aIxKhnxamY,61908
+portune/version.py,sha256=bSmADqydH8nBu-J4lG8UVuR7hnU_zcwhnSav2oQ0W0A,511
+portune-0.1.2.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
+portune-0.1.2.dist-info/METADATA,sha256=qEkffZiY8znnWihHuYtJlzf7t4bRPFTPvCcajLqmYBs,2837
+portune-0.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+portune-0.1.2.dist-info/entry_points.txt,sha256=6j7jAf5fOZrLPbVIs3z92R1tT891WyY9YxQ6OVnPKG0,80
+portune-0.1.2.dist-info/top_level.txt,sha256=CITDikHhRKAsSOGmNJzD-xSp6D5iBhSr9ZS1qy8-SL0,8
+portune-0.1.2.dist-info/RECORD,,

portune-0.1.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-portune/__init__.py,sha256=RfXuNfHBqfRt_z4IukwN1a0oeCXahuMOO8_eBt4T8NM,58
-portune/portune.py,sha256=fB3UrmIOg8UnwF5dTio_p-e-9KjP6w1Y2V_XkfmPnzM,61799
-portune/version.py,sha256=Mmxse1R0ki5tjz9qzU8AQyqUsLt8nTyCAbYQp8R87PU,511
-portune-0.1.1.dist-info/licenses/LICENSE,sha256=gRJf0JPT_wsZJsUGlWPTS8Vypfl9vQ1qjp6sNbKykuA,1064
-portune-0.1.1.dist-info/METADATA,sha256=MpHha4A721qziGCuDDwsNDvwSBxnbb0PVn7UzjgwPp0,2837
-portune-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-portune-0.1.1.dist-info/entry_points.txt,sha256=6j7jAf5fOZrLPbVIs3z92R1tT891WyY9YxQ6OVnPKG0,80
-portune-0.1.1.dist-info/top_level.txt,sha256=CITDikHhRKAsSOGmNJzD-xSp6D5iBhSr9ZS1qy8-SL0,8
-portune-0.1.1.dist-info/RECORD,,