more consistent naming, renamed conn -> c2n, channel -> c2c in function names and enumerations

3 files changed, 25 insertions, 25 deletions

diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp
index 579b84b..5969781 100644
--- a/pica-client/nodethread.cpp
+++ b/pica-client/nodethread.cpp
@@ -23,7 +23,7 @@ void NodeThread::run()
     int ret;
     exit = 0;
 
-    /*ret = PICA_new_connection(node_addr.address.toUtf8().constData(),
+    /*ret = PICA_new_c2n(node_addr.address.toUtf8().constData(),
                               node_addr.port,
                               user_account.CA_file.toUtf8().constData(),
                               user_account.cert_file.toUtf8().constData(),
@@ -31,7 +31,7 @@ void NodeThread::run()
                               DHParam::GetDHParamFilename().toUtf8().constData(),
                               AskPassword::ask_password_cb,
                               &ci);*/
-    ret = PICA_new_connection(user_account, node_addr.address.toUtf8().constData(), node_addr.port, &ci);
+    ret = PICA_new_c2n(user_account, node_addr.address.toUtf8().constData(), node_addr.port, &ci);
 
     switch(ret)
     {
diff --git a/pica-client/skynet.cpp b/pica-client/skynet.cpp
index 9d66377..55a4120 100644
--- a/pica-client/skynet.cpp
+++ b/pica-client/skynet.cpp
@@ -19,11 +19,11 @@ SkyNet::SkyNet()
 PICA_client_callbacks cbs = {
                             newmsg_cb,
                             msgok_cb,
-                            channel_established_cb,
-                            channel_failed,
+                            c2c_established_cb,
+                            c2c_failed,
                             accept_cb,
                             notfound_cb,
-                            channel_closed_cb,
+                            c2c_closed_cb,
                             nodelist_cb,
                             peer_cert_verify_cb,
                             accept_file_cb,
@@ -94,9 +94,9 @@ void SkyNet::nodethread_connected(QString addr, quint16 port, NodeThread *thread
         write_mutex.lock();
         struct PICA_c2c *chan = NULL;
 
-        ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), NULL, &chan);
+        ret = PICA_new_c2c(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), NULL, &chan);
 
-        qDebug()<<"restoring channel to "<<c2c_peer_ids[i]<<" ret ="<<ret<<"\n";
+        qDebug()<<"restoring c2c to "<<c2c_peer_ids[i]<<" ret ="<<ret<<"\n";
         write_mutex.unlock();
     }
 
@@ -186,9 +186,9 @@ void SkyNet::timerEvent(QTimerEvent *e)
 
                 struct PICA_c2c *chan = NULL;
 
-                ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), NULL, &chan);
+                ret = PICA_new_c2c(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), NULL, &chan);
 
-                qDebug()<<"restoring channel to "<<c2c_peer_ids[i]<<" ret ="<<ret<<" in timer event\n";
+                qDebug()<<"restoring c2c to "<<c2c_peer_ids[i]<<" ret ="<<ret<<" in timer event\n";
 
             }
             write_mutex.unlock();
@@ -299,7 +299,7 @@ if ( (iptr = find_active_chan(to)) )
     {
        struct PICA_c2c *chan = NULL;
 
-       ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), NULL, &chan);
+       ret = PICA_new_c2c(nodelink, (const unsigned char*)to.constData(), NULL, &chan);
 
        QList<QString> l;
        l.append(filepath);
@@ -435,7 +435,7 @@ if ( (iptr = find_active_chan(to)) )
     {
         struct PICA_c2c *chan = NULL;
 
-        ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), NULL, &chan);
+        ret = PICA_new_c2c(nodelink, (const unsigned char*)to.constData(), NULL, &chan);
 
         QList<QString> l;
         l.append(msg);
@@ -509,7 +509,7 @@ struct PICA_c2c *iptr = nodelink->chan_list_head;
 
 while(iptr)
     {
-    if (iptr->state == PICA_CHANSTATE_ACTIVE && QByteArray((const char*)iptr->peer_id, PICA_ID_SIZE) == peer_id)
+    if (iptr->state == PICA_C2C_STATE_ACTIVE && QByteArray((const char*)iptr->peer_id, PICA_ID_SIZE) == peer_id)
         break;
 
         iptr = iptr->next;
@@ -628,9 +628,9 @@ void SkyNet::emit_IncomingFileFinished(QByteArray peer_id)
     emit IncomingFileFinished(peer_id);
 }
 
-void SkyNet::emit_ChannelClosed(QByteArray peer_id)
+void SkyNet::emit_c2cClosed(QByteArray peer_id)
 {
-    emit ChannelClosed(peer_id);
+    emit c2cClosed(peer_id);
 }
 
 
@@ -651,14 +651,14 @@ void SkyNet::msgok_cb(const unsigned char *peer_id)
 skynet->emit_Delivered(QByteArray((const char*)peer_id, PICA_ID_SIZE));
 }
 
-void SkyNet::channel_established_cb(const unsigned char *peer_id)
+void SkyNet::c2c_established_cb(const unsigned char *peer_id)
 {
 skynet->flush_queues(QByteArray((const char*)peer_id, PICA_ID_SIZE));
 }
 
-void SkyNet::channel_failed(const unsigned char *peer_id)
+void SkyNet::c2c_failed(const unsigned char *peer_id)
 {
-    qDebug()<<"channel failed ("<<QByteArray((const char*)peer_id, PICA_ID_SIZE).toBase64()<<")\n";
+    qDebug()<<"c2c failed ("<<QByteArray((const char*)peer_id, PICA_ID_SIZE).toBase64()<<")\n";
 }
 
 int SkyNet::accept_cb(const unsigned char *caller_id)
@@ -683,12 +683,12 @@ void SkyNet::notfound_cb(const unsigned char *callee_id)
   */
 }
 
-void SkyNet::channel_closed_cb(const unsigned char *peer_id, int reason)
+void SkyNet::c2c_closed_cb(const unsigned char *peer_id, int reason)
 {
-    qDebug()<<"channel closed ("<<QByteArray((const char*)peer_id, PICA_ID_SIZE).toBase64()
+    qDebug()<<"c2c closed ("<<QByteArray((const char*)peer_id, PICA_ID_SIZE).toBase64()
             <<", error_code =" << reason << ")\n";
 
-    skynet->emit_ChannelClosed(QByteArray((const char*)peer_id, PICA_ID_SIZE));
+    skynet->emit_c2cClosed(QByteArray((const char*)peer_id, PICA_ID_SIZE));
 }
 
 void SkyNet::nodelist_cb(int type, void *addr_bin, const char *addr_str, unsigned int port)
diff --git a/pica-client/skynet.h b/pica-client/skynet.h
index 4df41db..0b2c84b 100644
--- a/pica-client/skynet.h
+++ b/pica-client/skynet.h
@@ -55,7 +55,7 @@ signals:
     void OutgoingFileFinished(QByteArray peer_id);
     void IncomingFileFinished(QByteArray peer_id);
 
-    void ChannelClosed(QByteArray peer_id);
+    void c2cClosed(QByteArray peer_id);
 
 private:
     Nodes nodes;
@@ -98,22 +98,22 @@ private:
     void emit_OutgoingFileFinished(QByteArray peer_id);
     void emit_IncomingFileFinished(QByteArray peer_id);
 
-    void emit_ChannelClosed(QByteArray peer_id);
+    void emit_c2cClosed(QByteArray peer_id);
 
     //получение сообщения.
     static void newmsg_cb(const unsigned char *peer_id,const char* msgbuf,unsigned int nb,int type);
     //получение подтверждения о доставке сообщения
     static void msgok_cb(const unsigned char *peer_id);
     //создание канала с собеседником
-    static void channel_established_cb(const unsigned char *peer_id);
+    static void c2c_established_cb(const unsigned char *peer_id);
     //создать канал не удалось
-    static void channel_failed(const unsigned char *peer_id);
+    static void c2c_failed(const unsigned char *peer_id);
     //входящий запрос на создание канала от пользователя с номером caller_id
     static int accept_cb(const unsigned char *caller_id);
     //запрошенный пользователь не найден, в оффлайне или отказался от общения
     static void notfound_cb(const unsigned char *callee_id);
 
-    static void channel_closed_cb(const unsigned char *peer_id, int reason);
+    static void c2c_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);