From 414f328a8c1af89d61d0a025f6947b4f0974b74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Tue, 30 Aug 2016 17:17:00 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@243
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/io/piconnection.cpp      | 30 ++++++++++++++++--------------
 src/io/piserial.cpp          |  5 +++--
 utils/system_daemon/daemon.h |  1 -
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/io/piconnection.cpp b/src/io/piconnection.cpp
index bf8487d3..b65261a0 100755
--- a/src/io/piconnection.cpp
+++ b/src/io/piconnection.cpp
@@ -1172,22 +1172,24 @@ void PIConnection::unboundExtractor(PIPacketExtractor * pe) {
 
 void PIConnection::packetExtractorReceived(uchar * data, int size) {
 	PIString from(emitter() == 0 ? "" : emitter()->name());
+	PIIODevice * cd = (PIIODevice * )emitter();
+//	piCout << "packetExtractorReceived" << from << cd;
+	if (cd != 0) {
+		PIVector<PIPacketExtractor * > be(bounded_extractors.value(cd));
+		//piCout << be << (void*)data << size;
+		piForeach (PIPacketExtractor * i, be)
+			i->threadedRead(data, size);
+		PIVector<PIIODevice * > chd(channels_.value(cd));
+		piForeach (PIIODevice * d, chd) {
+			int ret = d->write(data, size);
+			PIDiagnostics * diag = diags_.value(d);
+			if (diag != 0) diag->sended(ret);
+		}
+		PIDiagnostics * diag = diags_.value(cd);
+		if (diag != 0) diag->received(size);
+	}
 	packetReceived(from, PIByteArray(data, size));
 	packetReceivedEvent(from, PIByteArray(data, size));
-	PIIODevice * cd = (PIIODevice * )emitter();
-	if (cd == 0) return;
-	PIVector<PIPacketExtractor * > be(bounded_extractors.value(cd));
-	//piCout << be << (void*)data << size;
-	piForeach (PIPacketExtractor * i, be)
-		i->threadedRead(data, size);
-	PIVector<PIIODevice * > chd(channels_.value(cd));
-	piForeach (PIIODevice * d, chd) {
-		int ret = d->write(data, size);
-		PIDiagnostics * diag = diags_.value(d);
-		if (diag != 0) diag->sended(ret);
-	}
-	PIDiagnostics * diag = diags_.value(cd);
-	if (diag != 0) diag->received(size);
 }
 
 
diff --git a/src/io/piserial.cpp b/src/io/piserial.cpp
index 64638ae0..172006c5 100755
--- a/src/io/piserial.cpp
+++ b/src/io/piserial.cpp
@@ -296,7 +296,8 @@ bool PISerial::closeDevice() {
 #ifdef WINDOWS
 		SetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
 		SetCommMask(PRIVATE->hCom, PRIVATE->mask);
-//		piCoutObj << "close" << CloseHandle(PRIVATE->hCom);
+//		piCoutObj << "close" <<
+		CloseHandle(PRIVATE->hCom);
 		PRIVATE->hCom = 0;
 #else
 		tcsetattr(fd, TCSANOW, &PRIVATE->sdesc);
@@ -618,7 +619,7 @@ int PISerial::read(void * read_to, int max_size) {
 
 
 int PISerial::write(const void * data, int max_size, bool wait) {
-	//piCoutObj << "send " << max_size << ": " << PIString((char*)data, max_size);
+//	piCoutObj << "send " << max_size;// << ": " << PIString((char*)data, max_size);
 	if (fd == -1 || !canWrite()) {
 		//piCoutObj << "Can`t write to uninitialized COM";
 		return -1;
diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h
index a31f94d5..308c60fa 100644
--- a/utils/system_daemon/daemon.h
+++ b/utils/system_daemon/daemon.h
@@ -156,7 +156,6 @@ private:
 	PITimer dtimer;
 	PIString conn_name;
 	PIMutex remote_mutex;
-	PIMap<int, PIString> dnames;
 	PIMap<PIString, Remote*> remotes;
 	PISystemMonitor sys_mon_other;
 	HostInfo info_my, info_other;