Merge pull request #74 from microsoft/20240820_EthernetParsingIssue

PCAPNG parser fix

Author: Malcolm-Stewart

SQL_Network_Analyzer/.vs/SQLNetworkAnalyzer/v15/.suo

@@ -2086,7 +2086,7 @@ private static void DisplayLoginErrors(NetworkTrace Trace)
 
             foreach (SQLServer s in Trace.sqlServers)
             {
-                if (s.hasLoginFailures)
+                if (s.hasLoginFailures || s.hasSynFailure)
                 {
                     hasError = true;
                     List<FailedConnectionData> TimeoutRecords = new List<FailedConnectionData>();
@@ -2103,7 +2103,7 @@ private static void DisplayLoginErrors(NetworkTrace Trace)
 
                     foreach (ConversationData c in s.conversations)
                     {
-                        if (c.hasLoginFailure)
+                        if (c.hasLoginFailure || c.hasSynFailure)
                         {
                             FailedConnectionData td = new FailedConnectionData();
 

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

@@ -181,7 +181,8 @@ void readInterfaceBlock()
             {
                 OptType = read2Bytes();
                 OptLen = read2Bytes();
-                padding = OptLen % 4;
+                // padding = OptLen % 4;
+                padding = (OptLen % 4) == 0 ? 0: 4 - (OptLen % 4);
 
                 while (OptType != 0)
                 {
@@ -205,9 +206,12 @@ void readInterfaceBlock()
                             }
                     }
 
+                    if (r.BaseStream.Position >= nextBlockStart - 4) break;  // potentially no OptType 0 at end of options, though this is not supposed to happen, the spec seems to allow it
+
                     OptType = read2Bytes();
                     OptLen = read2Bytes();
-                    padding = OptLen % 4;
+                    // padding = OptLen % 4;
+                    padding = (OptLen % 4) == 0 ? 0 : 4 - (OptLen % 4);
                 }
             }
 

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

@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft: CSS SQL Networking Team")]
 [assembly: AssemblyProduct("SQLNA.EXE")]
-[assembly: AssemblyCopyright("Copyright ©  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023")]
+[assembly: AssemblyCopyright("Copyright ©  2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.2185.0")]
-[assembly: AssemblyFileVersion("1.5.2185.0")]
+[assembly: AssemblyVersion("1.5.2194.0")]
+[assembly: AssemblyFileVersion("1.5.2194.0")]