aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/FirewallCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/FirewallCompiler.cs')
-rw-r--r--src/wixext/FirewallCompiler.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/wixext/FirewallCompiler.cs b/src/wixext/FirewallCompiler.cs
index aefc7f2c..e3cf201b 100644
--- a/src/wixext/FirewallCompiler.cs
+++ b/src/wixext/FirewallCompiler.cs
@@ -312,13 +312,19 @@ namespace WixToolset.Firewall
312 private void ParseRemoteAddressElement(Intermediate intermediate, IntermediateSection section, XElement element, ref string remoteAddresses) 312 private void ParseRemoteAddressElement(Intermediate intermediate, IntermediateSection section, XElement element, ref string remoteAddresses)
313 { 313 {
314 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element); 314 var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
315 string address = null;
315 316
316 // no attributes 317 // no attributes
317 foreach (var attrib in element.Attributes()) 318 foreach (var attrib in element.Attributes())
318 { 319 {
319 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) 320 if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
320 { 321 {
321 this.ParseHelper.UnexpectedAttribute(element, attrib); 322 switch (attrib.Name.LocalName)
323 {
324 case "Value":
325 address = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
326 break;
327 }
322 } 328 }
323 else 329 else
324 { 330 {
@@ -328,10 +334,9 @@ namespace WixToolset.Firewall
328 334
329 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 335 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
330 336
331 var address = this.ParseHelper.GetTrimmedInnerText(element);
332 if (String.IsNullOrEmpty(address)) 337 if (String.IsNullOrEmpty(address))
333 { 338 {
334 this.Messaging.Write(FirewallErrors.IllegalEmptyRemoteAddress(sourceLineNumbers)); 339 this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Value"));
335 } 340 }
336 else 341 else
337 { 342 {