From dd97bbe87c8aaa3be91d23de12b38ebf3e69db75 Mon Sep 17 00:00:00 2001 From: Kjell Hedstrom Date: Thu, 19 Jun 2014 16:57:38 -0600 Subject: [PATCH 1/2] Added flag to dpi message to tell whether or not the header was written. This will only happen ONCE per message lifetime. --- protofiles/DpiMsgLRproto.proto | 1 + resources/DpiMsgLRproto.protoheader | 1 + 2 files changed, 2 insertions(+) diff --git a/protofiles/DpiMsgLRproto.proto b/protofiles/DpiMsgLRproto.proto index 995d64db2b281f..7d02bfb7f349a9 100644 --- a/protofiles/DpiMsgLRproto.proto +++ b/protofiles/DpiMsgLRproto.proto @@ -64,6 +64,7 @@ message DpiMsgLRproto repeated uint32 DestIP6 = 43; optional string RawData = 44; optional uint64 TimeEnd = 45; + optional bool HeaderWritten = 46; // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well repeated bytes framed_ipQ_PROTO_DIAMETER = 343; // QOSMOS:Q_PROTO_DIAMETER,Q_DIAMETER_FRAMED_IP diff --git a/resources/DpiMsgLRproto.protoheader b/resources/DpiMsgLRproto.protoheader index 85aa645d907b6f..32984f4d899ccf 100644 --- a/resources/DpiMsgLRproto.protoheader +++ b/resources/DpiMsgLRproto.protoheader @@ -64,5 +64,6 @@ message DpiMsgLRproto repeated uint32 DestIP6 = 43; optional string RawData = 44; optional uint64 TimeEnd = 45; + optional bool HeaderWritten = 46; // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well From b18d2d71e7d53737b071f878881868945bb35063 Mon Sep 17 00:00:00 2001 From: Kjell Hedstrom Date: Thu, 19 Jun 2014 23:49:51 -0600 Subject: [PATCH 2/2] Added queue size as configurable parameters for writer/feedback queues (disk packet capture) --- protofiles/BaseConfMsg.proto | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/protofiles/BaseConfMsg.proto b/protofiles/BaseConfMsg.proto index be5b2a958ddf5b..5076c987468128 100644 --- a/protofiles/BaseConfMsg.proto +++ b/protofiles/BaseConfMsg.proto @@ -45,8 +45,13 @@ message BaseConf { optional string flowReportInterval = 48; optional string esIndexerQueueSize = 49; optional string syslogQueue = 50; + optional string diskpacketwriterQueueSize = 51; + optional string diskpacketwriterFeedbackQueueSize = 52; - // REMEMBER to add any new parameters to the unit test at + + // REMEMBER to : + // 1. Add Default validation for ANY new parameter you add above + // 2. add any new parameters to the unit test at // Research/test/ConfBaseValidationTests.cpp : // ValidateAllFieldsSetInvalidOnXLowerBound // ValidateAllFieldsSetInvalidOnXUpperBound