Incremented version # to 2.1.1

ravahn · ravahn · commit e382b6b6f9b1 · 2018-12-26T14:37:33.000-05:00
Updated trace logging to include a category
Minor fix to WinPCap to prevent null reference exception under rare conditions
Updated FFXIV Message Type IDs to patch 4.4
diff --git a/Machina.FFXIV/FFXIVBundleDecoder.cs b/Machina.FFXIV/FFXIVBundleDecoder.cs
@@ -75,7 +75,7 @@ public unsafe void StoreData(byte[] buffer)
                             header.magic2 != 0 && header.magic3 != 0)
                         {
                             if (LastMessageTimestamp != DateTime.MinValue)
-                                Trace.WriteLine("FFXIVBundleDecoder: Invalid magic # in header:" + Utility.ByteArrayToHexString(_bundleBuffer, offset, 36));
+                                Trace.WriteLine("FFXIVBundleDecoder: Invalid magic # in header:" + Utility.ByteArrayToHexString(_bundleBuffer, offset, 36), "DEBUG-MACHINA");
 
                             offset = ResetStream(offset);
                             continue;
@@ -121,7 +121,7 @@ public unsafe void StoreData(byte[] buffer)
                                 if (message_offset > messageBufferSize)
                                 {
                                     Trace.WriteLine("FFXIVBundleDecoder: Bad message offset - offset=" + message_offset.ToString() + ", bufferSize=" + messageBufferSize.ToString() +
-                                        ", data: " + Utility.ByteArrayToHexString(data, 0, 50));
+                                        ", data: " + Utility.ByteArrayToHexString(data, 0, 50), "DEBUG-MACHINA");
 
                                     _allocated = 0;
                                     return;
@@ -165,7 +165,7 @@ private unsafe byte[] DecompressFFXIVMessage(ref FFXIVBundleHeader header, byte[
             if (header.encoding != 0x0101 && header.encoding != 0x0100)
             {
                 if (!_encodingError)
-                    Trace.WriteLine("FFXIVBundleDecoder: unknown encoding type: " + header.encoding.ToString("X4"));
+                    Trace.WriteLine("FFXIVBundleDecoder: unknown encoding type: " + header.encoding.ToString("X4"), "DEBUG-MACHINA");
                 _encodingError = true;
                 return null;
             }
@@ -183,7 +183,7 @@ private unsafe byte[] DecompressFFXIVMessage(ref FFXIVBundleHeader header, byte[
             }
             catch (Exception ex)
             {
-                Trace.WriteLine("FFXIVBundleDecoder: Decompression error: " + ex.ToString());
+                Trace.WriteLine("FFXIVBundleDecoder: Decompression error: " + ex.ToString(), "DEBUG-MACHINA");
                 return null;
             }
 
diff --git a/Machina.FFXIV/Headers/FFXIMessageHeader.cs b/Machina.FFXIV/Headers/FFXIMessageHeader.cs
@@ -24,19 +24,18 @@ namespace Machina.FFXIV
     /// </summary>
     public enum ServerMessageType : ushort
     {
-        StatusEffectList = 0x0125,
-        Ability1 = 0x0128,
-        Ability8 = 0x012b,
-        Ability16 = 0x0138,
-        Ability24 = 0x0139,
-        Ability32 = 0x013a,
-        ActorCast = 0x0162,
+        StatusEffectList = 0x0149,
+        Ability1 = 0x014c,
+        Ability8 = 0x014f,
+        Ability16 = 0x0150,
+        Ability24 = 0x0151, 
+        Ability32 = 0x0152,
+        ActorCast = 0x0174,
         AddStatusEffect = 0x0141,
         ActorControl142 = 0x0142,
         ActorControl143 = 0x0143,
         ActorControl144 = 0x0144,
-        //ActorSpawn = 0x0190,
-        ActorGauge = 0x027d
+        ActorGauge = 0x0292
     }
 
     [StructLayout(LayoutKind.Explicit)]
diff --git a/Machina.FFXIV/Properties/AssemblyInfo.cs b/Machina.FFXIV/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Machina.FFXIV")]
-[assembly: AssemblyCopyright("Copyright © 2018 Ravahn")]
+[assembly: AssemblyCopyright("Copyright © 2019 Ravahn")]
 [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("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/Machina/FirewallManager.cs b/Machina/FirewallManager.cs
@@ -129,7 +129,7 @@ public void AddFirewallApplicationEntry(string appName, string ExecutablePath)
             }
             catch (Exception ex)
             {
-                Trace.WriteLine("FirewallWrapper: Exception " + ex.ToString());
+                Trace.WriteLine("FirewallWrapper: Exception " + ex.ToString(), "FIREWALL");
             }
         }
     }
diff --git a/Machina/IPDecoder.cs b/Machina/IPDecoder.cs
@@ -86,7 +86,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)
 
             if (buffer.Length < size)
             {
-                Trace.WriteLine("IPDecoder: Buffer length is less than specified size.  Size=[" + size.ToString() + "], Length=[" + buffer.Length + "]");
+                Trace.WriteLine("IPDecoder: Buffer length is less than specified size.  Size=[" + size.ToString() + "], Length=[" + buffer.Length + "]", "DEBUG-MACHINA");
                 return;
             }
 
@@ -101,7 +101,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)
                         // TODO: IP6 packets, and mixed IP4/IP6, need to be tested with real-world data.
                         if (offset + sizeof(IPv6Header) > size)
                         {
-                            Trace.WriteLine("IPDecoder: IP6 Packet too small for header. offset: " + offset.ToString() + ", size: " + size.ToString());
+                            Trace.WriteLine("IPDecoder: IP6 Packet too small for header. offset: " + offset.ToString() + ", size: " + size.ToString(), "DEBUG-MACHINA");
                             return;
                         }
 
@@ -111,7 +111,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)
                         if (header6.PayloadLength * 8 > buffer.Length - offset - sizeof(IPv6Header))
                         {
                             Trace.WriteLine("IPDecoder: IP6 Packet too small for payload. payload length: " +
-                                (header6.payload_length * 8).ToString() + ", Buffer: " + buffer.Length.ToString() + ", offset: " + offset.ToString());
+                                (header6.payload_length * 8).ToString() + ", Buffer: " + buffer.Length.ToString() + ", offset: " + offset.ToString(), "DEBUG-MACHINA");
                             return;
                         }
 
@@ -121,7 +121,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)
                     }
                     else if (version != 4)
                     {
-                        Trace.WriteLine("IPDecoder: IP protocol version is neither 4 nor 6. Version is " + version.ToString());
+                        Trace.WriteLine("IPDecoder: IP protocol version is neither 4 nor 6. Version is " + version.ToString(), "DEBUG-MACHINA");
                         return;
                     }
 
@@ -136,12 +136,12 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)
                     // make sure we have a valid exit condition
                     if (packetLength <= 0 & packetLength > 65535)
                     {
-                        Trace.WriteLine("IPDecoder: Invalid packet length [" + packetLength.ToString() + "].");
+                        Trace.WriteLine("IPDecoder: Invalid packet length [" + packetLength.ToString() + "].", "DEBUG-MACHINA");
                         return;
                     }
                     if (packetLength > buffer.Length - offset)
                     {
-                        Trace.WriteLine("IPDecoder: buffer too small to hold complete packet.  Packet length is [" + packetLength.ToString() + "], remaining buffer is [" + (buffer.Length - offset).ToString() + "].");
+                        Trace.WriteLine("IPDecoder: buffer too small to hold complete packet.  Packet length is [" + packetLength.ToString() + "], remaining buffer is [" + (buffer.Length - offset).ToString() + "].", "DEBUG-MACHINA");
                         return;
                     }
 
diff --git a/Machina/ProcessTCPInfo.cs b/Machina/ProcessTCPInfo.cs
@@ -115,7 +115,7 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)
             {
                 if (connections.Count > 0)
                 {
-                    Trace.WriteLine("ProcessTCPInfo: Process has exited, closing all connections.");
+                    Trace.WriteLine("ProcessTCPInfo: Process has exited, closing all connections.", "DEBUG-MACHINA");
 
                     connections.Clear();
                 }
@@ -185,7 +185,7 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)
 
                                 connections.Add(connection);
 
-                                Trace.WriteLine("ProcessTCPInfo: New connection detected for Process [" + _currentProcessID.ToString() + "]: " + connection.ToString());
+                                Trace.WriteLine("ProcessTCPInfo: New connection detected for Process [" + _currentProcessID.ToString() + "]: " + connection.ToString(), "DEBUG-MACHINA");
                             }
                         }
 
@@ -220,20 +220,20 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)
                         }
                         if (!bFound)
                         {
-                            Trace.WriteLine("ProcessTCPInfo: Removed connection " + connections[i].ToString());
+                            Trace.WriteLine("ProcessTCPInfo: Removed connection " + connections[i].ToString(), "DEBUG-MACHINA");
                             connections.RemoveAt(i);
                         }
                     }
                 }
                 else
                 {
-                    Trace.WriteLine("ProcessTCPInfo: Unable to retrieve TCP table. Return code: " + ret.ToString());
+                    Trace.WriteLine("ProcessTCPInfo: Unable to retrieve TCP table. Return code: " + ret.ToString(), "DEBUG-MACHINA");
                     throw new System.ComponentModel.Win32Exception(ret);
                 }
             }
             catch (Exception ex)
             {
-                Trace.WriteLine("ProcessTCPInfo: Exception updating TCP connection list." + ex.ToString());
+                Trace.WriteLine("ProcessTCPInfo: Exception updating TCP connection list." + ex.ToString(), "DEBUG-MACHINA");
                 throw new System.ComponentModel.Win32Exception(ret, ex.Message);
             }
             finally
diff --git a/Machina/Properties/AssemblyInfo.cs b/Machina/Properties/AssemblyInfo.cs
@@ -27,7 +27,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Machina")]
-[assembly: AssemblyCopyright("Copyright © 2018 Ravahn")]
+[assembly: AssemblyCopyright("Copyright © 2019 Ravahn")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -51,7 +51,7 @@
 // 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("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
 [assembly: AssemblyInformationalVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
 
diff --git a/Machina/RawPCap.cs b/Machina/RawPCap.cs
@@ -222,10 +222,10 @@ public void Create(uint localAddress, uint remoteAddress = 0)
             Device device = GetAllDevices().FirstOrDefault(x =>
                 x.Addresses.Contains(localAddress));
 
-            if (!string.IsNullOrWhiteSpace(device.Name))
+            if (!string.IsNullOrWhiteSpace(device?.Name))
                 StartCapture(device, remoteAddress);
             else
-                Trace.WriteLine("RawPCap: IP [" + new System.Net.IPAddress(localAddress).ToString() + " selected but unable to find corresponding WinPCap device.");
+                Trace.WriteLine("RawPCap: IP [" + new System.Net.IPAddress(localAddress).ToString() + " selected but unable to find corresponding WinPCap device.", "DEBUG-MACHINA");
 
         }
 
@@ -264,7 +264,7 @@ public void Destroy()
             }
             catch (Exception ex)
             {
-                Trace.WriteLine("RawPCap: Exception cleaning up RawPCap class. " + ex.ToString());
+                Trace.WriteLine("RawPCap: Exception cleaning up RawPCap class. " + ex.ToString(), "DEBUG-MACHINA");
             }
         }
 
@@ -433,7 +433,7 @@ private unsafe void RunCaptureLoop()
                     {
                         string error = Marshal.PtrToStringAnsi(pcap_geterr(_activeDevice.Handle));
                         if (!bExceptionLogged)
-                            Trace.WriteLine("RawPCap: Error during pcap_loop. " + error);
+                            Trace.WriteLine("RawPCap: Error during pcap_loop. " + error, "DEBUG-MACHINA");
 
                         bExceptionLogged = true;
 
@@ -442,7 +442,7 @@ private unsafe void RunCaptureLoop()
                     else if (status != 1) // anything else besides success
                     {
                         if (!bExceptionLogged)
-                            Trace.WriteLine("RawPCap: Unknown response code [" + status.ToString() + "] from pcap_next_ex.);");
+                            Trace.WriteLine("RawPCap: Unknown response code [" + status.ToString() + "] from pcap_next_ex.", "DEBUG-MACHINA");
 
                         bExceptionLogged = true;
 
@@ -459,7 +459,7 @@ private unsafe void RunCaptureLoop()
                         // prepare data - skip the 14-byte ethernet header
                         buffer.AllocatedSize = (int)packetHeader.caplen - layer2Length;
                         if (buffer.AllocatedSize > buffer.Data.Length)
-                            Trace.WriteLine("RawPCap: packet length too large: " + buffer.AllocatedSize.ToString());
+                            Trace.WriteLine("RawPCap: packet length too large: " + buffer.AllocatedSize.ToString(), "DEBUG-MACHINA");
                         else
                         {
 
@@ -477,7 +477,7 @@ private unsafe void RunCaptureLoop()
                 catch (Exception ex)
                 {
                     if (!bExceptionLogged)
-                        Trace.WriteLine("WinPCap: Exception during RunCaptureLoop. " + ex.ToString());
+                        Trace.WriteLine("WinPCap: Exception during RunCaptureLoop. " + ex.ToString(), "DEBUG-MACHINA");
 
                     bExceptionLogged = true;
                     
diff --git a/Machina/RawSocket.cs b/Machina/RawSocket.cs
@@ -143,7 +143,7 @@ private static void OnReceive(IAsyncResult ar)
             }
             catch (Exception ex)
             {
-                Trace.WriteLine("RawSocket: Error while receiving socket data.  Network capture aborted, please restart application." + ex.ToString());
+                Trace.WriteLine("RawSocket: Error while receiving socket data.  Network capture aborted, please restart application." + ex.ToString(), "DEBUG-MACHINA");
             }
         }
     }
diff --git a/Machina/TCPDecoder.cs b/Machina/TCPDecoder.cs
@@ -72,7 +72,7 @@ public unsafe void FilterAndStoreData(byte[] buffer)
             // There is one TCP packet per buffer.
             if (buffer?.Length < sizeof(TCPHeader))
             {
-                Trace.WriteLine("TCPDecoder: Buffer length smaller than TCP header: Length=[" + (buffer?.Length ?? 0).ToString() + "].");
+                Trace.WriteLine("TCPDecoder: Buffer length smaller than TCP header: Length=[" + (buffer?.Length ?? 0).ToString() + "].", "DEBUG-MACHINA");
                 return;
             }
 
@@ -137,11 +137,11 @@ public unsafe byte[] GetNextTCPDatagram()
                                 _NextSequence = header.SequenceNumber + 1;
                             else if (Math.Abs(_NextSequence - header.SequenceNumber) > 100000)
                             {
-                                Trace.WriteLine("TCPDecoder: Updating sequence number from SYN packet.  Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].");
+                                Trace.WriteLine("TCPDecoder: Updating sequence number from SYN packet.  Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].", "DEBUG-MACHINA");
                                 _NextSequence = header.SequenceNumber + 1;
                             }
                             else
-                                Trace.WriteLine("TCPDecoder: Ignoring SYN packet new sequence number.  Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].");
+                                Trace.WriteLine("TCPDecoder: Ignoring SYN packet new sequence number.  Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].", "DEBUG-MACHINA");
 
                             continue; // do not process SYN packet, but set next sequence #.
                         }
@@ -155,7 +155,7 @@ public unsafe byte[] GetNextTCPDatagram()
                         if (packetOffset >= packet.Length - header.DataOffset)
                         {
                             // this packet will get removed once we exit the loop.
-                            Trace.WriteLine("TCPDecoder: packet data already processed, expected sequence [" + _NextSequence.ToString() + "], received [" + header.SequenceNumber + "], size [" + (packet.Length - header.DataOffset) + "].  Data: " + Utility.ByteArrayToHexString(packet, 0, 50));
+                            Trace.WriteLine("TCPDecoder: packet data already processed, expected sequence [" + _NextSequence.ToString() + "], received [" + header.SequenceNumber + "], size [" + (packet.Length - header.DataOffset) + "].  Data: " + Utility.ByteArrayToHexString(packet, 0, 50), "DEBUG-MACHINA");
                             continue;
                         }
 
@@ -195,13 +195,13 @@ public unsafe byte[] GetNextTCPDatagram()
             {
                 if (LastPacketTimestamp.AddMilliseconds(2000) < DateTime.UtcNow)
                 {
-                    Trace.WriteLine("TCPDecoder: >2 sec since last processed packet, resetting stream.");
+                    Trace.WriteLine("TCPDecoder: >2 sec since last processed packet, resetting stream.", "DEBUG-MACHINA");
 
                     for (int i = Packets.Count - 1; i >= 0; i--)
                     {
                         // todo: need to explore this logic, can we recover and get next highest sequence?
                         Trace.WriteLine("TCPDecoder: Missing Sequence # [" + _NextSequence.ToString() + "], Dropping packet with sequence # [" +
-                            Utility.ntohl(BitConverter.ToUInt32(Packets[i], 4)).ToString() + "].");
+                            Utility.ntohl(BitConverter.ToUInt32(Packets[i], 4)).ToString() + "].", "DEBUG-MACHINA");
                         Packets.RemoveAt(i);
                     }
                     _NextSequence = 0;
diff --git a/Machina/TCPNetworkMonitor.cs b/Machina/TCPNetworkMonitor.cs

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public unsafe void StoreData(byte[] buffer)`
`75`	`75`	`header.magic2 != 0 && header.magic3 != 0)`
`76`	`76`	`{`
`77`	`77`	`if (LastMessageTimestamp != DateTime.MinValue)`
`78`		`- Trace.WriteLine("FFXIVBundleDecoder: Invalid magic # in header:" + Utility.ByteArrayToHexString(_bundleBuffer, offset, 36));`
	`78`	`+ Trace.WriteLine("FFXIVBundleDecoder: Invalid magic # in header:" + Utility.ByteArrayToHexString(_bundleBuffer, offset, 36), "DEBUG-MACHINA");`
`79`	`79`
`80`	`80`	`offset = ResetStream(offset);`
`81`	`81`	`continue;`
`@@ -121,7 +121,7 @@ public unsafe void StoreData(byte[] buffer)`
`121`	`121`	`if (message_offset > messageBufferSize)`
`122`	`122`	`{`
`123`	`123`	`Trace.WriteLine("FFXIVBundleDecoder: Bad message offset - offset=" + message_offset.ToString() + ", bufferSize=" + messageBufferSize.ToString() +`
`124`		`- ", data: " + Utility.ByteArrayToHexString(data, 0, 50));`
	`124`	`+ ", data: " + Utility.ByteArrayToHexString(data, 0, 50), "DEBUG-MACHINA");`
`125`	`125`
`126`	`126`	`_allocated = 0;`
`127`	`127`	`return;`
`@@ -165,7 +165,7 @@ private unsafe byte[] DecompressFFXIVMessage(ref FFXIVBundleHeader header, byte[`
`165`	`165`	`if (header.encoding != 0x0101 && header.encoding != 0x0100)`
`166`	`166`	`{`
`167`	`167`	`if (!_encodingError)`
`168`		`- Trace.WriteLine("FFXIVBundleDecoder: unknown encoding type: " + header.encoding.ToString("X4"));`
	`168`	`+ Trace.WriteLine("FFXIVBundleDecoder: unknown encoding type: " + header.encoding.ToString("X4"), "DEBUG-MACHINA");`
`169`	`169`	`_encodingError = true;`
`170`	`170`	`return null;`
`171`	`171`	`}`
`@@ -183,7 +183,7 @@ private unsafe byte[] DecompressFFXIVMessage(ref FFXIVBundleHeader header, byte[`
`183`	`183`	`}`
`184`	`184`	`catch (Exception ex)`
`185`	`185`	`{`
`186`		`- Trace.WriteLine("FFXIVBundleDecoder: Decompression error: " + ex.ToString());`
	`186`	`+ Trace.WriteLine("FFXIVBundleDecoder: Decompression error: " + ex.ToString(), "DEBUG-MACHINA");`
`187`	`187`	`return null;`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ public void AddFirewallApplicationEntry(string appName, string ExecutablePath)`
`129`	`129`	`}`
`130`	`130`	`catch (Exception ex)`
`131`	`131`	`{`
`132`		`- Trace.WriteLine("FirewallWrapper: Exception " + ex.ToString());`
	`132`	`+ Trace.WriteLine("FirewallWrapper: Exception " + ex.ToString(), "FIREWALL");`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)`
`86`	`86`
`87`	`87`	`if (buffer.Length < size)`
`88`	`88`	`{`
`89`		`- Trace.WriteLine("IPDecoder: Buffer length is less than specified size. Size=[" + size.ToString() + "], Length=[" + buffer.Length + "]");`
	`89`	`+ Trace.WriteLine("IPDecoder: Buffer length is less than specified size. Size=[" + size.ToString() + "], Length=[" + buffer.Length + "]", "DEBUG-MACHINA");`
`90`	`90`	`return;`
`91`	`91`	`}`
`92`	`92`
`@@ -101,7 +101,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)`
`101`	`101`	`// TODO: IP6 packets, and mixed IP4/IP6, need to be tested with real-world data.`
`102`	`102`	`if (offset + sizeof(IPv6Header) > size)`
`103`	`103`	`{`
`104`		`- Trace.WriteLine("IPDecoder: IP6 Packet too small for header. offset: " + offset.ToString() + ", size: " + size.ToString());`
	`104`	`+ Trace.WriteLine("IPDecoder: IP6 Packet too small for header. offset: " + offset.ToString() + ", size: " + size.ToString(), "DEBUG-MACHINA");`
`105`	`105`	`return;`
`106`	`106`	`}`
`107`	`107`
`@@ -111,7 +111,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)`
`111`	`111`	`if (header6.PayloadLength * 8 > buffer.Length - offset - sizeof(IPv6Header))`
`112`	`112`	`{`
`113`	`113`	`Trace.WriteLine("IPDecoder: IP6 Packet too small for payload. payload length: " +`
`114`		`- (header6.payload_length * 8).ToString() + ", Buffer: " + buffer.Length.ToString() + ", offset: " + offset.ToString());`
	`114`	`+ (header6.payload_length * 8).ToString() + ", Buffer: " + buffer.Length.ToString() + ", offset: " + offset.ToString(), "DEBUG-MACHINA");`
`115`	`115`	`return;`
`116`	`116`	`}`
`117`	`117`
`@@ -121,7 +121,7 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)`
`121`	`121`	`}`
`122`	`122`	`else if (version != 4)`
`123`	`123`	`{`
`124`		`- Trace.WriteLine("IPDecoder: IP protocol version is neither 4 nor 6. Version is " + version.ToString());`
	`124`	`+ Trace.WriteLine("IPDecoder: IP protocol version is neither 4 nor 6. Version is " + version.ToString(), "DEBUG-MACHINA");`
`125`	`125`	`return;`
`126`	`126`	`}`
`127`	`127`
`@@ -136,12 +136,12 @@ public unsafe void FilterAndStoreData(byte[] buffer, int size)`
`136`	`136`	`// make sure we have a valid exit condition`
`137`	`137`	`if (packetLength <= 0 & packetLength > 65535)`
`138`	`138`	`{`
`139`		`- Trace.WriteLine("IPDecoder: Invalid packet length [" + packetLength.ToString() + "].");`
	`139`	`+ Trace.WriteLine("IPDecoder: Invalid packet length [" + packetLength.ToString() + "].", "DEBUG-MACHINA");`
`140`	`140`	`return;`
`141`	`141`	`}`
`142`	`142`	`if (packetLength > buffer.Length - offset)`
`143`	`143`	`{`
`144`		`- Trace.WriteLine("IPDecoder: buffer too small to hold complete packet. Packet length is [" + packetLength.ToString() + "], remaining buffer is [" + (buffer.Length - offset).ToString() + "].");`
	`144`	`+ Trace.WriteLine("IPDecoder: buffer too small to hold complete packet. Packet length is [" + packetLength.ToString() + "], remaining buffer is [" + (buffer.Length - offset).ToString() + "].", "DEBUG-MACHINA");`
`145`	`145`	`return;`
`146`	`146`	`}`
`147`	`147`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)`
`115`	`115`	`{`
`116`	`116`	`if (connections.Count > 0)`
`117`	`117`	`{`
`118`		`- Trace.WriteLine("ProcessTCPInfo: Process has exited, closing all connections.");`
	`118`	`+ Trace.WriteLine("ProcessTCPInfo: Process has exited, closing all connections.", "DEBUG-MACHINA");`
`119`	`119`
`120`	`120`	`connections.Clear();`
`121`	`121`	`}`
`@@ -185,7 +185,7 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)`
`185`	`185`
`186`	`186`	`connections.Add(connection);`
`187`	`187`
`188`		`- Trace.WriteLine("ProcessTCPInfo: New connection detected for Process [" + _currentProcessID.ToString() + "]: " + connection.ToString());`
	`188`	`+ Trace.WriteLine("ProcessTCPInfo: New connection detected for Process [" + _currentProcessID.ToString() + "]: " + connection.ToString(), "DEBUG-MACHINA");`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`@@ -220,20 +220,20 @@ public unsafe void UpdateTCPIPConnections(List<TCPConnection> connections)`
`220`	`220`	`}`
`221`	`221`	`if (!bFound)`
`222`	`222`	`{`
`223`		`- Trace.WriteLine("ProcessTCPInfo: Removed connection " + connections[i].ToString());`
	`223`	`+ Trace.WriteLine("ProcessTCPInfo: Removed connection " + connections[i].ToString(), "DEBUG-MACHINA");`
`224`	`224`	`connections.RemoveAt(i);`
`225`	`225`	`}`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`	`else`
`229`	`229`	`{`
`230`		`- Trace.WriteLine("ProcessTCPInfo: Unable to retrieve TCP table. Return code: " + ret.ToString());`
	`230`	`+ Trace.WriteLine("ProcessTCPInfo: Unable to retrieve TCP table. Return code: " + ret.ToString(), "DEBUG-MACHINA");`
`231`	`231`	`throw new System.ComponentModel.Win32Exception(ret);`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`catch (Exception ex)`
`235`	`235`	`{`
`236`		`- Trace.WriteLine("ProcessTCPInfo: Exception updating TCP connection list." + ex.ToString());`
	`236`	`+ Trace.WriteLine("ProcessTCPInfo: Exception updating TCP connection list." + ex.ToString(), "DEBUG-MACHINA");`
`237`	`237`	`throw new System.ComponentModel.Win32Exception(ret, ex.Message);`
`238`	`238`	`}`
`239`	`239`	`finally`
Original file line number	Diff line number	Diff line change
`@@ -222,10 +222,10 @@ public void Create(uint localAddress, uint remoteAddress = 0)`
`222`	`222`	`Device device = GetAllDevices().FirstOrDefault(x =>`
`223`	`223`	`x.Addresses.Contains(localAddress));`
`224`	`224`
`225`		`- if (!string.IsNullOrWhiteSpace(device.Name))`
	`225`	`+ if (!string.IsNullOrWhiteSpace(device?.Name))`
`226`	`226`	`StartCapture(device, remoteAddress);`
`227`	`227`	`else`
`228`		`- Trace.WriteLine("RawPCap: IP [" + new System.Net.IPAddress(localAddress).ToString() + " selected but unable to find corresponding WinPCap device.");`
	`228`	`+ Trace.WriteLine("RawPCap: IP [" + new System.Net.IPAddress(localAddress).ToString() + " selected but unable to find corresponding WinPCap device.", "DEBUG-MACHINA");`
`229`	`229`
`230`	`230`	`}`
`231`	`231`
`@@ -264,7 +264,7 @@ public void Destroy()`
`264`	`264`	`}`
`265`	`265`	`catch (Exception ex)`
`266`	`266`	`{`
`267`		`- Trace.WriteLine("RawPCap: Exception cleaning up RawPCap class. " + ex.ToString());`
	`267`	`+ Trace.WriteLine("RawPCap: Exception cleaning up RawPCap class. " + ex.ToString(), "DEBUG-MACHINA");`
`268`	`268`	`}`
`269`	`269`	`}`
`270`	`270`
`@@ -433,7 +433,7 @@ private unsafe void RunCaptureLoop()`
`433`	`433`	`{`
`434`	`434`	`string error = Marshal.PtrToStringAnsi(pcap_geterr(_activeDevice.Handle));`
`435`	`435`	`if (!bExceptionLogged)`
`436`		`- Trace.WriteLine("RawPCap: Error during pcap_loop. " + error);`
	`436`	`+ Trace.WriteLine("RawPCap: Error during pcap_loop. " + error, "DEBUG-MACHINA");`
`437`	`437`
`438`	`438`	`bExceptionLogged = true;`
`439`	`439`
`@@ -442,7 +442,7 @@ private unsafe void RunCaptureLoop()`
`442`	`442`	`else if (status != 1) // anything else besides success`
`443`	`443`	`{`
`444`	`444`	`if (!bExceptionLogged)`
`445`		`- Trace.WriteLine("RawPCap: Unknown response code [" + status.ToString() + "] from pcap_next_ex.);");`
	`445`	`+ Trace.WriteLine("RawPCap: Unknown response code [" + status.ToString() + "] from pcap_next_ex.", "DEBUG-MACHINA");`
`446`	`446`
`447`	`447`	`bExceptionLogged = true;`
`448`	`448`
`@@ -459,7 +459,7 @@ private unsafe void RunCaptureLoop()`
`459`	`459`	`// prepare data - skip the 14-byte ethernet header`
`460`	`460`	`buffer.AllocatedSize = (int)packetHeader.caplen - layer2Length;`
`461`	`461`	`if (buffer.AllocatedSize > buffer.Data.Length)`
`462`		`- Trace.WriteLine("RawPCap: packet length too large: " + buffer.AllocatedSize.ToString());`
	`462`	`+ Trace.WriteLine("RawPCap: packet length too large: " + buffer.AllocatedSize.ToString(), "DEBUG-MACHINA");`
`463`	`463`	`else`
`464`	`464`	`{`
`465`	`465`
`@@ -477,7 +477,7 @@ private unsafe void RunCaptureLoop()`
`477`	`477`	`catch (Exception ex)`
`478`	`478`	`{`
`479`	`479`	`if (!bExceptionLogged)`
`480`		`- Trace.WriteLine("WinPCap: Exception during RunCaptureLoop. " + ex.ToString());`
	`480`	`+ Trace.WriteLine("WinPCap: Exception during RunCaptureLoop. " + ex.ToString(), "DEBUG-MACHINA");`
`481`	`481`
`482`	`482`	`bExceptionLogged = true;`
`483`	`483`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private static void OnReceive(IAsyncResult ar)`
`143`	`143`	`}`
`144`	`144`	`catch (Exception ex)`
`145`	`145`	`{`
`146`		`- Trace.WriteLine("RawSocket: Error while receiving socket data. Network capture aborted, please restart application." + ex.ToString());`
	`146`	`+ Trace.WriteLine("RawSocket: Error while receiving socket data. Network capture aborted, please restart application." + ex.ToString(), "DEBUG-MACHINA");`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public unsafe void FilterAndStoreData(byte[] buffer)`
`72`	`72`	`// There is one TCP packet per buffer.`
`73`	`73`	`if (buffer?.Length < sizeof(TCPHeader))`
`74`	`74`	`{`
`75`		`- Trace.WriteLine("TCPDecoder: Buffer length smaller than TCP header: Length=[" + (buffer?.Length ?? 0).ToString() + "].");`
	`75`	`+ Trace.WriteLine("TCPDecoder: Buffer length smaller than TCP header: Length=[" + (buffer?.Length ?? 0).ToString() + "].", "DEBUG-MACHINA");`
`76`	`76`	`return;`
`77`	`77`	`}`
`78`	`78`
`@@ -137,11 +137,11 @@ public unsafe byte[] GetNextTCPDatagram()`
`137`	`137`	`_NextSequence = header.SequenceNumber + 1;`
`138`	`138`	`else if (Math.Abs(_NextSequence - header.SequenceNumber) > 100000)`
`139`	`139`	`{`
`140`		`- Trace.WriteLine("TCPDecoder: Updating sequence number from SYN packet. Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].");`
	`140`	`+ Trace.WriteLine("TCPDecoder: Updating sequence number from SYN packet. Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].", "DEBUG-MACHINA");`
`141`	`141`	`_NextSequence = header.SequenceNumber + 1;`
`142`	`142`	`}`
`143`	`143`	`else`
`144`		`- Trace.WriteLine("TCPDecoder: Ignoring SYN packet new sequence number. Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].");`
	`144`	`+ Trace.WriteLine("TCPDecoder: Ignoring SYN packet new sequence number. Current Sequence: [" + _NextSequence.ToString() + ", sent sequence: [" + header.SequenceNumber.ToString() + "].", "DEBUG-MACHINA");`
`145`	`145`
`146`	`146`	`continue; // do not process SYN packet, but set next sequence #.`
`147`	`147`	`}`
`@@ -155,7 +155,7 @@ public unsafe byte[] GetNextTCPDatagram()`
`155`	`155`	`if (packetOffset >= packet.Length - header.DataOffset)`
`156`	`156`	`{`
`157`	`157`	`// this packet will get removed once we exit the loop.`
`158`		`- Trace.WriteLine("TCPDecoder: packet data already processed, expected sequence [" + _NextSequence.ToString() + "], received [" + header.SequenceNumber + "], size [" + (packet.Length - header.DataOffset) + "]. Data: " + Utility.ByteArrayToHexString(packet, 0, 50));`
	`158`	`+ Trace.WriteLine("TCPDecoder: packet data already processed, expected sequence [" + _NextSequence.ToString() + "], received [" + header.SequenceNumber + "], size [" + (packet.Length - header.DataOffset) + "]. Data: " + Utility.ByteArrayToHexString(packet, 0, 50), "DEBUG-MACHINA");`
`159`	`159`	`continue;`
`160`	`160`	`}`
`161`	`161`
`@@ -195,13 +195,13 @@ public unsafe byte[] GetNextTCPDatagram()`
`195`	`195`	`{`
`196`	`196`	`if (LastPacketTimestamp.AddMilliseconds(2000) < DateTime.UtcNow)`
`197`	`197`	`{`
`198`		`- Trace.WriteLine("TCPDecoder: >2 sec since last processed packet, resetting stream.");`
	`198`	`+ Trace.WriteLine("TCPDecoder: >2 sec since last processed packet, resetting stream.", "DEBUG-MACHINA");`
`199`	`199`
`200`	`200`	`for (int i = Packets.Count - 1; i >= 0; i--)`
`201`	`201`	`{`
`202`	`202`	`// todo: need to explore this logic, can we recover and get next highest sequence?`
`203`	`203`	`Trace.WriteLine("TCPDecoder: Missing Sequence # [" + _NextSequence.ToString() + "], Dropping packet with sequence # [" +`
`204`		`- Utility.ntohl(BitConverter.ToUInt32(Packets[i], 4)).ToString() + "].");`
	`204`	`+ Utility.ntohl(BitConverter.ToUInt32(Packets[i], 4)).ToString() + "].", "DEBUG-MACHINA");`
`205`	`205`	`Packets.RemoveAt(i);`
`206`	`206`	`}`
`207`	`207`	`_NextSequence = 0;`