kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-24 04:32:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1122 from aryanA101a/main

Browse Source 
Fix to adapt libkiwix IPv6 related API changes
This commit is contained in:
Kelson 2024-06-01 15:00:13 +02:00 committed by GitHub
commit 324b1e0ab4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/localkiwixserver.cpp
View File

@ -41,7 +41,7 @@ LocalKiwixServer::LocalKiwixServer(QWidget *parent) :
QVector<QString> interfaces; QVector<QString> interfaces;
interfaces.reserve(interfacesMap.size() + 1); interfaces.reserve(interfacesMap.size() + 1);
for (const auto &interfacePair : interfacesMap) { for (const auto &interfacePair : interfacesMap) {
QString ip = QString::fromStdString(interfacePair.second); QString ip = QString::fromStdString(interfacePair.second.addr);
interfaces.push_back(ip); interfaces.push_back(ip);
} }
std::sort(interfaces.begin(), interfaces.end()); std::sort(interfaces.begin(), interfaces.end());
@ -88,7 +88,7 @@ void LocalKiwixServer::runOrStopServer()
settingsManager->setKiwixServerPort(m_port); settingsManager->setKiwixServerPort(m_port);
settingsManager->setKiwixServerIpAddress(m_ipAddress); settingsManager->setKiwixServerIpAddress(m_ipAddress);
mp_server->setAddress(m_ipAddress.toStdString()); mp_server->setAddress(m_ipAddress.toStdString());
m_ipAddress = (m_ipAddress != "0.0.0.0") ? m_ipAddress : QString::fromStdString(kiwix::getBestPublicIp()); m_ipAddress = (m_ipAddress != "0.0.0.0") ? m_ipAddress : QString::fromStdString(kiwix::getBestPublicIp(false));
ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port)); ui->IpAddress->setText("http://" + m_ipAddress + ":" + QString::number(m_port));
ui->IpAddress->setReadOnly(true); ui->IpAddress->setReadOnly(true);
if (!mp_server->start()) { if (!mp_server->start()) {