expr: add comparison function for singleton expressions

Singed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/expression.h b/include/expression.h
index 354e679cc30c73be9e9aa9fe994fda9ed94b28ac..d974131e74042a1d6d843aa032ac154a2b397d70 100644 (file)
--- a/include/expression.h
+++ b/include/expression.h
@@ -120,6 +120,7 @@ static inline void expr_set_context(struct expr_ctx *ctx,
  * @destroy:   destructor, must release inner expressions
  * @set_type:  function to promote type and byteorder of inner types
  * @print:     function to print the expression
+ * @cmp:       function to compare two expressions of the same types
  * @pctx_update:update protocol context
  */
 struct proto_ctx;
@@ -132,6 +133,8 @@ struct expr_ops {
                                            const struct datatype *dtype,
                                            enum byteorder byteorder);
        void                    (*print)(const struct expr *expr);
+       bool                    (*cmp)(const struct expr *e1,
+                                      const struct expr *e2);
        void                    (*pctx_update)(struct proto_ctx *ctx,
                                               const struct expr *expr);
 };
@@ -261,6 +264,7 @@ extern struct expr *expr_clone(const struct expr *expr);
 extern struct expr *expr_get(struct expr *expr);
 extern void expr_free(struct expr *expr);
 extern void expr_print(const struct expr *expr);
+extern bool expr_cmp(const struct expr *e1, const struct expr *e2);
 extern void expr_describe(const struct expr *expr);
 
 extern const struct datatype *expr_basetype(const struct expr *expr);

diff --git a/src/ct.c b/src/ct.c
index 32f22a5c6705f671f1e95692e3d5d085f46aa97d..a27621e2334598a59d4be3d65deee833beeec9fa 100644 (file)
--- a/src/ct.c
+++ b/src/ct.c
@@ -204,6 +204,11 @@ static void ct_expr_print(const struct expr *expr)
        printf("ct %s", ct_templates[expr->ct.key].token);
 }
 
+static bool ct_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       return e1->ct.key == e2->ct.key;
+}
+
 static void ct_expr_clone(struct expr *new, const struct expr *expr)
 {
        new->ct.key = expr->ct.key;
@@ -233,6 +238,7 @@ static const struct expr_ops ct_expr_ops = {
        .type           = EXPR_CT,
        .name           = "ct",
        .print          = ct_expr_print,
+       .cmp            = ct_expr_cmp,
        .clone          = ct_expr_clone,
        .pctx_update    = ct_expr_pctx_update,
 };

diff --git a/src/expression.c b/src/expression.c
index cdc2b7b06a250d69417e4eb46bf90b57bf92779f..131392566716bafb3eabafa4b4261e3a1e4b45e6 100644 (file)
--- a/src/expression.c
+++ b/src/expression.c
@@ -74,6 +74,17 @@ void expr_print(const struct expr *expr)
        expr->ops->print(expr);
 }
 
+bool expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       assert(e1->flags & EXPR_F_SINGLETON);
+       assert(e2->flags & EXPR_F_SINGLETON);
+
+       if (e1->ops->type != e2->ops->type)
+               return false;
+
+       return e1->ops->cmp(e1, e2);
+}
+
 void expr_describe(const struct expr *expr)
 {
        const struct datatype *dtype = expr->dtype;
@@ -148,6 +159,19 @@ static void verdict_expr_print(const struct expr *expr)
        datatype_print(expr);
 }
 
+static bool verdict_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       if (e1->verdict != e2->verdict)
+               return false;
+
+       if ((e1->verdict == NFT_JUMP ||
+            e1->verdict == NFT_GOTO) &&
+           strcmp(e1->chain, e2->chain))
+               return false;
+
+       return true;
+}
+
 static void verdict_expr_clone(struct expr *new, const struct expr *expr)
 {
        new->verdict = expr->verdict;
@@ -164,6 +188,7 @@ static const struct expr_ops verdict_expr_ops = {
        .type           = EXPR_VERDICT,
        .name           = "verdict",
        .print          = verdict_expr_print,
+       .cmp            = verdict_expr_cmp,
        .clone          = verdict_expr_clone,
        .destroy        = verdict_expr_destroy,
 };
@@ -226,6 +251,12 @@ static void constant_expr_print(const struct expr *expr)
        datatype_print(expr);
 }
 
+static bool constant_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       return expr_basetype(e1) == expr_basetype(e2) &&
+              !mpz_cmp(e1->value, e2->value);
+}
+
 static void constant_expr_clone(struct expr *new, const struct expr *expr)
 {
        mpz_init_set(new->value, expr->value);
@@ -240,6 +271,7 @@ static const struct expr_ops constant_expr_ops = {
        .type           = EXPR_VALUE,
        .name           = "value",
        .print          = constant_expr_print,
+       .cmp            = constant_expr_cmp,
        .clone          = constant_expr_clone,
        .destroy        = constant_expr_destroy,
 };

diff --git a/src/exthdr.c b/src/exthdr.c
index 458f9d620ff2f01e416b34b822f53781832aa665..a619eccea113c604e8b5f8517c5b957ee2b219fa 100644 (file)
--- a/src/exthdr.c
+++ b/src/exthdr.c
@@ -27,6 +27,12 @@ static void exthdr_expr_print(const struct expr *expr)
        printf("%s %s", expr->exthdr.desc->name, expr->exthdr.tmpl->token);
 }
 
+static bool exthdr_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       return e1->exthdr.desc == e2->exthdr.desc &&
+              e1->exthdr.tmpl == e2->exthdr.tmpl;
+}
+
 static void exthdr_expr_clone(struct expr *new, const struct expr *expr)
 {
        new->exthdr.desc = expr->exthdr.desc;
@@ -37,6 +43,7 @@ static const struct expr_ops exthdr_expr_ops = {
        .type           = EXPR_EXTHDR,
        .name           = "exthdr",
        .print          = exthdr_expr_print,
+       .cmp            = exthdr_expr_cmp,
        .clone          = exthdr_expr_clone,
 };
 

diff --git a/src/meta.c b/src/meta.c
index af5c3f97f9ab109a6fdb6f8492bce6ea3fef4aa0..ebc0c5419d497e7c2732afa9b4554e4b5d356bcf 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -350,6 +350,11 @@ static void meta_expr_print(const struct expr *expr)
        }
 }
 
+static bool meta_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       return e1->meta.key == e2->meta.key;
+}
+
 static void meta_expr_clone(struct expr *new, const struct expr *expr)
 {
        new->meta.key = expr->meta.key;
@@ -407,6 +412,7 @@ static const struct expr_ops meta_expr_ops = {
        .type           = EXPR_META,
        .name           = "meta",
        .print          = meta_expr_print,
+       .cmp            = meta_expr_cmp,
        .clone          = meta_expr_clone,
        .pctx_update    = meta_expr_pctx_update,
 };

diff --git a/src/payload.c b/src/payload.c
index 9f2db6d95b7235a00f8dba564226018fd9054a71..427080c0c1e9dd83249eccba881dc3b87549436e 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -40,6 +40,14 @@ static void payload_expr_print(const struct expr *expr)
                       expr->payload.offset, expr->len);
 }
 
+static bool payload_expr_cmp(const struct expr *e1, const struct expr *e2)
+{
+       return e1->payload.desc   == e2->payload.desc &&
+              e1->payload.tmpl   == e2->payload.tmpl &&
+              e1->payload.base   == e2->payload.base &&
+              e1->payload.offset == e2->payload.offset;
+}
+
 static void payload_expr_clone(struct expr *new, const struct expr *expr)
 {
        new->payload.desc   = expr->payload.desc;
@@ -76,6 +84,7 @@ static const struct expr_ops payload_expr_ops = {
        .type           = EXPR_PAYLOAD,
        .name           = "payload",
        .print          = payload_expr_print,
+       .cmp            = payload_expr_cmp,
        .clone          = payload_expr_clone,
        .pctx_update    = payload_expr_pctx_update,
 };