tyranid · trusthat · Aug 1, 2023 · Aug 5, 2023 · Aug 19, 2023
diff --git a/CANAPE.Cli.Lib/ConsoleUtils.cs b/CANAPE.Cli.Lib/ConsoleUtils.cs
@@ -15,11 +15,11 @@
 //
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using CANAPE.DataFrames;
 using CANAPE.Utils;
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using CANAPE.DataFrames;
 
 namespace CANAPE.Cli
 {
@@ -96,7 +96,7 @@ private static bool GetEffectiveColorMode()
         {
             return _supports_ansi_color && EnableColor;
         }
-        
+
         public static void WritePacket(LogPacket packet)
         {
             Console.Out.WriteLine(PacketUtils.ConvertPacketToString(packet, GetEffectiveColorMode()));
@@ -110,17 +110,17 @@ public static void WritePackets(IEnumerable<LogPacket> packets)
             }
         }
 
-		public static void WritePacket(DataFrame frame)
-		{
-			Console.Out.WriteLine(PacketUtils.ConvertPacketToString(frame));
-		}
+        public static void WritePacket(DataFrame frame)
+        {
+            Console.Out.WriteLine(PacketUtils.ConvertPacketToString(frame));
+        }
 
-		public static void WritePackets(IEnumerable<DataFrame> packets)
-		{
+        public static void WritePackets(IEnumerable<DataFrame> packets)
+        {
             foreach (DataFrame packet in packets)
-			{
-				WritePacket(packet);
-			}
-		}
+            {
+                WritePacket(packet);
+            }
+        }
     }
 }
diff --git a/CANAPE.Cli.Lib/EntryPoint.cs b/CANAPE.Cli.Lib/EntryPoint.cs
@@ -17,10 +17,10 @@
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using CANAPE.Net.Templates;
 using CANAPE.Utils;
+using McMaster.Extensions.CommandLineUtils;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Scripting;
 using Microsoft.CodeAnalysis.Scripting;
-using McMaster.Extensions.CommandLineUtils;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -70,7 +70,7 @@ private static ScriptOptions CreateScriptOptions(string filename, IEnumerable<st
             {
                 resolve_paths.Add(Path.GetDirectoryName(filename));
             }
-            
+
             Type template_type = typeof(FixedProxyTemplate);
             SourceFileResolver resolver = new SourceFileResolver(include_dirs.Concat(resolve_paths), base_path);
             ScriptMetadataResolver metadata_resolver = ScriptMetadataResolver.Default
@@ -80,7 +80,7 @@ private static ScriptOptions CreateScriptOptions(string filename, IEnumerable<st
                                                      "CANAPE.Utils", "CANAPE.Nodes", "CANAPE.Net.Utils",
                                                      "CANAPE.DataFrames", "CANAPE.Net.Templates.Factories",
                                                      "CANAPE.Net.Templates", "CANAPE.Security.Cryptography.X509Certificates")
-                .WithReferences(template_type.GetTypeInfo().Assembly, 
+                .WithReferences(template_type.GetTypeInfo().Assembly,
                                 typeof(EntryPoint).GetTypeInfo().Assembly)
                 .WithSourceResolver(resolver)
                 .WithMetadataResolver(metadata_resolver);
@@ -98,7 +98,7 @@ private async static Task RunConsole(IEnumerable<string> include_dirs, IEnumerab
             var options = CreateScriptOptions(null, include_dirs, metadata_dirs);
             var state = await CSharpScript.RunAsync("static void quit() { Environment.Exit(0); }", options);
             Console.WriteLine("Type quit() to exit the console");
-            
+
             while (true)
             {
                 StringBuilder current_line = new StringBuilder();
@@ -124,7 +124,7 @@ private async static Task RunConsole(IEnumerable<string> include_dirs, IEnumerab
             }
         }
 
-        private static ScriptRunner<object> CompileScript(string filename, 
+        private static ScriptRunner<object> CompileScript(string filename,
             IEnumerable<string> include_dirs,
             IEnumerable<string> metadata_dirs)
         {
@@ -141,8 +141,8 @@ private static ScriptRunner<object> CompileScript(string filename,
             }
         }
 
-        private async static Task RunScript(string filename, 
-            IEnumerable<string> include_dirs, 
+        private async static Task RunScript(string filename,
+            IEnumerable<string> include_dirs,
             IEnumerable<string> metadata_dirs,
             IEnumerable<string> args)
         {
@@ -169,7 +169,7 @@ public static int Main(string[] args)
                 Logger.SystemLogger = LogUtils.GetLogger(Console.Error);
                 Console.Error.WriteLine("CANAPE.Cli (c) 2017 James Forshaw, 2014 Context Information Security.");
                 CommandLineApplication app = new CommandLineApplication(false);
-                
+
                 CommandArgument script = app.Argument("script", "Specify a script file to run.");
                 CommandOption compile = app.Option(
                   "-c | --compile", "Compile script file only.",
@@ -193,7 +193,7 @@ public static int Main(string[] args)
                     IEnumerable<string> include_dirs = include.HasValue() ? include.Values.Select(p => Path.GetFullPath(p)) : new string[0];
                     IEnumerable<string> metadata_dirs = libs.HasValue() ? libs.Values.Select(p => Path.GetFullPath(p)) : new string[0];
 
-                    ConsoleUtils.EnableColor = color.HasValue();                    
+                    ConsoleUtils.EnableColor = color.HasValue();
                     if (verbose.HasValue())
                     {
                         Logger.SystemLogger.LogLevel = Logger.LogEntryType.All;

diff --git a/CANAPE.Cli.Lib/NetGraphUtils.cs b/CANAPE.Cli.Lib/NetGraphUtils.cs
@@ -71,7 +71,7 @@ public static string ToDot(NetGraphFactory netgraph)
                 if (!node.Enabled)
                 {
                     attrs.Add("style=dotted");
-                }                
+                }
 
                 if (attrs.Count > 0)
                 {

diff --git a/CANAPE.Cli.Lib/PacketUtils.cs b/CANAPE.Cli.Lib/PacketUtils.cs
@@ -16,7 +16,6 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 using CANAPE.DataFrames;
-using CANAPE.Nodes;
 using CANAPE.Utils;
 using System;
 using System.Collections.Generic;
@@ -151,7 +150,7 @@ private static string GetHeader(LogPacket p)
             return String.Format("Time {0} - Tag '{1}' - Network '{2}'",
                     p.Timestamp.ToString(), p.Tag, p.Network);
         }
-                
+
         /// <summary>
         /// Convert a packet to a hex string format
         /// </summary>
@@ -188,10 +187,10 @@ public static string ConvertPacketToString(DataFrame p)
                 return ConvertTextPacketToString(p);
             }
             else
-			{
-				return ConvertBinaryPacketToString(p);
-			}
-		}
+            {
+                return ConvertBinaryPacketToString(p);
+            }
+        }
 
         private static ColorValue PickContrastingColor(ColorValue color)
         {

diff --git a/CANAPE.Cli/CANAPE.Cli.csproj b/CANAPE.Cli/CANAPE.Cli.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.0; netcoreapp2.0; net471</TargetFrameworks>
+    <TargetFrameworks>netcoreapp7.0; net48</TargetFrameworks>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>James Forshaw</Authors>
     <Description>Command Line Interface CANAPE.Core network library.</Description>

diff --git a/CANAPE.Cli/Program.cs b/CANAPE.Cli/Program.cs
@@ -15,7 +15,6 @@
 //
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-using System;
 
 namespace CANAPE.Cli
 {

diff --git a/CANAPE.Net.Protocols/Endpoint/EchoDataEndpoint.cs b/CANAPE.Net.Protocols/Endpoint/EchoDataEndpoint.cs
@@ -18,7 +18,6 @@
 using CANAPE.DataAdapters;
 using CANAPE.DataFrames;
 using CANAPE.Nodes;
-using CANAPE.Utils;
 
 namespace CANAPE.Net.Protocols.Endpoint
 {
@@ -39,7 +38,7 @@ public class EchoDataEndpointConfig
     /// Echo data endpoint.
     /// </summary>
     public class EchoDataEndpoint : BasePersistDataEndpoint<EchoDataEndpointConfig>
-    {       
+    {
         /// <summary>
         /// Run the specified adapter.
         /// </summary>
@@ -49,8 +48,8 @@ public override void Run(IDataAdapter adapter)
         {
             DataFrame frame = adapter.Read();
 
-            while(frame != null)
-            {                
+            while (frame != null)
+            {
                 if (Config.ConvertToBasic)
                 {
                     frame = frame.ToArray().ToDataFrame();
@@ -59,7 +58,7 @@ public override void Run(IDataAdapter adapter)
                 adapter.Write(frame);
 
                 frame = adapter.Read();
-            }            
+            }
         }
 
         /// <summary>

diff --git a/CANAPE.Net.Protocols/Parser/DNSPacket.cs b/CANAPE.Net.Protocols/Parser/DNSPacket.cs
@@ -15,7 +15,6 @@
 //
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-using CANAPE.DataFrames;
 using CANAPE.Utils;
 using System;
 using System.Collections.Generic;
@@ -307,7 +306,7 @@ public class CNameDNSRR : DNSRRBase
             /// <summary>
             /// The CNAME
             /// </summary>
-            public string CName { get; set; }         
+            public string CName { get; set; }
 
             /// <summary>
             /// Constructor
@@ -334,7 +333,7 @@ public CNameDNSRR()
             /// <param name="stringCache">The string cache</param>
             public override void WriteData(DataWriter writer, Dictionary<string, int> stringCache)
             {
-                WriteString(CName, writer, stringCache);             
+                WriteString(CName, writer, stringCache);
             }
         }
 
@@ -426,7 +425,7 @@ public AAAADNSRR()
             /// <param name="writer">The writer</param>
             /// <param name="stringCache">The string cache</param>
             public override void WriteData(DataWriter writer, Dictionary<string, int> stringCache)
-            {               
+            {
                 if (Address.AddressFamily != System.Net.Sockets.AddressFamily.InterNetworkV6)
                 {
                     throw new ArgumentException("Must provide a IPv6 address for a AAAA record");
@@ -629,7 +628,7 @@ private static DNSRRBase ReadResourceRecord(byte[] data, DataReader reader)
             rr.Class = cls;
             rr.Type = type;
             rr.TimeToLive = ttl;
-            
+
             return rr;
         }
 
@@ -647,12 +646,12 @@ private static DNSRRBase[] ReadResourceRecords(byte[] data, DataReader reader, i
 
         private static bool GetBooleanFlag(ushort flags, int pos)
         {
-            return ((flags >> (15-pos)) & 1) == 1;
+            return ((flags >> (15 - pos)) & 1) == 1;
         }
 
         private static int GetFlagValue(ushort flags, int pos)
         {
-            return (flags >> (15-pos-3)) & 0xF;
+            return (flags >> (15 - pos - 3)) & 0xF;
         }
 
         private static ushort SetBooleanFlag(ushort flags, int pos, bool value)
@@ -669,7 +668,7 @@ private static ushort SetBooleanFlag(ushort flags, int pos, bool value)
 
         private static ushort SetFlagValue(ushort flags, int pos, int val)
         {
-            return (ushort)(flags | (val << (15 - pos - 3)));      
+            return (ushort)(flags | (val << (15 - pos - 3)));
         }
 
         /// <summary>
@@ -703,7 +702,7 @@ public static DNSPacket FromArray(byte[] data)
             if (qdcount > 0)
             {
                 DNSQuestion[] questions = new DNSQuestion[qdcount];
-                
+
                 for (int i = 0; i < qdcount; i++)
                 {
                     questions[i] = ReadQuestion(data, reader);
@@ -713,7 +712,7 @@ public static DNSPacket FromArray(byte[] data)
             }
 
             if (ancount > 0)
-            {                
+            {
                 ret.Answers = ReadResourceRecords(data, reader, ancount);
             }
 
@@ -767,7 +766,7 @@ private static void WriteStringPart(string value, DataWriter writer, Dictionary<
                     {
                         WriteStringPart(null, writer, stringCache);
                     }
-                }   
+                }
             }
         }
 
@@ -842,5 +841,5 @@ public byte[] ToArray()
 
             return stm.ToArray();
         }
-    }    
+    }
 }
diff --git a/CANAPE.Net.Protocols/Parser/HttpDataChunk.cs b/CANAPE.Net.Protocols/Parser/HttpDataChunk.cs
@@ -187,14 +187,14 @@ private bool FilterHeader(string name, string value)
                 if (!CanSendBody() || FinalChunk)
                 {
                     return true;
-                }                
+                }
             }
 
             return false;
         }
 
         private void WriteHeaders(DataWriter writer)
-        {            
+        {
             string writeHeader = OnWriteHeader();
 
             // null indicates that a response has no headers
@@ -233,7 +233,7 @@ private byte[] GetBody()
         }
 
         private void WriteBody(DataWriter writer)
-        {            
+        {
             byte[] body = GetBody();
 
             if (ChunkedEncoding)
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ public static string ToDot(NetGraphFactory netgraph) @@
                     if (!node.Enabled)
                     {
                         attrs.Add("style=dotted");
-                    }
+                    }
                     if (attrs.Count > 0)
                     {
@@ Expand Down @@