From 4419df1e5b8a8f6871a5d1044d4821f3aef2da29 Mon Sep 17 00:00:00 2001
From: Thumbscrew <james@intmain.co.uk>
Date: Wed, 6 Nov 2019 19:35:16 +0000
Subject: [PATCH] Adjusted Table width, added labels. Removed Include switches
 as no longer required.

---
 PSWinFW.psd1                        | Bin 8138 -> 8186 bytes
 formats/FirewallEvent.Format.ps1xml |   5 ++-
 public/Get-PSFirewallLog.ps1        |  49 +++++-----------------------
 3 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/PSWinFW.psd1 b/PSWinFW.psd1
index 926927d51623d54a2e40b8f41c2c71eb8a3c89be..f19fb4bb23bcffa1af9c3dc2b5f63ef5a86a9ec0 100644
GIT binary patch
delta 117
zcmX?Q|I2<u6Qg+$Lp~6eF!%z=6oyiU9EMZ|1qNFnR%g&-h+zm|2xbUp$YjW4a0AkM
z3<V6u47m)3n-?-lGf$qxtg!hM%QN1|IwD4lI+J5Xd^hhCa%1FI25NT(DoX(yS2DR#
LOndVx5e04lXa^h`

delta 81
zcmexmf69JC6C<-SgTmxSM%l?cJbar^F!C_-CNiWj<T7M3<S}G1WNiM-@|<__IWfM?
lQNnJF+|EFm6owpzRECnt8^vTN-x4yK%qQ%#`Id+RHvrrW7yJMK

diff --git a/formats/FirewallEvent.Format.ps1xml b/formats/FirewallEvent.Format.ps1xml
index 223ff5a..35d36c2 100644
--- a/formats/FirewallEvent.Format.ps1xml
+++ b/formats/FirewallEvent.Format.ps1xml
@@ -15,17 +15,20 @@
                         <Width>8</Width>
                     </TableColumnHeader>
                     <TableColumnHeader> <!-- Action -->
-                        <Width>5</Width>
+                        <Width>6</Width>
                     </TableColumnHeader>
                     <TableColumnHeader> <!-- Protocol -->
+                        <Label>Prot</Label>
                         <Width>4</Width>
                     </TableColumnHeader>
                     <TableColumnHeader/> <!-- SourceIP -->
                     <TableColumnHeader/> <!-- Destination IP -->
                     <TableColumnHeader> <!-- SourcePort -->
+                        <Label>SrcPt</Label>
                         <Width>5</Width>
                     </TableColumnHeader>
                     <TableColumnHeader> <!-- DestinationPort -->
+                        <Label>DstPt</Label>
                         <Width>5</Width>
                     </TableColumnHeader>
                     <TableColumnHeader/> <!-- Size -->
diff --git a/public/Get-PSFirewallLog.ps1 b/public/Get-PSFirewallLog.ps1
index d406ee3..a3f4d9b 100644
--- a/public/Get-PSFirewallLog.ps1
+++ b/public/Get-PSFirewallLog.ps1
@@ -28,21 +28,6 @@ function Get-PSFirewallLog {
         [int]
         $Tail = 0,
 
-        # Include extended TCP information (TCP Flags, TCP Sequence Number, TCP ACK Number, TCP Window Size). Defaults to false.
-        [Parameter(Mandatory = $false)]
-        [switch]
-        $IncludeTcpInfo,
-
-        # Include extended ICMP information (ICMP Type and Code). Defaults to false.
-        [Parameter(Mandatory = $false)]
-        [switch]
-        $IncludeIcmpInfo,
-
-        # Include Info field. Defaults to false.
-        [Parameter(Mandatory = $false)]
-        [switch]
-        $IncludeInfo,
-
         # ComputerName to retrieve log from
         [Parameter(Mandatory = $false, ParameterSetName = 'remote')]
         [string]
@@ -96,34 +81,16 @@ function Get-PSFirewallLog {
                     "SourcePort" = 6
                     "DestinationPort" = 7
                     "Size" = 8
+                    "TcpFlags" = 9
+                    "TcpSyn" = 10
+                    "TcpAck" = 11
+                    "TcpWin" = 12
+                    "IcmpType" = 13
+                    "IcmpCode" = 14
+                    "Info" = 15
+                    "Path" = 16
                 }
 
-                if($IncludeTcpInfo) {
-                    $tcpMembers = @{
-                        "TcpFlags" = 9
-                        "TcpSyn" = 10
-                        "TcpAck" = 11
-                        "TcpWin" = 12
-                    }
-
-                    $members += $tcpMembers
-                }
-
-                if($IncludeIcmpInfo) {
-                    $icmpMembers = @{
-                        "IcmpType" = 13
-                        "IcmpCode" = 14
-                    }
-
-                    $members += $icmpMembers
-                }
-
-                if($IncludeInfo) {
-                    $members += @{ "Info" = 15 }
-                }
-
-                $members += @{ "Path" = 16 }
-
                 $log | ForEach-Object {
                     $line = $_
                     $split = $line -split ('\s')