dan9i10/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-05-08 14:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: NM down/up reconnection problem

Browse Source
This commit is contained in:
NickVs2015
2026-04-13 21:08:43 +03:00
parent dcb097b0b2
commit 0edffc5f88
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
client/core/utils/networkUtilities.cpp
View File

@@ -286,7 +286,7 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
return { resGateway, QNetworkInterface::interfaceFromIndex(resIndex) }; return { resGateway, QNetworkInterface::interfaceFromIndex(resIndex) };
#endif #endif
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
constexpr int BUFFER_SIZE = 100; constexpr int BUFFER_SIZE = 8192;
int received_bytes = 0, msg_len = 0, route_attribute_len = 0; int received_bytes = 0, msg_len = 0, route_attribute_len = 0;
int sock = -1, msgseq = 0; int sock = -1, msgseq = 0;
struct nlmsghdr *nlh, *nlmsg; struct nlmsghdr *nlh, *nlmsg;
@@ -294,7 +294,7 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
// This struct contain route attributes (route type) // This struct contain route attributes (route type)
struct rtattr *route_attribute; struct rtattr *route_attribute;
char gateway_address[INET_ADDRSTRLEN], interface[IF_NAMESIZE]; char gateway_address[INET_ADDRSTRLEN], interface[IF_NAMESIZE];
char msgbuf[BUFFER_SIZE], buffer[BUFFER_SIZE]; char msgbuf[100], buffer[BUFFER_SIZE];
char *ptr = buffer; char *ptr = buffer;
struct timeval tv; struct timeval tv;
@@ -339,8 +339,8 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
nlh = (struct nlmsghdr *) ptr; nlh = (struct nlmsghdr *) ptr;
/* Check if the header is valid */ /* Check if the header is valid */
if((NLMSG_OK(nlmsg, received_bytes) == 0) || if((NLMSG_OK(nlh, received_bytes) == 0) ||
(nlmsg->nlmsg_type == NLMSG_ERROR)) (nlh->nlmsg_type == NLMSG_ERROR))
{ {
perror("Error in received packet"); perror("Error in received packet");
return {}; return {};
@@ -355,13 +355,15 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
} }
/* Break if its not a multi part message */ /* Break if its not a multi part message */
if ((nlmsg->nlmsg_flags & NLM_F_MULTI) == 0) if ((nlh->nlmsg_flags & NLM_F_MULTI) == 0)
break; break;
} }
while ((nlmsg->nlmsg_seq != msgseq) || (nlmsg->nlmsg_pid != getpid())); while ((nlh->nlmsg_seq != msgseq) || (nlh->nlmsg_pid != getpid()));
/* parse response */ /* parse response */
for ( ; NLMSG_OK(nlh, received_bytes); nlh = NLMSG_NEXT(nlh, received_bytes)) int remaining = msg_len + received_bytes;
nlh = (struct nlmsghdr *) buffer;
for ( ; NLMSG_OK(nlh, remaining); nlh = NLMSG_NEXT(nlh, remaining))
{ {
/* Get the route data */ /* Get the route data */
route_entry = (struct rtmsg *) NLMSG_DATA(nlh); route_entry = (struct rtmsg *) NLMSG_DATA(nlh);
@@ -370,6 +372,10 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
if (route_entry->rtm_table != RT_TABLE_MAIN) if (route_entry->rtm_table != RT_TABLE_MAIN)
continue; continue;
/* Reset per-route to avoid cross-route state pollution */
memset(gateway_address, 0, sizeof(gateway_address));
memset(interface, 0, sizeof(interface));
route_attribute = (struct rtattr *) RTM_RTA(route_entry); route_attribute = (struct rtattr *) RTM_RTA(route_entry);
route_attribute_len = RTM_PAYLOAD(nlh); route_attribute_len = RTM_PAYLOAD(nlh);
@@ -395,6 +401,8 @@ QPair<QString, QNetworkInterface> NetworkUtilities::getGatewayAndIface()
break; break;
} }
} }
if (!(*gateway_address) || !(*interface))
qDebug() << "getGatewayAndIface: no gateway found";
close(sock); close(sock);
return { gateway_address, QNetworkInterface::interfaceFromName(interface) }; return { gateway_address, QNetworkInterface::interfaceFromName(interface) };
#endif #endif

2
client/daemon/daemon.cpp
View File

@@ -613,7 +613,7 @@ void Daemon::checkHandshake() {
pendingHandshakes++; pendingHandshakes++;
} }
} }
// Check again if there were connections that haven't completed a handshake. // Check again if there were connections that haven't completed a handshake.
if (pendingHandshakes > 0) { if (pendingHandshakes > 0) {
m_handshakeTimer.start(HANDSHAKE_POLL_MSEC); m_handshakeTimer.start(HANDSHAKE_POLL_MSEC);