commparams in tcp/tls server class.

Author: janiversen

pymodbus/server/async_io.py

@@ -20,7 +20,7 @@
     ModbusTlsFramer,
 )
 from pymodbus.transport.serial_asyncio import create_serial_connection
-from pymodbus.transport.transport import CommParams, Transport
+from pymodbus.transport.transport import CommParams, CommType, Transport
 
 
 with suppress(ImportError):
@@ -320,16 +320,20 @@ def __init__(
         :param response_manipulator: Callback method for manipulating the
                                         response
         """
-        super().__init__(
+        params = kwargs.get(
+            "internal_tls_setup",
             CommParams(
+                comm_type=CommType.TCP,
                 comm_name="server_listener",
                 reconnect_delay=0.0,
                 reconnect_delay_max=0.0,
                 timeout_connect=0.0,
             ),
+        )
+        super().__init__(
+            params,
             True,
         )
-
         self.local_active_connections = {}
         self.loop = kwargs.get("loop") or asyncio.get_event_loop()
         self.decoder = ServerDecoder()
@@ -354,9 +358,8 @@ def __init__(
             "reuse_address": True,
             "start_serving": True,
         }
-        use_ssl = kwargs.get("internal_ssl", None)
-        if use_ssl:
-            self.factory_parms["ssl"] = use_ssl
+        if params.sslctx:
+            self.factory_parms["ssl"] = params.sslctx
         self.handle_local_echo = False
 
     async def serve_forever(self):
@@ -451,8 +454,15 @@ def __init__(
             framer=framer,
             identity=identity,
             address=address,
-            internal_ssl=CommParams.generate_ssl(
-                True, certfile, keyfile, password, sslctx=sslctx
+            internal_tls_setup=CommParams(
+                comm_type=CommType.TLS,
+                comm_name="server_listener",
+                reconnect_delay=0.0,
+                reconnect_delay_max=0.0,
+                timeout_connect=0.0,
+                sslctx=CommParams.generate_ssl(
+                    True, certfile, keyfile, password, sslctx=sslctx
+                ),
             ),
             **kwargs,
         )
@@ -495,6 +505,7 @@ def __init__(
         # ----------------
         super().__init__(
             CommParams(
+                comm_type=CommType.UDP,
                 comm_name="server_listener",
                 reconnect_delay=0.0,
                 reconnect_delay_max=0.0,
@@ -613,6 +624,7 @@ def __init__(
         """
         super().__init__(
             CommParams(
+                comm_type=CommType.SERIAL,
                 comm_name="server_listener",
                 reconnect_delay=0.0,
                 reconnect_delay_max=0.0,