Merge pull request elastic#337 from kjell-hedstrom/2.6.2.spikes.merge…

…_with_master 2.6.2.spikes.merge with master
harper-carroll · May 20, 2015 · 1cef1b3 · 1cef1b3
2 parents 1ed8738 + 0c6c155
commit 1cef1b3
Show file tree

Hide file tree

Showing 8 changed files with 5,466 additions and 5,314 deletions.
diff --git a/protofiles/DpiMsgLRproto.proto b/protofiles/DpiMsgLRproto.proto
diff --git a/resources/DpiMsgLRproto.protoheader b/resources/DpiMsgLRproto.protoheader
@@ -19,6 +19,14 @@ message DpiMsgLRproto
       MID_FLOW_DETECT = 5;
    }
 
+   message Void {
+   }
+
+   message EmailAttach {
+      optional string FileName = 1;
+      optional uint32 FileSize = 2;
+   }
+
    optional string Session = 1;
    optional uint64 SrcMAC = 2;
    optional uint64 DestMAC = 3;
@@ -67,5 +75,6 @@ message DpiMsgLRproto
    optional bool ConnectionEstablished = 46;
    optional uint32 MaxRepeatedFieldCount = 47;
    optional uint32 FieldCountIndexed = 48;
+   repeated EmailAttach emailAttachments = 49;
    // REMEMBER TO UPDATE resources/DpiMsgLRproto.protoheader as well
 
diff --git a/resources/NetMonFieldNames.csv b/resources/NetMonFieldNames.csv
diff --git a/resources/ProtocolDescriptions.csv b/resources/ProtocolDescriptions.csv
diff --git a/resources/ProtocolFilters b/resources/ProtocolFilters