change firewall extension table name to Wix5FirewallException

1 files changed, 27 insertions, 13 deletions

diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 69f2c3f4..9ddd8a9a 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -32,7 +32,7 @@ namespace WixToolset.Firewall
         {
             switch (table.Name)
             {
-                case "Wix4FirewallException":
+                case "Wix5FirewallException":
                     this.DecompileWixFirewallExceptionTable(table);
                     break;
                 default:
@@ -69,18 +69,29 @@ namespace WixToolset.Firewall
                     string[] addresses = ((string)row[2]).Split(',');
                     if (addresses.Length == 1)
                     {
-                        // special-case the Scope attribute values
-                        if (addresses[0] == "*")
+                        switch(addresses[0])
                         {
-                            firewallException.Add(new XAttribute("Scope", "any"));
-                        }
-                        else if (addresses[0] == "LocalSubnet")
-                        {
-                            firewallException.Add(new XAttribute("Scope", "localSubnet"));
-                        }
-                        else
-                        {
-                            FirewallDecompiler.AddRemoteAddress(firewallException, addresses[0]);
+                            case "*":
+                                firewallException.Add(new XAttribute("Scope", "any"));
+                                break;
+                            case "LocalSubnet":
+                                firewallException.Add(new XAttribute("Scope", "localSubnet"));
+                                break;
+                            case "dns":
+                                firewallException.Add(new XAttribute("Scope", "DNS"));
+                                break;
+                            case "dhcp":
+                                firewallException.Add(new XAttribute("Scope", "DHCP"));
+                                break;
+                            case "wins":
+                                firewallException.Add(new XAttribute("Scope", "WINS"));
+                                break;
+                            case "DefaultGateway":
+                                firewallException.Add(new XAttribute("Scope", "defaultGateway"));
+                                break;
+                            default:
+                                FirewallDecompiler.AddRemoteAddress(firewallException, addresses[0]);
+                                break;
                         }
                     }
                     else
@@ -107,6 +118,9 @@ namespace WixToolset.Firewall
                         case FirewallConstants.NET_FW_IP_PROTOCOL_UDP:
                             firewallException.Add(new XAttribute("Protocol", "udp"));
                             break;
+                        default:
+                            firewallException.Add(new XAttribute("Protocol", row[4]));
+                            break;
                     }
                 }
 
@@ -183,7 +197,7 @@ namespace WixToolset.Firewall
         /// <param name="tables">Collection of all tables.</param>
         private void FinalizeFirewallExceptionTable(TableIndexedCollection tables)
         {
-            if (tables.TryGetTable("Wix4FirewallException", out var firewallExceptionTable))
+            if (tables.TryGetTable("Wix5FirewallException", out var firewallExceptionTable))
             {
                 foreach (var row in firewallExceptionTable.Rows)
                 {