diff --git a/PSWinFW.psd1 b/PSWinFW.psd1
index 926927d..f19fb4b 100644
Binary files a/PSWinFW.psd1 and b/PSWinFW.psd1 differ
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 @@
8
- 5
+ 6
+
4
+
5
+
5
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')