Changing AppSig ordering param name

PaloAltoNetworks · Aug 8, 2019 · ac03658 · ac03658
1 parent 7828309
commit ac03658
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/objs/app/signature/entry.go b/objs/app/signature/entry.go
@@ -12,7 +12,7 @@ type Entry struct {
     Name string
     Comment string
     Scope string
-    OrderedMatch bool
+    OrderFree bool
 
     raw map[string] string
 }
@@ -22,7 +22,7 @@ type Entry struct {
 func (o *Entry) Copy(s Entry) {
     o.Comment = s.Comment
     o.Scope = s.Scope
-    o.OrderedMatch = s.OrderedMatch
+    o.OrderFree = s.OrderFree
 }
 
 /** Structs / functions for this namespace. **/
@@ -39,7 +39,7 @@ func (o *container_v1) Normalize() Entry {
     ans := Entry{
         Name: o.Answer.Name,
         Comment: o.Answer.Comment,
-        OrderedMatch: util.AsBool(o.Answer.OrderedMatch),
+        OrderFree: util.AsBool(o.Answer.OrderFree),
     }
 
     switch o.Answer.Scope {
@@ -67,15 +67,15 @@ type entry_v1 struct {
     Name string `xml:"name,attr"`
     Comment string `xml:"comment,omitempty"`
     Scope string `xml:"scope,omitempty"`
-    OrderedMatch string `xml:"order-free"`
+    OrderFree string `xml:"order-free"`
     Sigs *util.RawXml `xml:"and-condition"`
 }
 
 func specify_v1(e Entry) interface{} {
     ans := entry_v1{
         Name: e.Name,
         Comment: e.Comment,
-        OrderedMatch: util.YesNo(e.OrderedMatch),
+        OrderFree: util.YesNo(e.OrderFree),
     }
 
     switch e.Scope {

diff --git a/objs/app/signature/testdata_test.go b/objs/app/signature/testdata_test.go
@@ -16,21 +16,21 @@ func getTests() []tc {
             Name: "v1",
             Comment: "my comment",
             Scope: ScopeSession,
-            OrderedMatch: false,
+            OrderFree: false,
         }},
         {"v1 raw no order", version.Number{7, 1, 0, ""}, Entry{
             Name: "v1",
             Comment: "my comment",
             Scope: ScopeSession,
-            OrderedMatch: false,
+            OrderFree: false,
             raw: map[string] string{
                 "sigs": "and sig config",
             },
         }},
         {"v1 no raw ordered", version.Number{7, 1, 0, ""}, Entry{
             Name: "v1",
             Scope: ScopeTransaction,
-            OrderedMatch: true,
+            OrderFree: true,
         }},
     }
 }