Skip to content

Commit c3bd431

Browse files
committed
gui: accomodate unix socket Proxy in updateDefaultProxyNets()
This will require a follow-up to add unix socket options to the GUI
1 parent a88bf9d commit c3bd431

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/qt/optionsdialog.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -454,20 +454,24 @@ void OptionsDialog::updateProxyValidationState()
454454

455455
void OptionsDialog::updateDefaultProxyNets()
456456
{
457-
const std::optional<CNetAddr> ui_proxy_netaddr{LookupHost(ui->proxyIp->text().toStdString(), /*fAllowLookup=*/false)};
458-
const CService ui_proxy{ui_proxy_netaddr.value_or(CNetAddr{}), ui->proxyPort->text().toUShort()};
457+
std::string proxyIpText{ui->proxyIp->text().toStdString()};
458+
if (!IsUnixSocketPath(proxyIpText)) {
459+
const std::optional<CNetAddr> ui_proxy_netaddr{LookupHost(proxyIpText, /*fAllowLookup=*/false)};
460+
const CService ui_proxy{ui_proxy_netaddr.value_or(CNetAddr{}), ui->proxyPort->text().toUShort()};
461+
proxyIpText = ui_proxy.ToStringAddrPort();
462+
}
459463

460464
Proxy proxy;
461465
bool has_proxy;
462466

463467
has_proxy = model->node().getProxy(NET_IPV4, proxy);
464-
ui->proxyReachIPv4->setChecked(has_proxy && proxy.proxy == ui_proxy);
468+
ui->proxyReachIPv4->setChecked(has_proxy && proxy.ToString() == proxyIpText);
465469

466470
has_proxy = model->node().getProxy(NET_IPV6, proxy);
467-
ui->proxyReachIPv6->setChecked(has_proxy && proxy.proxy == ui_proxy);
471+
ui->proxyReachIPv6->setChecked(has_proxy && proxy.ToString() == proxyIpText);
468472

469473
has_proxy = model->node().getProxy(NET_ONION, proxy);
470-
ui->proxyReachTor->setChecked(has_proxy && proxy.proxy == ui_proxy);
474+
ui->proxyReachTor->setChecked(has_proxy && proxy.ToString() == proxyIpText);
471475
}
472476

473477
ProxyAddressValidator::ProxyAddressValidator(QObject *parent) :

0 commit comments

Comments
 (0)