X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeerfactory.cpp;h=0dc0140d38b7eb054c892d072636822371e99068;hp=9d55fccdee950e161a37bb3c3867a65ab1f48260;hb=2e9855c688c827b2159fbb548bf816de360e3ae3;hpb=31414ddaa421b1f8091eab8149da74545f7c47ab

diff --git a/src/common/peerfactory.cpp b/src/common/peerfactory.cpp
index 9d55fccd..0dc0140d 100644
--- a/src/common/peerfactory.cpp
+++ b/src/common/peerfactory.cpp
@@ -20,8 +20,19 @@
 
 #include "peerfactory.h"
 
+#include "protocols/datastream/datastreampeer.h"
 #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;
+}
+
+
 RemotePeer *PeerFactory::createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent)
 {
     return createPeer(ProtoList() << protocol, authHandler, socket, parent);
@@ -36,6 +47,10 @@ RemotePeer *PeerFactory::createPeer(const ProtoList &protocols, AuthHandler *aut
         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;
         }