From 4775f9e5e8e4f1aaad51ce54aa0c8174ac52f80d Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <schanzen@gnunet.org>
Date: Thu, 10 Nov 2022 13:54:58 +0900
Subject: GNS: Use flags as defined and generated from GANA

---
 src/gnsrecord/gnsrecord_crypto.c | 12 ++++++------
 src/gnsrecord/gnsrecord_misc.c   |  2 +-
 src/gnsrecord/json_gnsrecord.c   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/gnsrecord')

diff --git a/src/gnsrecord/gnsrecord_crypto.c b/src/gnsrecord/gnsrecord_crypto.c
index d794c9cb4..a62304c40 100644
--- a/src/gnsrecord/gnsrecord_crypto.c
+++ b/src/gnsrecord/gnsrecord_crypto.c
@@ -793,7 +793,7 @@ block_decrypt_ecdsa (const struct GNUNET_GNSRECORD_Block *block,
           continue;
         }
 
-        if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD))
+        if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW))
         {
           int include_record = GNUNET_YES;
           /* Shadow record, figure out if we have a not expired active record */
@@ -805,7 +805,7 @@ block_decrypt_ecdsa (const struct GNUNET_GNSRECORD_Block *block,
               include_record = GNUNET_NO;       /* Shadow record is expired */
             if ((rd[k].record_type == rd[i].record_type) &&
                 (rd[k].expiration_time >= now.abs_value_us) &&
-                (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)))
+                (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW)))
             {
               include_record = GNUNET_NO;         /* We have a non-expired, non-shadow record of the same type */
               GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -815,7 +815,7 @@ block_decrypt_ecdsa (const struct GNUNET_GNSRECORD_Block *block,
           }
           if (GNUNET_YES == include_record)
           {
-            rd[i].flags ^= GNUNET_GNSRECORD_RF_SHADOW_RECORD;       /* Remove Flag */
+            rd[i].flags ^= GNUNET_GNSRECORD_RF_SHADOW;       /* Remove Flag */
             if (j != i)
               rd[j] = rd[i];
             j++;
@@ -919,7 +919,7 @@ block_decrypt_eddsa (const struct GNUNET_GNSRECORD_Block *block,
           continue;
         }
 
-        if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD))
+        if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW))
         {
           int include_record = GNUNET_YES;
           /* Shadow record, figure out if we have a not expired active record */
@@ -931,7 +931,7 @@ block_decrypt_eddsa (const struct GNUNET_GNSRECORD_Block *block,
               include_record = GNUNET_NO;       /* Shadow record is expired */
             if ((rd[k].record_type == rd[i].record_type) &&
                 (rd[k].expiration_time >= now.abs_value_us) &&
-                (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)))
+                (0 == (rd[k].flags & GNUNET_GNSRECORD_RF_SHADOW)))
             {
               include_record = GNUNET_NO;         /* We have a non-expired, non-shadow record of the same type */
               GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -941,7 +941,7 @@ block_decrypt_eddsa (const struct GNUNET_GNSRECORD_Block *block,
           }
           if (GNUNET_YES == include_record)
           {
-            rd[i].flags ^= GNUNET_GNSRECORD_RF_SHADOW_RECORD;       /* Remove Flag */
+            rd[i].flags ^= GNUNET_GNSRECORD_RF_SHADOW;       /* Remove Flag */
             if (j != i)
               rd[j] = rd[i];
             j++;
diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index 97ca7b135..e225bcc7f 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -173,7 +173,7 @@ GNUNET_GNSRECORD_record_get_expiration_time (unsigned int rd_count,
       /* Check for shadow record */
       if ((c == c2) ||
           (rd[c].record_type != rd[c2].record_type) ||
-          (0 == (rd[c2].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)))
+          (0 == (rd[c2].flags & GNUNET_GNSRECORD_RF_SHADOW)))
         continue;
       /* We have a shadow record */
       if (0 != (rd[c2].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
diff --git a/src/gnsrecord/json_gnsrecord.c b/src/gnsrecord/json_gnsrecord.c
index 2b840ab30..0725cb1a1 100644
--- a/src/gnsrecord/json_gnsrecord.c
+++ b/src/gnsrecord/json_gnsrecord.c
@@ -168,7 +168,7 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
   if (1 == supplemental)
     rd->flags |= GNUNET_GNSRECORD_RF_SUPPLEMENTAL;
   if (1 == shadow)
-    rd->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+    rd->flags |= GNUNET_GNSRECORD_RF_SHADOW;
   return GNUNET_OK;
 }
 
@@ -353,7 +353,7 @@ GNUNET_GNSRECORD_JSON_from_gnsrecord (const char*rname,
                         GNUNET_JSON_GNSRECORD_FLAG_SUPPLEMENTAL,
                         rd[i].flags & GNUNET_GNSRECORD_RF_SUPPLEMENTAL,
                         GNUNET_JSON_GNSRECORD_FLAG_SUPPLEMENTAL,
-                        rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD);
+                        rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW);
     GNUNET_free (value_str);
     if (NULL == record)
     {
-- 
cgit v1.2.3