[GNUnet-SVN] r4650 - in GNUnet/src: applications/fs/namespace applications/fs/tools include

[gnunet]

Author: grothoff
Date: 2007-03-07 20:50:46 -0700 (Wed, 07 Mar 2007)
New Revision: 4650

Modified:
   GNUnet/src/applications/fs/namespace/namespace_info.c
   GNUnet/src/applications/fs/tools/gnunet-insert.c
   GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
   GNUnet/src/include/gnunet_namespace_lib.h
Log:
fixing expiration time for namespace advertisements

Modified: GNUnet/src/applications/fs/namespace/namespace_info.c
===================================================================
--- GNUnet/src/applications/fs/namespace/namespace_info.c       2007-03-06 
21:54:05 UTC (rev 4649)
+++ GNUnet/src/applications/fs/namespace/namespace_info.c       2007-03-08 
03:50:46 UTC (rev 4650)
@@ -177,7 +177,7 @@
                   struct GC_Configuration * cfg,               
                   unsigned int anonymityLevel,
                   unsigned int insertPriority,
-                  unsigned int insertExpiration,
+                  cron_t insertExpiration,
                   const char * namespaceName,
                   const struct ECRS_MetaData * meta,
                   const struct ECRS_URI * advertisementURI,
@@ -190,7 +190,7 @@
                             meta,
                             anonymityLevel,
                             insertPriority,
-                            insertExpiration + get_time(),
+                            insertExpiration,
                             advertisementURI,
                             rootEntry);
   /* store binding of namespaceName to 'meta' in state DB! */
@@ -619,7 +619,7 @@
                  struct GC_Configuration * cfg,
                  unsigned int anonymityLevel,
                  unsigned int insertPriority,
-                 unsigned int insertExpiration,
+                 cron_t insertExpiration,
                  const char * name,
                  TIME_T updateInterval,
                  const HashCode512 * lastId,
@@ -723,7 +723,7 @@
                            name,
                            anonymityLevel,
                            insertPriority,
-                           insertExpiration + get_time(),
+                           insertExpiration,
                            creationTime,
                            updateInterval,
                            &tid,

Modified: GNUnet/src/applications/fs/tools/gnunet-insert.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-insert.c    2007-03-06 21:54:05 UTC 
(rev 4649)
+++ GNUnet/src/applications/fs/tools/gnunet-insert.c    2007-03-08 03:50:46 UTC 
(rev 4650)
@@ -122,7 +122,7 @@
                            cfg,
                            anonymity,
                            priority,
-                           1024, /* FIXME: expiration */
+                           get_time() + 2 * cronYEARS,
                            pseudonym,
                            (TIME_T) interval,
                            prev_id == NULL ? NULL : &prevId,

Modified: GNUnet/src/applications/fs/tools/gnunet-pseudonym.c
===================================================================
--- GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2007-03-06 21:54:05 UTC 
(rev 4649)
+++ GNUnet/src/applications/fs/tools/gnunet-pseudonym.c 2007-03-08 03:50:46 UTC 
(rev 4650)
@@ -55,7 +55,7 @@
 
 static unsigned int priority;
 
-static unsigned int expiration;
+static cron_t expiration = 2 * cronYEARS;
 
 static char * cfgFilename = DEFAULT_CLIENT_CONFIG_FILE;
 
@@ -277,7 +277,7 @@
                                   cfg,
                                   anonymity,
                                   priority,
-                                  expiration,
+                                  expiration + get_time(),
                                   create_name,
                                   meta,
                                   advertisement,

Modified: GNUnet/src/include/gnunet_namespace_lib.h
===================================================================
--- GNUnet/src/include/gnunet_namespace_lib.h   2007-03-06 21:54:05 UTC (rev 
4649)
+++ GNUnet/src/include/gnunet_namespace_lib.h   2007-03-08 03:50:46 UTC (rev 
4650)
@@ -79,7 +79,7 @@
                   struct GC_Configuration * cfg,
                   unsigned int anonymityLevel,
                   unsigned int insertPriority,
-                  unsigned int insertExpiration,
+                  cron_t insertExpiration,
                   const char * namespaceName,
                   const struct ECRS_MetaData * meta,
                   const struct ECRS_URI * advertisementURI,
@@ -186,7 +186,7 @@
                  struct GC_Configuration * cfg,
                  unsigned int anonymityLevel,
                  unsigned int insertPriority,
-                 unsigned int insertExpiration,
+                 cron_t insertExpiration,
                  const char * name,
                  TIME_T updateInterval,
                  const HashCode512 * lastId,