Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Weixuan Xiao
kdeconnect-kde
Commits
13dcd018
Commit
13dcd018
authored
Sep 09, 2013
by
Albert Vaca Cintora
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added some comments and todos
parent
2625150b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
7 deletions
+13
-7
kded/backends/lan/CMakeLists.txt
kded/backends/lan/CMakeLists.txt
+1
-1
kded/backends/loopback/CMakeLists.txt
kded/backends/loopback/CMakeLists.txt
+1
-1
kded/backends/loopback/loopbackdevicelink.cpp
kded/backends/loopback/loopbackdevicelink.cpp
+1
-2
kded/networkpackage.cpp
kded/networkpackage.cpp
+10
-3
No files found.
kded/backends/lan/CMakeLists.txt
View file @
13dcd018
kded/backends/loopback/CMakeLists.txt
View file @
13dcd018
kded/backends/loopback/loopbackdevicelink.cpp
View file @
13dcd018
...
@@ -30,12 +30,11 @@ LoopbackDeviceLink::LoopbackDeviceLink(const QString& deviceId, LoopbackLinkProv
...
@@ -30,12 +30,11 @@ LoopbackDeviceLink::LoopbackDeviceLink(const QString& deviceId, LoopbackLinkProv
bool
LoopbackDeviceLink
::
sendPackage
(
const
NetworkPackage
&
input
)
bool
LoopbackDeviceLink
::
sendPackage
(
const
NetworkPackage
&
input
)
{
{
qDebug
()
<<
"loopbacksendpackage"
;
NetworkPackage
output
(
""
);
NetworkPackage
output
(
""
);
NetworkPackage
::
unserialize
(
input
.
serialize
(),
&
output
);
NetworkPackage
::
unserialize
(
input
.
serialize
(),
&
output
);
//LoopbackDeviceLink does not need deviceTransferInfo
if
(
input
.
hasPayload
())
{
if
(
input
.
hasPayload
())
{
//Loopback does not need payloadTransferInfo
QIODevice
*
device
=
input
.
payload
();
QIODevice
*
device
=
input
.
payload
();
device
->
open
(
QIODevice
::
ReadOnly
);
device
->
open
(
QIODevice
::
ReadOnly
);
output
.
setPayload
(
device
);
output
.
setPayload
(
device
);
...
...
kded/networkpackage.cpp
View file @
13dcd018
...
@@ -44,7 +44,6 @@ NetworkPackage::NetworkPackage(const QString& type)
...
@@ -44,7 +44,6 @@ NetworkPackage::NetworkPackage(const QString& type)
mPayload
=
0
;
mPayload
=
0
;
}
}
void
NetworkPackage
::
createIdentityPackage
(
NetworkPackage
*
np
)
void
NetworkPackage
::
createIdentityPackage
(
NetworkPackage
*
np
)
{
{
KSharedConfigPtr
config
=
KSharedConfig
::
openConfig
(
"kdeconnectrc"
);
KSharedConfigPtr
config
=
KSharedConfig
::
openConfig
(
"kdeconnectrc"
);
...
@@ -69,6 +68,7 @@ QByteArray NetworkPackage::serialize() const
...
@@ -69,6 +68,7 @@ QByteArray NetworkPackage::serialize() const
QVariantMap
variant
=
QJson
::
QObjectHelper
::
qobject2qvariant
(
this
);
QVariantMap
variant
=
QJson
::
QObjectHelper
::
qobject2qvariant
(
this
);
if
(
hasPayload
())
{
if
(
hasPayload
())
{
//qDebug() << "Serializing payloadTransferInfo";
variant
[
"payloadTransferInfo"
]
=
mPayloadTransferInfo
;
variant
[
"payloadTransferInfo"
]
=
mPayloadTransferInfo
;
}
}
...
@@ -103,6 +103,7 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
...
@@ -103,6 +103,7 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
QJson
::
QObjectHelper
::
qvariant2qobject
(
variant
,
np
);
QJson
::
QObjectHelper
::
qvariant2qobject
(
variant
,
np
);
if
(
variant
.
contains
(
"payloadTransferInfo"
))
{
if
(
variant
.
contains
(
"payloadTransferInfo"
))
{
//qDebug() << "Unserializing payloadTransferInfo";
np
->
mPayloadTransferInfo
=
variant
[
"payloadTransferInfo"
].
toMap
();
np
->
mPayloadTransferInfo
=
variant
[
"payloadTransferInfo"
].
toMap
();
}
}
...
@@ -110,9 +111,10 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
...
@@ -110,9 +111,10 @@ bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
}
}
void
NetworkPackage
::
encrypt
(
QCA
::
PublicKey
&
key
)
void
NetworkPackage
::
encrypt
(
QCA
::
PublicKey
&
key
)
{
{
//TODO: Implement payload encryption somehow (create an intermediate iodevice to encrypt the payload here?)
QByteArray
serialized
=
serialize
();
QByteArray
serialized
=
serialize
();
int
chunkSize
=
key
.
maximumEncryptSize
(
NetworkPackage
::
EncryptionAlgorithm
);
int
chunkSize
=
key
.
maximumEncryptSize
(
NetworkPackage
::
EncryptionAlgorithm
);
...
@@ -134,8 +136,9 @@ void NetworkPackage::encrypt (QCA::PublicKey& key)
...
@@ -134,8 +136,9 @@ void NetworkPackage::encrypt (QCA::PublicKey& key)
}
}
bool
NetworkPackage
::
decrypt
(
QCA
::
PrivateKey
&
key
,
NetworkPackage
*
out
)
const
bool
NetworkPackage
::
decrypt
(
QCA
::
PrivateKey
&
key
,
NetworkPackage
*
out
)
const
{
{
const
QStringList
&
chunks
=
mBody
[
"data"
].
toStringList
();
const
QStringList
&
chunks
=
mBody
[
"data"
].
toStringList
();
QByteArray
decryptedJson
;
QByteArray
decryptedJson
;
...
@@ -147,7 +150,11 @@ bool NetworkPackage::decrypt (QCA::PrivateKey& key, NetworkPackage* out) const
...
@@ -147,7 +150,11 @@ bool NetworkPackage::decrypt (QCA::PrivateKey& key, NetworkPackage* out) const
return
false
;
return
false
;
}
}
decryptedJson
.
append
(
decryptedChunk
.
toByteArray
());
decryptedJson
.
append
(
decryptedChunk
.
toByteArray
());
}
//TODO: Implement payload encryption somehow (create an intermediate iodevice to decrypt the payload here?)
if
(
hasPayload
())
{
out
->
setPayload
(
mPayload
);
}
}
return
unserialize
(
decryptedJson
,
out
);
return
unserialize
(
decryptedJson
,
out
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment