From c6f557b7259ee8c8b5d71706abd3ac9b6db0bff8 Mon Sep 17 00:00:00 2001 From: me_desk Date: Fri, 30 Jan 2015 20:10:57 +0000 Subject: renamed structs PICA_conninfo to PICA_c2n (client-to-node) and PICA_chaninfo to PICA_c2c (client-to-client) git-svn-id: svn://localhost/project_picapica/trunk@340 fb96df88-216d-11de-830c-f3023f12d8ac --- pica-client/nodethread.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pica-client/nodethread.cpp') diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp index 393c156..3850397 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, Accounts::AccountRecord &acc, PICA_c2n **pica_conn, QMutex *wm) : QThread(0) { node_addr = addr; -- cgit v1.2.1 From a3b23291f5c50b423faa4d3c3ae88889be02d6cb Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 13 Mar 2015 03:45:11 +0400 Subject: updated client library calls in pica-client and fixed password asking dialog behaviour, now invalid password error is detected and asked again, cancel button is handled --- pica-client/nodethread.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pica-client/nodethread.cpp') diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp index 3850397..579b84b 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_c2n **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_connection(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_connection(user_account, node_addr.address.toUtf8().constData(), node_addr.port, &ci); switch(ret) { -- cgit v1.2.1 From ec751f3f1260b72ade3a9fcb2dae5b55a6854fa9 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 11 Apr 2015 23:34:46 +0400 Subject: more consistent naming, renamed conn -> c2n, channel -> c2c in function names and enumerations --- pica-client/nodethread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pica-client/nodethread.cpp') 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) { -- cgit v1.2.1 From 55b17bd87fc0d695500574b188534014922cb2a4 Mon Sep 17 00:00:00 2001 From: Anton Date: Sat, 11 Apr 2015 23:54:35 +0400 Subject: renamed remaining PICA_close_connection() -> PICA_close_c2n() --- pica-client/nodethread.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pica-client/nodethread.cpp') diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp index 5969781..ee6504f 100644 --- a/pica-client/nodethread.cpp +++ b/pica-client/nodethread.cpp @@ -42,7 +42,7 @@ void NodeThread::run() finished_mutex.lock(); if (*finished_flag) { - PICA_close_connection(ci); + PICA_close_c2n(ci); exit = 1; } else @@ -106,7 +106,7 @@ void NodeThread::run() while (!exit); write_mutex->lock(); - PICA_close_connection(ci); + PICA_close_c2n(ci); *connection = NULL; write_mutex->unlock(); } -- cgit v1.2.1