Code refactor

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

Hide file tree

Showing 10 changed files with 93 additions and 120 deletions.
diff --git a/examples/icmp_echo_client.py b/examples/icmp_echo_client.py
@@ -180,6 +180,7 @@ def __thread__client(self) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -192,6 +193,7 @@ def __thread__client(self) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -212,9 +214,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     remote_ip_address: IpAddress,
 ) -> None:
@@ -225,16 +227,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,

diff --git a/examples/run_stack.py b/examples/run_stack.py
@@ -67,6 +67,7 @@
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -79,6 +80,7 @@
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -93,9 +95,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
 ) -> None:
     """
@@ -104,20 +106,18 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
+
     stack = TcpIpStack(
         fd=fd,
         mtu=mtu,
         mac_address=mac_address,
-        ip6_host=(
-            None
-            if ip6_address is None
-            else Ip6Host(ip6_address, gateway=ip6_gateway)
-        ),
-        ip4_host=(
-            None
-            if ip4_address is None
-            else Ip4Host(ip4_address, gateway=ip4_gateway)
-        ),
+        ip6_host=ip6_host,
+        ip4_host=ip4_host,
     )
 
     try:

diff --git a/examples/tcp_daytime_service.py b/examples/tcp_daytime_service.py
@@ -139,6 +139,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -151,6 +152,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -171,9 +173,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     local_port: int,
 ) -> None:
@@ -184,16 +186,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,

diff --git a/examples/tcp_discard_service.py b/examples/tcp_discard_service.py
@@ -144,6 +144,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -156,6 +157,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -176,9 +178,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     local_port: int,
 ) -> None:
@@ -189,16 +191,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,

diff --git a/examples/tcp_echo_client.py b/examples/tcp_echo_client.py
@@ -194,6 +194,7 @@ def __thread__client(self) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -206,6 +207,7 @@ def __thread__client(self) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -226,9 +228,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     remote_ip_address: IpAddress,
 ) -> None:
@@ -239,16 +241,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,

diff --git a/examples/tcp_echo_service.py b/examples/tcp_echo_service.py
@@ -155,6 +155,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -167,6 +168,7 @@ def _service(self, *, connected_socket: Socket) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -187,9 +189,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     local_port: int,
 ) -> None:
@@ -200,16 +202,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,

diff --git a/examples/udp_daytime_service.py b/examples/udp_daytime_service.py
@@ -107,6 +107,7 @@ def _service(self, *, listening_socket: Socket) -> None:
 )
 @click.option(
     "--ip6-address",
+    "ip6_host",
     type=ClickTypeIp6Host(),
     default=None,
     help="IPv6 address/mask to be assigned to the interface.",
@@ -119,6 +120,7 @@ def _service(self, *, listening_socket: Socket) -> None:
 )
 @click.option(
     "--ip4-address",
+    "ip4_host",
     type=ClickTypeIp4Host(),
     default=None,
     help="IPv4 address/mask to be assigned to the interface.",
@@ -139,9 +141,9 @@ def cli(
     *,
     interface: str,
     mac_address: MacAddress | None,
-    ip6_address: Ip6Host | None,
+    ip6_host: Ip6Host | None,
     ip6_gateway: Ip6Address | None,
-    ip4_address: Ip4Host | None,
+    ip4_host: Ip4Host | None,
     ip4_gateway: Ip4Address | None,
     local_port: int,
 ) -> None:
@@ -152,16 +154,11 @@ def cli(
 
     fd, mtu = initialize_interface(interface)
 
-    ip6_host = (
-        None
-        if ip6_address is None
-        else Ip6Host(ip6_address, gateway=ip6_gateway)
-    )
-    ip4_host = (
-        None
-        if ip4_address is None
-        else Ip4Host(ip4_address, gateway=ip4_gateway)
-    )
+    if ip6_host:
+        ip6_host.gateway = ip6_gateway
+
+    if ip4_host:
+        ip4_host.gateway = ip4_gateway
 
     stack = TcpIpStack(
         fd=fd,