updated pica-client to make it handle new id format. quint32 type for id is replaced with QByteArray in most places. Implemented verification callbacks in client and node that allow self-signed certificates

git-svn-id: svn://localhost/project_picapica/trunk@266 fb96df88-216d-11de-830c-f3023f12d8ac

1 files changed, 23 insertions, 23 deletions

diff --git a/pica-client/skynet.h b/pica-client/skynet.h
index 4612e35..b9029a1 100644
--- a/pica-client/skynet.h
+++ b/pica-client/skynet.h
@@ -19,17 +19,17 @@ public:
     QString& Status();
     void Exit();
 
-    void SendMessage(quint32 to, QString msg);
+    void SendMessage(QByteArray to, QString msg);
     Accounts::AccountRecord CurrentAccount() {return skynet_account;};
 
 signals:
-    void MessageReceived(quint32 from, QString msg);
-    void UnableToDeliver(quint32 to, QString msg);
-    void Delivered(quint32 to);
+    void MessageReceived(QByteArray from, QString msg);
+    void UnableToDeliver(QByteArray to, QString msg);
+    void Delivered(QByteArray to);
     void BecameSelfAware();
     void LostSelfAwareness();
-    void PeerCertificateReceived(quint32 peer_id, QString cert_pem, bool *verified);
-    void CertificateForged(quint32 peer_id, QString received_cert, QString stored_cert);
+    void PeerCertificateReceived(QByteArray peer_id, QString cert_pem, bool *verified);
+    void CertificateForged(QByteArray peer_id, QString received_cert, QString stored_cert);
     void ErrMsgFromNode(QString msg);
 
 private:
@@ -40,44 +40,44 @@ private:
     struct PICA_conninfo *nodelink;
     Accounts::AccountRecord skynet_account;
     QMutex write_mutex;
-    QMap<quint32, QList<QString> > msgqueues;
+    QMap<QByteArray, QList<QString> > msgqueues;
     int timer_id;
 
     void timerEvent(QTimerEvent * e);
 
-    void flush_msgqueue(quint32 to);
-    struct PICA_chaninfo *find_active_chan(quint32 peer_id);
-    QList<quint32> filter_existing_chans(QList<quint32> peer_ids);
+    void flush_msgqueue(QByteArray to);
+    struct PICA_chaninfo *find_active_chan(QByteArray peer_id);
+    QList<QByteArray> filter_existing_chans(QList<QByteArray> peer_ids);
 
-    void emit_MessageReceived(quint32 from, QString msg);
-    void emit_UnableToDeliver(quint32 to, QString msg);
-    void emit_Delivered(quint32 to);
-    void emit_PeerCertificateReceived(quint32 peer_id, QString cert_pem, bool *verified);
+    void emit_MessageReceived(QByteArray from, QString msg);
+    void emit_UnableToDeliver(QByteArray to, QString msg);
+    void emit_Delivered(QByteArray to);
+    void emit_PeerCertificateReceived(QByteArray peer_id, QString cert_pem, bool *verified);
 
     //получение сообщения.
-    static void newmsg_cb(unsigned int peer_id,char* msgbuf,unsigned int nb,int type);
+    static void newmsg_cb(const unsigned char *peer_id,char* msgbuf,unsigned int nb,int type);
     //получение подтверждения о доставке сообщения
-    static void msgok_cb(unsigned int peer_id);
+    static void msgok_cb(const unsigned char *peer_id);
     //создание канала с собеседником
-    static void channel_established_cb(unsigned int peer_id);
+    static void channel_established_cb(const unsigned char *peer_id);
     //создать канал не удалось
-    static void channel_failed(unsigned int peer_id);
+    static void channel_failed(const unsigned char *peer_id);
     //входящий запрос на создание канала от пользователя с номером caller_id
-    static int accept_cb(unsigned int caller_id);
+    static int accept_cb(const unsigned char *caller_id);
     //запрошенный пользователь не найден, в оффлайне или отказался от общения
-    static void notfound_cb(unsigned int callee_id);
+    static void notfound_cb(const unsigned char *callee_id);
 
-    static void channel_closed_cb(unsigned int peer_id, int reason);
+    static void channel_closed_cb(const unsigned char *peer_id, int reason);
 
     static void nodelist_cb(int type, void *addr_bin, const char *addr_str, unsigned int port);
 
-    static int peer_cert_verify_cb(unsigned int peer_id, const char *cert_pem, unsigned int nb);
+    static int peer_cert_verify_cb(const unsigned char *peer_id, const char *cert_pem, unsigned int nb);
 
 private slots:
     void nodethread_finished();
     void nodethread_connected(QString addr, quint16 port, NodeThread *thread);
     void node_status_changed(QString addr,quint16 port,bool alive);
-    void verify_peer_cert(quint32 peer_id, QString cert_pem, bool *verified);
+    void verify_peer_cert(QByteArray peer_id, QString cert_pem, bool *verified);
 
 };