X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeerfactory.cpp;h=0dc0140d38b7eb054c892d072636822371e99068;hp=32ea16aff53b21ebbe8354bea75b478f8320f815;hb=db9bba48e1674f169d1ed3cf184e5fa56dbe3a80;hpb=6f82edb27a2ed2c77b36591e492d8aa2671344ef

diff --git a/src/common/peerfactory.cpp b/src/common/peerfactory.cpp
index 32ea16af..0dc0140d 100644
--- a/src/common/peerfactory.cpp
+++ b/src/common/peerfactory.cpp
@@ -20,12 +20,14 @@
 
 #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;
 }
@@ -45,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;
         }