-have non-infinite nick expiration time by default

3 files changed, 34 insertions, 7 deletions

diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index 6417f9c1..46faba72 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = .
 # we use libgnunetutil to load plugins, and it
 # only looks in /gnunet, not /gnunet-gtk!
 plugindir = $(libdir)/gnunet
+pkgcfgdir= $(prefix)/share/gnunet/config.d/
 
 AM_CPPFLAGS = \
   -I$(top_srcdir)/ \
@@ -10,6 +11,12 @@ AM_CPPFLAGS = \
 
 bin_PROGRAMS = gnunet-namestore-gtk
 
+pkgcfg_DATA = \
+  gnunet-namestore-gtk.conf
+
+EXTRA_DIST = \
+ $(pkgcfg_DATA)
+
 gnunet_namestore_gtk_SOURCES = \
   gnunet-namestore-gtk.c \
   gnunet-namestore-gtk_edit.c
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 7b3e1f9f..cea5ce0c 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -304,8 +304,10 @@ struct RecordInfo
 };
 
 
-
-
+/**
+ * When do NICK records expire?
+ */
+static struct GNUNET_TIME_Relative nick_expiration_time;
 
 /**
  * Hash map from the H(name) in the zone to the 'struct RecordInfo'
@@ -2139,8 +2141,8 @@ gnunet_namestore_gtk_pseu_entry_changed_cb (GtkEditable *editable,
     else
     {
       rd_new[off].record_type = GNUNET_GNSRECORD_TYPE_NICK;
-      rd_new[off].expiration_time = UINT64_MAX;
-      rd_new[off].flags = GNUNET_GNSRECORD_RF_PRIVATE;
+      rd_new[off].expiration_time = nick_expiration_time.rel_value_us;
+      rd_new[off].flags = GNUNET_GNSRECORD_RF_PRIVATE | GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
       rd_new[off].data_size = strlen (pseu) + 1;
       rd_new[off].data = pseu;
     }
@@ -2745,16 +2747,32 @@ run (void *cls,
 
   ml = cls;
   cfg = GNUNET_GTK_main_loop_get_configuration (ml);
-  if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+                                &cleanup_task, NULL);
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg,
+                                           "namestore-gtk",
+                                           "NICK_EXPIRATION",
+                                           &nick_expiration_time))
+  {
+    GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                               "namestore-gtk",
+                               "NICK_EXPIRATION");
+    GNUNET_SCHEDULER_shutdown ();
     return;
+  }
+  if (GNUNET_OK !=
+      GNUNET_GTK_main_loop_build_window (ml, NULL))
+  {
+    GNUNET_SCHEDULER_shutdown ();
+    return;
+  }
   GNUNET_GTK_set_icon_search_path ();
   GNUNET_GTK_setup_nls ();
 
   main_window = GTK_WIDGET (get_object ("gnunet_namestore_gtk_dialog"));
   main_window = GNUNET_GTK_plug_me ("GNUNET_NAMESTORE_GTK_PLUG",
                                     main_window);
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
-                                &cleanup_task, NULL);
 
   namestore = GNUNET_NAMESTORE_connect (cfg);
   if (NULL == namestore)
diff --git a/src/namestore/gnunet-namestore-gtk.conf b/src/namestore/gnunet-namestore-gtk.conf
new file mode 100644
index 00000000..00d3f8e9
--- /dev/null
+++ b/src/namestore/gnunet-namestore-gtk.conf
@@ -0,0 +1,2 @@
+[namestore-gtk]
+NICK_EXPIRATION = 1 week
\ No newline at end of file