Fix ip tree lookup on netmask content

Reed Morrison · Felipe Zimmerle · commit 95048d5fcfe4 · 2018-06-07T14:29:27.000-03:00
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.3 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Fix ip tree lookup on netmask content
+   [Issue #1793 - @tinselcity, @zimmerle]
  - Changes the behavior of the default sec actions
    [Issue #1629 - @mirkodziadzka-avi, @zimmerle, @victorhora]
  - Refactoring on {global,ip,resources,session,tx,user} collections
diff --git a/src/utils/msc_tree.cc b/src/utils/msc_tree.cc
@@ -755,7 +755,7 @@ TreeNode *CPTFindElement(unsigned char *ipdata, unsigned int ip_bitmask, CPTTree
         return node;
     }
 
-    if (memcmp(node->prefix->buffer, temp_data, bytes) == 0) {
+    if ((node->netmasks == NULL) && memcmp(node->prefix->buffer, temp_data, bytes) == 0) {
         mask = SHIFT_LEFT_MASK(8 - ip_bitmask % 8);
 
         if ((ip_bitmask % 8) == 0) {

Original file line number	Diff line number	Diff line change
`@@ -755,7 +755,7 @@ TreeNode CPTFindElement(unsigned char ipdata, unsigned int ip_bitmask, CPTTree`
`755`	`755`	`return node;`
`756`	`756`	`}`
`757`	`757`
`758`		`- if (memcmp(node->prefix->buffer, temp_data, bytes) == 0) {`
	`758`	`+ if ((node->netmasks == NULL) && memcmp(node->prefix->buffer, temp_data, bytes) == 0) {`
`759`	`759`	`mask = SHIFT_LEFT_MASK(8 - ip_bitmask % 8);`
`760`	`760`
`761`	`761`	`if ((ip_bitmask % 8) == 0) {`