jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix KNX IP Secure tunnelling endpoint selection with keyfile (#131941)

Browse Source
This commit is contained in:
Matthias Alphart 2024-11-30 01:13:52 +01:00 committed by Paulus Schoutsen
parent bb847b346d
commit 787a1613ec
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/knx/__init__.py
View File

@ -54,6 +54,7 @@ from .const import (
CONF_KNX_SECURE_USER_PASSWORD, CONF_KNX_SECURE_USER_PASSWORD,
CONF_KNX_STATE_UPDATER, CONF_KNX_STATE_UPDATER,
CONF_KNX_TELEGRAM_LOG_SIZE, CONF_KNX_TELEGRAM_LOG_SIZE,
CONF_KNX_TUNNEL_ENDPOINT_IA,
CONF_KNX_TUNNELING, CONF_KNX_TUNNELING,
CONF_KNX_TUNNELING_TCP, CONF_KNX_TUNNELING_TCP,
CONF_KNX_TUNNELING_TCP_SECURE, CONF_KNX_TUNNELING_TCP_SECURE,
@ -352,6 +353,7 @@ class KNXModule:
if _conn_type == CONF_KNX_TUNNELING_TCP: if _conn_type == CONF_KNX_TUNNELING_TCP:
return ConnectionConfig( return ConnectionConfig(
connection_type=ConnectionType.TUNNELING_TCP, connection_type=ConnectionType.TUNNELING_TCP,
individual_address=self.entry.data.get(CONF_KNX_TUNNEL_ENDPOINT_IA),
gateway_ip=self.entry.data[CONF_HOST], gateway_ip=self.entry.data[CONF_HOST],
gateway_port=self.entry.data[CONF_PORT], gateway_port=self.entry.data[CONF_PORT],
auto_reconnect=True, auto_reconnect=True,
@ -364,6 +366,7 @@ class KNXModule:
if _conn_type == CONF_KNX_TUNNELING_TCP_SECURE: if _conn_type == CONF_KNX_TUNNELING_TCP_SECURE:
return ConnectionConfig( return ConnectionConfig(
connection_type=ConnectionType.TUNNELING_TCP_SECURE, connection_type=ConnectionType.TUNNELING_TCP_SECURE,
individual_address=self.entry.data.get(CONF_KNX_TUNNEL_ENDPOINT_IA),
gateway_ip=self.entry.data[CONF_HOST], gateway_ip=self.entry.data[CONF_HOST],
gateway_port=self.entry.data[CONF_PORT], gateway_port=self.entry.data[CONF_PORT],
secure_config=SecureConfig( secure_config=SecureConfig(

2
homeassistant/components/knx/const.py
View File

@ -104,7 +104,7 @@ class KNXConfigEntryData(TypedDict, total=False):
route_back: bool # not required route_back: bool # not required
host: str # only required for tunnelling host: str # only required for tunnelling
port: int # only required for tunnelling port: int # only required for tunnelling
tunnel_endpoint_ia: str | None tunnel_endpoint_ia: str | None # tunnelling only - not required (use get())
# KNX secure # KNX secure
user_id: int | None # not required user_id: int | None # not required
user_password: str | None # not required user_password: str | None # not required