diff --git a/src_main/io/pipeer.cpp b/src_main/io/pipeer.cpp index 751ac307..a1fee1b5 100755 --- a/src_main/io/pipeer.cpp +++ b/src_main/io/pipeer.cpp @@ -447,7 +447,7 @@ bool PIPeer::dataRead(uchar * readed, int size) { ba >> type; // PIMutexLocker locker(eth_mutex); eth_mutex.lock(); - piCout << "dataRead lock"; +// piCout << "dataRead lock"; if (type == 5) { // ping request PIString addr; PISystemTime time; @@ -717,7 +717,7 @@ bool PIPeer::sendToNeighbour(PIPeer::PeerInfo * peer, const PIByteArray & ba) { void PIPeer::sendMBcast(const PIByteArray & ba) { send_mc_mutex.lock(); - piCout << "sendMBcast" << ba.size() << "bytes ..."; +// piCout << "sendMBcast" << ba.size() << "bytes ..."; piForeach (PIEthernet * e, eths_mcast) { //errorClear(); //piCout << "send to" << e->path() << e->sendAddress();// << e->send(ba); @@ -749,7 +749,7 @@ void PIPeer::sendMBcast(const PIByteArray & ba) { if (eth_tcp_cli.send(ba)) diag_s.sended(ba.size_s()); } - piCout << "sendMBcast ok"; +// piCout << "sendMBcast ok"; send_mc_mutex.unlock(); } @@ -852,7 +852,7 @@ bool PIPeer::closeDevice() { void PIPeer::syncPeers() { //piCout << "[PIPeer \"" + self_info.name + "\"] sync " << peers.size_s() << " peers"; PIMutexLocker locker(eth_mutex); - piCout << "syncPeers lock"; +// piCout << "syncPeers lock"; PIString pn; bool change = false; PIStringList dpeers; @@ -908,7 +908,7 @@ void PIPeer::reinit() { // timer.clearDelimiters(); PIMutexLocker mbl(mc_mutex); PIMutexLocker ethl(eth_mutex); - piCout << "reinit lock"; +// piCout << "reinit lock"; PIMutexLocker pl(peers_mutex); PIMutexLocker sl(send_mutex); initNetwork(); diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index 13b2cc6a..44de3e03 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -623,8 +623,8 @@ void Daemon::peerConnected(const PIString & p_name) { // piCout << r->methodsEH() << this->methodsEH(); CONNECTU(r, sendRequest, this, sendRequest) CONNECTU(r, receiveFinished, this, filesReceived) - CONNECTU(r, receiveFinished, this, closeFileDialog) - CONNECTU(r, sendFinished, this, closeFileDialog) + //CONNECTU(r, receiveFinished, this, closeFileDialog) + CONNECTU(r, sendFinished, this, filesSended) CONNECTU(r, changeDirFinished, this, dirChanged) PIMutexLocker ml2(remote_mutex); remotes.insert(p_name, r); @@ -650,6 +650,8 @@ void Daemon::peerDisconnected(const PIString & p_name) { void Daemon::filesReceived(const PIString & p_name, bool ok) { + piCoutObj << "filesReceived"; + closeFileDialog(p_name, ok); PIMutexLocker ml(remote_mutex); Remote * r = remotes.value(p_name, 0); if (!r) return; @@ -657,6 +659,12 @@ void Daemon::filesReceived(const PIString & p_name, bool ok) { } +void Daemon::filesSended(const PIString & p_name, bool ok) { + piCoutObj << "filesSended"; + closeFileDialog(p_name, ok); +} + + void Daemon::dirChanged(const PIString & p_name, const PIString & dir) { if (p_name == self_name) { fm.clearSelectionLocal(); diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h index 9ba952f2..cba7a388 100644 --- a/utils/system_daemon/daemon.h +++ b/utils/system_daemon/daemon.h @@ -163,6 +163,7 @@ private: EVENT_HANDLER1(void, shKeyEvent, PIKbdListener::KeyEvent, k); EVENT_HANDLER2(void, timerEvent, void * , _d, int, delim); EVENT_HANDLER2(void, filesReceived, const PIString & , p_name, bool, ok); + EVENT_HANDLER2(void, filesSended, const PIString & , p_name, bool, ok); EVENT_HANDLER2(void, dirChanged, const PIString & , p_name, const PIString & , dir); EVENT_HANDLER2(void, closeFileDialog, const PIString & , p_name, bool, ok); EVENT_HANDLER2(void, localSend, const PIString & , p_name, const PIByteArray &, data);