tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some bugs fixed and sockets keepalive enabled

Browse source
This commit is contained in:
Albert Vaca 2013-07-23 20:22:38 +02:00
parent 30b920b9a1
commit 8751345575
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/announcers/avahitcpannouncer.cpp
View file

@ -34,7 +34,7 @@ AvahiTcpAnnouncer::AvahiTcpAnnouncer()
service = new DNSSD::PublicService(QHostInfo::localHostName(), serviceType, port); service = new DNSSD::PublicService(QHostInfo::localHostName(), serviceType, port);
mServer = new QTcpServer(); mServer = new QTcpServer(this);
connect(mServer,SIGNAL(newConnection()),this, SLOT(newConnection())); connect(mServer,SIGNAL(newConnection()),this, SLOT(newConnection()));
mServer->listen(QHostAddress::Any, port); mServer->listen(QHostAddress::Any, port);
@ -45,6 +45,7 @@ void AvahiTcpAnnouncer::newConnection()
qDebug() << "AvahiTcpAnnouncer newConnection"; qDebug() << "AvahiTcpAnnouncer newConnection";
QTcpSocket* socket = mServer->nextPendingConnection(); QTcpSocket* socket = mServer->nextPendingConnection();
socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
connect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived())); connect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived()));

9
daemon/networkpackage.cpp
View file

@ -71,10 +71,6 @@ void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
np->setVersion(-1); np->setVersion(-1);
} }
if (np->version() > CURRENT_PACKAGE_VERSION) {
qDebug() << "Warning: package version " << np->version() << " greater than supported version " << CURRENT_PACKAGE_VERSION;
}
//QVariant -> Object //QVariant -> Object
//NetworkPackage np; //NetworkPackage np;
//QJSon json(a); //QJSon json(a);
@ -82,6 +78,11 @@ void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
//np.mType = json["type"]; //np.mType = json["type"];
//np.mBody = json["body"]; //np.mBody = json["body"];
QJson::QObjectHelper::qvariant2qobject(variant,np); QJson::QObjectHelper::qvariant2qobject(variant,np);
if (np->version() > CURRENT_PACKAGE_VERSION) {
qDebug() << "Warning: package version " << np->version() << " greater than supported version " << CURRENT_PACKAGE_VERSION;
}
} }
void NetworkPackage::createIdentityPackage(NetworkPackage* np) void NetworkPackage::createIdentityPackage(NetworkPackage* np)

3
daemon/packageinterfaces/clipboardpackageinterface.cpp
View file

@ -25,7 +25,6 @@
#include <QApplication> #include <QApplication>
ClipboardPackageInterface::ClipboardPackageInterface() { ClipboardPackageInterface::ClipboardPackageInterface() {
qDebug() << "ClipboardPackageInterface";
clipboard = QApplication::clipboard(); clipboard = QApplication::clipboard();
ignore_next_clipboard_change = false; ignore_next_clipboard_change = false;
connect(clipboard,SIGNAL(changed(QClipboard::Mode)),this,SLOT(clipboardChanged())); connect(clipboard,SIGNAL(changed(QClipboard::Mode)),this,SLOT(clipboardChanged()));
@ -37,7 +36,7 @@ void ClipboardPackageInterface::clipboardChanged()
ignore_next_clipboard_change = false; ignore_next_clipboard_change = false;
return; return;
} }
qDebug() << "ClipboardChanged"; //qDebug() << "ClipboardChanged";
NetworkPackage np(PACKAGE_TYPE_CLIPBOARD); NetworkPackage np(PACKAGE_TYPE_CLIPBOARD);
np.set("content",clipboard->text()); np.set("content",clipboard->text());
emit sendPackage(np); emit sendPackage(np);