Have the PeerFactory provide the list of supported protocols

... and make use of that in ClientAuthHandler, instead of hardcoding
the available protocols there.

diff --git a/src/client/clientauthhandler.cpp b/src/client/clientauthhandler.cpp
index 415a7dd..74bb295 100644 (file)
--- a/src/client/clientauthhandler.cpp
+++ b/src/client/clientauthhandler.cpp
@@ -180,7 +180,14 @@ void ClientAuthHandler::onSocketConnected()
         stream << magic;
 
         // here goes the list of protocols we support, in order of preference
-        stream << ((quint32)Protocol::LegacyProtocol | 0x80000000); // end list
+        PeerFactory::ProtoList protos = PeerFactory::supportedProtocols();
+        for (int i = 0; i < protos.count(); ++i) {
+            quint32 reply = protos[i].first;
+            reply |= protos[i].second<<8;
+            if (i == protos.count() - 1)
+                reply |= 0x80000000; // end list
+            stream << reply;
+        }
 
         socket()->flush(); // make sure the probing data is sent immediately
         return;

diff --git a/src/common/peerfactory.cpp b/src/common/peerfactory.cpp
index 9d55fcc..32ea16a 100644 (file)
--- a/src/common/peerfactory.cpp
+++ b/src/common/peerfactory.cpp
@@ -22,6 +22,15 @@
 
 #include "protocols/legacy/legacypeer.h"
 
+
+PeerFactory::ProtoList PeerFactory::supportedProtocols()
+{
+    ProtoList result;
+    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);

diff --git a/src/common/peerfactory.h b/src/common/peerfactory.h
index 9673711..79a0c35 100644 (file)
--- a/src/common/peerfactory.h
+++ b/src/common/peerfactory.h
@@ -39,6 +39,8 @@ public:
     typedef QPair<Protocol::Type, quint16> ProtoDescriptor;
     typedef QVector<ProtoDescriptor> ProtoList;
 
+    static ProtoList supportedProtocols();
+
     static RemotePeer *createPeer(const ProtoDescriptor &protocol, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);
     static RemotePeer *createPeer(const ProtoList &protocols, AuthHandler *authHandler, QTcpSocket *socket, QObject *parent = 0);