summaryrefslogtreecommitdiff
path: root/src/appMain
diff options
context:
space:
mode:
authorElisey Zamakhov <EZamakhov@luxoft.com>2015-11-03 16:26:16 +0300
committerElisey Zamakhov <EZamakhov@luxoft.com>2015-11-06 21:26:05 +0300
commitdc7d430a5f40c9f2b0e42cf5e29dfe1d3d98c1a4 (patch)
tree80e8f47e137199ba35daa4f88ac9d753fcff74f1 /src/appMain
parent889599ab98c2ed4eac38a7832aabbf4a872e6005 (diff)
downloadsdl_core-dc7d430a5f40c9f2b0e42cf5e29dfe1d3d98c1a4.tar.gz
Implement Multiframe assembling by MessageID
Each Session resposible for assembling multiframes according to MessageID Implemented MultiframeBuilder support class Add MultiframeBuilder tests Integrated MultiframeBuilder usage in PHimpl with pop all expired frames on each handled frame on any session of any connection Added Configurable parameter in ConfigProfile for expirated time configuration Updated PASA and Genevi ini files Fixed crash on printing empty ProtocolFramePtr Added ProtocolFramePtrList, ConnectionID typedefs to protocol_packet.h Removed redundant ConnectionID usage in PHImpl Fixed memoty leak in ProtocolPacket Code style fixs in PHIMpl. IncomingDataHandler Issues:CRQ - APPLINK-17629, Defect fixed indirectly - APPLINK-17954
Diffstat (limited to 'src/appMain')
-rw-r--r--src/appMain/life_cycle.cc3
-rw-r--r--src/appMain/smartDeviceLink.ini2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/appMain/life_cycle.cc b/src/appMain/life_cycle.cc
index 09095caff6..4888843588 100644
--- a/src/appMain/life_cycle.cc
+++ b/src/appMain/life_cycle.cc
@@ -99,7 +99,8 @@ bool LifeCycle::StartComponents() {
profile::Profile::instance()->message_frequency_count(),
profile::Profile::instance()->malformed_message_filtering(),
profile::Profile::instance()->malformed_frequency_time(),
- profile::Profile::instance()->malformed_frequency_count());
+ profile::Profile::instance()->malformed_frequency_count(),
+ profile::Profile::instance()->multiframe_waiting_timeout());
DCHECK(protocol_handler_ != NULL);
connection_handler_ =
diff --git a/src/appMain/smartDeviceLink.ini b/src/appMain/smartDeviceLink.ini
index c237ad7175..12d465c801 100644
--- a/src/appMain/smartDeviceLink.ini
+++ b/src/appMain/smartDeviceLink.ini
@@ -201,6 +201,8 @@ MalformedMessageFiltering = true
; #MalformedFrequencyCount to Zero
MalformedFrequencyCount = 10
MalformedFrequencyTime = 1000
+; Timeout for waiting CONSECUTIVE frames of multiframe
+ExpectedConsecutiveFramesTimeout = 10000
[ApplicationManager]
; Application list update timeout ms