projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce the DataStreamProtocol
[quassel.git]
/
src
/
common
/
peerfactory.cpp
diff --git
a/src/common/peerfactory.cpp
b/src/common/peerfactory.cpp
index
32ea16a
..
0dc0140
100644
(file)
--- a/
src/common/peerfactory.cpp
+++ b/
src/common/peerfactory.cpp
@@
-20,12
+20,14
@@
#include "peerfactory.h"
#include "peerfactory.h"
+#include "protocols/datastream/datastreampeer.h"
#include "protocols/legacy/legacypeer.h"
PeerFactory::ProtoList PeerFactory::supportedProtocols()
{
ProtoList result;
#include "protocols/legacy/legacypeer.h"
PeerFactory::ProtoList PeerFactory::supportedProtocols()
{
ProtoList result;
+ result.append(ProtoDescriptor(Protocol::DataStreamProtocol, DataStreamPeer::supportedFeatures()));
result.append(ProtoDescriptor(Protocol::LegacyProtocol, 0));
return result;
}
result.append(ProtoDescriptor(Protocol::LegacyProtocol, 0));
return result;
}
@@
-45,6
+47,10
@@
RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *aut
switch(proto) {
case Protocol::LegacyProtocol:
return new LegacyPeer(authHandler, socket, parent);
switch(proto) {
case Protocol::LegacyProtocol:
return new LegacyPeer(authHandler, socket, parent);
+ case Protocol::DataStreamProtocol:
+ if (DataStreamPeer::acceptsFeatures(features))
+ return new DataStreamPeer(authHandler, socket, features, parent);
+ break;
default:
break;
}
default:
break;
}