squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-03 06:02:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Extract PeerAddress class into separate file

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez)
2019-07-22 19:50:42 +03:00
parent efae685c25
commit ad6a40d5f4
11 changed files with 115 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/properties/peersadditiondialog.cpp
View File

@@ -31,6 +31,7 @@
#include <QHostAddress>
#include <QMessageBox>
#include "base/bittorrent/peeraddress.h"
#include "base/global.h"
#include "ui_peersadditiondialog.h"
@@ -63,7 +64,7 @@ void PeersAdditionDialog::validateInput()
return;
}
for (const QString &peer : asConst(m_ui->textEditPeers->toPlainText().trimmed().split('\n'))) {
BitTorrent::PeerAddress addr = parsePeer(peer);
const BitTorrent::PeerAddress addr = BitTorrent::PeerAddress::parse(peer);
if (!addr.ip.isNull()) {
m_peersList.append(addr);
}
@@ -77,29 +78,3 @@ void PeersAdditionDialog::validateInput()
}
accept();
}
BitTorrent::PeerAddress PeersAdditionDialog::parsePeer(QString peer)
{
BitTorrent::PeerAddress addr;
QStringList ipPort;
if ((peer[0] == '[') && (peer.indexOf("]:") != -1)) // IPv6
ipPort = peer.remove(QChar('[')).split("]:");
else if (peer.indexOf(':') != -1) // IPv4
ipPort = peer.split(':');
else
return addr;
QHostAddress ip(ipPort[0]);
if (ip.isNull())
return addr;
bool ok;
int port = ipPort[1].toInt(&ok);
if (!ok || (port < 1) || (port > 65535))
return addr;
addr.ip = ip;
addr.port = port;
return addr;
}