X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fpeer.h;h=6b824cfd2a2c57f02d4c5f4ea4d9ffc4468d4879;hp=de9a4b64da1d65cac9cdd32dade7a65e500d8bec;hb=28cee4568aeb1ce3014d11234e40f19e7aeae5bd;hpb=9d54503555534a2c554f09a33df6afa33d6308ec

diff --git a/src/common/peer.h b/src/common/peer.h
index de9a4b64..6b824cfd 100644
--- a/src/common/peer.h
+++ b/src/common/peer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,6 +22,7 @@
 #define PEER_H
 
 #include <QAbstractSocket>
+#include <QDataStream>
 #include <QPointer>
 
 #include "authhandler.h"
@@ -33,13 +34,26 @@ class Peer : public QObject
     Q_OBJECT
 
 public:
-    Peer(AuthHandler *authHandler, QObject *parent = 0);
+    explicit Peer(AuthHandler *authHandler, QObject *parent = 0);
 
+    virtual Protocol::Type protocol() const = 0;
     virtual QString description() const = 0;
 
     virtual SignalProxy *signalProxy() const = 0;
     virtual void setSignalProxy(SignalProxy *proxy) = 0;
 
+    const QDateTime &connectedSince() const;
+    void setConnectedSince(const QDateTime &connectedSince);
+
+    const QString &buildDate() const;
+    void setBuildDate(const QString &buildDate);
+
+    const QString &clientVersion() const;
+    void setClientVersion(const QString &clientVersion);
+
+    int id() const;
+    void setId(int id);
+
     AuthHandler *authHandler() const;
 
     virtual bool isOpen() const = 0;
@@ -48,6 +62,9 @@ public:
 
     virtual int lag() const = 0;
 
+    virtual QString address() const = 0;
+    virtual quint16 port() const = 0;
+
 public slots:
     /* Handshake messages */
     virtual void dispatch(const Protocol::RegisterClient &) = 0;
@@ -80,8 +97,22 @@ protected:
 
 private:
     QPointer<AuthHandler> _authHandler;
+
+    QDateTime _connectedSince;
+
+    QString _buildDate;
+    QString _clientVersion;
+
+    int _id = -1;
 };
 
+// We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
+typedef Peer * PeerPtr;
+Q_DECLARE_METATYPE(PeerPtr)
+
+QDataStream &operator<<(QDataStream &out, PeerPtr ptr);
+QDataStream &operator>>(QDataStream &in, PeerPtr &ptr);
+
 
 // Template method needed in the header
 template<typename T> inline