nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix knx socket options (closes #1422)

Browse Source
This commit is contained in:
John
2024-12-29 07:39:21 +01:00
parent c42d06dc05
commit d25551e3f9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/knx/knxnet.h
+7 -2
View File
@@ -402,7 +402,9 @@ class KnxNetConnection : public KnxConnection {
const char* open() override { const char* open() override {
close(); close();
int fd = socketConnect(m_url && m_url[0] ? m_url : SYSTEM_MULTICAST_IP_STR, int fd = socketConnect(m_url && m_url[0] ? m_url : SYSTEM_MULTICAST_IP_STR,
SYSTEM_MULTICAST_PORT, IPPROTO_UDP, nullptr, 0x02); SYSTEM_MULTICAST_PORT, IPPROTO_UDP, &m_multicast,
// do not use connect() as it will limit incoming to the mcast src which is not the case
0x01);
if (fd < 0) { if (fd < 0) {
return "create socket"; return "create socket";
} }
@@ -596,7 +598,7 @@ class KnxNetConnection : public KnxConnection {
} }
d[0] = tpci; d[0] = tpci;
logTelegram(true, c, l, d); logTelegram(true, c, l, d);
ssize_t sent = ::send(m_sock, buf, totalLen, MSG_NOSIGNAL); ssize_t sent = sendto(m_sock, buf, totalLen, MSG_NOSIGNAL, (sockaddr*)&m_multicast, sizeof(m_multicast));
if (sent < 0) { if (sent < 0) {
return "send error"; return "send error";
} }
@@ -633,6 +635,9 @@ class KnxNetConnection : public KnxConnection {
/** the URL to connect to. */ /** the URL to connect to. */
const char* m_url; const char* m_url;
/** the multicast address to send to. */
struct sockaddr_in m_multicast;
/** the socket if connected, or 0. */ /** the socket if connected, or 0. */
int m_sock; int m_sock;