diff --git a/SQL_Network_Analyzer/SQLNA/ConversationData.cs b/SQL_Network_Analyzer/SQLNA/ConversationData.cs index ee5486d..53a28e7 100644 --- a/SQL_Network_Analyzer/SQLNA/ConversationData.cs +++ b/SQL_Network_Analyzer/SQLNA/ConversationData.cs @@ -116,9 +116,9 @@ public class ConversationData // - constructed in GetI public string serverInstance = null; // - set in GetClientPreloginInfo public uint processID = 0; public uint threadID = 0; // - set in GetClientPreloginInfo - public Guid connectionPeerID = Guid.Empty; // - set in GetClientPreloginInfo - public Guid peeractivityid = Guid.Empty; - public long peeractivityseq = 0; // ActivitySequence + public Guid connectionID = Guid.Empty; // - set in GetClientPreloginInfo + public Guid activityID = Guid.Empty; // - set in GetClientPreloginInfo + public long activitySequence = 0; // - set in GetClientPreloginInfo public uint preloginFrameNumber = 0; // Login Error and Delay Stats diff --git a/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs b/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs index c388f5c..4af8ee4 100644 --- a/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs +++ b/SQL_Network_Analyzer/SQLNA/ETLFileReader.cs @@ -188,7 +188,7 @@ private void TraceEvent_EventCallback(TraceEventInterop.EVENT_RECORD* rawData) } else { - f.ticks = m_sessionStartTime.Ticks + ((long)(((rawData->EventHeader).TimeStamp - FirstTimeStamp) * (double)(100000000 / m_QPCFreq))); + f.ticks = m_sessionStartTime.Ticks + ((long)(((rawData->EventHeader).TimeStamp - FirstTimeStamp) * ((double)10000000.0 / m_QPCFreq))); // 10-million (seven 0's) } userData = new byte[rawData->UserDataLength - arrayOffset]; var x = ((byte*)rawData->UserData); diff --git a/SQL_Network_Analyzer/SQLNA/OutputText.cs b/SQL_Network_Analyzer/SQLNA/OutputText.cs index 3ea970d..337e088 100644 --- a/SQL_Network_Analyzer/SQLNA/OutputText.cs +++ b/SQL_Network_Analyzer/SQLNA/OutputText.cs @@ -3776,9 +3776,9 @@ private static void OutputStats(NetworkTrace Trace) (c.TTLCountIn == 0 ? "" : (c.TTLSumIn / c.TTLCountIn).ToString()) + "," + (c.TTLCountIn == 0 ? "" : c.minTTLHopsIn.ToString()) + "," + (c.preloginFrameNumber) + "," + - (c.connectionPeerID == Guid.Empty ? "" : c.connectionPeerID.ToString().ToUpper()) + "," + - (c.peeractivityid == Guid.Empty ? "" : c.peeractivityid.ToString().ToUpper()) + "," + - c.peeractivityseq + "," + + (c.connectionID == Guid.Empty ? "" : c.connectionID.ToString().ToUpper()) + "," + + (c.activityID == Guid.Empty ? "" : c.activityID.ToString().ToUpper()) + "," + + c.activitySequence + "," + ServerName + "," + (c.serverInstance == null ? "" : c.serverInstance) + "," + ServerVersion + "," + diff --git a/SQL_Network_Analyzer/SQLNA/Parser.cs b/SQL_Network_Analyzer/SQLNA/Parser.cs index 88ed805..57b9e9c 100644 --- a/SQL_Network_Analyzer/SQLNA/Parser.cs +++ b/SQL_Network_Analyzer/SQLNA/Parser.cs @@ -389,6 +389,8 @@ public static void ParseNextProtocol(uint ProtocolNumber, byte[] b, int offset, { switch (ProtocolNumber) { + case 0x0001: // ICMP - ignore and do not log + break; case 0x0006: // TCP ParseTCPFrame(b, offset, t, f); break; @@ -402,6 +404,7 @@ public static void ParseNextProtocol(uint ProtocolNumber, byte[] b, int offset, ParseIPV4Frame(b, offset, t, f); break; case 0x0806: // ARP - ignore and do not log + case 0x8035: // RARP - ignore and do not log - Reverse ARP break; case 0x8100: // 802.1Q Parse8021QFrame(b, offset, t, f); diff --git a/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs b/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs index d2d7c7e..044748d 100644 --- a/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs +++ b/SQL_Network_Analyzer/SQLNA/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.2129.0")] -[assembly: AssemblyFileVersion("1.5.2129.0")] +[assembly: AssemblyVersion("1.5.2143.0")] +[assembly: AssemblyFileVersion("1.5.2143.0")] diff --git a/SQL_Network_Analyzer/SQLNA/TDSParser.cs b/SQL_Network_Analyzer/SQLNA/TDSParser.cs index e5073c4..1bfef86 100644 --- a/SQL_Network_Analyzer/SQLNA/TDSParser.cs +++ b/SQL_Network_Analyzer/SQLNA/TDSParser.cs @@ -108,14 +108,13 @@ private static void GetClientPreloginInfo(byte[] tdsPayLoad, ConversationData co { byte[] guidBytes = new byte[16]; Array.Copy(tdsPayLoad, 8 + offset, guidBytes, 0, 16); - conv.connectionPeerID = new Guid(guidBytes); + conv.connectionID = new Guid(guidBytes); Array.Copy(tdsPayLoad, (8 + offset + 16), guidBytes, 0, 16); - conv.peeractivityid = new Guid(guidBytes); + conv.activityID = new Guid(guidBytes); //peer_activity_seq - conv.peeractivityseq = utility.ReadUInt32(tdsPayLoad, (8 + offset + 32)); - + conv.activitySequence = utility.ReadUInt32(tdsPayLoad, (8 + offset + 32)); } break; default: