Merge branch 'direct_c2c_connections'

1 files changed, 6 insertions, 5 deletions

diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp
index 393c156..ee6504f 100644
--- a/pica-client/nodethread.cpp
+++ b/pica-client/nodethread.cpp
@@ -6,7 +6,7 @@
 
 QMutex NodeThread::finished_mutex;
 
-NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, Accounts::AccountRecord &acc, PICA_conninfo **pica_conn, QMutex *wm) :
+NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, PICA_acc *acc, PICA_c2n **pica_conn, QMutex *wm) :
     QThread(0)
 {
     node_addr = addr;
@@ -23,14 +23,15 @@ 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(),
                               user_account.pkey_file.toUtf8().constData(),
                               DHParam::GetDHParamFilename().toUtf8().constData(),
                               AskPassword::ask_password_cb,
-                              &ci);
+                              &ci);*/
+    ret = PICA_new_c2n(user_account, node_addr.address.toUtf8().constData(), node_addr.port, &ci);
 
     switch(ret)
     {
@@ -41,7 +42,7 @@ void NodeThread::run()
         finished_mutex.lock();
         if (*finished_flag)
         {
-            PICA_close_connection(ci);
+            PICA_close_c2n(ci);
             exit = 1;
         }
         else
@@ -105,7 +106,7 @@ void NodeThread::run()
     while (!exit);
 
     write_mutex->lock();
-    PICA_close_connection(ci);
+    PICA_close_c2n(ci);
     *connection = NULL;
     write_mutex->unlock();
 }