andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-20 02:00:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: cache physical gateway and use kernel-assigned netlink pid

Browse Source
This commit is contained in:
cd-amn
2026-05-13 23:06:51 +04:00
parent 7ad0692306
commit 6750afd330
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/platforms/linux/daemon/linuxroutemonitor.cpp
+11 -8
View File
@@ -55,6 +55,8 @@ LinuxRouteMonitor::LinuxRouteMonitor(const QString& ifname, QObject* parent)
MZ_COUNT_CTOR(LinuxRouteMonitor); MZ_COUNT_CTOR(LinuxRouteMonitor);
logger.debug() << "LinuxRouteMonitor created."; logger.debug() << "LinuxRouteMonitor created.";
m_physicalGateway = NetworkUtilities::getGatewayAndIface().first;
m_nlsock = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); m_nlsock = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
if (m_nlsock < 0) { if (m_nlsock < 0) {
logger.warning() << "Failed to create netlink socket:" << strerror(errno); logger.warning() << "Failed to create netlink socket:" << strerror(errno);
@@ -63,7 +65,7 @@ LinuxRouteMonitor::LinuxRouteMonitor(const QString& ifname, QObject* parent)
struct sockaddr_nl nladdr; struct sockaddr_nl nladdr;
memset(&nladdr, 0, sizeof(nladdr)); memset(&nladdr, 0, sizeof(nladdr));
nladdr.nl_family = AF_NETLINK; nladdr.nl_family = AF_NETLINK;
nladdr.nl_pid = getpid(); nladdr.nl_pid = 0;
if (bind(m_nlsock, (struct sockaddr*)&nladdr, sizeof(nladdr)) != 0) { if (bind(m_nlsock, (struct sockaddr*)&nladdr, sizeof(nladdr)) != 0) {
logger.warning() << "Failed to bind netlink socket:" << strerror(errno); logger.warning() << "Failed to bind netlink socket:" << strerror(errno);
} }
@@ -164,14 +166,15 @@ bool LinuxRouteMonitor::rtmSendRoute(int action, int flags, int type,
} }
if (rtm->rtm_type == RTN_THROW) { if (rtm->rtm_type == RTN_THROW) {
QString gateway = NetworkUtilities::getGatewayAndIface().first; if (action == RTM_NEWROUTE) {
if (gateway.isEmpty()) { if (m_physicalGateway.isEmpty()) {
logger.warning() << "No default gateway available, skipping exclusion route"; logger.warning() << "No physical gateway available, skipping exclusion route";
return false; return false;
}
struct in_addr ip4;
inet_pton(AF_INET, m_physicalGateway.toUtf8(), &ip4);
nlmsg_append_attr(nlmsg, sizeof(buf), RTA_GATEWAY, &ip4, sizeof(ip4));
} }
struct in_addr ip4;
inet_pton(AF_INET, gateway.toUtf8(), &ip4);
nlmsg_append_attr(nlmsg, sizeof(buf), RTA_GATEWAY, &ip4, sizeof(ip4));
nlmsg_append_attr32(nlmsg, sizeof(buf), RTA_PRIORITY, 0); nlmsg_append_attr32(nlmsg, sizeof(buf), RTA_PRIORITY, 0);
rtm->rtm_type = RTN_UNICAST; rtm->rtm_type = RTN_UNICAST;
} }
client/platforms/linux/daemon/linuxroutemonitor.h
+1
View File
@@ -32,6 +32,7 @@ class LinuxRouteMonitor final : public QObject {
bool rtmSendRoute(int action, int flags, int type, bool rtmSendRoute(int action, int flags, int type,
const IPAddress& prefix); const IPAddress& prefix);
QString m_ifname; QString m_ifname;
QString m_physicalGateway;
unsigned int m_ifindex = 0; unsigned int m_ifindex = 0;
int m_nlsock = -1; int m_nlsock = -1;
int m_nlseq = 0; int m_nlseq = 0;