2024-12-30: Add support for the '~=' operator in expression parsing

BroadbandForum · Dec 30, 2024 · 00b8e94 · 00b8e94
1 parent 1235ce6
commit 00b8e94
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/src/core/dm_access.c b/src/core/dm_access.c
@@ -684,7 +684,12 @@ int DM_ACCESS_CompareString(char *lhs, expr_op_t op, char *rhs, bool *result)
             USP_ERR_SetMessage("%s: Operator '%s' not supported for strings", __FUNCTION__, expr_op_2_str[op]);
             err = USP_ERR_INVALID_PATH_SYNTAX;
             break;
-
+        case kExprOp_Contains:
+            if (strstr(lhs, rhs) != NULL)
+            {
+                *result = true;
+            }
+            break;
         default:
             TERMINATE_BAD_CASE(op);
             break;

diff --git a/src/core/expr_vector.c b/src/core/expr_vector.c
@@ -58,6 +58,7 @@ char *expr_op_2_str[kExprOp_Max] =
     "<",  // kExprOp_LessThan
     ">",  // kExprOp_GreaterThan
     "=",  // kExprOp_Equals
+    "~=", // kExprOp_Contains
 };
 
 
@@ -483,6 +484,15 @@ char *SplitOnOperator(char *buf, expr_op_t *p_op)
         return &op[2];
     }
 
+    // Exit if found the "~=" operator
+    op = strstr(buf, "~=");
+    if (op != NULL)
+    {
+        *p_op = kExprOp_Contains;
+        *op = '\0';
+        return &op[2];
+    }
+
     // Exit if found the "<" operator
     op = strchr(buf, '<');
     if (op != NULL)

diff --git a/src/core/path_resolver.c b/src/core/path_resolver.c
@@ -1481,7 +1481,7 @@ int ResolveUniqueKey(char *resolved, char *unresolved, resolver_state_t *state)
     char temp[MAX_DM_PATH];
     bool is_match;
     bool is_ref_match;
-    expr_op_t valid_ops[] = {kExprOp_Equal, kExprOp_NotEqual, kExprOp_LessThanOrEqual, kExprOp_GreaterThanOrEqual, kExprOp_LessThan, kExprOp_GreaterThan};
+    expr_op_t valid_ops[] = {kExprOp_Equal, kExprOp_NotEqual, kExprOp_LessThanOrEqual, kExprOp_GreaterThanOrEqual, kExprOp_LessThan, kExprOp_GreaterThan, kExprOp_Contains};
     unsigned short permission_bitmask;
 
     // Exit if unable to find the end of the unique key

diff --git a/src/include/usp_api.h b/src/include/usp_api.h
@@ -105,7 +105,7 @@ typedef enum
     kExprOp_LessThan,               // '<'
     kExprOp_GreaterThan,            // '>'
     kExprOp_Equals,                 // '='
-
+    kExprOp_Contains,               // '~='
     kExprOp_Max
 } expr_op_t;