Skip to content

Support multiple comma-separated IPs per host in split tunneling #1807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ilyachase wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Support multiple comma-separated IPs per host in split tunneling #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac9a4fc
Do not break at first IP
ilyachase Aug 20, 2025
133484d
Support multiple comma-separated IPs per host
ilyachase Aug 21, 2025
1e59e51
Reduce nesting level in the new code
ilyachase Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions client/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,20 @@ QStringList Settings::getVpnIps(RouteMode mode) const
for (auto i = m.constBegin(); i != m.constEnd(); ++i) {
if (NetworkUtilities::checkIpSubnetFormat(i.key())) {
ips.append(i.key());
} else if (NetworkUtilities::checkIpSubnetFormat(i.value().toString())) {
ips.append(i.value().toString());
continue;
}

QString ipValue = i.value().toString();
if (ipValue.isEmpty()) {
continue;
}

QStringList splitIps = ipValue.split(',', Qt::SkipEmptyParts);
for (const QString &ip : splitIps) {
QString trimmedIp = ip.trimmed();
if (NetworkUtilities::checkIpSubnetFormat(trimmedIp)) {
ips.append(trimmedIp);
}
}
}
ips.removeDuplicates();
Expand Down
60 changes: 51 additions & 9 deletions client/ui/controllers/sitesController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,23 +37,43 @@ void SitesController::addSite(QString hostname)
const auto &processSite = [this](const QString &hostname, const QString &ip) {
m_sitesModel->addSite(hostname, ip);

if (!ip.isEmpty()) {
QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << ip));
} else if (NetworkUtilities::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
if (ip.isEmpty()) {
if (NetworkUtilities::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << hostname));
}
return;
}

QStringList ips = ip.split(',', Qt::SkipEmptyParts);
QStringList validIps;
for (const QString &singleIp : ips) {
QString trimmedIp = singleIp.trimmed();
if (NetworkUtilities::checkIpSubnetFormat(trimmedIp)) {
validIps.append(trimmedIp);
}
}

if (!validIps.isEmpty()) {
QMetaObject::invokeMethod(m_vpnConnection.get(), "addRoutes", Qt::QueuedConnection,
Q_ARG(QStringList, QStringList() << hostname));
Q_ARG(QStringList, validIps));
}
};

const auto &resolveCallback = [this, processSite](const QHostInfo &hostInfo) {
const QList<QHostAddress> &addresses = hostInfo.addresses();
QStringList resolvedIps;

for (const QHostAddress &addr : hostInfo.addresses()) {
if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
processSite(hostInfo.hostName(), addr.toString());
break;
resolvedIps.append(addr.toString());
}
}

if (!resolvedIps.isEmpty()) {
QString aggregatedIps = resolvedIps.join(',');
processSite(hostInfo.hostName(), aggregatedIps);
}
};

if (NetworkUtilities::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
Expand Down Expand Up @@ -120,10 +140,32 @@ void SitesController::importSites(const QString &fileName, bool replaceExisting)

if (ip.isEmpty()) {
ips.append(hostname);
sites.insert(hostname, ip);
} else {
ips.append(ip);
QStringList importedIps = ip.split(',', Qt::SkipEmptyParts);
QStringList validIps;
for (const QString &singleIp : importedIps) {
QString trimmedIp = singleIp.trimmed();
if (NetworkUtilities::checkIpSubnetFormat(trimmedIp)) {
validIps.append(trimmedIp);
ips.append(trimmedIp);
}
}

if (sites.contains(hostname)) {
QString existingIps = sites.value(hostname);
if (!existingIps.isEmpty()) {
QStringList existingIpList = existingIps.split(',', Qt::SkipEmptyParts);
existingIpList.append(validIps);
existingIpList.removeDuplicates();
sites.insert(hostname, existingIpList.join(','));
} else {
sites.insert(hostname, validIps.join(','));
}
} else {
sites.insert(hostname, validIps.join(','));
}
}
sites.insert(hostname, ip);
}

m_sitesModel->addSites(sites, replaceExisting);
Expand Down
19 changes: 14 additions & 5 deletions client/vpnconnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,28 @@ void VpnConnection::addSitesRoutes(const QString &gw, Settings::RouteMode mode)
for (const QString &site : sites) {
const auto &cbResolv = [this, site, gw, mode, ips](const QHostInfo &hostInfo) {
const QList<QHostAddress> &addresses = hostInfo.addresses();
QString ipv4Addr;
QStringList newIps;
QString existingIpsStr = m_settings->vpnSites(mode).value(site).toString();
QStringList existingIps = existingIpsStr.split(',', Qt::SkipEmptyParts);

for (const QHostAddress &addr : hostInfo.addresses()) {
if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
const QString &ip = addr.toString();
// qDebug() << "VpnConnection::addSitesRoutes updating site" << site << ip;
if (!ips.contains(ip)) {
if (!ips.contains(ip) && !existingIps.contains(ip)) {
IpcClient::Interface()->routeAddList(gw, QStringList() << ip);
m_settings->addVpnSite(mode, site, ip);
newIps.append(ip);
}
flushDns();
break;
}
}

if (!newIps.isEmpty()) {
existingIps.append(newIps);
existingIps.removeDuplicates();
QString aggregatedIps = existingIps.join(',');
m_settings->addVpnSite(mode, site, aggregatedIps);
}
flushDns();
};
QHostInfo::lookupHost(site, this, cbResolv);
}
Expand Down