From 6ebe7e5ce6e6c8a661e419eab9234ba8c924a463 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: Mon, 20 Apr 2015 17:03:35 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@118
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 CMakeLists.txt            | 2 +-
 src/io/pibasetransfer.cpp | 9 +++++----
 src/io/piethernet.cpp     | 2 +-
 src/io/pipeer.cpp         | 4 ++++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb4d942d..d42367b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(pip)
 cmake_minimum_required(VERSION 2.6)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -pg")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 include(CheckFunctionExists)
diff --git a/src/io/pibasetransfer.cpp b/src/io/pibasetransfer.cpp
index 106e1097..b80e3e3c 100644
--- a/src/io/pibasetransfer.cpp
+++ b/src/io/pibasetransfer.cpp
@@ -14,6 +14,7 @@ PIBaseTransfer::PIBaseTransfer(): crc(standardCRC_16()), diag(false) {
 	timeout_ = 10.;
 	diag.setDisconnectTimeout(timeout_);
 	//CONNECTU(&diag, qualityChanged, this, diagChanged);
+	diag.start(100);
 	packets_count = 32;
 	setPacketSize(4096);
 	randomize();
@@ -150,7 +151,7 @@ void PIBaseTransfer::received(PIByteArray data) {
 				replies.resize(sr.packets + 1);
 				replies.fill(pt_Unknown);
 				diag.reset();
-				diag.start(100);
+//				diag.start(100);
 				//piCoutObj << "receiveStarted()";
 				is_receiving = true;
 				break_ = false;
@@ -188,7 +189,7 @@ bool PIBaseTransfer::send_process() {
 	packet_header_size = sizeof(PacketHeader) + customHeader().size();
 	break_ = false;
 	diag.reset();
-	diag.start(100);
+//	diag.start(100);
 	sendStarted();
 	is_sending = true;
 	replies.resize(session.size() + 1);
@@ -451,7 +452,7 @@ bool PIBaseTransfer::finish_send(bool ok) {
 	if (!ok) sendBreak(header.session_id);
 	else sendReply(pt_ReplySuccess);
 	sendFinished(ok);
-	diag.stop();
+//	diag.stop();
 	bytes_all = bytes_cur = 0;
 	return ok;
 }
@@ -464,7 +465,7 @@ void PIBaseTransfer::finish_receive(bool ok, bool quet) {
 	//piCoutObj << state_string << PIString::readableSize(bytes_all);
 	if (!ok && !quet) sendBreak(header.session_id);
 	receiveFinished(ok);
-	diag.stop();
+//	diag.stop();
 	bytes_all = bytes_cur = 0;
 }
 
diff --git a/src/io/piethernet.cpp b/src/io/piethernet.cpp
index c0dfd495..ae2801d8 100755
--- a/src/io/piethernet.cpp
+++ b/src/io/piethernet.cpp
@@ -74,7 +74,7 @@ PIString getSockAddr(sockaddr * s) {
 #endif
 
 
-REGISTER_DEVICE(PIEthernet);
+REGISTER_DEVICE(PIEthernet)
 
 
 PRIVATE_DEFINITION_START(PIEthernet)
diff --git a/src/io/pipeer.cpp b/src/io/pipeer.cpp
index 7942d857..d24bee9e 100755
--- a/src/io/pipeer.cpp
+++ b/src/io/pipeer.cpp
@@ -187,6 +187,7 @@ void PIPeer::timerEvent(void * data, int delim) {
 
 
 void PIPeer::initEths(PIStringList al) {
+	piCoutObj << "initEths start";
 	PIEthernet * ce;
 	const PIEthernet::Interface * cint = 0;
 	piForeachC (PIString & a, al) {
@@ -214,10 +215,12 @@ void PIPeer::initEths(PIStringList al) {
 	eth_send.setDebug(false);
 	eth_send.setName("__S__PIPeer_traffic_eth_send");
 	eth_send.setParameters(0);
+	piCoutObj << "initEths ok";
 }
 
 
 void PIPeer::initMBcasts(PIStringList al) {
+	piCoutObj << "initMBcasts start";
 	destroyMBcasts();
 	PIEthernet * ce;
 	const PIEthernet::Interface * cint;
@@ -270,6 +273,7 @@ void PIPeer::initMBcasts(PIStringList al) {
 	}
 	if (eths_mcast.isEmpty()) piCoutObj << "Warning! Can`t find suitable network interface for multicast receive, check for exists at least one interface with multicasting enabled!";
 	if (eths_bcast.isEmpty()) piCoutObj << "Warning! Can`t find suitable network interface for broadcast receive, check for exists at least one interface with broadcasting enabled!";
+	piCoutObj << "initMBcasts ok";
 }