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

Merge pull request #348 from dubslow/master

Browse Source 
tweak #340 dht connecting, remove dropped avatars from cache
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-09-30 15:42:10 +02:00
commit be46f82623
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core.cpp
View File

@ -220,12 +220,21 @@ void Core::start()
process(); // starts its own timer
}
/* Using the now commented out statements in checkConnection(), I watched how
* many ticks disconnects-after-initial-connect lasted. Out of roughly 15 trials,
* 5 disconnected; 4 were DCd for less than 20 ticks, while the 5th was ~50 ticks.
* So I set the tolerance here at 25, and initial DCs should be very rare now.
* This should be able to go to 50 or 100 without affecting legitimate disconnects'
* downtime, but lets be conservative for now.
*/
#define CORE_DISCONNECT_TOLERANCE 25
void Core::process()
{
if (!tox)
return;
static int retries = 0;
static int tolerance = CORE_DISCONNECT_TOLERANCE;
tox_do(tox);
#ifdef DEBUG
@ -234,10 +243,9 @@ void Core::process()
#endif
if (checkConnection())
retries = 0;
else if (retries < 2)
tolerance = CORE_DISCONNECT_TOLERANCE;
else if (!(--tolerance))
{
retries++;
bootstrapDht();
}
@ -247,17 +255,21 @@ void Core::process()
bool Core::checkConnection()
{
static bool isConnected = false;
//static int count = 0;
bool toxConnected = tox_isconnected(tox);
if (toxConnected && !isConnected) {
qDebug() << "Core: Connected to DHT";
emit connected();
isConnected = true;
//if (count) qDebug() << "Core: disconnect count:" << count;
//count = 0;
} else if (!toxConnected && isConnected) {
qDebug() << "Core: Disconnected to DHT";
emit disconnected();
isConnected = false;
}
//count++;
} //else if (!toxConnected) count++;
return isConnected;
}
@ -272,7 +284,7 @@ void Core::bootstrapDht()
qDebug() << "Core: Bootstraping to the DHT ...";
int i=0;
while (i < 2)
while (i < 4)
{
const Settings::DhtServer& dhtServer = dhtServerList[j % listSize];
if (tox_bootstrap_from_address(tox, dhtServer.address.toLatin1().data(),
@ -563,13 +575,23 @@ void Core::onAvatarInfoCallback(Tox*, int32_t friendnumber, uint8_t format,
Core* core = static_cast<Core*>(_core);
if (format == TOX_AVATAR_FORMAT_NONE)
{
qDebug() << "Core: Got null avatar info from" << core->getFriendUsername(friendnumber);
emit core->friendAvatarRemoved(friendnumber);
QFile::remove(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatars/"+core->getFriendAddress(friendnumber).left(64)+".png"));
QFile::remove(QDir(Settings::getInstance().getSettingsDirPath()).filePath("avatars/"+core->getFriendAddress(friendnumber).left(64)+".hash"));
}
else
{
QByteArray oldHash = Settings::getInstance().getAvatarHash(core->getFriendAddress(friendnumber));
if (QByteArray((char*)hash, TOX_HASH_LENGTH) != oldHash)
// comparison failed miserably if I didn't convert hash to QByteArray
{
qDebug() << "Core: Got new avatar info from" << core->getFriendUsername(friendnumber);
tox_request_avatar_data(core->tox, friendnumber);
}
else
qDebug() << "Core: Got same avatar info from" << core->getFriendUsername(friendnumber);
}
}
@ -580,6 +602,7 @@ void Core::onAvatarDataCallback(Tox*, int32_t friendnumber, uint8_t,
pic.loadFromData((uchar*)data, datalen);
if (!pic.isNull())
{
qDebug() << "Core: Got avatar data from" << static_cast<Core*>(core)->getFriendUsername(friendnumber);
Settings::getInstance().saveAvatar(pic, static_cast<Core*>(core)->getFriendAddress(friendnumber));
Settings::getInstance().saveAvatarHash(QByteArray((char*)hash, TOX_HASH_LENGTH), static_cast<Core*>(core)->getFriendAddress(friendnumber));
emit static_cast<Core*>(core)->friendAvatarChanged(friendnumber, pic);
@ -1283,6 +1306,13 @@ QString Core::getFriendAddress(int friendNumber) const
return id;
}
QString Core::getFriendUsername(int friendnumber) const
{
uint8_t name[TOX_MAX_NAME_LENGTH];
tox_get_name(tox, friendnumber, name);
return CString::toString(name, tox_get_name_size(tox, friendnumber));
}
QList<CString> Core::splitMessage(const QString &message)
{
QList<CString> splittedMsgs;

1
core.h
View File

@ -42,6 +42,7 @@ public:
QString getGroupPeerName(int groupId, int peerId) const;
QList<QString> getGroupPeerNames(int groupId) const;
QString getFriendAddress(int friendNumber) const;
QString getFriendUsername(int friendNumber) const;
int joinGroupchat(int32_t friendnumber, const uint8_t* friend_group_public_key,uint16_t length) const;
void quitGroupChat(int groupId) const;
void dispatchVideoFrame(vpx_image img) const;