Code cleanup

ccie18643 · Sep 8, 2024 · 8d1b908 · 8d1b908
1 parent 1536d13
commit 8d1b908
Show file tree

Hide file tree

Showing 12 changed files with 150 additions and 110 deletions.
diff --git a/examples/icmp_echo_client.py b/examples/icmp_echo_client.py
@@ -45,19 +45,20 @@
 
 from pytcp import TcpIpStack, initialize_interface
 from pytcp.lib import stack
-from pytcp.lib.net_addr import Ip4Address, Ip6Address
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeIpAddress,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 from pytcp.lib.stack import github_repository, version_string
 from pytcp.protocols.icmp4.message.icmp4_message__echo_request import (
     Icmp4EchoRequestMessage,

diff --git a/examples/run_stack.py b/examples/run_stack.py
@@ -39,18 +39,18 @@
 import click
 
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 
 @click.command()

diff --git a/examples/tcp_daytime_service.py b/examples/tcp_daytime_service.py
@@ -43,19 +43,19 @@
 
 from examples.lib.tcp_service import TcpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/examples/tcp_discard_service.py b/examples/tcp_discard_service.py
@@ -42,19 +42,19 @@
 
 from examples.lib.tcp_service import TcpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/examples/tcp_echo_client.py b/examples/tcp_echo_client.py
@@ -43,20 +43,20 @@
 
 from pytcp import TcpIpStack, initialize_interface
 from pytcp.lib import socket
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeIpAddress,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 
 class TcpEchoClient:

diff --git a/examples/tcp_echo_service.py b/examples/tcp_echo_service.py
@@ -43,19 +43,19 @@
 from examples.lib.malpi import malpa, malpi, malpka
 from examples.lib.tcp_service import TcpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/examples/udp_daytime_service.py b/examples/udp_daytime_service.py
@@ -43,19 +43,19 @@
 
 from examples.lib.udp_service import UdpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/examples/udp_discard_service.py b/examples/udp_discard_service.py
@@ -42,19 +42,19 @@
 
 from examples.lib.udp_service import UdpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/examples/udp_echo_client.py b/examples/udp_echo_client.py
@@ -43,20 +43,20 @@
 
 from pytcp import TcpIpStack, initialize_interface
 from pytcp.lib import socket
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeIpAddress,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 
 class UdpEchoClient:

diff --git a/examples/udp_echo_service.py b/examples/udp_echo_service.py
@@ -43,19 +43,19 @@
 from examples.lib.malpi import malpa, malpi, malpka
 from examples.lib.udp_service import UdpService
 from pytcp import TcpIpStack, initialize_interface
-from pytcp.lib.net_addr.click_types import (
+from pytcp.lib.net_addr import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
     ClickTypeMacAddress,
+    Ip4Address,
+    Ip4Host,
+    Ip6Address,
+    Ip6Host,
+    IpAddress,
+    MacAddress,
 )
-from pytcp.lib.net_addr.ip4_address import Ip4Address
-from pytcp.lib.net_addr.ip4_host import Ip4Host
-from pytcp.lib.net_addr.ip6_address import Ip6Address
-from pytcp.lib.net_addr.ip6_host import Ip6Host
-from pytcp.lib.net_addr.ip_address import IpAddress
-from pytcp.lib.net_addr.mac_address import MacAddress
 
 if TYPE_CHECKING:
     from pytcp.lib.socket import Socket

diff --git a/pytcp/lib/net_addr/__init__.py b/pytcp/lib/net_addr/__init__.py
@@ -36,12 +36,13 @@
 from .click_types import (
     ClickTypeIp4Address,
     ClickTypeIp4Host,
-    ClickTypeIp4Mask,
     ClickTypeIp4Network,
     ClickTypeIp6Address,
     ClickTypeIp6Host,
-    ClickTypeIp6Mask,
     ClickTypeIp6Network,
+    ClickTypeIpAddress,
+    ClickTypeIpHost,
+    ClickTypeIpNetwork,
     ClickTypeMacAddress,
 )
 from .errors import (