SQLNA Updates

Find and display the ConnectionID in the CSV file.
Display the InstOpt value in the CSV file.

Author: Malcolm-Stewart

SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/.suo

@@ -110,8 +110,10 @@ public class ConversationData              //              - constructed in GetI
         public bool hasLowTLSVersion = false;       //   - set in ProcessTDS
         public string databaseName = null;          //   - set in ProcessTDS
         public string serverName = null;            //   - set in ProcessTDS
+        public string serverInstance = null;        //   - set in GetClientPreloginInfo
         public uint processID = 0;
         public uint threadID = 0;                   //   - set in GetClientPreloginInfo
+        public Guid connectionID = Guid.Empty;      //   - set in GetClientPreloginInfo
         // Login Error and Delay Stats
         public long synTime = 0;                    //
         public long ackSynTime = 0;                 //

SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide

@@ -3517,7 +3517,7 @@ private static void DisplayFooter()
 
         private static void OutputStats(NetworkTrace Trace)
         {
-            Program.logStat(@"SourceIP,SourcePort,DestIP,DestPort,IPVersion,Protocol,Syn,Fin,Reset,AckSynDelayms,Retransmit,ClientDup,ServerDup,KeepAlive,Integrated Login,NTLM,Login7,Encrypted,Mars,PacketVisualization,Pktmon,MaxPktmonDelay,PktmonDrop,PktmonDropReason,MaxPayloadSize,PayloadSizeLimit,Frames,Bytes,SentBytes,ReceivedBytes,Bytes/Sec,StartFile,EndFile,StartTime,EndTime,Duration,ClientTTL,ClientLowHops,ServerTTL,ServerLowHops,ServerName,ServerVersion,DatabaseName,ServerTDSVersion,ClientTDSVersion,ServerTLSVersion,ClientTLSVersion,RedirSrv,RedirPort,Error,ErrorState,ErrorMessage,");
+            Program.logStat(@"SourceIP,SourcePort,DestIP,DestPort,IPVersion,Protocol,Syn,Fin,Reset,AckSynDelayms,Retransmit,ClientDup,ServerDup,KeepAlive,Integrated Login,NTLM,Login7,Encrypted,Mars,PacketVisualization,Pktmon,MaxPktmonDelay,PktmonDrop,PktmonDropReason,MaxPayloadSize,PayloadSizeLimit,Frames,Bytes,SentBytes,ReceivedBytes,Bytes/Sec,StartFile,EndFile,StartTime,EndTime,Duration,ClientTTL,ClientLowHops,ServerTTL,ServerLowHops,ConnectionID,ServerName,InstOpt,ServerVersion,DatabaseName,ServerTDSVersion,ClientTDSVersion,ServerTLSVersion,ClientTLSVersion,RedirSrv,RedirPort,Error,ErrorState,ErrorMessage,");
 
             long traceFirstTick = 0;
             if (Trace.frames != null && Trace.frames.Count > 0)
@@ -3583,7 +3583,9 @@ private static void OutputStats(NetworkTrace Trace)
                                 (c.TTLCountOut == 0 ? "" : c.minTTLHopsOut.ToString()) + "," +
                                 (c.TTLCountIn == 0 ? "" : (c.TTLSumIn / c.TTLCountIn).ToString()) + "," +
                                 (c.TTLCountIn == 0 ? "" : c.minTTLHopsIn.ToString()) + "," +
+                                (c.connectionID == Guid.Empty ? "" : c.connectionID.ToString())  + "," +
                                 ServerName + "," +
+                                (c.serverInstance == null ? "" : c.serverInstance) + "," +
                                 ServerVersion + "," +
                                 ((c.databaseName == null) ? "" : c.databaseName) + "," +
                                 c.FriendlyTDSVersionServer + "," +

SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-shm

@@ -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.2085.0")]
-[assembly: AssemblyFileVersion("1.5.2085.0")]
+[assembly: AssemblyVersion("1.5.2093.0")]
+[assembly: AssemblyFileVersion("1.5.2093.0")]

SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/Server/sqlite3/storage.ide-wal

@@ -89,8 +89,9 @@ private static void GetClientPreloginInfo(byte[] tdsPayLoad, ConversationData co
                         case 1: // encyption options. 
                             if (tdsPayLoad[8 + offset] == 1) conv.isEncrypted = true;
                             break;
-                        case 2: // Client requested Instance
-                            clientInstance = utility.CleanString(utility.ReadAnsiString(tdsPayLoad, 8 + offset, length));
+                        case 2: // Client requested Instance - this is an ASCIIZ string - but fotunately, we are given the length of the token, which ends in a null (0x00) string terminator byte
+                            clientInstance = utility.CleanString(utility.ReadAnsiString(tdsPayLoad, 8 + offset, length));  // cleans trailing nulls
+                            conv.serverInstance = clientInstance; // the instance that the client is requesting
                             break;
                         case 3: //Client TID.
                             if (4 == length)
@@ -99,6 +100,14 @@ private static void GetClientPreloginInfo(byte[] tdsPayLoad, ConversationData co
                         case 4: // MARS options. 
                             if (tdsPayLoad[8 + offset] == 1) conv.isMARSEnabled = true;
                             break;
+                        case 5: // ConnectionID (16 byte GUID) and ActivityID (20 bytes) - ignoring ActivityID as we don't need it
+                            if (length == 36)
+                            {
+                                byte[] guidBytes = new byte[16];
+                                Array.Copy(tdsPayLoad, 8 + offset, guidBytes, 0, 16);
+                                conv.connectionID = new Guid(guidBytes);
+                            }
+                            break;
                         default:
                             break;
                     }