StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Compat with Toxcore

Browse Source 
Fixes #190
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-08-17 14:57:54 +02:00
parent 020e77330c
commit 18f0e05778
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core.cpp
View File

@ -94,12 +94,21 @@ void Core::start()
qDebug() << "Core starting with IPv6 enabled"; qDebug() << "Core starting with IPv6 enabled";
else else
qWarning() << "Core starting with IPv6 disabled. LAN discovery may not work properly."; qWarning() << "Core starting with IPv6 disabled. LAN discovery may not work properly.";
tox = tox_new(enableIPv6);
Tox_Options toxOptions;
toxOptions.ipv6enabled = enableIPv6;
toxOptions.udp_disabled = 0;
toxOptions.proxy_enabled = false;
toxOptions.proxy_address[0] = 0;
toxOptions.proxy_port = 0;
tox = tox_new(&toxOptions);
if (tox == nullptr) if (tox == nullptr)
{ {
if (enableIPv6) // Fallback to IPv4 if (enableIPv6) // Fallback to IPv4
{ {
tox = tox_new(false); toxOptions.ipv6enabled = false;
tox = tox_new(&toxOptions);
if (tox == nullptr) if (tox == nullptr)
{ {
qCritical() << "Tox core failed to start"; qCritical() << "Tox core failed to start";
@ -711,7 +720,7 @@ void Core::bootstrapDht()
{ {
const Settings::DhtServer& dhtServer = dhtServerList[j % listSize]; const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(), if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
0, qToBigEndian(dhtServer.port), CUserId(dhtServer.userId).data()) == 1) qToBigEndian(dhtServer.port), CUserId(dhtServer.userId).data()) == 1)
qDebug() << QString("Core: Bootstraping from ")+dhtServer.name+QString(", addr ")+dhtServer.address.toLatin1().data() qDebug() << QString("Core: Bootstraping from ")+dhtServer.name+QString(", addr ")+dhtServer.address.toLatin1().data()
+QString(", port ")+QString().setNum(dhtServer.port); +QString(", port ")+QString().setNum(dhtServer.port);
else else