aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-13 22:26:32 +0100
committerSchanzenbach, Martin <mschanzenbach@posteo.de>2020-02-13 22:26:32 +0100
commit007bba133ffc04bb091f35c5a1aa8745be1d5139 (patch)
tree64089b747ff41ce87effb530e992ff313aec8e4c /src
parentf0b50570e6f62c4f7734d35bc56dd99099a4ad2a (diff)
parent79243b3d21f1687430e969626eba6785df3df901 (diff)
downloadgnunet-007bba133ffc04bb091f35c5a1aa8745be1d5139.tar.gz
gnunet-007bba133ffc04bb091f35c5a1aa8745be1d5139.zip
Merge branch 'master' into schanzen/reclaim_256bit
Diffstat (limited to 'src')
-rw-r--r--src/gns/gnunet-gns.c6
-rw-r--r--src/include/gnunet_gnsrecord_lib.h5
-rw-r--r--src/namestore/gnunet-service-namestore.c2
3 files changed, 9 insertions, 4 deletions
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c
index 37633daf1..d52761ef8 100644
--- a/src/gns/gnunet-gns.c
+++ b/src/gns/gnunet-gns.c
@@ -205,7 +205,11 @@ process_lookup_result (void *cls,
205 if (raw) 205 if (raw)
206 printf ("%s\n", string_val); 206 printf ("%s\n", string_val);
207 else 207 else
208 printf ("Got `%s' record: %s\n", typename, string_val); 208 printf ("Got `%s' record: %s%s\n",
209 typename,
210 string_val,
211 (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SUPPLEMENTAL)) ?
212 " (supplemental)" : "");
209 GNUNET_free (string_val); 213 GNUNET_free (string_val);
210 } 214 }
211 GNUNET_SCHEDULER_shutdown (); 215 GNUNET_SCHEDULER_shutdown ();
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h
index e06dcebc7..c976c89c5 100644
--- a/src/include/gnunet_gnsrecord_lib.h
+++ b/src/include/gnunet_gnsrecord_lib.h
@@ -168,10 +168,9 @@ enum GNUNET_GNSRECORD_Flags
168 GNUNET_GNSRECORD_RF_PRIVATE = 2, 168 GNUNET_GNSRECORD_RF_PRIVATE = 2,
169 169
170 /** 170 /**
171 * This flag is currently unused; former RF_PENDING flag 171 * This is a supplemental record.
172 *
173 * GNUNET_GNSRECORD_RF_UNUSED = 4,
174 */ 172 */
173 GNUNET_GNSRECORD_RF_SUPPLEMENTAL = 4,
175 174
176 /** 175 /**
177 * This expiration time of the record is a relative 176 * This expiration time of the record is a relative
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 619cabfc7..c57f15f65 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -695,6 +695,8 @@ merge_with_nick_records (const struct GNUNET_GNSRECORD_Data *nick_rd,
695 } 695 }
696 /* append nick */ 696 /* append nick */
697 target[rd2_length] = *nick_rd; 697 target[rd2_length] = *nick_rd;
698 /* Mark as supplemental */
699 target[rd2_length].flags = nick_rd->flags | GNUNET_GNSRECORD_RF_SUPPLEMENTAL;
698 target[rd2_length].expiration_time = latest_expiration; 700 target[rd2_length].expiration_time = latest_expiration;
699 target[rd2_length].data = (void *) &data[data_offset]; 701 target[rd2_length].data = (void *) &data[data_offset];
700 GNUNET_memcpy (&data[data_offset], nick_rd->data, nick_rd->data_size); 702 GNUNET_memcpy (&data[data_offset], nick_rd->data, nick_rd->data_size);