[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: GNS: Use flags as defined and generated
|
From: |
gnunet |
|
Subject: |
[gnunet] branch master updated: GNS: Use flags as defined and generated from GANA |
|
Date: |
Thu, 10 Nov 2022 05:55:05 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new 4775f9e5e GNS: Use flags as defined and generated from GANA
4775f9e5e is described below
commit 4775f9e5e8e4f1aaad51ce54aa0c8174ac52f80d
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Nov 10 13:54:58 2022 +0900
GNS: Use flags as defined and generated from GANA
---
bootstrap | 5 ++++-
contrib/gana | 2 +-
contrib/sphinx | 2 +-
src/gnsrecord/gnsrecord_crypto.c | 12 +++++------
src/gnsrecord/gnsrecord_misc.c | 2 +-
src/gnsrecord/json_gnsrecord.c | 4 ++--
src/include/gnunet_gnsrecord_lib.h | 42 ++------------------------------------
src/namestore/gnunet-namestore.c | 10 ++++-----
8 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/bootstrap b/bootstrap
index fbe03c6f7..a17324dd7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -132,10 +132,13 @@ gana_update()
cwd=$PWD
cd contrib/gana || exit 1
# GNS
- echo "Updating GNS record types"
+ echo "Updating GNS record types/flags"
cd gnu-name-system-record-types && \
make >/dev/null && \
cp gnu_name_system_record_types.h ../../../src/include/ || exit 1
+ cd gnu-name-system-record-flags && \
+ make >/dev/null && \
+ cp gnu_name_system_record_flags.h ../../../src/include/ || exit 1
echo "Creating default TLDs"
cd ../gnu-name-system-default-tlds && \
make >/dev/null && \
diff --git a/contrib/gana b/contrib/gana
index 6b9824cb4..092edfe57 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 6b9824cb4d4561f1167c7f518998a226a82222d6
+Subproject commit 092edfe57896d5f0fdf11008a4cba561203dfadd
diff --git a/contrib/sphinx b/contrib/sphinx
index 84cb6aaaa..4f40b5dec 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 84cb6aaaaebe9b79d5453a8444ee95459c8f5029
+Subproject commit 4f40b5deca02c8dc64ff6c73e6602e6abdd1bae2
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)
{
diff --git a/src/include/gnunet_gnsrecord_lib.h
b/src/include/gnunet_gnsrecord_lib.h
index 85a42d459..0ccf28e7d 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -69,46 +69,9 @@ extern "C" {
#include "gnu_name_system_record_types.h"
/**
- * Flags that can be set for a record.
- * MUST fit into 16 bit.
+ * Include the record flags generated from GANA
*/
-enum GNUNET_GNSRECORD_Flags
-{
- /**
- * No special options.
- */
- GNUNET_GNSRECORD_RF_NONE = 0,
-
- /**
- * This record is critical. If it cannot be processed
- * (for example because the record type is unknown)
- * resolution MUST fail
- */
- GNUNET_GNSRECORD_RF_CRITICAL = 1,
-
- /**
- * This record should not be used unless all (other) records with an absolute
- * expiration time have expired.
- */
- GNUNET_GNSRECORD_RF_SHADOW_RECORD = 2,
-
- /**
- * This is a supplemental record.
- */
- GNUNET_GNSRECORD_RF_SUPPLEMENTAL = 4,
-
- /**
- * This expiration time of the record is a relative
- * time (not an absolute time).
- */
- GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION = 16384, /* 2^14 */
-
- /**
- * This is a private record of this peer and it should
- * thus not be handed out to other peers.
- */
- GNUNET_GNSRECORD_RF_PRIVATE = 32768, /* 2^15 */
-
+#include "gnu_name_system_record_flags.h"
/**
* When comparing flags for record equality for removal,
@@ -122,7 +85,6 @@ enum GNUNET_GNSRECORD_Flags
* #GNUNET_GNSRECORD_records_cmp.
*/
#define GNUNET_GNSRECORD_RF_RCMP_FLAGS
(GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)
-};
/**
* Filter for GNUNET_GNSRECORD_normalize_record_set().
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 6444d446d..36a0a9ba3 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -200,7 +200,7 @@ static int del;
static int is_public;
/**
- * Is record a shadow record (#GNUNET_GNSRECORD_RF_SHADOW_RECORD)
+ * Is record a shadow record (#GNUNET_GNSRECORD_RF_SHADOW)
*/
static int is_shadow;
@@ -688,7 +688,7 @@ display_record (const struct GNUNET_IDENTITY_PrivateKey
*zone_key,
ets,
(0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE"
: "PUBLIC",
- (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ?
"SHADOW"
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW)) ? "SHADOW"
: "");
GNUNET_free (s);
}
@@ -917,7 +917,7 @@ get_existing_record (void *cls,
rde->data_size = data_size;
rde->record_type = type;
if (1 == is_shadow)
- rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ rde->flags |= GNUNET_GNSRECORD_RF_SHADOW;
if (1 != is_public)
rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
rde->expiration_time = etime;
@@ -1531,7 +1531,7 @@ run_with_zone_pkey (const struct
GNUNET_CONFIGURATION_Handle *cfg)
if (GNUNET_YES == etime_is_rel)
rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
if (1 == is_shadow)
- rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ rd.flags |= GNUNET_GNSRECORD_RF_SHADOW;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
sname,
@@ -1776,7 +1776,7 @@ multirecord_process (struct
GNUNET_GETOPT_CommandLineProcessorContext *ctx,
if (NULL == strchr (tok, (unsigned char) 'p')) /* p = public */
record.flags |= GNUNET_GNSRECORD_RF_PRIVATE;
if (NULL != strchr (tok, (unsigned char) 's'))
- record.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ record.flags |= GNUNET_GNSRECORD_RF_SHADOW;
/* find beginning of record value */
tok = strchr (&value[tok - cp], (unsigned char) ' ');
if (NULL == tok)
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: GNS: Use flags as defined and generated from GANA,
gnunet <=